Changeset 8865 for trunk/MagicSoft/Cosy/tcpip

Timestamp:

02/20/08 19:39:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/tcpip

Files:

• MTcpIpIO.cc (modified) (7 diffs)
• MTcpIpIO.h (modified) (2 diffs)

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -12 +12 @@
 
 #include "MString.h"
+#include "MTimeout.h"
 
 #undef DEBUG
@@ -84 +85 @@
     }
 
-    const Int_t l = tx.SendRaw(msg, len);
-    if (l<0)
-    {
-        gLog << err << "ERROR - Sending TCP/IP frame to " << GetSocketAddress(tx) << endl;
-        return false;
-    }
-
-    if (l!=len)
-    {
-        gLog << err << "ERROR - Sent wrong number (" << l << ") of bytes to " << GetSocketAddress(tx) << endl;
-        return false;
-    }
-
 #ifdef DEBUG
     cout << "Tx: " << msg << flush;
 #endif
+
+    const Int_t l = tx.SendRaw(msg, len);
+    if (l<0)
+    {
+        gLog << err << "ERROR - Sending TCP/IP frame to " << GetSocketAddress(tx) << endl;
+        return false;
+    }
+
+    if (l!=len)
+    {
+        gLog << err << "ERROR - Sent wrong number (" << l << ") of bytes to " << GetSocketAddress(tx) << endl;
+        return false;
+    }
 
     return true;
@@ -164 +165 @@
         const Int_t len = rx.RecvRaw(&c, 1);
 
-        // No data received (non-blocking mode)
-        if (len<0)
-        {
-            usleep(1);
-            continue;
-        }
-
-        // Data received with zero length! (Connection lost)
-        if (len==0)
-            return kFALSE; // This break is for TEST PURPOSE FIXME!!!
+        // For details see TSocket::RecvRaw
+        // -1: // ERROR
+        // EINVAL, EWOULDBLOCK
+        // -5: // EPIPE || ECONNRESET = Pipe broken or connection reset by peer
+        //  0: Data received with zero length! (Connection lost/call interrupted)
+        if (len<=0)
+            return kFALSE;
 
         // Data received
@@ -208 +206 @@
     fConnectionEstablished = kTRUE;
 
+    MTimeout timeout;
+
     // Get connection on port fPortRx and redirected
     while (!IsThreadCanceled())
@@ -220 +220 @@
                 return kFALSE;
             }
-
-            // *FALLTHROUGH*
+            timeout.Start(fTimeout);
+
+            // Go on waiting for new data
+            continue;
+
         case kFALSE: // Time out, no data yet, go on waiting
+            if (timeout.HasTimedOut())
+            {
+                gLog << warn << "WARNING - Connection to " << MTcpIpO::GetSocketAddress(sock) << " timed out." << endl;
+                return kFALSE;
+            }
 
             // Go on waiting for new data
@@ -248 +256 @@
         while (!IsThreadCanceled())
         {
+            // Wait for a new connection on RX port
             socket = server.Accept();
 
@@ -271 +280 @@
         if ((Long_t)socket<=0)
             return;
+
+        gLog << all << "Connection established to " << MTcpIpO::GetSocketAddress(*socket) << "..." << endl;
 
         if (!WaitForData(*socket))

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.h

@@ -18 +18 @@
 {
 private:
-    Int_t  fPortRx;
+    Int_t  fPortRx;     // Port on which to listen for connections
+    Int_t  fTimeout;    // [ms] Timeout to listen for data to be received
+
     Bool_t fConnectionEstablished;
 
@@ -29 +31 @@
 
 public:
-    MTcpIpI(Int_t rx) : MThread(Form("MTcpIpI::%d", rx)), fPortRx(rx), fConnectionEstablished(kFALSE) { /*RunThread();*/ }
+    MTcpIpI(Int_t rx, UInt_t timeout=5000) : MThread(Form("MTcpIpI::%d", rx)), fPortRx(rx), fTimeout(timeout), fConnectionEstablished(kFALSE) { /*RunThread();*/ }
     ~MTcpIpI() { CancelThread(); }