Use TcpListener.Stop to stop listening on the server

Author: TWaalen

RCONServerLib/RemoteConServer.cs

@@ -151,14 +151,22 @@ public void StopListening()
         {
             if (!_listener.Server.IsBound)
                 return;
-            
-            _listener.Server.Shutdown(SocketShutdown.Both);
-            _listener.Server.Close(0);
+
+            _listener.Stop();
         }
 
         private void OnAccept(IAsyncResult result)
         {
-            var tcpClient = _listener.EndAcceptTcpClient(result);
+            TcpClient tcpClient;
+            try
+            {
+                tcpClient = _listener.EndAcceptTcpClient(result);
+            }
+            catch (ObjectDisposedException)
+            {
+                LogDebug("Socket was closed");
+                return;
+            }
 
             var ip = ((IPEndPoint) tcpClient.Client.RemoteEndPoint).Address;
 

RCONServerLib/RemoteConTcpClient.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
+using System.Threading;
 using RCONServerLib.Utils;
 
 namespace RCONServerLib
@@ -183,6 +184,11 @@ private void OnPacket(IAsyncResult result)
                 _remoteConServer.LogDebug(((IPEndPoint) _tcp.Client.RemoteEndPoint).Address + " lost connection.");
                 CloseConnection();
             }
+            catch (ThreadAbortException)
+            {
+                _remoteConServer.LogDebug(((IPEndPoint) _tcp.Client.RemoteEndPoint).Address + " socket closed.");
+                CloseConnection();
+            }
             catch (RconServerException)
             {
                 throw;