Clients are now removed properly

Author: Subtixx

RCONServerLib.Tests/ConnectionTests.cs

@@ -12,13 +12,16 @@ public void TestAuthFail()
             server.StartListening();
 
             var client = new RemoteConClient();
-            client.OnAuthResult += Assert.False;
+            client.OnAuthResult += success =>
+            {
+                Assert.False(success);
+
+                client.Disconnect();
+                server.StopListening();
+            };
 
             client.Connect("127.0.0.1", 27015);
             client.Authenticate("unitfail");
-
-            client.Disconnect();
-            server.StopListening();
         }
 
         [Fact]

RCONServerLib/RemoteConServer.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
+using System.Threading;
 using RCONServerLib.Utils;
 
 namespace RCONServerLib
@@ -148,7 +149,11 @@ public void StartListening()
 
         public void StopListening()
         {
-            _listener.Stop();
+            if (!_listener.Server.IsBound)
+                return;
+            
+            _listener.Server.Shutdown(SocketShutdown.Both);
+            _listener.Server.Close(0);
         }
 
         private void OnAccept(IAsyncResult result)
@@ -223,5 +228,10 @@ internal void LogDebug(string message)
             System.Diagnostics.Debug.WriteLine(message);
             Console.WriteLine(message);
         }
+
+        internal void RemoveClient(TcpClient client)
+        {
+            _clients.Remove(client);
+        }
     }
 }

RCONServerLib/RemoteConTcpClient.cs

@@ -99,6 +99,7 @@ private void CloseConnection()
         {
             if (_isUnitTest)
                 return;
+            _remoteConServer.RemoveClient(_tcp);
             _remoteConServer.LogDebug(((IPEndPoint) _tcp.Client.RemoteEndPoint).Address + " connection closed.");
 
             _connected = false;
@@ -167,10 +168,7 @@ private void OnPacket(IAsyncResult result)
 
                 ParsePacket(_buffer);
 
-                if (!_tcp.Connected)
-                    return;
-
-                if (!_connected)
+                if (!_connected || !_tcp.Connected)
                 {
                     _remoteConServer.LogDebug(((IPEndPoint) _tcp.Client.RemoteEndPoint).Address + " lost connection.");
                     CloseConnection();
@@ -182,8 +180,8 @@ private void OnPacket(IAsyncResult result)
             }
             catch (IOException)
             {
-                _connected = false;
                 _remoteConServer.LogDebug(((IPEndPoint) _tcp.Client.RemoteEndPoint).Address + " lost connection.");
+                CloseConnection();
             }
             catch (RconServerException)
             {