helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add timeout for server ping

Browse source 
Thanks doranchak & FantomHD (post no.1193)
+ Add missing doc for MinecraftVersionPrompt
This commit is contained in:
ORelio 2015-04-14 15:36:51 +02:00
parent 2cf46c0487
commit 791ecba454
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MinecraftClient/Program.cs
View file

@ -327,9 +327,9 @@ namespace MinecraftClient
} }
/// <summary> /// <summary>
/// /// Ask for server version when failed to ping server and/or determinate serveur version
/// </summary> /// </summary>
/// <returns></returns> /// <returns>TRUE if a Minecraft version has been read from prompt</returns>
public static bool MinecraftVersionPrompt() public static bool MinecraftVersionPrompt()
{ {

32
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -25,25 +25,31 @@ namespace MinecraftClient.Protocol
public static bool GetServerInfo(string serverIP, ushort serverPort, ref int protocolversion) public static bool GetServerInfo(string serverIP, ushort serverPort, ref int protocolversion)
{ {
try bool success = false;
int protocolversionTmp = 0;
if (AutoTimeout.Perform(() =>
{ {
if (Protocol16Handler.doPing(serverIP, serverPort, ref protocolversion)) try
{ {
return true; if (Protocol16Handler.doPing(serverIP, serverPort, ref protocolversionTmp)
|| Protocol17Handler.doPing(serverIP, serverPort, ref protocolversionTmp))
{
success = true;
}
else ConsoleIO.WriteLineFormatted("§8Unexpected answer from the server (is that a Minecraft server ?)");
} }
else if (Protocol17Handler.doPing(serverIP, serverPort, ref protocolversion)) catch
{ {
return true; ConsoleIO.WriteLineFormatted("§8An error occured while attempting to connect to this IP.");
}
else
{
ConsoleIO.WriteLineFormatted("§8Unexpected answer from the server (is that a Minecraft server ?)");
return false;
} }
}, TimeSpan.FromSeconds(30)))
{
protocolversion = protocolversionTmp;
return success;
} }
catch else
{ {
ConsoleIO.WriteLineFormatted("§8An error occured while attempting to connect to this IP."); ConsoleIO.WriteLineFormatted("§8A timeout occured while attempting to connect to this IP.");
return false; return false;
} }
} }
@ -260,7 +266,7 @@ namespace MinecraftClient.Protocol
statusCode = Settings.str2int(raw_result.Split(' ')[1]); statusCode = Settings.str2int(raw_result.Split(' ')[1]);
} }
else statusCode = 520; //Web server is returning an unknown error else statusCode = 520; //Web server is returning an unknown error
}, 30000); }, TimeSpan.FromSeconds(30));
result = postResult; result = postResult;
return statusCode; return statusCode;
} }