Centralize resource cleanup

heartofimpetus · Feb 21, 2018 · 9afb7db · 9afb7db
1 parent 2e920e6
commit 9afb7db
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/src/Ether.Network/Common/NetConnection.cs b/src/Ether.Network/Common/NetConnection.cs
@@ -54,12 +54,16 @@ protected virtual void Dispose(bool disposing)
             {
                 if (this.Socket != null)
                 {
+#if !NETSTANDARD1_3
+                    this.Socket.Close();
+#endif
                     this.Socket.Dispose();
                     this.Socket = null;
                 }
+
+                this._disposedValue = true;
             }
 
-            this._disposedValue = true;
         }
     }
 }
diff --git a/src/Ether.Network/Server/NetServer.cs b/src/Ether.Network/Server/NetServer.cs
@@ -87,9 +87,9 @@ public void Start()
                 this._writePool.Push(NetUtils.CreateSocketAsync(null, this.IO_Completed, this.Configuration.BufferSize));
             }
 
-            this.Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            this.Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
             this.Initialize();
+            this.Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+            this.Socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, 1);
             this.Socket.Bind(new IPEndPoint(address, this.Configuration.Port));
             this.Socket.Listen(this.Configuration.Backlog);
             this.IsRunning = true;
@@ -105,22 +105,21 @@ public void Stop()
             if (!this.IsRunning)
                 return;
 
-            this.IsRunning = false;
-
-            this.ClearClients();
-            this._readPool.Clear();
-            this._writePool.Clear();
-
-            if (this.Configuration.Blocking)
-                this._manualResetEvent.Set();
+            this.ClearResources();
 
             if (this.Socket != null)
             {
+#if !NETSTANDARD1_3
+                this.Socket.Close();
+#endif
                 this.Socket.Dispose();
                 this.Socket = null;
             }
 
-            this._messageQueue.Clear();
+            if (this.Configuration.Blocking)
+                this._manualResetEvent.Set();
+
+            this.IsRunning = false;
         }
 
         /// <inheritdoc />
@@ -346,14 +345,17 @@ private void HandleIncomingMessages(T user, byte[] messageData)
         }
 
         /// <summary>
-        /// Clear client's list.
+        /// Clear NetServer's resources.
         /// </summary>
-        private void ClearClients()
+        private void ClearResources()
         {
             foreach (T client in this.Clients)
                 client.Dispose();
 
             this._clients.Clear();
+            this._readPool.Clear();
+            this._writePool.Clear();
+            this._messageQueue.Clear();
         }
 
         /// <summary>
@@ -393,18 +395,11 @@ protected override void Dispose(bool disposing)
                 if (disposing)
                 {
                     this._sendQueueTaskCancelTokenSource.Cancel(false);
-                    this._readPool?.Dispose();
-                    this._writePool?.Dispose();
-                    this.ClearClients();
-                    this._messageQueue.Clear();
+                    this.ClearResources();
+                    this._readPool.Dispose();
+                    this._writePool.Dispose();
                     this._messageQueue.Dispose();
-
-                    if (this.Socket != null)
-                    {
-                        this.Socket.Dispose();
-                        this.Socket = null;
-                    }
-
+
                     this._isDisposed = true;
                 }
             }

diff --git a/test/Ether.Network.Tests/NetServerConfigurationTest.cs b/test/Ether.Network.Tests/NetServerConfigurationTest.cs
@@ -15,8 +15,6 @@ public void StartServerWithoutConfiguration()
                 Exception ex = Assert.Throws<EtherConfigurationException>(() => server.Start());
 
                 Assert.IsType<EtherConfigurationException>(ex);
-
-                server.Stop();
             }
         }
 
@@ -27,7 +25,6 @@ public void SetupServerConfigurationBeforeStart()
             {
                 server.SetupConfiguration();
                 server.Start();
-                server.Stop();
             }
         }
 
@@ -42,8 +39,6 @@ public void SetupServerConfigurationAfterStart()
                 Exception ex = Assert.Throws<EtherConfigurationException>(() => server.SetupConfiguration());
 
                 Assert.IsType<EtherConfigurationException>(ex);
-
-                server.Stop();
             }
         }