override Close method from Connection in Rcon class

Author: Aquerr

MCQuery-Console/Program.cs

@@ -18,8 +18,16 @@ static void Main(string[] args)
             if (port != 0)
             {
                 //Connection connection = new Connection(ipAddress, port); //This should give us a challenge token needed for getting data from the sever.
+
+                using (Query query = new Query(ipAddress, port))
+                {
+
+                }
+
                 Query serverQuery = new Query(ipAddress, port);
 				Server basicServer = serverQuery.GetBasicServerInfo();
+                serverQuery.Close();
+                Rcon rconServer = new Rcon(ipAddress, port, "yolo");
 
                 Console.WriteLine("Printing out server info: ");
                 Console.WriteLine("Server MOTD: {0}", basicServer.Motd);

MCQuery/Connection.cs

@@ -10,8 +10,8 @@ namespace MCQuery
 {
 	public abstract class Connection : IDisposable
 	{
-		private string _address = "";
-		private int _port = 0;
+		protected internal string _address = "";
+		protected internal int _port = 0;
 
 		private UdpClient _udpClient;
 		private TcpClient _tcpClient;
@@ -22,16 +22,6 @@ public Connection(string address, int port)
 			_port = port;
 		}
 
-		//public Query GetQueryConnection()
-		//{
-		//	return new Query(_address, _port);
-		//}
-
-		//public Rcon GetRconConnection(string password)
-		//{
-		//	return new Rcon(_address, _port, password);
-		//}
-
 		protected byte[] SendByUdp(string address, int port, byte[] data)
 		{
 			try
@@ -49,10 +39,6 @@ protected byte[] SendByUdp(string address, int port, byte[] data)
 					_udpClient.Connect(address, port);
 					_udpClient.Client.SendTimeout = 10000; //Timeout after 10 seconds
 					_udpClient.Client.ReceiveTimeout = 10000; //Timeout after 10 seconds
-
-					_challengeTimer.Elapsed += RegenerateChallengeToken;
-					_challengeTimer.Interval = 30000;
-					_challengeTimer.Start();
 				}
 
 				_udpClient.Send(data, data.Length);
@@ -113,7 +99,7 @@ protected byte[] SendByTcp(string address, int port)
             return new byte[] { };
         }
 
-		protected virtual void Close()
+		public virtual void Close()
         {
             if(_udpClient != null)
             {

MCQuery/Query.cs

@@ -49,9 +49,10 @@ private void Handshake(string address, int port)
 			}
 			else
 			{
-				_address = address;
-				_port = port;
-				_challengeToken = GetChallengeToken(udpResponse);
+                _challengeTimer.Elapsed += RegenerateChallengeToken;
+                _challengeTimer.Interval = 30000;
+                _challengeTimer.Start();
+                _challengeToken = GetChallengeToken(udpResponse);
 			}
 		}
 
@@ -234,5 +235,10 @@ private void RegenerateChallengeToken(Object sender, ElapsedEventArgs e)
 			//Run handshake again to obtain new challenge token.
 			Handshake(_address, _port);
 		}
-	}
+
+        public override void Close()
+        {
+            base.Close();
+        }
+    }
 }

MCQuery/Rcon.cs

@@ -1,10 +1,15 @@
 namespace MCQuery
 {
-	internal class Rcon : Connection
+	public class Rcon : Connection
 	{
-		internal Rcon(string address, int port, string password) : base(address, port)
+		public Rcon(string address, int port, string password) : base(address, port)
 		{
 
 		}
-	}
+
+        public override void Close()
+        {
+            base.Close();
+        }
+    }
 }