(svn r8520) -Fix/Feature: requery gameservers that did not respond to their first query.
--- a/src/network/network.cpp Thu Feb 01 16:48:38 2007 +0000
+++ b/src/network/network.cpp Thu Feb 01 21:04:40 2007 +0000
@@ -1275,6 +1275,7 @@
} else {
_udp_client_socket->ReceivePackets();
if (_network_udp_broadcast > 0) _network_udp_broadcast--;
+ NetworkGameListRequery();
}
}
--- a/src/network/network.h Thu Feb 01 16:48:38 2007 +0000
+++ b/src/network/network.h Thu Feb 01 21:04:40 2007 +0000
@@ -71,6 +71,7 @@
uint16 port;
bool online; // False if the server did not respond (default status)
bool manually; // True if the server was added manually
+ uint8 retries;
struct NetworkGameList *next;
} NetworkGameList;
--- a/src/network/network_gamelist.cpp Thu Feb 01 16:48:38 2007 +0000
+++ b/src/network/network_gamelist.cpp Thu Feb 01 21:04:40 2007 +0000
@@ -7,6 +7,10 @@
#include "network_data.h"
#include "../newgrf_config.h"
#include "../helpers.hpp"
+#include "network_udp.h"
+
+/** Should we stop/contiue requerying of offline servers? */
+static bool _stop_requerying = false;
// This file handles the GameList
// Also, it handles the request to a server for data about the server
@@ -40,6 +44,7 @@
DEBUG(net, 4, "[gamelist] added server to list");
UpdateNetworkGameWindow(false);
+ _stop_requerying = false;
return item;
}
@@ -72,4 +77,37 @@
}
}
+enum {
+ MAX_GAME_LIST_REQUERY_COUNT = 5,
+ REQUERY_EVERY_X_GAMELOOPS = 30,
+};
+
+/** Requeries the (game) servers we have not gotten a reply from */
+void NetworkGameListRequery(void)
+{
+ static uint8 requery_cnt = 0;
+
+ if (_stop_requerying || ++requery_cnt < REQUERY_EVERY_X_GAMELOOPS) return;
+
+ requery_cnt = 0;
+ _stop_requerying = true;
+
+ struct in_addr ip;
+ NetworkGameList *item;
+
+ for (item = _network_game_list; item != NULL; item = item->next) {
+ if (item->online || item->retries >= MAX_GAME_LIST_REQUERY_COUNT) continue;
+
+ ip.s_addr = item->ip;
+
+ /* item gets mostly zeroed by NetworkUDPQueryServer */
+ uint8 retries = item->retries;
+ NetworkUDPQueryServer(inet_ntoa(ip), item->port);
+ item->retries = retries + 1;
+
+ _stop_requerying = false;
+ }
+
+}
+
#endif /* ENABLE_NETWORK */
--- a/src/network/network_gamelist.h Thu Feb 01 16:48:38 2007 +0000
+++ b/src/network/network_gamelist.h Thu Feb 01 21:04:40 2007 +0000
@@ -7,5 +7,6 @@
NetworkGameList *NetworkGameListAddItem(uint32 ip, uint16 port);
void NetworkGameListRemoveItem(NetworkGameList *remove);
void NetworkGameListAddQueriedItem(const NetworkGameInfo *info, bool server_online);
+void NetworkGameListRequery(void);
#endif /* NETWORK_GAMELIST_H */