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

Unhardcode server ping/query URLs.

Browse Source
This commit is contained in:
Paul Chote
2017-12-26 14:09:24 +00:00
committed by reaperrr
parent 86a17e9260
commit e7ce9aa263
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,11 +108,11 @@ namespace OpenRA.Mods.Common.Server
{ {
try try
{ {
var serverList = server.ModData.Manifest.Get<WebServices>().ServerList; var endpoint = server.ModData.Manifest.Get<WebServices>().ServerAdvertise;
using (var wc = new WebClient()) using (var wc = new WebClient())
{ {
wc.Proxy = null; wc.Proxy = null;
var masterResponseText = wc.UploadString(serverList + "ping", postData); var masterResponseText = wc.UploadString(endpoint, postData);
if (isInitialPing) if (isInitialPing)
{ {

3
OpenRA.Mods.Common/WebServices.cs
View File

@@ -15,7 +15,8 @@ namespace OpenRA
{ {
public class WebServices : IGlobalModData public class WebServices : IGlobalModData
{ {
public readonly string ServerList = "http://master.openra.net/"; public readonly string ServerList = "http://master.openra.net/games";
public readonly string ServerAdvertise = "http://master.openra.net/ping";
public readonly string MapRepository = "http://resource.openra.net/map/"; public readonly string MapRepository = "http://resource.openra.net/map/";
public readonly string GameNews = "http://master.openra.net/gamenews"; public readonly string GameNews = "http://master.openra.net/gamenews";
} }

2
OpenRA.Mods.Common/Widgets/Logic/MultiplayerLogic.cs
View File

@@ -348,7 +348,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Game.RunAfterTick(() => RefreshServerListInner(games)); Game.RunAfterTick(() => RefreshServerListInner(games));
}; };
var queryURL = services.ServerList + "games?protocol={0}&engine={1}&mod={2}&version={3}".F( var queryURL = services.ServerList + "?protocol={0}&engine={1}&mod={2}&version={3}".F(
GameServer.ProtocolVersion, GameServer.ProtocolVersion,
Uri.EscapeUriString(Game.EngineVersion), Uri.EscapeUriString(Game.EngineVersion),
Uri.EscapeUriString(Game.ModData.Manifest.Id), Uri.EscapeUriString(Game.ModData.Manifest.Id),