From ed9d520b4e698cc10a00fa9493573bd50143e569 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 4 Sep 2022 19:52:45 -0700 Subject: [PATCH] Retry contacting servers in the server browser every second until nettimeout --- src/d_clisrv.c | 59 +++++++++++++++++++++++++++++++++++++++----------- src/d_clisrv.h | 1 + src/m_menu.c | 2 ++ 3 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index a14801203..e76b79284 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1954,6 +1954,10 @@ static void SendAskInfo(INT32 node) serverelem_t serverlist[MAXSERVERLIST]; UINT32 serverlistcount = 0; +static boolean resendserverlistnode[MAXNETNODES]; +static boolean resendserverlist; +static tic_t serverlistepoch; + static void SL_ClearServerList(INT32 connectedserver) { UINT32 i; @@ -1965,6 +1969,8 @@ static void SL_ClearServerList(INT32 connectedserver) serverlist[i].node = 0; } serverlistcount = 0; + + memset(resendserverlistnode, 0, sizeof resendserverlistnode); } static UINT32 SL_SearchServer(INT32 node) @@ -1981,6 +1987,8 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node) { UINT32 i; + resendserverlistnode[node] = false; + // search if not already on it i = SL_SearchServer(node); if (i == UINT32_MAX) @@ -2038,6 +2046,8 @@ void CL_QueryServerList (msg_server_t *server_list) CL_UpdateServerList(); + serverlistepoch = I_GetTime(); + for (i = 0; server_list[i].header.buffer[0]; i++) { // Make sure MS version matches our own, to @@ -2050,19 +2060,42 @@ void CL_QueryServerList (msg_server_t *server_list) if (node == -1) break; // no more node free SendAskInfo(node); - // Force close the connection so that servers can't eat - // up nodes forever if we never get a reply back from them - // (usually when they've not forwarded their ports). - // - // Don't worry, we'll get in contact with the working - // servers again when they send SERVERINFO to us later! - // - // (Note: as a side effect this probably means every - // server in the list will probably be using the same node (e.g. node 1), - // not that it matters which nodes they use when - // the connections are closed afterwards anyway) - // -- Monster Iestyn 12/11/18 - Net_CloseConnection(node|FORCECLOSE); + resendserverlistnode[node] = true; + // Leave this node open. It'll be closed if the + // request times out (CL_TimeoutServerList). + } + } + + resendserverlist = true; +} + +#define SERVERLISTRESENDRATE NEWTICRATE + +void CL_TimeoutServerList(void) +{ + if (netgame && resendserverlist) + { + const tic_t timediff = I_GetTime() - serverlistepoch; + const tic_t timetoresend = timediff % SERVERLISTRESENDRATE; + const boolean timedout = timediff > connectiontimeout; + + if (timedout || (timediff > 0 && timetoresend == 0)) + { + INT32 node; + + for (node = 1; node < MAXNETNODES; ++node) + { + if (resendserverlistnode[node]) + { + if (timedout) + Net_CloseConnection(node|FORCECLOSE); + else + SendAskInfo(node); + } + } + + if (timedout) + resendserverlist = false; } } } diff --git a/src/d_clisrv.h b/src/d_clisrv.h index ee0576156..7c6582383 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -594,6 +594,7 @@ void CL_ClearPlayer(INT32 playernum); void CL_RemovePlayer(INT32 playernum, INT32 reason); void CL_QueryServerList(msg_server_t *list); void CL_UpdateServerList(void); +void CL_TimeoutServerList(void); // Is there a game running boolean Playing(void); diff --git a/src/m_menu.c b/src/m_menu.c index b657d1c9b..ede65a32a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3447,6 +3447,8 @@ void M_Ticker(void) } I_unlock_mutex(ms_ServerList_mutex); #endif + + CL_TimeoutServerList(); } //