Changeset 705 for trunk

Timestamp:

10/29/08 18:39:38 (16 years ago)

Author:

abeham

Message:

[TICKET #297] fixed some bugs in the TCP connection

Location:

trunk/sources

Files:

• HeuristicLab.Communication.Data/SocketData.cs (modified) (6 diffs)
• HeuristicLab.Communication.Operators/TcpNetworkInitiator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Communication.Data/SocketData.cs

@@ -95 +95 @@
 
     public bool Connect() {
-      if (tcpIn == null || !tcpIn.Connected) {
+      if (!Alive(tcpIn)) {
         if (tcpListener.Pending())
           tcpIn = tcpListener.AcceptTcpClient();
       }
-      if (tcpOut == null || !tcpOut.Connected) {
+      if (!Alive(tcpOut)) {
         tcpOut = new TcpClient();
         try {
@@ -112 +112 @@
 
     public void Close() {
-      tcpOut.Client.Close();
-      tcpOut.Close();
+      if (tcpOut != null && tcpOut.Connected) {
+        tcpOut.Client.Close();
+        tcpOut.Close();
+      }
       tcpOut = null;
-      while (tcpIn.Connected) ;
-      tcpIn.Client.Close();
-      tcpIn.Close();
+      if (tcpIn != null && tcpIn.Connected) {
+        tcpIn.Client.Close();
+        tcpIn.Close();
+      }
       tcpIn = null;
       tcpListener.Stop();
@@ -124 +127 @@
 
     public void Write(string s) {
-      if (tcpOut == null || !tcpOut.Connected) Connect();
+      //if (tcpOut == null || !tcpOut.Connected) Connect();
       NetworkStream outStream = tcpOut.GetStream();
 
@@ -134 +137 @@
 
     public string Read() {
-      if (tcpIn == null || !tcpIn.Connected) Connect();
+      //if (tcpIn == null || !tcpIn.Connected) Connect();
       NetworkStream inStream = tcpIn.GetStream();
       byte[] receivedBytes;
@@ -172 +175 @@
       if (messageEnd < count - 3)
         buffer = Encoding.ASCII.GetString(receivedBytes, messageEnd + 3, count - messageEnd - 3);
-      string result = Encoding.ASCII.GetString(receivedBytes, 0, messageEnd);
-      if (result.Equals("CLOSING")) return null;
-      else return result;
+      return Encoding.ASCII.GetString(receivedBytes, 0, messageEnd);
     }
 
@@ -183 +184 @@
       return -1;
     }
+
+    private bool Alive(TcpClient c) {
+      if (c == null || !c.Connected) return false; // not connected if null or the property says so
+      try {
+        c.Client.Send(new byte[1], 0, 0); // if c != null && c.Connected make a zero byte send to check if still alive
+      } catch (SocketException e) {
+        return e.NativeErrorCode.Equals(10035); // 10035 == WSAEWOULDBLOCK, if true then connected, otherwise not connected
+      } catch (Exception) { // false regarding any other exception
+        return false;
+      }
+      return c.Connected; // return the property
+    }
   }
 }

trunk/sources/HeuristicLab.Communication.Operators/TcpNetworkInitiator.cs

@@ -46 +46 @@
       socket.Initialize(config);
       while (!socket.Connect()) ;
+      try {
+        socket.Write("REQUEST_CONNECT");
+        if (!socket.Read().Equals("REQUEST_CONNECT")) throw new InvalidOperationException("ERROR in TcpNetworkInitiator: Remote host answered with unknown response!");
+        socket.Write("ACK");
+        if (!socket.Read().Equals("ACK")) throw new InvalidOperationException("ERROR in TcpNetworkInitiator: Remote host answered with unknown response!");
+      } catch (Exception) {
+        try {
+          socket.Close();
+        } catch (Exception) { }
+        return new AtomicOperation(this, scope);
+      }
 
       IVariableInfo info = GetVariableInfo("NetworkConnection");