Skip to content

Harden online menu server discovery #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IIPoliII wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Harden online menu server discovery #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 197 additions & 43 deletions Assets/Scripts/UI/OnlinePanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Threading;
using Lidgren.Network;
using Sanicball.Data;
using Sanicball.Logic;
Expand All @@ -24,21 +26,78 @@ public class OnlinePanel : MonoBehaviour
private List<string> serverBrowserIPs = new List<string>();

private NetClient discoveryClient;
private WWW serverBrowserRequester;
private ServerBrowserRequest serverBrowserRequester;
private DateTime latestLocalRefreshTime;
private DateTime latestBrowserRefreshTime;
private static bool tlsConfigured;

private static void TryEnableModernTls()
{
if (tlsConfigured)
{
return;
}
try
{
const SecurityProtocolType tls11 = (SecurityProtocolType)768;
const SecurityProtocolType tls12 = (SecurityProtocolType)3072;
ServicePointManager.SecurityProtocol |= tls11 | tls12;
}
catch (Exception ex)
{
Debug.LogWarning("Unable to enable modern TLS support: " + ex.Message);
}
finally
{
tlsConfigured = true;
}
}

public void RefreshServers()
{
TryEnableModernTls();
serverBrowserIPs.Clear();
errorField.enabled = false;

discoveryClient.DiscoverLocalPeers(25000);
if (discoveryClient != null)
{
try
{
discoveryClient.DiscoverLocalPeers(25000);
}
catch (Exception ex)
{
Debug.LogError("Failed to start local server discovery - " + ex.Message);
}
}
latestLocalRefreshTime = DateTime.Now;

serverBrowserRequester = new WWW(ActiveData.GameSettings.serverListURL);
serverBrowserRequester = null;
if (!string.IsNullOrEmpty(ActiveData.GameSettings.serverListURL))
{
try
{
serverBrowserRequester = new ServerBrowserRequest(ActiveData.GameSettings.serverListURL);
}
catch (Exception ex)
{
Debug.LogError("Failed to begin server list request - " + ex.Message);
errorField.enabled = true;
errorField.text = "Cannot query server list.";
serverCountField.text = "Cannot access server list URL!";
}
}
else
{
errorField.enabled = true;
errorField.text = "Server list URL missing.";
serverCountField.text = "Server list unavailable";
}

serverCountField.text = "Refreshing servers, hang on...";
errorField.enabled = false;
if (serverBrowserRequester != null)
{
serverCountField.text = "Refreshing servers, hang on...";
}

//Clear old servers
foreach (var serv in servers)
Expand All @@ -54,8 +113,16 @@ private void Awake()

NetPeerConfiguration config = new NetPeerConfiguration(OnlineMatchMessenger.APP_ID);
config.EnableMessageType(NetIncomingMessageType.DiscoveryResponse);
discoveryClient = new NetClient(config);
discoveryClient.Start();
try
{
discoveryClient = new NetClient(config);
discoveryClient.Start();
}
catch (Exception ex)
{
Debug.LogError("Failed to start discovery client - " + ex.Message);
discoveryClient = null;
}
}

private void Update()
Expand All @@ -67,79 +134,106 @@ private void Update()
}

//Check for response from the server browser requester
if (serverBrowserRequester != null && serverBrowserRequester.isDone)
if (serverBrowserRequester != null && serverBrowserRequester.IsDone)
{
if (string.IsNullOrEmpty(serverBrowserRequester.error))
if (string.IsNullOrEmpty(serverBrowserRequester.Error))
{
latestBrowserRefreshTime = DateTime.Now;

string result = serverBrowserRequester.text;
string result = serverBrowserRequester.Result;
string[] entries = result.Split(new string[] { "<br>" }, StringSplitOptions.RemoveEmptyEntries);

foreach (string entry in entries)
{
int seperationPoint = entry.LastIndexOf(':');
if (seperationPoint <= 0 || seperationPoint >= entry.Length - 1)
{
string trimmedEntry = entry.Length > 120 ? entry.Substring(0, 120) + "..." : entry;
Debug.LogWarning("Ignoring malformed server entry: " + trimmedEntry);
continue;
}
string ip = entry.Substring(0, seperationPoint);
string port = entry.Substring(seperationPoint + 1, entry.Length - (seperationPoint + 1));

int portInt;
if (int.TryParse(port, out portInt))
{
System.Threading.Thread discoverThread = new System.Threading.Thread(() => { discoveryClient.DiscoverKnownPeer(ip, portInt); });
discoverThread.Start();
if (discoveryClient != null)
{
try
{
discoveryClient.DiscoverKnownPeer(ip, portInt);
}
catch (Exception ex)
{
Debug.LogError("Failed to discover known peer " + ip + ":" + portInt + " - " + ex.Message);
}
}
serverBrowserIPs.Add(ip);
}
}
serverCountField.text = "0 servers";
serverCountField.text = "0 servers";
}
else
{
Debug.LogError("Failed to receive servers - " + serverBrowserRequester.error);
serverCountField.text = "Cannot access server list URL!";
Debug.LogError("Failed to receive servers - " + serverBrowserRequester.Error);
serverCountField.text = "Cannot access server list URL!";
}

serverBrowserRequester = null;
}

