[certi-cvs] certi/libCERTI SecureTCPSocket.cc SecureTCPSock...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       08/10/13 11:27:51

Modified files:
        libCERTI       : SecureTCPSocket.cc SecureTCPSocket.hh Socket.hh 
                         SocketMC.hh SocketTCP.hh SocketUDP.hh 

Log message:
        Bug #24537: Socket::getClass() removed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecureTCPSocket.cc?cvsroot=certi&r1=3.10&r2=3.11
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SecureTCPSocket.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Socket.hh?cvsroot=certi&r1=3.14&r2=3.15
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.hh?cvsroot=certi&r1=3.22&r2=3.23
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.hh?cvsroot=certi&r1=3.12&r2=3.13

Patches:
Index: SecureTCPSocket.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecureTCPSocket.cc,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -b -r3.10 -r3.11
--- SecureTCPSocket.cc  12 Jun 2008 07:39:50 -0000      3.10
+++ SecureTCPSocket.cc  13 Oct 2008 11:27:51 -0000      3.11
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SecureTCPSocket.cc,v 3.10 2008/06/12 07:39:50 erk Exp $
+// $Id: SecureTCPSocket.cc,v 3.11 2008/10/13 11:27:51 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -108,17 +108,6 @@
 }
 #endif // WITH_GSSAPI
 
-// ----------------------------------------------------------------------------
-int
-SecureTCPSocket::getClass() const
-{
-#ifdef HLA_USES_GSSAPI
-    return SOCKET_TYPE_S_TCP ;
-#else
-    return SOCKET_TYPE_TCP ;
-#endif
-}
-
 #ifdef WITH_GSSAPI
 // ----------------------------------------------------------------------------
 void
@@ -259,4 +248,4 @@
 
 }
 
-// $Id: SecureTCPSocket.cc,v 3.10 2008/06/12 07:39:50 erk Exp $
+// $Id: SecureTCPSocket.cc,v 3.11 2008/10/13 11:27:51 gotthardp Exp $

Index: SecureTCPSocket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SecureTCPSocket.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- SecureTCPSocket.hh  22 Jun 2007 08:51:39 -0000      3.8
+++ SecureTCPSocket.hh  13 Oct 2008 11:27:51 -0000      3.9
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SecureTCPSocket.hh,v 3.8 2007/06/22 08:51:39 erk Exp $
+// $Id: SecureTCPSocket.hh,v 3.9 2008/10/13 11:27:51 gotthardp Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef CERTI_SECURE_TCP_SOCKET_HH
@@ -51,7 +51,6 @@
     // FIXME: Peut-etre devrait-on regarder si un message est pret en interne,
     // et balancer une exception dans ce cas la.
     virtual bool isDataReady() const { return SocketTCP::isDataReady(); }
-    virtual int getClass() const ;
 
     // Return Peer's principal name. Must not be freed ! Principal name is
     // without any network address part(starting with a '@').
@@ -95,5 +94,5 @@
 
 #endif // CERTI_SECURE_TCP_SOCKET_HH
 
-// $Id: SecureTCPSocket.hh,v 3.8 2007/06/22 08:51:39 erk Exp $
+// $Id: SecureTCPSocket.hh,v 3.9 2008/10/13 11:27:51 gotthardp Exp $
 

Index: Socket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Socket.hh,v
retrieving revision 3.14
retrieving revision 3.15
diff -u -b -r3.14 -r3.15
--- Socket.hh   12 Oct 2008 11:46:40 -0000      3.14
+++ Socket.hh   13 Oct 2008 11:27:51 -0000      3.15
@@ -31,12 +31,6 @@
 #include <string>
 #include <sstream>
 
-// Those values are returned by the GetClass method.
-#define SOCKET_TYPE_TCP 0 // TCP Socket class ID
-#define SOCKET_TYPE_MC 1 // Multicast Socket class ID
-#define SOCKET_TYPE_UDP 2
-#define SOCKET_TYPE_S_TCP 3 // Secure TCP Socket class ID
-
 namespace certi {
 
 class Socket
@@ -56,7 +50,6 @@
        // See Important Note in SocketTCP.hh
        virtual bool isDataReady() const = 0 ;
 
-       virtual int getClass() const = 0 ;
        virtual unsigned long returnAdress() const = 0 ;
 
        #ifdef _WIN32

Index: SocketMC.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- SocketMC.hh 20 Nov 2007 09:04:53 -0000      3.12
+++ SocketMC.hh 13 Oct 2008 11:27:51 -0000      3.13
@@ -66,7 +66,6 @@
        #endif
 
        virtual unsigned long returnAdress() const ;
-       virtual int getClass() const { return SOCKET_TYPE_MC ; };
        virtual void close();
 
        void sendMC(NetworkMessage *msg);

Index: SocketTCP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.hh,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -b -r3.22 -r3.23
--- SocketTCP.hh        12 Oct 2008 11:46:41 -0000      3.22
+++ SocketTCP.hh        13 Oct 2008 11:27:51 -0000      3.23
@@ -63,7 +63,6 @@
 
        virtual bool isDataReady() const ;
 
-       virtual int getClass() const { return SOCKET_TYPE_TCP ; };
        virtual unsigned long returnAdress() const ;
        
        SocketTCP &operator=(SocketTCP &theSocket);

Index: SocketUDP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- SocketUDP.hh        12 Oct 2008 11:46:41 -0000      3.12
+++ SocketUDP.hh        13 Oct 2008 11:27:51 -0000      3.13
@@ -52,7 +52,6 @@
 
        virtual bool isDataReady() const ;
 
-       virtual int getClass() const { return SOCKET_TYPE_UDP ; };
        #ifdef _WIN32
                SOCKET returnSocket();
        #else