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

Timestamp:

04/22/09 10:46:59 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Cosy/tcpip/MTcpIpIO.cc

@@ -15 +15 @@
 
 #undef DEBUG
+//#define DEBUG
 
 using namespace std;
@@ -40 +41 @@
      */
 
-MTcpIpO::MTcpIpO(const char *addr, Int_t tx)
-{
+MTcpIpO::MTcpIpO(const char *addr, Int_t tx) : fPortTx(tx)
+{
+    gLog << inf2 << "- Open send socket to " << addr << ":" << tx << endl;
     fTxSocket = new TSocket(addr, tx);
 }
@@ -147 +149 @@
 bool MTcpIpO::Send(const char *msg, Int_t len)
 {
+    if (!fTxSocket->IsValid())
+    {
+        const TInetAddress &a = fTxSocket->GetInetAddress();
+        if (!a.IsValid())
+            return false;
+#ifdef DEBUG
+        cout << "- Reopen send socket to " << a.GetHostAddress() << ":" << fPortTx << endl;
+#endif
+        delete fTxSocket;
+        fTxSocket = new TSocket(a.GetHostAddress(), fPortTx);
+    }
+
     return SendFrame(*fTxSocket, msg, len);
 }
@@ -206 +220 @@
     fConnectionEstablished = kTRUE;
 
-    MTimeout timeout;
+    MTimeout timeout(fTimeout);
 
     // Get connection on port fPortRx and redirected
@@ -228 +242 @@
             if (timeout.HasTimedOut())
             {
-                gLog << warn << MTime(-1) << " WARNING - Connection to " << MTcpIpO::GetSocketAddress(sock) << " timed out." << endl;
+                gLog << warn << MTime(-1) << " WARNING - Connection to " << MTcpIpO::GetSocketAddress(sock) << " timed out after " << fTimeout << "ms." << endl;
                 return kFALSE;
             }
@@ -285 +299 @@
             fConnectionEstablished = kFALSE;
 
+#ifdef DEBUG
+        cout << "===> DEL SOCKET" << endl;
+#endif
         delete socket;
     }
@@ -314 +331 @@
         }
 
+#ifdef DEBUG
+        cout << "===> DEL SERVER" << endl;
+#endif
         delete server;