From f34dfad926ac76a8a042b4a75ee29e201f8eaf68 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 20 Dec 2008 08:41:02 +0000 Subject: [PATCH] reverted pinging (the other way limits the amount of servers) git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4049 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/serverbrowser.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/source/src/serverbrowser.cpp b/source/src/serverbrowser.cpp index f6b65aab..2e1ce103 100644 --- a/source/src/serverbrowser.cpp +++ b/source/src/serverbrowser.cpp @@ -337,12 +337,8 @@ VARP(servpingrate, 1000, 5000, 60000); VARP(maxservpings, 0, 0, 1000); VAR(searchlan, 0, 1, 2); -#define PINGBUFSIZE 50 -static int pingbuf[PINGBUFSIZE]; - void pingservers(bool issearch) { - static int curpingbuf = 0; if(pingsock == ENET_SOCKET_NULL) { pingsock = enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM); @@ -357,9 +353,7 @@ void pingservers(bool issearch) ENetBuffer buf; static uchar ping[MAXTRANS]; ucharbuf p(ping, sizeof(ping)); - curpingbuf = (curpingbuf + 1) % PINGBUFSIZE; - pingbuf[curpingbuf] = totalmillis; - putint(p, curpingbuf + 1); // offset by 1 to avoid extinfo trigger + putint(p, totalmillis); int baselen = p.length(); if(searchlan < 2) { @@ -449,8 +443,7 @@ void checkpings() ucharbuf p(ping, len); si->lastpingmillis = totalmillis; - int pingtm = pingbuf[(getint(p) - 1) % PINGBUFSIZE]; - si->ping = pingtm ? totalmillis - pingtm : 9997; + si->ping = totalmillis - getint(p); int query = getint(p); si->protocol = getint(p); if(si->protocol!=PROTOCOL_VERSION) si->ping = 9998;