Added IsConnected property

Author: Aquerr

MCQuery/Connection.cs

@@ -19,6 +19,8 @@ protected Connection(string address, int port)
 			_port = port;
 		}
 
+	    public abstract bool IsConnected { get; }
+
 		protected byte[] SendByUdp(string address, int port, byte[] data)
 		{
 			try
@@ -86,14 +88,14 @@ protected bool IsDomainAddress(string address)
 
 		protected byte[] SendByTcp(string address, int port, byte[] data)
         {
-            //TODO: Implement sending packet by TCP.
-
             try
             {
                 if (_tcpClient == null)
                 {
-                    _tcpClient = new TcpClient(address, port);
-                    _tcpClient.ReceiveTimeout = 5000;
+                    _tcpClient = new TcpClient(address, port)
+                    {
+                        ReceiveTimeout = 5000
+                    };
                 }
 
                 NetworkStream networkStream = _tcpClient.GetStream();
@@ -114,16 +116,10 @@ protected byte[] SendByTcp(string address, int port, byte[] data)
 
 		public virtual void Close()
         {
-            if(_udpClient != null)
-            {
-                _udpClient.Close();
-            }
-            if (_tcpClient != null)
-            {
-                _tcpClient.Close();
-            }
+            _udpClient?.Close();
+            _tcpClient?.Close();
 
-			Dispose();
+            Dispose();
         }
 
 		#region IDisposable Support

MCQuery/MCQuery.csproj

@@ -45,7 +45,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Query.cs" />
     <Compile Include="Rcon.cs" />
-    <Compile Include="Request.cs" />
     <Compile Include="Server.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

MCQuery/Query.cs

@@ -21,8 +21,7 @@ public class Query : Connection
 
 		//Byte[] - but written as byte array - Challenge Token
 		private byte[] _challengeToken;
-
-		private readonly Timer _challengeTimer = new Timer();
+        private readonly Timer _challengeTimer = new Timer();
 
 		public Query(string address, int port) : base(address, port)
 		{
@@ -72,12 +71,9 @@ private byte[] GetBasicStat(string address, int port)
 				byte[] tcpResponse = SendByTcp(address, port, basicStatMessage);
 
 				if (tcpResponse.Length == 0) return new byte[] { };
-				else return tcpResponse;
-			}
-			else
-			{
-				return udpResponse;
+			    return tcpResponse;
 			}
+		    return udpResponse;
 		}
 
 		private byte[] GetFullStat(string address, int port)
@@ -97,12 +93,9 @@ private byte[] GetFullStat(string address, int port)
 				byte[] tcpResponse = SendByTcp(address, port, fullStatMessage);
 
 				if (tcpResponse.Length == 0) return new byte[] { };
-				else return tcpResponse;
-			}
-			else
-			{
-				return udpResponse;
+			    return tcpResponse;
 			}
+		    return udpResponse;
 		}
 
 		public Server GetBasicServerInfo()
@@ -205,7 +198,7 @@ private byte[] GetChallengeToken(byte[] message)
 			//Index 1 - 4 = SessionId
 			//Index 5 and further is a challenge token which we need to extract.
 
-			byte[] challengeToken = new byte[message.Length - 5];
+			//byte[] challengeToken = new byte[message.Length - 5];
 
 			string response = "";
 
@@ -214,13 +207,12 @@ private byte[] GetChallengeToken(byte[] message)
 				if (i >= 5)
 				{
 					byte item = message[i];
-					response += Encoding.ASCII.GetString(new byte[] { item });
+					response += Encoding.ASCII.GetString(new[] { item });
 				}
 			}
 			Int32 tokenInt32 = Int32.Parse(response);
 
-			byte[] challenge = new byte[]
-			{
+			byte[] challenge = {
 				(byte)(tokenInt32 >> 24 & 0xFF),
 				(byte)(tokenInt32 >> 16 & 0xFF),
 				(byte)(tokenInt32 >> 8 & 0xFF),
@@ -236,9 +228,10 @@ private void RegenerateChallengeToken(Object sender, ElapsedEventArgs e)
 			Handshake(_address, _port);
 		}
 
-        public override void Close()
-        {
-            base.Close();
-        }
+	    public override bool IsConnected
+	    {
+	        get => _challengeToken != null || _challengeToken.Length > 0;
+	        set => _isAuthenticated = value;
+	    }
     }
 }

MCQuery/Rcon.cs

@@ -14,6 +14,7 @@ public class Rcon : Connection
         private readonly byte[] _twoBytePad = { 0x00, 0x00 };
 
         private string _password;
+        private bool _isAuthenticated;
 
         public Rcon(string address, int port, string password) : base(address, port)
         {
@@ -41,18 +42,17 @@ public bool Login()
             message.AddRange(_twoBytePad);
 
             byte[] response = SendByTcp(_address, _port, message.ToArray());
-            bool authenticated = false;
 
             foreach (byte item in response)
             {
                 if (reminder[0] == item)
                 {
-                    authenticated = true;
+                    _isAuthenticated = true;
                     break;
                 }
             }
 
-            return authenticated;
+            return _isAuthenticated;
         }
 
         public bool SendCommand(string command)
@@ -81,5 +81,10 @@ public bool SendCommand(string command)
 
             return didSucceeed;
         }
+
+        public override bool IsConnected
+        {
+            get => _isAuthenticated;
+        }
     }
 }