plc: implemented shutdown of the socket correctly (Issue #29).

Signed-off-by: Michele Cattafesta <michele.cattafesta@mesta-automation.com>
S7NetPlus · Aug 26, 2016 · 78bb5ea · 78bb5ea
1 parent 83e45e3
commit 78bb5ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/S7.Net.Core/SocketClient.cs b/S7.Net.Core/SocketClient.cs
@@ -143,11 +143,15 @@ public int Receive(byte[] buffer, int size, SocketFlags socketFlag)
             return response;
         }
 
+        public void Shutdown(SocketShutdown how)
+        {
+            _socket.Shutdown(how);
+        }
+
         public void Close()
         {
             if (_socket != null)
             {
-                _socket.Shutdown(SocketShutdown.Both);
                 _socket.Dispose();
                 _socket = null;
             }

diff --git a/S7.Net/PLC.cs b/S7.Net/PLC.cs
@@ -242,6 +242,7 @@ public void Close()
         {
             if (_mSocket != null && _mSocket.Connected) 
             {
+                _mSocket.Shutdown(SocketShutdown.Both);
                 _mSocket.Close();
             }
         }
@@ -1096,6 +1097,7 @@ public void Dispose()
                 if (_mSocket.Connected)
                 {
                     //Close() performs a Dispose on the socket.
+                    _mSocket.Shutdown(SocketShutdown.Both);
                     _mSocket.Close();
                 }
                 //((IDisposable)_mSocket).Dispose();