certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

certi libCERTI/SocketMC.cc libCERTI/SocketMC.hh...


From: certi-cvs
Subject: certi libCERTI/SocketMC.cc libCERTI/SocketMC.hh...
Date: Tue, 20 Nov 2007 09:04:54 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      07/11/20 09:04:54

Modified files:
        libCERTI       : SocketMC.cc SocketMC.hh SocketUN.hh Message.hh 
                         SocketUDP.cc MessageBody.cc SocketTCP.hh 
                         SocketUDP.hh LBTS.hh SocketUN.cc Socket.hh 
                         SocketTCP.cc 
        RTIA           : Communications.cc 

Log message:
        Correct
        bug #21616 : Compilation problem: ISO C++ does not support 'long long'
        and suppress spurious dotNet comment

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketMC.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUN.hh?cvsroot=certi&r1=3.11&r2=3.12
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Message.hh?cvsroot=certi&r1=3.37&r2=3.38
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.cc?cvsroot=certi&r1=3.15&r2=3.16
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/MessageBody.cc?cvsroot=certi&r1=3.13&r2=3.14
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.hh?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUDP.hh?cvsroot=certi&r1=3.8&r2=3.9
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/LBTS.hh?cvsroot=certi&r1=3.7&r2=3.8
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketUN.cc?cvsroot=certi&r1=3.16&r2=3.17
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/Socket.hh?cvsroot=certi&r1=3.12&r2=3.13
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/SocketTCP.cc?cvsroot=certi&r1=3.17&r2=3.18
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/Communications.cc?cvsroot=certi&r1=3.18&r2=3.19

Patches:
Index: libCERTI/SocketMC.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/SocketMC.cc        6 Jul 2007 09:25:17 -0000       3.13
+++ libCERTI/SocketMC.cc        20 Nov 2007 09:04:53 -0000      3.14
@@ -22,7 +22,7 @@
 #include "SocketMC.hh"
 #include "config.h"
 
-#ifdef _WIN32                                                          //dotNet
+#ifdef _WIN32
        #include "SocketTCP.hh"
 #else
        #include <arpa/inet.h>
@@ -39,7 +39,7 @@
 {
 _est_init_mc = false ;
 _num_msg = 1 ;
-#ifdef _WIN32                                                          //dotNet
+#ifdef _WIN32
   SocketTCP::winsockStartup();
 #endif
 }
@@ -49,7 +49,7 @@
 {
 if (_est_init_mc) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                 closesocket(_socket_mc);
                 closesocket(_socket_emetteur);
        #else
@@ -59,7 +59,7 @@
        _est_init_mc = false ;
        }
        
-#ifdef _WIN32                                                          //dotNet
+#ifdef _WIN32
        SocketTCP::winsockShutdown();
 #endif
 
@@ -84,11 +84,11 @@
 assert(!_est_init_mc);
 assert(addr>0);
 
-#ifdef _WIN32                                                          //dotNet
+#ifdef _WIN32
        assert(SocketTCP::winsockInitialized());
 #endif
 
