epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve handling of unknown error codes.

Browse Source
This commit is contained in:
Paul Chote
2017-05-22 20:56:35 +00:00
committed by abcdefg30
parent e8b2a12714
commit b104f8baa2
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRA.Mods.Common/ServerTraits/MasterServerPinger.cs
View File

@@ -14,6 +14,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using BeaconLib; using BeaconLib;
using OpenRA.Server; using OpenRA.Server;
using S = OpenRA.Server.Server; using S = OpenRA.Server.Server;
@@ -25,6 +26,11 @@ namespace OpenRA.Mods.Common.Server
// 3 minutes. Server has a 5 minute TTL for games, so give ourselves a bit of leeway. // 3 minutes. Server has a 5 minute TTL for games, so give ourselves a bit of leeway.
const int MasterPingInterval = 60 * 3; const int MasterPingInterval = 60 * 3;
static readonly Beacon LanGameBeacon = new Beacon("OpenRALANGame", (ushort)new Random(DateTime.Now.Millisecond).Next(2048, 60000)); static readonly Beacon LanGameBeacon = new Beacon("OpenRALANGame", (ushort)new Random(DateTime.Now.Millisecond).Next(2048, 60000));
static readonly Dictionary<int, string> MasterServerErrors = new Dictionary<int, string>()
{
{ 1, "Server ports are not forwarded." },
{ 2, "Server contains blacklisted word in server name." }
};
public int TickTimeout { get { return MasterPingInterval * 10000; } } public int TickTimeout { get { return MasterPingInterval * 10000; } }
@@ -118,20 +124,31 @@ namespace OpenRA.Mods.Common.Server
if (isInitialPing) if (isInitialPing)
{ {
var masterResponseText = Encoding.UTF8.GetString(masterResponse); var masterResponseText = Encoding.UTF8.GetString(masterResponse);
Log.Write("server", "Master server: " + masterResponseText);
var errorCode = 0;
var errorMessage = string.Empty;
if (masterResponseText.Length > 0)
{
var regex = new Regex(@"^\[(?<code>\d+)\](?<message>.*)");
var match = regex.Match(masterResponseText);
errorMessage = match.Success && int.TryParse(match.Groups["code"].Value, out errorCode) ?
match.Groups["message"].Value.Trim() : "Failed to parse error message";
}
isInitialPing = false; isInitialPing = false;
lock (masterServerMessages) lock (masterServerMessages)
{ {
masterServerMessages.Enqueue("Master server communication established."); masterServerMessages.Enqueue("Master server communication established.");
if (masterResponseText.Contains("[001]")) // Server does not respond code if (errorCode != 0)
{ {
Log.Write("server", masterResponseText); // Hardcoded error messages take precedence over the server-provided messages
masterServerMessages.Enqueue("Warning: Server ports are not forwarded."); string message;
masterServerMessages.Enqueue("Game has not been advertised online."); if (!MasterServerErrors.TryGetValue(errorCode, out message))
} message = errorMessage;
if (masterResponseText.Contains("[002]")) // Server contains blacklisted characters in its name
{ masterServerMessages.Enqueue("Warning: " + message);
Log.Write("server", masterResponseText);
masterServerMessages.Enqueue("Warning: Server contains blacklisted word in server name.");
masterServerMessages.Enqueue("Game has not been advertised online."); masterServerMessages.Enqueue("Game has not been advertised online.");
} }
} }