Changeset 8869 for trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

Timestamp:

02/21/08 22:03:06 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc (modified) (6 diffs)

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -217 +217 @@
             if (!ReadSocket(sock))
             {
-                gLog << warn << "WARNING - Connection lost to " << MTcpIpO::GetSocketAddress(sock) << endl;
+                gLog << warn << MTime(-1) << " WARNING - Connection lost to " << MTcpIpO::GetSocketAddress(sock) << endl;
                 return kFALSE;
             }
@@ -228 +228 @@
             if (timeout.HasTimedOut())
             {
-                gLog << warn << "WARNING - Connection to " << MTcpIpO::GetSocketAddress(sock) << " timed out." << endl;
+                gLog << warn << MTime(-1) << " WARNING - Connection to " << MTcpIpO::GetSocketAddress(sock) << " timed out." << endl;
                 return kFALSE;
             }
@@ -245 +245 @@
 void MTcpIpI::WaitForConnection(TServerSocket &server)
 {
-    gLog << all << " Wait for connection" << endl;
-
     while (!IsThreadCanceled())
     {
-        gLog << all << "Listening for new connection on port " << fPortRx << "..." << endl;
+        gLog << all << MTime(-1) << " Listening for new connection on port " << fPortRx << "..." << endl;
 
         // Check for a connection request (reminder: we are in non-blocking mode)
@@ -256 +254 @@
         while (!IsThreadCanceled())
         {
+            //cout << (int) IsThreadCanceled() << endl;
             // Wait for a new connection on RX port
             socket = server.Accept();
@@ -281 +280 @@
             return;
 
-        gLog << all << "Connection established to " << MTcpIpO::GetSocketAddress(*socket) << "..." << endl;
+        gLog << all << MTime(-1) << " Connection established to " << MTcpIpO::GetSocketAddress(*socket) << "..." << endl;
 
         if (!WaitForData(*socket))
@@ -296 +295 @@
     while (!IsThreadCanceled())
     {
-        TServerSocket *server=new TServerSocket(fPortRx, kTRUE);
+        TServerSocket *server=new TServerSocket(fPortRx, kTRUE, 0);
         server->SetOption(kNoBlock, 1);