-// creation du socket recepteur
+// create receiving socket
 _socket_mc = socket(AF_INET, SOCK_DGRAM, 0);
 if (_socket_mc < 0) {
        perror("socket1");
@@ -172,7 +172,7 @@
 SocketMC::close()
 {
 if (_est_init_mc) {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                 closesocket(_socket_mc);
                 closesocket(_socket_emetteur);
        #else
@@ -247,7 +247,7 @@
        {
        nb = select(_socket_mc+1, SELECT_TYPE_ARG234 &fdset, NULL, NULL, 
&timeout);
        
-       #ifdef _WIN32                                                           
//dotNet
+       #ifdef _WIN32
                        check= (WSAGetLastError() == WSAEINTR);
        #else
                        check= (errno == EINTR);

Index: libCERTI/SocketMC.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketMC.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/SocketMC.hh        25 Sep 2007 13:18:27 -0000      3.11
+++ libCERTI/SocketMC.hh        20 Nov 2007 09:04:53 -0000      3.12
@@ -23,7 +23,7 @@
 #include "Socket.hh"
 #include "NetworkMessage.hh"
 
-#ifdef _WIN32                                  //dotNet
+#ifdef _WIN32
        #ifndef _WINSOCK2API_
        #ifndef _WINSOCKAPI_
        #include <winsock.h>
@@ -75,7 +75,7 @@
 private:
        struct sockaddr_in _sin ;
        struct sockaddr_in _sin_e ;
-       #ifdef _WIN32                                   //dotNet
+       #ifdef _WIN32
                int _sinlen;
                SOCKET _socket_emetteur;
        #else

Index: libCERTI/SocketUN.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUN.hh,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -b -r3.11 -r3.12
--- libCERTI/SocketUN.hh        31 Oct 2007 10:30:22 -0000      3.11
+++ libCERTI/SocketUN.hh        20 Nov 2007 09:04:53 -0000      3.12
@@ -20,7 +20,7 @@
 #ifndef CERTI_SOCKET_UN_HH
 #define CERTI_SOCKET_UN_HH
 
-#ifdef _WIN32                                          //dotNet
+#ifdef _WIN32
        #include "SocketTCP.hh"
 #else
        #include <netdb.h>
@@ -94,13 +94,9 @@
        std::string name ;
 
 private:
-       #ifdef _WIN32
-               unsigned long SentBytesCount;
-               unsigned long RcvdBytesCount;
-       #else
-               ByteCount SentBytesCount ;
-               ByteCount RcvdBytesCount ;
-       #endif
+
+       Socket::ByteCount_t SentBytesCount ;
+       Socket::ByteCount_t RcvdBytesCount ;
 
        // la socket du serveur RTIA qui a ete cree par le federe-client
        int sock_connect ;

Index: libCERTI/Message.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Message.hh,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -b -r3.37 -r3.38
--- libCERTI/Message.hh 30 Oct 2007 15:24:47 -0000      3.37
+++ libCERTI/Message.hh 20 Nov 2007 09:04:54 -0000      3.38
@@ -474,6 +474,6 @@
     ValueLengthPair valueArray[MAX_ATTRIBUTES_PER_CLASS] ;
 };
 
-}; // namespace certi
+} // namespace certi
 
 #endif // CERTI_MESSAGE_HH

Index: libCERTI/SocketUDP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.cc,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -b -r3.15 -r3.16
--- libCERTI/SocketUDP.cc       22 Oct 2007 14:25:53 -0000      3.15
+++ libCERTI/SocketUDP.cc       20 Nov 2007 09:04:54 -0000      3.16
@@ -113,30 +113,33 @@
                        << "> with error <"
                        << strerror(errno) 
                        << ">";
-               //perror("SocketUDP: gethostbyname");
           throw NetworkError(msg.str().c_str());
        }
 
-#ifdef _WIN32                                                          //netDot
+#ifdef _WIN32
        memcpy((char*)&sock_local.sin_addr,(char *)hp_local->h_addr,    
hp_local->h_length);
 #else
        bcopy((char*)hp_local->h_addr, (char *) 
&sock_local.sin_addr,hp_local->h_length);
 #endif
 
 // lors du BIND, le systeme alloue un port libre au socket _sock_udp
-sock_local.sin_family = AF_INET; //Look at dotNet
+sock_local.sin_family = AF_INET;
 sock_local.sin_port = 0 ;
 
 if (!open())
        {
-       perror("SocketUDP: Open");
-       throw NetworkError("");
+       msg << "Cannot Open Socket open gave error < "
+           <<  strerror(errno) 
+           << ">";     
+       throw NetworkError(msg.str().c_str());
        }
        
 if (!bind())
        {
-       perror("SocketUDP: Bind");
-       throw NetworkError("");
+       msg << "Cannot Bind Socket bind gave error < "
+                   <<  strerror(errno) 
+                   << ">";     
+       throw NetworkError(msg.str().c_str());
        }
 
 // recuperation du port lie au socket _socket_udp

Index: libCERTI/MessageBody.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/MessageBody.cc,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -b -r3.13 -r3.14
--- libCERTI/MessageBody.cc     6 Jul 2007 09:25:18 -0000       3.13
+++ libCERTI/MessageBody.cc     20 Nov 2007 09:04:54 -0000      3.14
@@ -17,7 +17,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: MessageBody.cc,v 3.13 2007/07/06 09:25:18 erk Exp $
+// $Id: MessageBody.cc,v 3.14 2007/11/20 09:04:54 erk Exp $
 // ----------------------------------------------------------------------------
 
 
@@ -108,13 +108,14 @@
 unsigned long  result;                 
 *(me()) >> result; 
 return result;
-};
+}
+
 unsigned short MessageBody::readShortInt() const 
 { 
 unsigned short result; 
 *(me()) >> result; 
 return result;
-};
+}
 
 // ----------------------------------------------------------------------------
 MessageBody &MessageBody::operator<<(unsigned long val)