//Check for messages on the discovery client
NetIncomingMessage msg;
while ((msg = discoveryClient.ReadMessage()) != null)
if (discoveryClient == null)
{
switch (msg.MessageType)
return;
}

try
{
NetIncomingMessage msg;
while ((msg = discoveryClient.ReadMessage()) != null)
{
case NetIncomingMessageType.DiscoveryResponse:
ServerInfo info;
try
{
info = Newtonsoft.Json.JsonConvert.DeserializeObject<ServerInfo>(msg.ReadString());
}
catch (Newtonsoft.Json.JsonException ex)
{
Debug.LogError("Failed to deserialize info for a server: " + ex.Message);
continue;
}
switch (msg.MessageType)
{
case NetIncomingMessageType.DiscoveryResponse:
ServerInfo info;
try
{
info = Newtonsoft.Json.JsonConvert.DeserializeObject<ServerInfo>(msg.ReadString());
}
catch (Newtonsoft.Json.JsonException ex)
{
Debug.LogError("Failed to deserialize info for a server: " + ex.Message);
continue;
}

//double timeDiff = (DateTime.UtcNow - info.Timestamp).TotalMilliseconds;
bool isLocal = !serverBrowserIPs.Contains(msg.SenderEndPoint.Address.ToString());
//double timeDiff = (DateTime.UtcNow - info.Timestamp).TotalMilliseconds;
bool isLocal = !serverBrowserIPs.Contains(msg.SenderEndPoint.Address.ToString());

DateTime timeToCompareTo = isLocal ? latestLocalRefreshTime : latestBrowserRefreshTime;
double timeDiff = (DateTime.Now - timeToCompareTo).TotalMilliseconds;
DateTime timeToCompareTo = isLocal ? latestLocalRefreshTime : latestBrowserRefreshTime;
double timeDiff = (DateTime.Now - timeToCompareTo).TotalMilliseconds;

var server = Instantiate(serverListItemPrefab);
server.transform.SetParent(targetServerListContainer, false);
server.Init(info, msg.SenderEndPoint, (int)timeDiff, isLocal);
servers.Add(server);
RefreshNavigation();
var server = Instantiate(serverListItemPrefab);
server.transform.SetParent(targetServerListContainer, false);
server.Init(info, msg.SenderEndPoint, (int)timeDiff, isLocal);
servers.Add(server);
RefreshNavigation();

serverCountField.text = servers.Count + (servers.Count == 1 ? " server" : " servers");
serverCountField.text = servers.Count + (servers.Count == 1 ? " server" : " servers");

break;
break;

default:
Debug.Log("Server discovery client received an unhandled NetMessage (" + msg.MessageType + ")");
break;
default:
Debug.Log("Server discovery client received an unhandled NetMessage (" + msg.MessageType + ")");
break;
}
}
}
catch (Exception ex)
{
Debug.LogError("Server discovery failed - " + ex.Message);
}
}

private void RefreshNavigation()
Expand Down Expand Up @@ -179,5 +273,65 @@ private void RefreshNavigation()
}
}
}

private sealed class ServerBrowserRequest
{
private volatile bool isDone;

public ServerBrowserRequest(string url)
{
Result = string.Empty;
Error = null;
ThreadPool.QueueUserWorkItem(FetchServerList, url);
}

public bool IsDone
{
get { return isDone; }
}

public string Result { get; private set; }

public string Error { get; private set; }

private void FetchServerList(object state)
{
try
{
var request = WebRequest.Create(state as string);
if (request != null)
{
request.Timeout = 10000;
using (var response = request.GetResponse())
using (var stream = response.GetResponseStream())
{
if (stream != null)
{
using (var reader = new StreamReader(stream))
{
Result = reader.ReadToEnd();
}
}
else
{
Error = "Empty response stream.";
}
}
}
else
{
Error = "Invalid server list request.";
}
}
catch (Exception ex)
{
Error = ex.Message;
}
finally
{
isDone = true;
}
}
}
}
}