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

send new=1 on initial server ping so we can easily count games

Browse Source
This commit is contained in:
Chris Forbes
2010-05-03 19:10:06 +12:00
parent 5db6a389b3
commit e8b77963e3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Server/Server.cs
View File

@@ -53,9 +53,11 @@ namespace OpenRA.Server
static int lastPing = 0; static int lastPing = 0;
static bool isInternetServer; static bool isInternetServer;
static string masterServerUrl; static string masterServerUrl;
static bool isInitialPing;
public static void ServerMain(bool internetServer, string masterServerUrl, string name, int port, int extport, string[] mods, string map) public static void ServerMain(bool internetServer, string masterServerUrl, string name, int port, int extport, string[] mods, string map)
{ {
isInitialPing = true;
Server.masterServerUrl = masterServerUrl; Server.masterServerUrl = masterServerUrl;
isInternetServer = internetServer; isInternetServer = internetServer;
listener = new TcpListener(IPAddress.Any, port); listener = new TcpListener(IPAddress.Any, port);
@@ -92,7 +94,6 @@ namespace OpenRA.Server
checkRead.Add( listener.Server ); checkRead.Add( listener.Server );
foreach( var c in conns ) checkRead.Add( c.socket ); foreach( var c in conns ) checkRead.Add( c.socket );
/* msdn lies, -1 doesnt work. this is ~1h instead. */
Socket.Select( checkRead, null, null, MasterPingInterval * 1000000 ); Socket.Select( checkRead, null, null, MasterPingInterval * 1000000 );
foreach( Socket s in checkRead ) foreach( Socket s in checkRead )
@@ -538,8 +539,15 @@ namespace OpenRA.Server
{ {
if (wc.IsBusy || !isInternetServer) return; if (wc.IsBusy || !isInternetServer) return;
var url = "ping.php?port={0}&name={1}&state={2}&players={3}&mods={4}&map={5}";
if (isInitialPing)
{
url += "&new=1";
isInitialPing = false;
}
wc.DownloadDataAsync(new Uri( wc.DownloadDataAsync(new Uri(
masterServerUrl + "ping.php?port={0}&name={1}&state={2}&players={3}&mods={4}&map={5}".F( masterServerUrl + url.F(
ExternalPort, Uri.EscapeUriString(Name), ExternalPort, Uri.EscapeUriString(Name),
GameStarted ? 2 : 1, // todo: post-game states, etc. GameStarted ? 2 : 1, // todo: post-game states, etc.
lobbyInfo.Clients.Count, lobbyInfo.Clients.Count,