@@ -137,7 +138,7 @@
 
 MessageBody &MessageBody::operator<<(unsigned short val)
 {
-assert(val <= 4294967295U);
+//assert(val <= 4294967295U);
 #ifdef BIG_INDIAN
        buffer[wPtr++]= (char)0x000000FF & (val >>  8);
        buffer[wPtr++]= (char)0x000000FF & val;
@@ -180,4 +181,4 @@
 
 } // certi
 
-// $Id: MessageBody.cc,v 3.13 2007/07/06 09:25:18 erk Exp $
+// $Id: MessageBody.cc,v 3.14 2007/11/20 09:04:54 erk Exp $

Index: libCERTI/SocketTCP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.hh,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/SocketTCP.hh       19 Nov 2007 10:04:33 -0000      3.16
+++ libCERTI/SocketTCP.hh       20 Nov 2007 09:04:54 -0000      3.17
@@ -87,17 +87,14 @@
        in_addr_t getAddr() const ;
        int timeoutTCP(int, int);
 
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
          SOCKET _socket_tcp;
-         unsigned long SentBytesCount;
-         unsigned long RcvdBytesCount;
          static int winsockInits;
        #else
          long _socket_tcp;
-         unsigned long long SentBytesCount;
-         unsigned long long RcvdBytesCount;
        #endif
-
+       ByteCount_t SentBytesCount;
+    ByteCount_t RcvdBytesCount;
 bool   _est_init_tcp;
 struct sockaddr_in _sockIn;
 

Index: libCERTI/SocketUDP.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUDP.hh,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -b -r3.8 -r3.9
--- libCERTI/SocketUDP.hh       22 Jun 2007 08:51:40 -0000      3.8
+++ libCERTI/SocketUDP.hh       20 Nov 2007 09:04:54 -0000      3.9
@@ -22,7 +22,7 @@
 
 #include "Socket.hh"
 
-#ifdef _WIN32                                  //dotNet
+#ifdef _WIN32
        #ifndef _WINSOCK2API_
                #ifndef _WINSOCKAPI_
                        #include <winsock2.h>
@@ -53,7 +53,7 @@
        virtual bool isDataReady() const ;
 
        virtual int getClass() const { return SOCKET_TYPE_UDP ; };
-       #ifdef _WIN32                                   //dotNet
+       #ifdef _WIN32
                SOCKET returnSocket();
        #else
                int returnSocket();
@@ -83,7 +83,7 @@
 
        bool PhysicalLink ; ///< tak indicating physical or logical link
 
-       #ifdef _WIN32                                   //dotNet
+       #ifdef _WIN32
                SOCKET _socket_udp;
        #else
                long _socket_udp;
@@ -99,13 +99,9 @@
        int _sock_local_length ;
        bool _est_init_udp ;
 
-       #ifdef _WIN32                                   //dotNet
-               unsigned long SentBytesCount;
-               unsigned long RcvdBytesCount;
-       #else
-               ByteCount SentBytesCount ;
-               ByteCount RcvdBytesCount ;
-       #endif
+       ByteCount_t SentBytesCount ;
+       ByteCount_t RcvdBytesCount ;
+
        unsigned long BufferSize ;
        char Buffer[4096] ;
 

Index: libCERTI/LBTS.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/LBTS.hh,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -b -r3.7 -r3.8
--- libCERTI/LBTS.hh    22 Jun 2007 08:51:37 -0000      3.7
+++ libCERTI/LBTS.hh    20 Nov 2007 09:04:54 -0000      3.8
@@ -19,7 +19,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: LBTS.hh,v 3.7 2007/06/22 08:51:37 erk Exp $
+// $Id: LBTS.hh,v 3.8 2007/11/20 09:04:54 erk Exp $
 // ----------------------------------------------------------------------------
 
 #ifndef LIBCERTI_LBTS_HH
@@ -27,7 +27,7 @@
 
 #include "certi.hh"
 
-#ifndef _WIN32                         //dotNet
+#ifndef _WIN32                         
 #include <unistd.h>
 #include <stdlib.h>
 #endif
@@ -68,4 +68,4 @@
 
 #endif // LIBCERTI_LBTS_HH
 
-// $Id: LBTS.hh,v 3.7 2007/06/22 08:51:37 erk Exp $
+// $Id: LBTS.hh,v 3.8 2007/11/20 09:04:54 erk Exp $

