[certi-cvs] certi RTIG/RTIG_processing.cc RTIG/RTIG.cc libC...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      08/10/13 10:06:48

Modified files:
        RTIG           : RTIG_processing.cc RTIG.cc 
        libCERTI       : SecurityServer.cc SocketServer.cc 

Log message:
        Partial bug #24537: Remove unused Socket::getClass() fix
        Now we may remove getClass but the polymorphic
        Socket subclasses usage is NOT yet clean.
        More work to come...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG_processing.cc?cvsroot=certi&r1=3.77&r2=3.78
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/RTIG.cc?cvsroot=certi&r1=3.49&r2=3.50
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecurityServer.cc?cvsroot=certi&r1=3.14&r2=3.15
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketServer.cc?cvsroot=certi&r1=3.17&r2=3.18

Patches:
Index: RTIG/RTIG_processing.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG_processing.cc,v
retrieving revision 3.77
retrieving revision 3.78
diff -u -b -r3.77 -r3.78
--- RTIG/RTIG_processing.cc     18 Sep 2008 14:41:27 -0000      3.77
+++ RTIG/RTIG_processing.cc     13 Oct 2008 10:06:47 -0000      3.78
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG_processing.cc,v 3.77 2008/09/18 14:41:27 gotthardp Exp $
+// $Id: RTIG_processing.cc,v 3.78 2008/10/13 10:06:47 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -157,7 +157,7 @@
        {
         num_federe = federations.addFederate(num_federation,
                                           federate.c_str(),
-                                          (SecureTCPSocket *) link);
+                                          static_cast<SocketTCP*>(link));
         }
     catch (RTI::FederateAlreadyExecutionMember &e)
         {
@@ -1433,4 +1433,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG_processing.cc,v 3.77 2008/09/18 14:41:27 gotthardp Exp $
+// $Id: RTIG_processing.cc,v 3.78 2008/10/13 10:06:47 erk Exp $

Index: RTIG/RTIG.cc
===================================================================
RCS file: /sources/certi/certi/RTIG/RTIG.cc,v
retrieving revision 3.49
retrieving revision 3.50
diff -u -b -r3.49 -r3.50
--- RTIG/RTIG.cc        10 Jul 2008 20:20:05 -0000      3.49
+++ RTIG/RTIG.cc        13 Oct 2008 10:06:48 -0000      3.50
@@ -18,7 +18,7 @@
 // along with this program ; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: RTIG.cc,v 3.49 2008/07/10 20:20:05 approx Exp $
+// $Id: RTIG.cc,v 3.50 2008/10/13 10:06:48 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -491,7 +491,7 @@
                link->returnSocket());
                try {
                        do {
-                               link = processIncomingMessage((SecureTCPSocket 
*)link);
+                               link = processIncomingMessage(link);
                                if (link == NULL)break ;
                                } while (link->isDataReady());
                        }
@@ -502,7 +502,7 @@
                        D.Out(pdExcept, "Catching Network Error, no reason 
string.");
                        cout << "RTIG dropping client connection " << 
link->returnSocket()
                        << '.' << endl ;
-                       closeConnection((SecureTCPSocket *)link, true);
+                       closeConnection(link, true);
                        link = NULL ;
                        }
                }
@@ -1025,4 +1025,4 @@
 
 }} // namespace certi/rtig
 
-// $Id: RTIG.cc,v 3.49 2008/07/10 20:20:05 approx Exp $
+// $Id: RTIG.cc,v 3.50 2008/10/13 10:06:48 erk Exp $

Index: libCERTI/SecurityServer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecurityServer.cc,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -b -r3.14 -r3.15
--- libCERTI/SecurityServer.cc  9 Jul 2008 15:04:26 -0000       3.14
+++ libCERTI/SecurityServer.cc  13 Oct 2008 10:06:48 -0000      3.15
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SecurityServer.cc,v 3.14 2008/07/09 15:04:26 rousse Exp $
+// $Id: SecurityServer.cc,v 3.15 2008/10/13 10:06:48 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -73,15 +73,14 @@
 SecurityServer::canFederateAccessData(FederateHandle theFederate,
                                       SecurityLevelID theDataLevelID)
 {
-    Socket *FederateSocket ;
-    SecureTCPSocket *SecureSocket ;
+    Socket          *FederateSocket=NULL;
+    SecureTCPSocket *SecureSocket=NULL;
 
     const char *FederateName ;
     SecurityLevelID FederateLevel ;
 
     // 1- Get the socket of this federate
     //(Killed federate/link will throw an RTIinternalError)
-
     try {
         FederateSocket = getSocketLink(theFederate);
     }
@@ -90,19 +89,19 @@
     }
 
     // 2- Check if it is a secure socket
+    if (NULL!=FederateSocket) {
+       SecureSocket = dynamic_cast<SecureTCPSocket *>(FederateSocket);
+    }
 
-    if (FederateSocket->getClass() != SOCKET_TYPE_S_TCP)
+    if (NULL==SecureSocket) {
         // If not, all federate are at Public Level.
         return dominates(PublicLevelID, theDataLevelID);
+    }
 
     // 3- If yes, retrieve federate principal name.
-
-    SecureSocket = (SecureTCPSocket *) FederateSocket ;
-
     FederateName = SecureSocket->getPeerName();
 
     // 4- Retrieve Federate level
-
     FederateLevel = getLevel(FederateName);
 
     return dominates(FederateLevel, theDataLevelID);
@@ -197,4 +196,4 @@
 
 }
 
-// $Id: SecurityServer.cc,v 3.14 2008/07/09 15:04:26 rousse Exp $
+// $Id: SecurityServer.cc,v 3.15 2008/10/13 10:06:48 erk Exp $

Index: libCERTI/SocketServer.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketServer.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/SocketServer.cc    27 Jun 2008 09:54:47 -0000      3.17
+++ libCERTI/SocketServer.cc    13 Oct 2008 10:06:48 -0000      3.18
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SocketServer.cc,v 3.17 2008/06/27 09:54:47 rousse Exp $
+// $Id: SocketServer.cc,v 3.18 2008/10/13 10:06:48 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -293,7 +293,11 @@
 SocketServer::open()
     throw (RTIinternalError)
 {
+#ifdef WITH_GSSAPI
     SecureTCPSocket *newLink = new SecureTCPSocket();
+#else
+    SocketTCP *newLink = new SocketTCP();
+#endif
 
     if (newLink == NULL)
         throw RTIinternalError("Could not allocate new socket.");
@@ -338,4 +342,4 @@
 
 }
 
-// $Id: SocketServer.cc,v 3.17 2008/06/27 09:54:47 rousse Exp $
+// $Id: SocketServer.cc,v 3.18 2008/10/13 10:06:48 erk Exp $