Index: libCERTI/SocketUN.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketUN.cc,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -b -r3.16 -r3.17
--- libCERTI/SocketUN.cc        6 Jul 2007 09:25:18 -0000       3.16
+++ libCERTI/SocketUN.cc        20 Nov 2007 09:04:54 -0000      3.17
@@ -52,7 +52,7 @@
 void
 SocketUN::acceptUN()
 {
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        struct sockaddr_in nom_client, nom_serveur;
        int lg_nom;
        int result;
@@ -173,7 +173,7 @@
        pD->Out(pdInit, "Opening Client UNIX Socket.");
        
 // Socket--------------------------------------------------
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        if((_socket_un = socket(AF_INET, SOCK_STREAM, 0)) == -1)
                error("socket");
 
@@ -239,7 +239,7 @@
     : _socket_un(0), _est_serveur(false), _est_init_un(false),
       HandlerType(theType), SentBytesCount(0), RcvdBytesCount(0)
 {
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        SocketTCP::winsockStartup();
 #endif
 
@@ -257,7 +257,7 @@
 {
 if (_est_init_un) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                closesocket(_socket_un);
                if(_est_serveur == RTI_TRUE)
                        closesocket(sock_connect);
@@ -274,7 +274,7 @@
                pD->Out(pdTerm, "Client: Closed all sockets.");
        }
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
   SocketTCP::winsockShutdown();
 #endif
 
@@ -302,7 +302,7 @@
 
 while (total_sent < size) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                sent = ::send(_socket_un, (char *) buffer + total_sent, size - 
total_sent, 0);
        #else
                sent = write(_socket_un, (char *) buffer + total_sent, size - 
total_sent);
@@ -319,7 +319,7 @@
                        {
                        pD->Out(pdExcept, "Error while sending on UN socket.");
                        
-                       #ifdef _WIN32                                           
        //dotNet
+                       #ifdef _WIN32
                                if(WSAGetLastError() == WSAEINTR)
                        #else
                                if(errno == EINTR)
@@ -388,7 +388,7 @@
 
 while (RBLength < Size) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                #ifdef SOCKTCP_BUFFER_LENGTH
                                nReceived = recv(_socket_un,
                                                 ReadBuffer + RBLength,
@@ -412,7 +412,7 @@
                {
                pD->Out(pdExcept, "Error while receiving on UN socket.");
        
-               #ifdef _WIN32                                                   
//dotNet
+               #ifdef _WIN32
                        if(WSAGetLastError() == WSAEINTR)
                #else
                        if(errno == EINTR)

Index: libCERTI/Socket.hh
===================================================================
RCS file: /sources/certi/certi/libCERTI/Socket.hh,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -b -r3.12 -r3.13
--- libCERTI/Socket.hh  19 Nov 2007 10:04:33 -0000      3.12
+++ libCERTI/Socket.hh  20 Nov 2007 09:04:54 -0000      3.13
@@ -39,11 +39,10 @@
 
 namespace certi {
 
-typedef unsigned long ByteCount ;
-
 class Socket
 {
 public:
+       typedef unsigned long ByteCount_t;
        virtual ~Socket() {};
 
        virtual void send(const unsigned char *, size_t) = 0 ;

Index: libCERTI/SocketTCP.cc
===================================================================
RCS file: /sources/certi/certi/libCERTI/SocketTCP.cc,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -b -r3.17 -r3.18
--- libCERTI/SocketTCP.cc       22 Oct 2007 14:25:53 -0000      3.17
+++ libCERTI/SocketTCP.cc       20 Nov 2007 09:04:54 -0000      3.18
@@ -17,10 +17,10 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 // USA
 //
-// $Id: SocketTCP.cc,v 3.17 2007/10/22 14:25:53 erk Exp $
+// $Id: SocketTCP.cc,v 3.18 2007/11/20 09:04:54 erk Exp $
 // ----------------------------------------------------------------------------
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        #define EADDRINUSE              WSAEADDRINUSE
        #include <winsock2.h>
 #else
@@ -30,8 +30,6 @@
        #include <iostream>
 #endif
 
-
-
 #include "SocketTCP.hh"
 #include "PrettyDebug.hh"
 #include "baseTypes.hh"
@@ -47,7 +45,7 @@
 static pdCDebug D("SOCKTCP", "(SocketTCP) - ");
 
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
 int SocketTCP::winsockInits = 0;
 
 bool SocketTCP::winsockStartup()
@@ -101,7 +99,7 @@
 SentBytesCount = 0 ;
 RcvdBytesCount = 0 ;
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        winsockStartup();
 #endif
 
@@ -116,7 +114,7 @@
 if (_est_init_tcp)
        close();
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        winsockShutdown();
 #endif
 
@@ -184,7 +182,7 @@
 struct protoent *TCPent ;
 int optval = 1 ;
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        int                     l;
 #else
        socklen_t       l;
@@ -243,7 +241,7 @@
 
 Result = ::bind(_socket_tcp, (sockaddr *)&_sockIn, Length);
 
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        if((Result <0) &&(WSAGetLastError() == WSAEADDRINUSE))
 #else
        if((Result <0) &&(errno == EADDRINUSE))
@@ -386,7 +384,7 @@
 
 while (total_sent < expected_size) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                int sent = ::send(_socket_tcp, (char*) buffer + total_sent, 
expected_size - total_sent, 0);
        #else
                int sent = ::send(_socket_tcp, buffer + total_sent, 
expected_size - total_sent, 0);
@@ -396,7 +394,7 @@
                {
                D.Out(pdExcept, "Error while sending on TCP socket.");
 
-               #ifdef _WIN32                                                   
//dotNetv
+               #ifdef _WIN32
                        if(WSAGetLastError() == WSAEINTR)
                #else
                        if(errno == EINTR)
@@ -428,7 +426,7 @@
 {
 if (_est_init_tcp) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                ::closesocket(_socket_tcp);
        #else
                ::close(_socket_tcp);
@@ -478,7 +476,7 @@
 int
 SocketTCP::open()
 {
-#ifdef _WIN32                                                  //dotNet
+#ifdef _WIN32
        assert(winsockInits>0);
 #endif
        return(((_socket_tcp=socket(AF_INET,SOCK_STREAM,0))<0)?0:1);
@@ -527,7 +525,7 @@
        if (nReceived < 0) 
                {
                D.Out(pdExcept, "Error while receiving on TCP socket.");
-               #ifdef _WIN32                                                   
//dotNet
+               #ifdef _WIN32
                        if(WSAGetLastError() == WSAEINTR)
                #else
                        if(errno == EINTR)
@@ -604,14 +602,14 @@
 
 if (nb < 0) 
        {
-       #ifdef _WIN32                                                   //dotNet
+       #ifdef _WIN32
                 if(WSAGetLastError() == WSAEINTR)
        #else
                 if(errno == EINTR)
        #endif
-               throw NetworkSignal("TCP::TimeOut Interrompu par un signal.");
+               throw NetworkSignal("TCP::TimeOut signal interrupt.");
        else
-               throw NetworkError("");
+               throw NetworkError("Select gave negative return value");
        }
 else 
        return nb > 0 ;
@@ -619,4 +617,4 @@
 
 } // namespace
 
-// $Id: SocketTCP.cc,v 3.17 2007/10/22 14:25:53 erk Exp $
+// $Id: SocketTCP.cc,v 3.18 2007/11/20 09:04:54 erk Exp $

Index: RTIA/Communications.cc
===================================================================
RCS file: /sources/certi/certi/RTIA/Communications.cc,v
retrieving revision 3.18
retrieving revision 3.19
diff -u -b -r3.18 -r3.19
--- RTIA/Communications.cc      5 Nov 2007 14:30:03 -0000       3.18
+++ RTIA/Communications.cc      20 Nov 2007 09:04:54 -0000      3.19
@@ -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: Communications.cc,v 3.18 2007/11/05 14:30:03 rousse Exp $
+// $Id: Communications.cc,v 3.19 2007/11/20 09:04:54 erk Exp $
 // ----------------------------------------------------------------------------
 
 #include <config.h>
@@ -245,7 +245,7 @@
         // waitingList is empty and no data in TCP buffer.
         // Wait a message (coming from federate or network).
         if (select(max_fd, &fdset, NULL, NULL, NULL) < 0) {
-                       #ifdef _WIN32                                           
        //dotNet
+                       #ifdef _WIN32
                                 if(WSAGetLastError() == WSAEINTR)
                        #else
                                 if(errno == EINTR)
@@ -342,4 +342,4 @@
 
 }} // namespace certi/rtia
 
-// $Id: Communications.cc,v 3.18 2007/11/05 14:30:03 rousse Exp $
+// $Id: Communications.cc,v 3.19 2007/11/20 09:04:54 erk Exp $




reply via email to

[Prev in Thread] Current Thread [Next in Thread]