diff --git a/src/m_menu.c b/src/m_menu.c
index d3ae4da2a97974ba37b96ea876f6ee4fa267b06b..06d1b1b96752e64ae2b65d71ab07a583abfe8c5a 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -57,6 +57,7 @@
#include "netcode/d_net.h"
#include "netcode/mserv.h"
+#include "netcode/client_connection.h"
#include "m_misc.h"
#include "m_anigif.h"
#include "byteptr.h"
diff --git a/src/netcode/Sourcefile b/src/netcode/Sourcefile
index 9087917d0443548ed36d4162b6c60393b70b6f80..c11b3d6c1fb9399db859d9d95aaff32996cc2325 100644
--- a/src/netcode/Sourcefile
+++ b/src/netcode/Sourcefile
@@ -1,4 +1,5 @@
d_clisrv.c
+client_connection.c
d_net.c
d_netcmd.c
d_netfil.c
diff --git a/src/netcode/client_connection.c b/src/netcode/client_connection.c
new file mode 100644
index 0000000000000000000000000000000000000000..bfaea2e81ef4405f03492bed8c2161925075980c
--- /dev/null
+++ b/src/netcode/client_connection.c
@@ -0,0 +1,1181 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file client_connection.h
+/// \brief Client connection handling
+
+#include "client_connection.h"
+#include "d_clisrv.h"
+#include "d_netfil.h"
+#include "../d_main.h"
+#include "../f_finale.h"
+#include "../g_game.h"
+#include "../i_gamepad.h"
+#include "i_net.h"
+#include "../i_system.h"
+#include "../i_time.h"
+#include "../i_video.h"
+#include "../m_menu.h"
+#include "../m_misc.h"
+#include "../snake.h"
+#include "../s_sound.h"
+#include "../v_video.h"
+#include "../y_inter.h"
+#include "../z_zone.h"
+#include "../doomtype.h"
+#include "../doomstat.h"
+
+cl_mode_t cl_mode = CL_SEARCHING;
+static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
+boolean serverisfull = false; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not
+tic_t firstconnectattempttime = 0;
+UINT8 mynode; // my address pointofview server
+static void *snake = NULL;
+
+static void CL_DrawConnectionStatusBox(void)
+{
+ M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
+ if (cl_mode != CL_CONFIRMCONNECT)
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
+}
+
+//
+// CL_DrawConnectionStatus
+//
+// Keep the local client informed of our status.
+//
+static inline void CL_DrawConnectionStatus(void)
+{
+ INT32 ccstime = I_GetTime();
+
+ // Draw background fade
+ V_DrawFadeScreen(0xFF00, 16); // force default
+
+ if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES)
+ {
+ INT32 i, animtime = ((ccstime / 4) & 15) + 16;
+ UINT8 palstart;
+ const char *cltext;
+
+ // Draw the bottom box.
+ CL_DrawConnectionStatusBox();
+
+ if (cl_mode == CL_SEARCHING)
+ palstart = 32; // Red
+ else if (cl_mode == CL_CONFIRMCONNECT)
+ palstart = 48; // Orange
+ else
+ palstart = 96; // Green
+
+ if (!(cl_mode == CL_DOWNLOADSAVEGAME && lastfilenum != -1))
+ for (i = 0; i < 16; ++i) // 15 pal entries total.
+ V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-16, 16, 8, palstart + ((animtime - i) & 15));
+
+ switch (cl_mode)
+ {
+ case CL_DOWNLOADSAVEGAME:
+ if (fileneeded && lastfilenum != -1)
+ {
+ UINT32 currentsize = fileneeded[lastfilenum].currentsize;
+ UINT32 totalsize = fileneeded[lastfilenum].totalsize;
+ INT32 dldlength;
+
+ cltext = M_GetText("Downloading game state...");
+ Net_GetNetStat();
+
+ dldlength = (INT32)((currentsize/(double)totalsize) * 256);
+ if (dldlength > 256)
+ dldlength = 256;
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, dldlength, 8, 96);
+
+ V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
+ va(" %4uK/%4uK",currentsize>>10,totalsize>>10));
+
+ V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
+ va("%3.1fK/s ", ((double)getbps)/1024));
+ }
+ else
+ cltext = M_GetText("Waiting to download game state...");
+ break;
+ case CL_ASKFULLFILELIST:
+ case CL_CHECKFILES:
+ cltext = M_GetText("Checking server addon list...");
+ break;
+ case CL_CONFIRMCONNECT:
+ cltext = "";
+ break;
+ case CL_LOADFILES:
+ cltext = M_GetText("Loading server addons...");
+ break;
+ case CL_ASKJOIN:
+ case CL_WAITJOINRESPONSE:
+ if (serverisfull)
+ cltext = M_GetText("Server full, waiting for a slot...");
+ else
+ cltext = M_GetText("Requesting to join...");
+ break;
+ default:
+ cltext = M_GetText("Connecting to server...");
+ break;
+ }
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, cltext);
+ }
+ else
+ {
+ if (cl_mode == CL_LOADFILES)
+ {
+ INT32 totalfileslength;
+ INT32 loadcompletednum = 0;
+ INT32 i;
+
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
+
+ //ima just count files here
+ if (fileneeded)
+ {
+ for (i = 0; i < fileneedednum; i++)
+ if (fileneeded[i].status == FS_OPEN)
+ loadcompletednum++;
+ }
+
+ // Loading progress
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, "Loading server addons...");
+ totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256);
+ M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, totalfileslength, 8, 96);
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
+ va(" %2u/%2u Files",loadcompletednum,fileneedednum));
+ }
+ else if (lastfilenum != -1)
+ {
+ INT32 dldlength;
+ static char tempname[28];
+ fileneeded_t *file;
+ char *filename;
+
+ if (snake)
+ Snake_Draw(snake);
+
+ // Draw the bottom box.
+ CL_DrawConnectionStatusBox();
+
+ if (fileneeded)
+ {
+ file = &fileneeded[lastfilenum];
+ filename = file->filename;
+ }
+ else
+ return;
+
+ Net_GetNetStat();
+ dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256);
+ if (dldlength > 256)
+ dldlength = 256;
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
+ V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, dldlength, 8, 96);
+
+ memset(tempname, 0, sizeof(tempname));
+ // offset filename to just the name only part
+ filename += strlen(filename) - nameonlylength(filename);
+
+ if (strlen(filename) > sizeof(tempname)-1) // too long to display fully
+ {
+ size_t endhalfpos = strlen(filename)-10;
+ // display as first 14 chars + ... + last 10 chars
+ // which should add up to 27 if our math(s) is correct
+ snprintf(tempname, sizeof(tempname), "%.14s...%.10s", filename, filename+endhalfpos);
+ }
+ else // we can copy the whole thing in safely
+ {
+ strncpy(tempname, filename, sizeof(tempname)-1);
+ }
+
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP,
+ va(M_GetText("Downloading \"%s\""), tempname));
+ V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
+ va(" %4uK/%4uK",fileneeded[lastfilenum].currentsize>>10,file->totalsize>>10));
+ V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
+ va("%3.1fK/s ", ((double)getbps)/1024));
+ }
+ else
+ {
+ if (snake)
+ Snake_Draw(snake);
+
+ CL_DrawConnectionStatusBox();
+ V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP,
+ M_GetText("Waiting to download files..."));
+ }
+ }
+}
+
+static boolean CL_AskFileList(INT32 firstfile)
+{
+ netbuffer->packettype = PT_TELLFILESNEEDED;
+ netbuffer->u.filesneedednum = firstfile;
+
+ return HSendPacket(servernode, false, 0, sizeof (INT32));
+}
+
+/** Sends a special packet to declare how many players in local
+ * Used only in arbitratrenetstart()
+ * Sends a PT_CLIENTJOIN packet to the server
+ *
+ * \return True if the packet was successfully sent
+ * \todo Improve the description...
+ *
+ */
+boolean CL_SendJoin(void)
+{
+ UINT8 localplayers = 1;
+ if (netgame)
+ CONS_Printf(M_GetText("Sending join request...\n"));
+ netbuffer->packettype = PT_CLIENTJOIN;
+
+ netbuffer->u.clientcfg.modversion = MODVERSION;
+ strncpy(netbuffer->u.clientcfg.application,
+ SRB2APPLICATION,
+ sizeof netbuffer->u.clientcfg.application);
+
+ if (splitscreen || botingame)
+ localplayers++;
+ netbuffer->u.clientcfg.localplayers = localplayers;
+
+ CleanupPlayerName(consoleplayer, cv_playername.zstring);
+ if (splitscreen)
+ CleanupPlayerName(1, cv_playername2.zstring);/* 1 is a HACK? oh no */
+
+ strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
+ strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
+
+ return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
+}
+
+static void SendAskInfo(INT32 node)
+{
+ const tic_t asktime = I_GetTime();
+ netbuffer->packettype = PT_ASKINFO;
+ netbuffer->u.askinfo.version = VERSION;
+ netbuffer->u.askinfo.time = (tic_t)LONG(asktime);
+
+ // Even if this never arrives due to the host being firewalled, we've
+ // now allowed traffic from the host to us in, so once the MS relays
+ // our address to the host, it'll be able to speak to us.
+ HSendPacket(node, false, 0, sizeof (askinfo_pak));
+}
+
+serverelem_t serverlist[MAXSERVERLIST];
+UINT32 serverlistcount = 0;
+
+#define FORCECLOSE 0x8000
+
+static void SL_ClearServerList(INT32 connectedserver)
+{
+ UINT32 i;
+
+ for (i = 0; i < serverlistcount; i++)
+ if (connectedserver != serverlist[i].node)
+ {
+ Net_CloseConnection(serverlist[i].node|FORCECLOSE);
+ serverlist[i].node = 0;
+ }
+ serverlistcount = 0;
+}
+
+static UINT32 SL_SearchServer(INT32 node)
+{
+ UINT32 i;
+ for (i = 0; i < serverlistcount; i++)
+ if (serverlist[i].node == node)
+ return i;
+
+ return UINT32_MAX;
+}
+
+static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
+{
+ UINT32 i;
+
+ // search if not already on it
+ i = SL_SearchServer(node);
+ if (i == UINT32_MAX)
+ {
+ // not found add it
+ if (serverlistcount >= MAXSERVERLIST)
+ return; // list full
+
+ /* check it later if connecting to this one */
+ if (node != servernode)
+ {
+ if (info->_255 != 255)
+ return;/* old packet format */
+
+ if (info->packetversion != PACKETVERSION)
+ return;/* old new packet format */
+
+ if (info->version != VERSION)
+ return; // Not same version.
+
+ if (info->subversion != SUBVERSION)
+ return; // Close, but no cigar.
+
+ if (strcmp(info->application, SRB2APPLICATION))
+ return;/* that's a different mod */
+ }
+
+ i = serverlistcount++;
+ }
+
+ serverlist[i].info = *info;
+ serverlist[i].node = node;
+
+ // resort server list
+ M_SortServerList();
+}
+
+#if defined (MASTERSERVER) && defined (HAVE_THREADS)
+struct Fetch_servers_ctx
+{
+ int room;
+ int id;
+};
+
+static void
+Fetch_servers_thread (struct Fetch_servers_ctx *ctx)
+{
+ msg_server_t *server_list;
+
+ server_list = GetShortServersList(ctx->room, ctx->id);
+
+ if (server_list)
+ {
+ I_lock_mutex(&ms_QueryId_mutex);
+ {
+ if (ctx->id != ms_QueryId)
+ {
+ free(server_list);
+ server_list = NULL;
+ }
+ }
+ I_unlock_mutex(ms_QueryId_mutex);
+
+ if (server_list)
+ {
+ I_lock_mutex(&m_menu_mutex);
+ {
+ if (m_waiting_mode == M_WAITING_SERVERS)
+ m_waiting_mode = M_NOT_WAITING;
+ }
+ I_unlock_mutex(m_menu_mutex);
+
+ I_lock_mutex(&ms_ServerList_mutex);
+ {
+ ms_ServerList = server_list;
+ }
+ I_unlock_mutex(ms_ServerList_mutex);
+ }
+ }
+
+ free(ctx);
+}
+#endif/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/
+
+void CL_QueryServerList (msg_server_t *server_list)
+{
+ INT32 i;
+
+ for (i = 0; server_list[i].header.buffer[0]; i++)
+ {
+ // Make sure MS version matches our own, to
+ // thwart nefarious servers who lie to the MS.
+
+ /* lol bruh, that version COMES from the servers */
+ //if (strcmp(version, server_list[i].version) == 0)
+ {
+ INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
+ 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);
+ }
+ }
+}
+
+void CL_UpdateServerList(boolean internetsearch, INT32 room)
+{
+ (void)internetsearch;
+ (void)room;
+
+ SL_ClearServerList(0);
+
+ if (!netgame && I_NetOpenSocket)
+ {
+ if (I_NetOpenSocket())
+ {
+ netgame = true;
+ multiplayer = true;
+ }
+ }
+
+ // search for local servers
+ if (netgame)
+ SendAskInfo(BROADCASTADDR);
+
+#ifdef MASTERSERVER
+ if (internetsearch)
+ {
+#ifdef HAVE_THREADS
+ struct Fetch_servers_ctx *ctx;
+
+ ctx = malloc(sizeof *ctx);
+
+ /* This called from M_Refresh so I don't use a mutex */
+ m_waiting_mode = M_WAITING_SERVERS;
+
+ I_lock_mutex(&ms_QueryId_mutex);
+ {
+ ctx->id = ms_QueryId;
+ }
+ I_unlock_mutex(ms_QueryId_mutex);
+
+ ctx->room = room;
+
+ I_spawn_thread("fetch-servers", (I_thread_fn)Fetch_servers_thread, ctx);
+#else
+ msg_server_t *server_list;
+
+ server_list = GetShortServersList(room, 0);
+
+ if (server_list)
+ {
+ CL_QueryServerList(server_list);
+ free(server_list);
+ }
+#endif
+ }
+#endif/*MASTERSERVER*/
+}
+
+static void M_ConfirmConnect(event_t *ev)
+{
+ if (ev->type == ev_keydown || ev->type == ev_gamepad_down)
+ {
+ if ((ev->type == ev_keydown && (ev->key == ' ' || ev->key == 'y' || ev->key == KEY_ENTER)) || (ev->type == ev_gamepad_down && ev->which == 0 && ev->key == GAMEPAD_BUTTON_A))
+ {
+ if (totalfilesrequestednum > 0)
+ {
+ if (CL_SendFileRequest())
+ {
+ cl_mode = CL_DOWNLOADFILES;
+ Snake_Allocate(&snake);
+ }
+ }
+ else
+ cl_mode = CL_LOADFILES;
+
+ M_ClearMenus(true);
+ }
+ else if ((ev->type == ev_keydown && (ev->key == 'n' || ev->key == KEY_ESCAPE)) || (ev->type == ev_gamepad_down && ev->which == 0 && ev->key == GAMEPAD_BUTTON_B))
+ {
+ cl_mode = CL_ABORTED;
+ M_ClearMenus(true);
+ }
+ }
+}
+
+static boolean CL_FinishedFileList(void)
+{
+ INT32 i;
+ char *downloadsize = NULL;
+
+ //CONS_Printf(M_GetText("Checking files...\n"));
+ i = CL_CheckFiles();
+ if (i == 4) // still checking ...
+ {
+ return true;
+ }
+ else if (i == 3) // too many files
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "You have too many WAD files loaded\n"
+ "to add ones the server is using.\n"
+ "Please restart SRB2 before connecting.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+ else if (i == 2) // cannot join for some reason
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "You have the wrong addons loaded.\n\n"
+ "To play on this server, restart\n"
+ "the game and don't load any addons.\n"
+ "SRB2 will automatically add\n"
+ "everything you need when you join.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+ else if (i == 1)
+ {
+ if (serverisfull)
+ {
+ M_StartMessage(M_GetText(
+ "This server is full!\n"
+ "\n"
+ "You may load server addons (if any), and wait for a slot.\n"
+ "\n"
+ "Press ENTER to continue\nor ESC to cancel.\n\n"
+ ), M_ConfirmConnect, MM_EVENTHANDLER);
+ cl_mode = CL_CONFIRMCONNECT;
+ curfadevalue = 0;
+ }
+ else
+ cl_mode = CL_LOADFILES;
+ }
+ else
+ {
+ // must download something
+ // can we, though?
+ if (!CL_CheckDownloadable()) // nope!
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "An error occured when trying to\n"
+ "download missing addons.\n"
+ "(This is almost always a problem\n"
+ "with the server, not your game.)\n\n"
+ "See the console or log file\n"
+ "for additional details.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+
+ downloadcompletednum = 0;
+ downloadcompletedsize = 0;
+ totalfilesrequestednum = 0;
+ totalfilesrequestedsize = 0;
+
+ if (fileneeded == NULL)
+ I_Error("CL_FinishedFileList: fileneeded == NULL");
+
+ for (i = 0; i < fileneedednum; i++)
+ if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
+ {
+ totalfilesrequestednum++;
+ totalfilesrequestedsize += fileneeded[i].totalsize;
+ }
+
+ if (totalfilesrequestedsize>>20 >= 100)
+ downloadsize = Z_StrDup(va("%uM",totalfilesrequestedsize>>20));
+ else
+ downloadsize = Z_StrDup(va("%uK",totalfilesrequestedsize>>10));
+
+ if (serverisfull)
+ M_StartMessage(va(M_GetText(
+ "This server is full!\n"
+ "Download of %s additional content\nis required to join.\n"
+ "\n"
+ "You may download, load server addons,\nand wait for a slot.\n"
+ "\n"
+ "Press ENTER to continue\nor ESC to cancel.\n"
+ ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+ else
+ M_StartMessage(va(M_GetText(
+ "Download of %s additional content\nis required to join.\n"
+ "\n"
+ "Press ENTER to continue\nor ESC to cancel.\n"
+ ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
+
+ Z_Free(downloadsize);
+ cl_mode = CL_CONFIRMCONNECT;
+ curfadevalue = 0;
+ }
+ return true;
+}
+
+static const char * InvalidServerReason (serverinfo_pak *info)
+{
+#define EOT "\nPress ESC\n"
+
+ /* magic number for new packet format */
+ if (info->_255 != 255)
+ {
+ return
+ "Outdated server (version unknown).\n" EOT;
+ }
+
+ if (strncmp(info->application, SRB2APPLICATION, sizeof
+ info->application))
+ {
+ return va(
+ "%s cannot connect\n"
+ "to %s servers.\n" EOT,
+ SRB2APPLICATION,
+ info->application);
+ }
+
+ if (
+ info->packetversion != PACKETVERSION ||
+ info->version != VERSION ||
+ info->subversion != SUBVERSION
+ ){
+ return va(
+ "Incompatible %s versions.\n"
+ "(server version %d.%d.%d)\n" EOT,
+ SRB2APPLICATION,
+ info->version / 100,
+ info->version % 100,
+ info->subversion);
+ }
+
+ switch (info->refusereason)
+ {
+ case REFUSE_BANNED:
+ return
+ "You have been banned\n"
+ "from the server.\n" EOT;
+ case REFUSE_JOINS_DISABLED:
+ return
+ "The server is not accepting\n"
+ "joins for the moment.\n" EOT;
+ case REFUSE_SLOTS_FULL:
+ return va(
+ "Maximum players reached: %d\n" EOT,
+ info->maxplayer);
+ default:
+ if (info->refusereason)
+ {
+ return
+ "You can't join.\n"
+ "I don't know why,\n"
+ "but you can't join.\n" EOT;
+ }
+ }
+
+ return NULL;
+
+#undef EOT
+}
+
+/** Called by CL_ServerConnectionTicker
+ *
+ * \param asksent The last time we asked the server to join. We re-ask every second in case our request got lost in transmit.
+ * \return False if the connection was aborted
+ * \sa CL_ServerConnectionTicker
+ * \sa CL_ConnectToServer
+ *
+ */
+static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
+{
+ INT32 i;
+
+ // serverlist is updated by GetPacket function
+ if (serverlistcount > 0)
+ {
+ // this can be a responce to our broadcast request
+ if (servernode == -1 || servernode >= MAXNETNODES)
+ {
+ i = 0;
+ servernode = serverlist[i].node;
+ CONS_Printf(M_GetText("Found, "));
+ }
+ else
+ {
+ i = SL_SearchServer(servernode);
+ if (i < 0)
+ return true;
+ }
+
+ if (client)
+ {
+ serverinfo_pak *info = &serverlist[i].info;
+
+ if (info->refusereason == REFUSE_SLOTS_FULL)
+ serverisfull = true;
+ else
+ {
+ const char *reason = InvalidServerReason(info);
+
+ // Quit here rather than downloading files
+ // and being refused later.
+ if (reason)
+ {
+ char *message = Z_StrDup(reason);
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(message, NULL, MM_NOTHING);
+ Z_Free(message);
+ return false;
+ }
+ }
+
+ D_ParseFileneeded(info->fileneedednum, info->fileneeded, 0);
+
+ if (info->flags & SV_LOTSOFADDONS)
+ {
+ cl_mode = CL_ASKFULLFILELIST;
+ cl_lastcheckedfilecount = 0;
+ return true;
+ }
+
+ cl_mode = CL_CHECKFILES;
+ }
+ else
+ {
+ cl_mode = CL_ASKJOIN; // files need not be checked for the server.
+ *asksent = 0;
+ }
+
+ return true;
+ }
+
+ // Ask the info to the server (askinfo packet)
+ if (*asksent + NEWTICRATE < I_GetTime())
+ {
+ SendAskInfo(servernode);
+ *asksent = I_GetTime();
+ }
+
+ return true;
+}
+
+/** Called by CL_ConnectToServer
+ *
+ * \param tmpsave The name of the gamestate file???
+ * \param oldtic Used for knowing when to poll events and redraw
+ * \param asksent ???
+ * \return False if the connection was aborted
+ * \sa CL_ServerConnectionSearchTicker
+ * \sa CL_ConnectToServer
+ *
+ */
+static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic_t *asksent)
+{
+ boolean waitmore;
+ INT32 i;
+
+ switch (cl_mode)
+ {
+ case CL_SEARCHING:
+ if (!CL_ServerConnectionSearchTicker(asksent))
+ return false;
+ break;
+
+ case CL_ASKFULLFILELIST:
+ if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
+ cl_mode = CL_CHECKFILES;
+ else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent)
+ {
+ if (CL_AskFileList(fileneedednum))
+ {
+ cl_lastcheckedfilecount = fileneedednum;
+ *asksent = I_GetTime() + NEWTICRATE;
+ }
+ }
+ break;
+ case CL_CHECKFILES:
+ if (!CL_FinishedFileList())
+ return false;
+ break;
+ case CL_DOWNLOADFILES:
+ waitmore = false;
+ for (i = 0; i < fileneedednum; i++)
+ if (fileneeded[i].status == FS_DOWNLOADING
+ || fileneeded[i].status == FS_REQUESTED)
+ {
+ waitmore = true;
+ break;
+ }
+ if (waitmore)
+ break; // exit the case
+
+ Snake_Free(&snake);
+
+ cl_mode = CL_LOADFILES;
+ break;
+ case CL_LOADFILES:
+ if (CL_LoadServerFiles())
+ {
+ FreeFileNeeded();
+ *asksent = 0; //This ensure the first join ask is right away
+ firstconnectattempttime = I_GetTime();
+ cl_mode = CL_ASKJOIN;
+ }
+ break;
+ case CL_ASKJOIN:
+ if (firstconnectattempttime + NEWTICRATE*300 < I_GetTime() && !server)
+ {
+ CONS_Printf(M_GetText("5 minute wait time exceeded.\n"));
+ CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "5 minute wait time exceeded.\n"
+ "You may retry connection.\n"
+ "\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+
+ // prepare structures to save the file
+ // WARNING: this can be useless in case of server not in GS_LEVEL
+ // but since the network layer doesn't provide ordered packets...
+ CL_PrepareDownloadSaveGame(tmpsave);
+
+ if (I_GetTime() >= *asksent && CL_SendJoin())
+ {
+ *asksent = I_GetTime() + NEWTICRATE*3;
+ cl_mode = CL_WAITJOINRESPONSE;
+ }
+ break;
+ case CL_WAITJOINRESPONSE:
+ if (I_GetTime() >= *asksent)
+ {
+ cl_mode = CL_ASKJOIN;
+ }
+ break;
+ case CL_DOWNLOADSAVEGAME:
+ // At this state, the first (and only) needed file is the gamestate
+ if (fileneeded[0].status == FS_FOUND)
+ {
+ // Gamestate is now handled within CL_LoadReceivedSavegame()
+ CL_LoadReceivedSavegame(false);
+ cl_mode = CL_CONNECTED;
+ } // don't break case continue to CL_CONNECTED
+ else
+ break;
+
+ case CL_CONNECTED:
+ case CL_CONFIRMCONNECT: //logic is handled by M_ConfirmConnect
+ default:
+ break;
+
+ // Connection closed by cancel, timeout or refusal.
+ case CL_ABORTED:
+ cl_mode = CL_SEARCHING;
+ return false;
+ }
+
+ GetPackets();
+ Net_AckTicker();
+
+ // Call it only once by tic
+ if (*oldtic != I_GetTime())
+ {
+ I_OsPolling();
+
+ if (cl_mode == CL_CONFIRMCONNECT)
+ D_ProcessEvents(); //needed for menu system to receive inputs
+ else
+ {
+ // my hand has been forced and I am dearly sorry for this awful hack :vomit:
+ for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
+ {
+ G_MapEventsToControls(&events[eventtail]);
+ }
+ }
+
+ if (gamekeydown[KEY_ESCAPE] || gamepads[0].buttons[GAMEPAD_BUTTON_B] || cl_mode == CL_ABORTED)
+ {
+ CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
+ M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING);
+
+ Snake_Free(&snake);
+
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ memset(gamekeydown, 0, NUMKEYS);
+ return false;
+ }
+ else if (cl_mode == CL_DOWNLOADFILES && snake)
+ Snake_Update(snake);
+
+ if (client && (cl_mode == CL_DOWNLOADFILES || cl_mode == CL_DOWNLOADSAVEGAME))
+ FileReceiveTicker();
+
+ // why are these here? this is for servers, we're a client
+ //if (key == 's' && server)
+ // doomcom->numnodes = (INT16)pnumnodes;
+ //FileSendTicker();
+ *oldtic = I_GetTime();
+
+ if (client && cl_mode != CL_CONNECTED && cl_mode != CL_ABORTED)
+ {
+ if (!snake)
+ {
+ F_MenuPresTicker(true); // title sky
+ F_TitleScreenTicker(true);
+ F_TitleScreenDrawer();
+ }
+ CL_DrawConnectionStatus();
+#ifdef HAVE_THREADS
+ I_lock_mutex(&m_menu_mutex);
+#endif
+ M_Drawer(); //Needed for drawing messageboxes on the connection screen
+#ifdef HAVE_THREADS
+ I_unlock_mutex(m_menu_mutex);
+#endif
+ I_UpdateNoVsync(); // page flip or blit buffer
+ if (moviemode)
+ M_SaveFrame();
+ S_UpdateSounds();
+ S_UpdateClosedCaptions();
+ }
+ }
+ else
+ {
+ I_Sleep(cv_sleep.value);
+ I_UpdateTime(cv_timescale.value);
+ }
+
+ return true;
+}
+
+#define TMPSAVENAME "$$$.sav"
+
+/** Use adaptive send using net_bandwidth and stat.sendbytes
+ *
+ * \todo Better description...
+ *
+ */
+void CL_ConnectToServer(void)
+{
+ INT32 pnumnodes, nodewaited = doomcom->numnodes, i;
+ tic_t oldtic;
+ tic_t asksent;
+ char tmpsave[256];
+
+ sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
+
+ lastfilenum = -1;
+
+ cl_mode = CL_SEARCHING;
+
+ // Don't get a corrupt savegame error because tmpsave already exists
+ if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
+ I_Error("Can't delete %s\n", tmpsave);
+
+ if (netgame)
+ {
+ if (servernode < 0 || servernode >= MAXNETNODES)
+ CONS_Printf(M_GetText("Searching for a server...\n"));
+ else
+ CONS_Printf(M_GetText("Contacting the server...\n"));
+ }
+
+ if (gamestate == GS_INTERMISSION)
+ Y_EndIntermission(); // clean up intermission graphics etc
+
+ DEBFILE(va("waiting %d nodes\n", doomcom->numnodes));
+ G_SetGamestate(GS_WAITINGPLAYERS);
+ wipegamestate = GS_WAITINGPLAYERS;
+
+ ClearAdminPlayers();
+ pnumnodes = 1;
+ oldtic = I_GetTime() - 1;
+
+ asksent = (tic_t) - TICRATE;
+ firstconnectattempttime = I_GetTime();
+
+ i = SL_SearchServer(servernode);
+
+ if (i != -1)
+ {
+ char *gametypestr = serverlist[i].info.gametypename;
+ CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
+ gametypestr[sizeof serverlist[i].info.gametypename - 1] = '\0';
+ CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
+ CONS_Printf(M_GetText("Version: %d.%d.%u\n"), serverlist[i].info.version/100,
+ serverlist[i].info.version%100, serverlist[i].info.subversion);
+ }
+ SL_ClearServerList(servernode);
+
+ do
+ {
+ // If the connection was aborted for some reason, leave
+ if (!CL_ServerConnectionTicker(tmpsave, &oldtic, &asksent))
+ return;
+
+ if (server)
+ {
+ pnumnodes = 0;
+ for (i = 0; i < MAXNETNODES; i++)
+ if (netnodes[i].ingame)
+ pnumnodes++;
+ }
+ }
+ while (!(cl_mode == CL_CONNECTED && (client || (server && nodewaited <= pnumnodes))));
+
+ DEBFILE(va("Synchronisation Finished\n"));
+
+ displayplayer = consoleplayer;
+}
+
+/** Called when a PT_SERVERINFO packet is received
+ *
+ * \param node The packet sender
+ * \note What happens if the packet comes from a client or something like that?
+ *
+ */
+void HandleServerInfo(SINT8 node)
+{
+ // compute ping in ms
+ const tic_t ticnow = I_GetTime();
+ const tic_t ticthen = (tic_t)LONG(netbuffer->u.serverinfo.time);
+ const tic_t ticdiff = (ticnow - ticthen)*1000/NEWTICRATE;
+ netbuffer->u.serverinfo.time = (tic_t)LONG(ticdiff);
+ netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = 0;
+ netbuffer->u.serverinfo.application
+ [sizeof netbuffer->u.serverinfo.application - 1] = '\0';
+ netbuffer->u.serverinfo.gametypename
+ [sizeof netbuffer->u.serverinfo.gametypename - 1] = '\0';
+
+ SL_InsertServer(&netbuffer->u.serverinfo, node);
+}
+
+// Helper function for packets that should only be sent by the server
+// If it is NOT from the server, bail out and close the connection!
+static boolean ServerOnly(SINT8 node)
+{
+ if (node == servernode)
+ return false;
+
+ Net_CloseConnection(node);
+ return true;
+}
+
+void PT_MoreFilesNeeded(SINT8 node)
+{
+ if (server && serverrunning)
+ { // But wait I thought I'm the server?
+ Net_CloseConnection(node);
+ return;
+ }
+ if (ServerOnly(node))
+ return;
+ if (cl_mode == CL_ASKFULLFILELIST && netbuffer->u.filesneededcfg.first == fileneedednum)
+ {
+ D_ParseFileneeded(netbuffer->u.filesneededcfg.num, netbuffer->u.filesneededcfg.files, netbuffer->u.filesneededcfg.first);
+ if (!netbuffer->u.filesneededcfg.more)
+ cl_lastcheckedfilecount = UINT16_MAX; // Got the whole file list
+ }
+}
+
+// Negative response of client join request
+void PT_ServerRefuse(SINT8 node)
+{
+ if (server && serverrunning)
+ { // But wait I thought I'm the server?
+ Net_CloseConnection(node);
+ return;
+ }
+ if (ServerOnly(node))
+ return;
+ if (cl_mode == CL_WAITJOINRESPONSE)
+ {
+ // Save the reason so it can be displayed after quitting the netgame
+ char *reason = strdup(netbuffer->u.serverrefuse.reason);
+ if (!reason)
+ I_Error("Out of memory!\n");
+
+ if (strstr(reason, "Maximum players reached"))
+ {
+ serverisfull = true;
+ //Special timeout for when refusing due to player cap. The client will wait 3 seconds between join requests when waiting for a slot, so we need this to be much longer
+ //We set it back to the value of cv_nettimeout.value in CL_Reset
+ connectiontimeout = NEWTICRATE*7;
+ cl_mode = CL_ASKJOIN;
+ free(reason);
+ return;
+ }
+
+ M_StartMessage(va(M_GetText("Server refuses connection\n\nReason:\n%s"),
+ reason), NULL, MM_NOTHING);
+
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+
+ free(reason);
+
+ // Will be reset by caller. Signals refusal.
+ cl_mode = CL_ABORTED;
+ }
+}
+
+// Positive response of client join request
+void PT_ServerCFG(SINT8 node)
+{
+ if (server && serverrunning && node != servernode)
+ { // but wait I thought I'm the server?
+ Net_CloseConnection(node);
+ return;
+ }
+ if (ServerOnly(node))
+ return;
+ /// \note how would this happen? and is it doing the right thing if it does?
+ if (cl_mode != CL_WAITJOINRESPONSE)
+ return;
+
+ if (client)
+ {
+ maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
+ G_SetGametype(netbuffer->u.servercfg.gametype);
+ modifiedgame = netbuffer->u.servercfg.modifiedgame;
+ memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
+ }
+
+ netnodes[(UINT8)servernode].ingame = true;
+ serverplayer = netbuffer->u.servercfg.serverplayer;
+ doomcom->numslots = SHORT(netbuffer->u.servercfg.totalslotnum);
+ mynode = netbuffer->u.servercfg.clientnode;
+ if (serverplayer >= 0)
+ playernode[(UINT8)serverplayer] = servernode;
+
+ if (netgame)
+ CONS_Printf(M_GetText("Join accepted, waiting for complete game state...\n"));
+ DEBFILE(va("Server accept join gametic=%u mynode=%d\n", gametic, mynode));
+
+ /// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
+ /// Shouldn't them be downloaded even at intermission time?
+ /// Also, according to HandleConnect, the server will send the savegame even during intermission...
+ if (netbuffer->u.servercfg.gamestate == GS_LEVEL/* ||
+ netbuffer->u.servercfg.gamestate == GS_INTERMISSION*/)
+ cl_mode = CL_DOWNLOADSAVEGAME;
+ else
+ cl_mode = CL_CONNECTED;
+}
diff --git a/src/netcode/client_connection.h b/src/netcode/client_connection.h
new file mode 100644
index 0000000000000000000000000000000000000000..a76411ba64775a4278cab173f6a69f738e69f024
--- /dev/null
+++ b/src/netcode/client_connection.h
@@ -0,0 +1,61 @@
+// SONIC ROBO BLAST 2
+//-----------------------------------------------------------------------------
+// Copyright (C) 1998-2000 by DooM Legacy Team.
+// Copyright (C) 1999-2022 by Sonic Team Junior.
+//
+// This program is free software distributed under the
+// terms of the GNU General Public License, version 2.
+// See the 'LICENSE' file for more details.
+//-----------------------------------------------------------------------------
+/// \file client_connection.h
+/// \brief Client connection handling
+
+#ifndef __D_CLIENT_CONNECTION__
+#define __D_CLIENT_CONNECTION__
+
+#include "../doomtype.h"
+#include "d_clisrv.h"
+
+#define MAXSERVERLIST (MAXNETNODES-1)
+
+typedef struct
+{
+ SINT8 node;
+ serverinfo_pak info;
+} serverelem_t;
+
+typedef enum
+{
+ CL_SEARCHING,
+ CL_CHECKFILES,
+ CL_DOWNLOADFILES,
+ CL_ASKJOIN,
+ CL_LOADFILES,
+ CL_WAITJOINRESPONSE,
+ CL_DOWNLOADSAVEGAME,
+ CL_CONNECTED,
+ CL_ABORTED,
+ CL_ASKFULLFILELIST,
+ CL_CONFIRMCONNECT
+} cl_mode_t;
+
+extern serverelem_t serverlist[MAXSERVERLIST];
+extern UINT32 serverlistcount;
+
+extern cl_mode_t cl_mode;
+extern boolean serverisfull; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not
+extern tic_t firstconnectattempttime;
+extern UINT8 mynode; // my address pointofview server
+
+void CL_QueryServerList(msg_server_t *list);
+void CL_UpdateServerList(boolean internetsearch, INT32 room);
+
+void CL_ConnectToServer(void);
+boolean CL_SendJoin(void);
+
+void HandleServerInfo(SINT8 node);
+void PT_MoreFilesNeeded(SINT8 node);
+void PT_ServerRefuse(SINT8 node);
+void PT_ServerCFG(SINT8 node);
+
+#endif
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index 9b11e23ff02d49d920836e4fce6534ac9917f7ee..f7a9260e1c442781ca171c72e20ab9484fa5d345 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -49,14 +49,7 @@
#include "../lua_libs.h"
#include "../md5.h"
#include "../m_perfstats.h"
-
-// aaaaaa
-#include "../i_gamepad.h"
-
-// cl loading screen
-#include "../v_video.h"
-#include "../f_finale.h"
-#include "../snake.h"
+#include "client_connection.h"
//
// NETWORKING
@@ -103,7 +96,7 @@ tic_t servermaxping = 800; // server's max ping. Defaults to 800
static tic_t firstticstosend; // min of the nettics
static tic_t tictoclear = 0; // optimize d_clearticcmd
-static tic_t maketic;
+tic_t maketic;
static INT16 consistancy[BACKUPTICS];
@@ -121,21 +114,17 @@ static ticcmd_t localcmds;
static ticcmd_t localcmds2;
static boolean cl_packetmissed;
// here it is for the secondary local player (splitscreen)
-static UINT8 mynode; // my address pointofview server
static boolean cl_redownloadinggamestate = false;
static UINT8 localtextcmd[MAXTEXTCMD];
static UINT8 localtextcmd2[MAXTEXTCMD]; // splitscreen
-static tic_t neededtic;
+tic_t neededtic;
SINT8 servernode = 0; // the number of the server node
/// \brief do we accept new players?
/// \todo WORK!
boolean acceptnewnode = true;
-static boolean serverisfull = false; //lets us be aware if the server was full after we check files, but before downloading, so we can ask if the user still wants to download or not
-static tic_t firstconnectattempttime = 0;
-
// engine
// Must be a power of two
@@ -512,250 +501,6 @@ void ReadLmpExtraData(UINT8 **demo_pointer, INT32 playernum)
static INT16 Consistancy(void);
-typedef enum
-{
- CL_SEARCHING,
- CL_CHECKFILES,
- CL_DOWNLOADFILES,
- CL_ASKJOIN,
- CL_LOADFILES,
- CL_WAITJOINRESPONSE,
- CL_DOWNLOADSAVEGAME,
- CL_CONNECTED,
- CL_ABORTED,
- CL_ASKFULLFILELIST,
- CL_CONFIRMCONNECT
-} cl_mode_t;
-
-static void GetPackets(void);
-
-static cl_mode_t cl_mode = CL_SEARCHING;
-
-static UINT16 cl_lastcheckedfilecount = 0; // used for full file list
-
-static void *snake = NULL;
-
-static void CL_DrawConnectionStatusBox(void)
-{
- M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
- if (cl_mode != CL_CONFIRMCONNECT)
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
-}
-
-//
-// CL_DrawConnectionStatus
-//
-// Keep the local client informed of our status.
-//
-static inline void CL_DrawConnectionStatus(void)
-{
- INT32 ccstime = I_GetTime();
-
- // Draw background fade
- V_DrawFadeScreen(0xFF00, 16); // force default
-
- if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_LOADFILES)
- {
- INT32 i, animtime = ((ccstime / 4) & 15) + 16;
- UINT8 palstart;
- const char *cltext;
-
- // Draw the bottom box.
- CL_DrawConnectionStatusBox();
-
- if (cl_mode == CL_SEARCHING)
- palstart = 32; // Red
- else if (cl_mode == CL_CONFIRMCONNECT)
- palstart = 48; // Orange
- else
- palstart = 96; // Green
-
- if (!(cl_mode == CL_DOWNLOADSAVEGAME && lastfilenum != -1))
- for (i = 0; i < 16; ++i) // 15 pal entries total.
- V_DrawFill((BASEVIDWIDTH/2-128) + (i * 16), BASEVIDHEIGHT-16, 16, 8, palstart + ((animtime - i) & 15));
-
- switch (cl_mode)
- {
- case CL_DOWNLOADSAVEGAME:
- if (fileneeded && lastfilenum != -1)
- {
- UINT32 currentsize = fileneeded[lastfilenum].currentsize;
- UINT32 totalsize = fileneeded[lastfilenum].totalsize;
- INT32 dldlength;
-
- cltext = M_GetText("Downloading game state...");
- Net_GetNetStat();
-
- dldlength = (INT32)((currentsize/(double)totalsize) * 256);
- if (dldlength > 256)
- dldlength = 256;
- V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
- V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, dldlength, 8, 96);
-
- V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
- va(" %4uK/%4uK",currentsize>>10,totalsize>>10));
-
- V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
- va("%3.1fK/s ", ((double)getbps)/1024));
- }
- else
- cltext = M_GetText("Waiting to download game state...");
- break;
- case CL_ASKFULLFILELIST:
- case CL_CHECKFILES:
- cltext = M_GetText("Checking server addon list...");
- break;
- case CL_CONFIRMCONNECT:
- cltext = "";
- break;
- case CL_LOADFILES:
- cltext = M_GetText("Loading server addons...");
- break;
- case CL_ASKJOIN:
- case CL_WAITJOINRESPONSE:
- if (serverisfull)
- cltext = M_GetText("Server full, waiting for a slot...");
- else
- cltext = M_GetText("Requesting to join...");
- break;
- default:
- cltext = M_GetText("Connecting to server...");
- break;
- }
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, cltext);
- }
- else
- {
- if (cl_mode == CL_LOADFILES)
- {
- INT32 totalfileslength;
- INT32 loadcompletednum = 0;
- INT32 i;
-
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-16, V_YELLOWMAP, "Press ESC to abort");
-
- //ima just count files here
- if (fileneeded)
- {
- for (i = 0; i < fileneedednum; i++)
- if (fileneeded[i].status == FS_OPEN)
- loadcompletednum++;
- }
-
- // Loading progress
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP, "Loading server addons...");
- totalfileslength = (INT32)((loadcompletednum/(double)(fileneedednum)) * 256);
- M_DrawTextBox(BASEVIDWIDTH/2-128-8, BASEVIDHEIGHT-16-8, 32, 1);
- V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
- V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, totalfileslength, 8, 96);
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
- va(" %2u/%2u Files",loadcompletednum,fileneedednum));
- }
- else if (lastfilenum != -1)
- {
- INT32 dldlength;
- static char tempname[28];
- fileneeded_t *file;
- char *filename;
-
- if (snake)
- Snake_Draw(snake);
-
- // Draw the bottom box.
- CL_DrawConnectionStatusBox();
-
- if (fileneeded)
- {
- file = &fileneeded[lastfilenum];
- filename = file->filename;
- }
- else
- return;
-
- Net_GetNetStat();
- dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256);
- if (dldlength > 256)
- dldlength = 256;
- V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, 256, 8, 111);
- V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, dldlength, 8, 96);
-
- memset(tempname, 0, sizeof(tempname));
- // offset filename to just the name only part
- filename += strlen(filename) - nameonlylength(filename);
-
- if (strlen(filename) > sizeof(tempname)-1) // too long to display fully
- {
- size_t endhalfpos = strlen(filename)-10;
- // display as first 14 chars + ... + last 10 chars
- // which should add up to 27 if our math(s) is correct
- snprintf(tempname, sizeof(tempname), "%.14s...%.10s", filename, filename+endhalfpos);
- }
- else // we can copy the whole thing in safely
- {
- strncpy(tempname, filename, sizeof(tempname)-1);
- }
-
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP,
- va(M_GetText("Downloading \"%s\""), tempname));
- V_DrawString(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
- va(" %4uK/%4uK",fileneeded[lastfilenum].currentsize>>10,file->totalsize>>10));
- V_DrawRightAlignedString(BASEVIDWIDTH/2+128, BASEVIDHEIGHT-16, V_20TRANS|V_MONOSPACE,
- va("%3.1fK/s ", ((double)getbps)/1024));
- }
- else
- {
- if (snake)
- Snake_Draw(snake);
-
- CL_DrawConnectionStatusBox();
- V_DrawCenteredString(BASEVIDWIDTH/2, BASEVIDHEIGHT-16-24, V_YELLOWMAP,
- M_GetText("Waiting to download files..."));
- }
- }
-}
-
-static boolean CL_AskFileList(INT32 firstfile)
-{
- netbuffer->packettype = PT_TELLFILESNEEDED;
- netbuffer->u.filesneedednum = firstfile;
-
- return HSendPacket(servernode, false, 0, sizeof (INT32));
-}
-
-/** Sends a special packet to declare how many players in local
- * Used only in arbitratrenetstart()
- * Sends a PT_CLIENTJOIN packet to the server
- *
- * \return True if the packet was successfully sent
- * \todo Improve the description...
- *
- */
-static boolean CL_SendJoin(void)
-{
- UINT8 localplayers = 1;
- if (netgame)
- CONS_Printf(M_GetText("Sending join request...\n"));
- netbuffer->packettype = PT_CLIENTJOIN;
-
- netbuffer->u.clientcfg.modversion = MODVERSION;
- strncpy(netbuffer->u.clientcfg.application,
- SRB2APPLICATION,
- sizeof netbuffer->u.clientcfg.application);
-
- if (splitscreen || botingame)
- localplayers++;
- netbuffer->u.clientcfg.localplayers = localplayers;
-
- CleanupPlayerName(consoleplayer, cv_playername.zstring);
- if (splitscreen)
- CleanupPlayerName(1, cv_playername2.zstring);/* 1 is a HACK? oh no */
-
- strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
- strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
-
- return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
-}
-
static INT32 FindRejoinerNum(SINT8 node)
{
char strippednodeaddress[64];
@@ -1105,7 +850,7 @@ static void SV_SavedGame(void)
#define TMPSAVENAME "$$$.sav"
-static void CL_LoadReceivedSavegame(boolean reloading)
+void CL_LoadReceivedSavegame(boolean reloading)
{
UINT8 *savebuffer = NULL;
size_t length, decompressedlen;
@@ -1206,790 +951,6 @@ static void CL_ReloadReceivedSavegame(void)
CONS_Printf(M_GetText("Game state reloaded\n"));
}
-static void SendAskInfo(INT32 node)
-{
- const tic_t asktime = I_GetTime();
- netbuffer->packettype = PT_ASKINFO;
- netbuffer->u.askinfo.version = VERSION;
- netbuffer->u.askinfo.time = (tic_t)LONG(asktime);
-
- // Even if this never arrives due to the host being firewalled, we've
- // now allowed traffic from the host to us in, so once the MS relays
- // our address to the host, it'll be able to speak to us.
- HSendPacket(node, false, 0, sizeof (askinfo_pak));
-}
-
-serverelem_t serverlist[MAXSERVERLIST];
-UINT32 serverlistcount = 0;
-
-#define FORCECLOSE 0x8000
-
-static void SL_ClearServerList(INT32 connectedserver)
-{
- UINT32 i;
-
- for (i = 0; i < serverlistcount; i++)
- if (connectedserver != serverlist[i].node)
- {
- Net_CloseConnection(serverlist[i].node|FORCECLOSE);
- serverlist[i].node = 0;
- }
- serverlistcount = 0;
-}
-
-static UINT32 SL_SearchServer(INT32 node)
-{
- UINT32 i;
- for (i = 0; i < serverlistcount; i++)
- if (serverlist[i].node == node)
- return i;
-
- return UINT32_MAX;
-}
-
-static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
-{
- UINT32 i;
-
- // search if not already on it
- i = SL_SearchServer(node);
- if (i == UINT32_MAX)
- {
- // not found add it
- if (serverlistcount >= MAXSERVERLIST)
- return; // list full
-
- /* check it later if connecting to this one */
- if (node != servernode)
- {
- if (info->_255 != 255)
- return;/* old packet format */
-
- if (info->packetversion != PACKETVERSION)
- return;/* old new packet format */
-
- if (info->version != VERSION)
- return; // Not same version.
-
- if (info->subversion != SUBVERSION)
- return; // Close, but no cigar.
-
- if (strcmp(info->application, SRB2APPLICATION))
- return;/* that's a different mod */
- }
-
- i = serverlistcount++;
- }
-
- serverlist[i].info = *info;
- serverlist[i].node = node;
-
- // resort server list
- M_SortServerList();
-}
-
-#if defined (MASTERSERVER) && defined (HAVE_THREADS)
-struct Fetch_servers_ctx
-{
- int room;
- int id;
-};
-
-static void
-Fetch_servers_thread (struct Fetch_servers_ctx *ctx)
-{
- msg_server_t *server_list;
-
- server_list = GetShortServersList(ctx->room, ctx->id);
-
- if (server_list)
- {
- I_lock_mutex(&ms_QueryId_mutex);
- {
- if (ctx->id != ms_QueryId)
- {
- free(server_list);
- server_list = NULL;
- }
- }
- I_unlock_mutex(ms_QueryId_mutex);
-
- if (server_list)
- {
- I_lock_mutex(&m_menu_mutex);
- {
- if (m_waiting_mode == M_WAITING_SERVERS)
- m_waiting_mode = M_NOT_WAITING;
- }
- I_unlock_mutex(m_menu_mutex);
-
- I_lock_mutex(&ms_ServerList_mutex);
- {
- ms_ServerList = server_list;
- }
- I_unlock_mutex(ms_ServerList_mutex);
- }
- }
-
- free(ctx);
-}
-#endif/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/
-
-void CL_QueryServerList (msg_server_t *server_list)
-{
- INT32 i;
-
- for (i = 0; server_list[i].header.buffer[0]; i++)
- {
- // Make sure MS version matches our own, to
- // thwart nefarious servers who lie to the MS.
-
- /* lol bruh, that version COMES from the servers */
- //if (strcmp(version, server_list[i].version) == 0)
- {
- INT32 node = I_NetMakeNodewPort(server_list[i].ip, server_list[i].port);
- 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);
- }
- }
-}
-
-void CL_UpdateServerList(boolean internetsearch, INT32 room)
-{
- (void)internetsearch;
- (void)room;
-
- SL_ClearServerList(0);
-
- if (!netgame && I_NetOpenSocket)
- {
- if (I_NetOpenSocket())
- {
- netgame = true;
- multiplayer = true;
- }
- }
-
- // search for local servers
- if (netgame)
- SendAskInfo(BROADCASTADDR);
-
-#ifdef MASTERSERVER
- if (internetsearch)
- {
-#ifdef HAVE_THREADS
- struct Fetch_servers_ctx *ctx;
-
- ctx = malloc(sizeof *ctx);
-
- /* This called from M_Refresh so I don't use a mutex */
- m_waiting_mode = M_WAITING_SERVERS;
-
- I_lock_mutex(&ms_QueryId_mutex);
- {
- ctx->id = ms_QueryId;
- }
- I_unlock_mutex(ms_QueryId_mutex);
-
- ctx->room = room;
-
- I_spawn_thread("fetch-servers", (I_thread_fn)Fetch_servers_thread, ctx);
-#else
- msg_server_t *server_list;
-
- server_list = GetShortServersList(room, 0);
-
- if (server_list)
- {
- CL_QueryServerList(server_list);
- free(server_list);
- }
-#endif
- }
-#endif/*MASTERSERVER*/
-}
-
-static void M_ConfirmConnect(event_t *ev)
-{
- if (ev->type == ev_keydown || ev->type == ev_gamepad_down)
- {
- if ((ev->type == ev_keydown && (ev->key == ' ' || ev->key == 'y' || ev->key == KEY_ENTER)) || (ev->type == ev_gamepad_down && ev->which == 0 && ev->key == GAMEPAD_BUTTON_A))
- {
- if (totalfilesrequestednum > 0)
- {
- if (CL_SendFileRequest())
- {
- cl_mode = CL_DOWNLOADFILES;
- Snake_Allocate(&snake);
- }
- }
- else
- cl_mode = CL_LOADFILES;
-
- M_ClearMenus(true);
- }
- else if ((ev->type == ev_keydown && (ev->key == 'n' || ev->key == KEY_ESCAPE)) || (ev->type == ev_gamepad_down && ev->which == 0 && ev->key == GAMEPAD_BUTTON_B))
- {
- cl_mode = CL_ABORTED;
- M_ClearMenus(true);
- }
- }
-}
-
-static boolean CL_FinishedFileList(void)
-{
- INT32 i;
- char *downloadsize = NULL;
-
- //CONS_Printf(M_GetText("Checking files...\n"));
- i = CL_CheckFiles();
- if (i == 4) // still checking ...
- {
- return true;
- }
- else if (i == 3) // too many files
- {
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(M_GetText(
- "You have too many WAD files loaded\n"
- "to add ones the server is using.\n"
- "Please restart SRB2 before connecting.\n\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
- return false;
- }
- else if (i == 2) // cannot join for some reason
- {
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(M_GetText(
- "You have the wrong addons loaded.\n\n"
- "To play on this server, restart\n"
- "the game and don't load any addons.\n"
- "SRB2 will automatically add\n"
- "everything you need when you join.\n\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
- return false;
- }
- else if (i == 1)
- {
- if (serverisfull)
- {
- M_StartMessage(M_GetText(
- "This server is full!\n"
- "\n"
- "You may load server addons (if any), and wait for a slot.\n"
- "\n"
- "Press ENTER to continue\nor ESC to cancel.\n\n"
- ), M_ConfirmConnect, MM_EVENTHANDLER);
- cl_mode = CL_CONFIRMCONNECT;
- curfadevalue = 0;
- }
- else
- cl_mode = CL_LOADFILES;
- }
- else
- {
- // must download something
- // can we, though?
- if (!CL_CheckDownloadable()) // nope!
- {
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(M_GetText(
- "An error occured when trying to\n"
- "download missing addons.\n"
- "(This is almost always a problem\n"
- "with the server, not your game.)\n\n"
- "See the console or log file\n"
- "for additional details.\n\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
- return false;
- }
-
- downloadcompletednum = 0;
- downloadcompletedsize = 0;
- totalfilesrequestednum = 0;
- totalfilesrequestedsize = 0;
-
- if (fileneeded == NULL)
- I_Error("CL_FinishedFileList: fileneeded == NULL");
-
- for (i = 0; i < fileneedednum; i++)
- if (fileneeded[i].status == FS_NOTFOUND || fileneeded[i].status == FS_MD5SUMBAD)
- {
- totalfilesrequestednum++;
- totalfilesrequestedsize += fileneeded[i].totalsize;
- }
-
- if (totalfilesrequestedsize>>20 >= 100)
- downloadsize = Z_StrDup(va("%uM",totalfilesrequestedsize>>20));
- else
- downloadsize = Z_StrDup(va("%uK",totalfilesrequestedsize>>10));
-
- if (serverisfull)
- M_StartMessage(va(M_GetText(
- "This server is full!\n"
- "Download of %s additional content\nis required to join.\n"
- "\n"
- "You may download, load server addons,\nand wait for a slot.\n"
- "\n"
- "Press ENTER to continue\nor ESC to cancel.\n"
- ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
- else
- M_StartMessage(va(M_GetText(
- "Download of %s additional content\nis required to join.\n"
- "\n"
- "Press ENTER to continue\nor ESC to cancel.\n"
- ), downloadsize), M_ConfirmConnect, MM_EVENTHANDLER);
-
- Z_Free(downloadsize);
- cl_mode = CL_CONFIRMCONNECT;
- curfadevalue = 0;
- }
- return true;
-}
-
-static const char * InvalidServerReason (serverinfo_pak *info)
-{
-#define EOT "\nPress ESC\n"
-
- /* magic number for new packet format */
- if (info->_255 != 255)
- {
- return
- "Outdated server (version unknown).\n" EOT;
- }
-
- if (strncmp(info->application, SRB2APPLICATION, sizeof
- info->application))
- {
- return va(
- "%s cannot connect\n"
- "to %s servers.\n" EOT,
- SRB2APPLICATION,
- info->application);
- }
-
- if (
- info->packetversion != PACKETVERSION ||
- info->version != VERSION ||
- info->subversion != SUBVERSION
- ){
- return va(
- "Incompatible %s versions.\n"
- "(server version %d.%d.%d)\n" EOT,
- SRB2APPLICATION,
- info->version / 100,
- info->version % 100,
- info->subversion);
- }
-
- switch (info->refusereason)
- {
- case REFUSE_BANNED:
- return
- "You have been banned\n"
- "from the server.\n" EOT;
- case REFUSE_JOINS_DISABLED:
- return
- "The server is not accepting\n"
- "joins for the moment.\n" EOT;
- case REFUSE_SLOTS_FULL:
- return va(
- "Maximum players reached: %d\n" EOT,
- info->maxplayer);
- default:
- if (info->refusereason)
- {
- return
- "You can't join.\n"
- "I don't know why,\n"
- "but you can't join.\n" EOT;
- }
- }
-
- return NULL;
-
-#undef EOT
-}
-
-/** Called by CL_ServerConnectionTicker
- *
- * \param asksent The last time we asked the server to join. We re-ask every second in case our request got lost in transmit.
- * \return False if the connection was aborted
- * \sa CL_ServerConnectionTicker
- * \sa CL_ConnectToServer
- *
- */
-static boolean CL_ServerConnectionSearchTicker(tic_t *asksent)
-{
- INT32 i;
-
- // serverlist is updated by GetPacket function
- if (serverlistcount > 0)
- {
- // this can be a responce to our broadcast request
- if (servernode == -1 || servernode >= MAXNETNODES)
- {
- i = 0;
- servernode = serverlist[i].node;
- CONS_Printf(M_GetText("Found, "));
- }
- else
- {
- i = SL_SearchServer(servernode);
- if (i < 0)
- return true;
- }
-
- if (client)
- {
- serverinfo_pak *info = &serverlist[i].info;
-
- if (info->refusereason == REFUSE_SLOTS_FULL)
- serverisfull = true;
- else
- {
- const char *reason = InvalidServerReason(info);
-
- // Quit here rather than downloading files
- // and being refused later.
- if (reason)
- {
- char *message = Z_StrDup(reason);
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(message, NULL, MM_NOTHING);
- Z_Free(message);
- return false;
- }
- }
-
- D_ParseFileneeded(info->fileneedednum, info->fileneeded, 0);
-
- if (info->flags & SV_LOTSOFADDONS)
- {
- cl_mode = CL_ASKFULLFILELIST;
- cl_lastcheckedfilecount = 0;
- return true;
- }
-
- cl_mode = CL_CHECKFILES;
- }
- else
- {
- cl_mode = CL_ASKJOIN; // files need not be checked for the server.
- *asksent = 0;
- }
-
- return true;
- }
-
- // Ask the info to the server (askinfo packet)
- if (*asksent + NEWTICRATE < I_GetTime())
- {
- SendAskInfo(servernode);
- *asksent = I_GetTime();
- }
-
- return true;
-}
-
-/** Called by CL_ConnectToServer
- *
- * \param tmpsave The name of the gamestate file???
- * \param oldtic Used for knowing when to poll events and redraw
- * \param asksent ???
- * \return False if the connection was aborted
- * \sa CL_ServerConnectionSearchTicker
- * \sa CL_ConnectToServer
- *
- */
-static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic_t *asksent)
-{
- boolean waitmore;
- INT32 i;
-
- switch (cl_mode)
- {
- case CL_SEARCHING:
- if (!CL_ServerConnectionSearchTicker(asksent))
- return false;
- break;
-
- case CL_ASKFULLFILELIST:
- if (cl_lastcheckedfilecount == UINT16_MAX) // All files retrieved
- cl_mode = CL_CHECKFILES;
- else if (fileneedednum != cl_lastcheckedfilecount || I_GetTime() >= *asksent)
- {
- if (CL_AskFileList(fileneedednum))
- {
- cl_lastcheckedfilecount = fileneedednum;
- *asksent = I_GetTime() + NEWTICRATE;
- }
- }
- break;
- case CL_CHECKFILES:
- if (!CL_FinishedFileList())
- return false;
- break;
- case CL_DOWNLOADFILES:
- waitmore = false;
- for (i = 0; i < fileneedednum; i++)
- if (fileneeded[i].status == FS_DOWNLOADING
- || fileneeded[i].status == FS_REQUESTED)
- {
- waitmore = true;
- break;
- }
- if (waitmore)
- break; // exit the case
-
- Snake_Free(&snake);
-
- cl_mode = CL_LOADFILES;
- break;
- case CL_LOADFILES:
- if (CL_LoadServerFiles())
- {
- FreeFileNeeded();
- *asksent = 0; //This ensure the first join ask is right away
- firstconnectattempttime = I_GetTime();
- cl_mode = CL_ASKJOIN;
- }
- break;
- case CL_ASKJOIN:
- if (firstconnectattempttime + NEWTICRATE*300 < I_GetTime() && !server)
- {
- CONS_Printf(M_GetText("5 minute wait time exceeded.\n"));
- CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- M_StartMessage(M_GetText(
- "5 minute wait time exceeded.\n"
- "You may retry connection.\n"
- "\n"
- "Press ESC\n"
- ), NULL, MM_NOTHING);
- return false;
- }
-
- // prepare structures to save the file
- // WARNING: this can be useless in case of server not in GS_LEVEL
- // but since the network layer doesn't provide ordered packets...
- CL_PrepareDownloadSaveGame(tmpsave);
-
- if (I_GetTime() >= *asksent && CL_SendJoin())
- {
- *asksent = I_GetTime() + NEWTICRATE*3;
- cl_mode = CL_WAITJOINRESPONSE;
- }
- break;
- case CL_WAITJOINRESPONSE:
- if (I_GetTime() >= *asksent)
- {
- cl_mode = CL_ASKJOIN;
- }
- break;
- case CL_DOWNLOADSAVEGAME:
- // At this state, the first (and only) needed file is the gamestate
- if (fileneeded[0].status == FS_FOUND)
- {
- // Gamestate is now handled within CL_LoadReceivedSavegame()
- CL_LoadReceivedSavegame(false);
- cl_mode = CL_CONNECTED;
- } // don't break case continue to CL_CONNECTED
- else
- break;
-
- case CL_CONNECTED:
- case CL_CONFIRMCONNECT: //logic is handled by M_ConfirmConnect
- default:
- break;
-
- // Connection closed by cancel, timeout or refusal.
- case CL_ABORTED:
- cl_mode = CL_SEARCHING;
- return false;
- }
-
- GetPackets();
- Net_AckTicker();
-
- // Call it only once by tic
- if (*oldtic != I_GetTime())
- {
- I_OsPolling();
-
- if (cl_mode == CL_CONFIRMCONNECT)
- D_ProcessEvents(); //needed for menu system to receive inputs
- else
- {
- // my hand has been forced and I am dearly sorry for this awful hack :vomit:
- for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
- {
- G_MapEventsToControls(&events[eventtail]);
- }
- }
-
- if (gamekeydown[KEY_ESCAPE] || gamepads[0].buttons[GAMEPAD_BUTTON_B] || cl_mode == CL_ABORTED)
- {
- CONS_Printf(M_GetText("Network game synchronization aborted.\n"));
- M_StartMessage(M_GetText("Network game synchronization aborted.\n\nPress ESC\n"), NULL, MM_NOTHING);
-
- Snake_Free(&snake);
-
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
- memset(gamekeydown, 0, NUMKEYS);
- return false;
- }
- else if (cl_mode == CL_DOWNLOADFILES && snake)
- Snake_Update(snake);
-
- if (client && (cl_mode == CL_DOWNLOADFILES || cl_mode == CL_DOWNLOADSAVEGAME))
- FileReceiveTicker();
-
- // why are these here? this is for servers, we're a client
- //if (key == 's' && server)
- // doomcom->numnodes = (INT16)pnumnodes;
- //FileSendTicker();
- *oldtic = I_GetTime();
-
- if (client && cl_mode != CL_CONNECTED && cl_mode != CL_ABORTED)
- {
- if (!snake)
- {
- F_MenuPresTicker(true); // title sky
- F_TitleScreenTicker(true);
- F_TitleScreenDrawer();
- }
- CL_DrawConnectionStatus();
-#ifdef HAVE_THREADS
- I_lock_mutex(&m_menu_mutex);
-#endif
- M_Drawer(); //Needed for drawing messageboxes on the connection screen
-#ifdef HAVE_THREADS
- I_unlock_mutex(m_menu_mutex);
-#endif
- I_UpdateNoVsync(); // page flip or blit buffer
- if (moviemode)
- M_SaveFrame();
- S_UpdateSounds();
- S_UpdateClosedCaptions();
- }
- }
- else
- {
- I_Sleep(cv_sleep.value);
- I_UpdateTime(cv_timescale.value);
- }
-
- return true;
-}
-
-/** Use adaptive send using net_bandwidth and stat.sendbytes
- *
- * \todo Better description...
- *
- */
-static void CL_ConnectToServer(void)
-{
- INT32 pnumnodes, nodewaited = doomcom->numnodes, i;
- tic_t oldtic;
- tic_t asksent;
- char tmpsave[256];
-
- sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
-
- lastfilenum = -1;
-
- cl_mode = CL_SEARCHING;
-
- // Don't get a corrupt savegame error because tmpsave already exists
- if (FIL_FileExists(tmpsave) && unlink(tmpsave) == -1)
- I_Error("Can't delete %s\n", tmpsave);
-
- if (netgame)
- {
- if (servernode < 0 || servernode >= MAXNETNODES)
- CONS_Printf(M_GetText("Searching for a server...\n"));
- else
- CONS_Printf(M_GetText("Contacting the server...\n"));
- }
-
- if (gamestate == GS_INTERMISSION)
- Y_EndIntermission(); // clean up intermission graphics etc
-
- DEBFILE(va("waiting %d nodes\n", doomcom->numnodes));
- G_SetGamestate(GS_WAITINGPLAYERS);
- wipegamestate = GS_WAITINGPLAYERS;
-
- ClearAdminPlayers();
- pnumnodes = 1;
- oldtic = I_GetTime() - 1;
-
- asksent = (tic_t) - TICRATE;
- firstconnectattempttime = I_GetTime();
-
- i = SL_SearchServer(servernode);
-
- if (i != -1)
- {
- char *gametypestr = serverlist[i].info.gametypename;
- CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
- gametypestr[sizeof serverlist[i].info.gametypename - 1] = '\0';
- CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
- CONS_Printf(M_GetText("Version: %d.%d.%u\n"), serverlist[i].info.version/100,
- serverlist[i].info.version%100, serverlist[i].info.subversion);
- }
- SL_ClearServerList(servernode);
-
- do
- {
- // If the connection was aborted for some reason, leave
- if (!CL_ServerConnectionTicker(tmpsave, &oldtic, &asksent))
- return;
-
- if (server)
- {
- pnumnodes = 0;
- for (i = 0; i < MAXNETNODES; i++)
- if (netnodes[i].ingame)
- pnumnodes++;
- }
- }
- while (!(cl_mode == CL_CONNECTED && (client || (server && nodewaited <= pnumnodes))));
-
- DEBFILE(va("Synchronisation Finished\n"));
-
- displayplayer = consoleplayer;
-}
-
typedef struct banreason_s
{
char *reason;
@@ -3525,39 +2486,6 @@ static void HandleTimeout(SINT8 node)
M_StartMessage(M_GetText("Server Timeout\n\nPress Esc\n"), NULL, MM_NOTHING);
}
-/** Called when a PT_SERVERINFO packet is received
- *
- * \param node The packet sender
- * \note What happens if the packet comes from a client or something like that?
- *
- */
-static void HandleServerInfo(SINT8 node)
-{
- // compute ping in ms
- const tic_t ticnow = I_GetTime();
- const tic_t ticthen = (tic_t)LONG(netbuffer->u.serverinfo.time);
- const tic_t ticdiff = (ticnow - ticthen)*1000/NEWTICRATE;
- netbuffer->u.serverinfo.time = (tic_t)LONG(ticdiff);
- netbuffer->u.serverinfo.servername[MAXSERVERNAME-1] = 0;
- netbuffer->u.serverinfo.application
- [sizeof netbuffer->u.serverinfo.application - 1] = '\0';
- netbuffer->u.serverinfo.gametypename
- [sizeof netbuffer->u.serverinfo.gametypename - 1] = '\0';
-
- SL_InsertServer(&netbuffer->u.serverinfo, node);
-}
-
-// Helper function for packets that should only be sent by the server
-// If it is NOT from the server, bail out and close the connection!
-static boolean ServerOnly(SINT8 node)
-{
- if (node == servernode)
- return false;
-
- Net_CloseConnection(node);
- return true;
-}
-
static void PT_AskInfoViaMS(SINT8 node)
{
Net_CloseConnection(node);
@@ -3582,23 +2510,6 @@ static void PT_TellFilesNeeded(SINT8 node)
Net_CloseConnection(node);
}
-static void PT_MoreFilesNeeded(SINT8 node)
-{
- if (server && serverrunning)
- { // But wait I thought I'm the server?
- Net_CloseConnection(node);
- return;
- }
- if (ServerOnly(node))
- return;
- if (cl_mode == CL_ASKFULLFILELIST && netbuffer->u.filesneededcfg.first == fileneedednum)
- {
- D_ParseFileneeded(netbuffer->u.filesneededcfg.num, netbuffer->u.filesneededcfg.files, netbuffer->u.filesneededcfg.first);
- if (!netbuffer->u.filesneededcfg.more)
- cl_lastcheckedfilecount = UINT16_MAX; // Got the whole file list
- }
-}
-
static void PT_AskInfo(SINT8 node)
{
if (server && serverrunning)
@@ -3609,91 +2520,6 @@ static void PT_AskInfo(SINT8 node)
Net_CloseConnection(node);
}
-// Negative response of client join request
-static void PT_ServerRefuse(SINT8 node)
-{
- if (server && serverrunning)
- { // But wait I thought I'm the server?
- Net_CloseConnection(node);
- return;
- }
- if (ServerOnly(node))
- return;
- if (cl_mode == CL_WAITJOINRESPONSE)
- {
- // Save the reason so it can be displayed after quitting the netgame
- char *reason = strdup(netbuffer->u.serverrefuse.reason);
- if (!reason)
- I_Error("Out of memory!\n");
-
- if (strstr(reason, "Maximum players reached"))
- {
- serverisfull = true;
- //Special timeout for when refusing due to player cap. The client will wait 3 seconds between join requests when waiting for a slot, so we need this to be much longer
- //We set it back to the value of cv_nettimeout.value in CL_Reset
- connectiontimeout = NEWTICRATE*7;
- cl_mode = CL_ASKJOIN;
- free(reason);
- return;
- }
-
- M_StartMessage(va(M_GetText("Server refuses connection\n\nReason:\n%s"),
- reason), NULL, MM_NOTHING);
-
- D_QuitNetGame();
- CL_Reset();
- D_StartTitle();
-
- free(reason);
-
- // Will be reset by caller. Signals refusal.
- cl_mode = CL_ABORTED;
- }
-}
-
-// Positive response of client join request
-static void PT_ServerCFG(SINT8 node)
-{
- if (server && serverrunning && node != servernode)
- { // but wait I thought I'm the server?
- Net_CloseConnection(node);
- return;
- }
- if (ServerOnly(node))
- return;
- /// \note how would this happen? and is it doing the right thing if it does?
- if (cl_mode != CL_WAITJOINRESPONSE)
- return;
-
- if (client)
- {
- maketic = gametic = neededtic = (tic_t)LONG(netbuffer->u.servercfg.gametic);
- G_SetGametype(netbuffer->u.servercfg.gametype);
- modifiedgame = netbuffer->u.servercfg.modifiedgame;
- memcpy(server_context, netbuffer->u.servercfg.server_context, 8);
- }
-
- netnodes[(UINT8)servernode].ingame = true;
- serverplayer = netbuffer->u.servercfg.serverplayer;
- doomcom->numslots = SHORT(netbuffer->u.servercfg.totalslotnum);
- mynode = netbuffer->u.servercfg.clientnode;
- if (serverplayer >= 0)
- playernode[(UINT8)serverplayer] = servernode;
-
- if (netgame)
- CONS_Printf(M_GetText("Join accepted, waiting for complete game state...\n"));
- DEBFILE(va("Server accept join gametic=%u mynode=%d\n", gametic, mynode));
-
- /// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
- /// Shouldn't them be downloaded even at intermission time?
- /// Also, according to HandleConnect, the server will send the savegame even during intermission...
- if (netbuffer->u.servercfg.gamestate == GS_LEVEL/* ||
- netbuffer->u.servercfg.gamestate == GS_INTERMISSION*/)
- cl_mode = CL_DOWNLOADSAVEGAME;
- else
- cl_mode = CL_CONNECTED;
-}
-
static void PT_ClientCmd(SINT8 node, INT32 netconsole)
{
tic_t realend, realstart;
@@ -4190,7 +3016,7 @@ static void HandlePacketFromPlayer(SINT8 node)
* \todo Add details to this description (lol)
*
*/
-static void GetPackets(void)
+void GetPackets(void)
{
SINT8 node; // The packet sender
diff --git a/src/netcode/d_clisrv.h b/src/netcode/d_clisrv.h
index 50b86e9f01700c45849f50b492b947014238ace1..3b0690a799a3a3613fdc10314d6fd4a4767fa9b9 100644
--- a/src/netcode/d_clisrv.h
+++ b/src/netcode/d_clisrv.h
@@ -332,15 +332,6 @@ typedef struct
#pragma pack()
#endif
-#define MAXSERVERLIST (MAXNETNODES-1)
-typedef struct
-{
- SINT8 node;
- serverinfo_pak info;
-} serverelem_t;
-
-extern serverelem_t serverlist[MAXSERVERLIST];
-extern UINT32 serverlistcount;
extern INT32 mapchangepending;
// Points inside doomcom
@@ -385,6 +376,8 @@ extern boolean dedicated; // For dedicated server
extern UINT16 software_MAXPACKETLENGTH;
extern boolean acceptnewnode;
extern SINT8 servernode;
+extern tic_t maketic;
+extern tic_t neededtic;
void Command_Ping_f(void);
extern tic_t connectiontimeout;
@@ -411,6 +404,8 @@ void SendKick(UINT8 playernum, UINT8 msg);
// Create any new ticcmds and broadcast to other players.
void NetUpdate(void);
+void GetPackets(void);
+
void SV_StartSinglePlayerServer(void);
void SV_SpawnServer(void);
void SV_StopServer(void);
@@ -419,9 +414,8 @@ void CL_AddSplitscreenPlayer(void);
void CL_RemoveSplitscreenPlayer(void);
void CL_Reset(void);
void CL_ClearPlayer(INT32 playernum);
-void CL_QueryServerList(msg_server_t *list);
-void CL_UpdateServerList(boolean internetsearch, INT32 room);
void CL_RemovePlayer(INT32 playernum, kickreason_t reason);
+void CL_LoadReceivedSavegame(boolean reloading);
// Is there a game running
boolean Playing(void);
diff --git a/src/netcode/http-mserv.c b/src/netcode/http-mserv.c
index 72dc1cafb2f5f398fe4a083f8de8c1eddea62dd3..68e46b52a1c45c7c39e067f7fe350f7f43ca109b 100644
--- a/src/netcode/http-mserv.c
+++ b/src/netcode/http-mserv.c
@@ -20,6 +20,7 @@ Documentation available here.
#include "../doomdef.h"
#include "d_clisrv.h"
+#include "client_connection.h"
#include "../command.h"
#include "../m_argv.h"
#include "../m_menu.h"
diff --git a/src/netcode/mserv.c b/src/netcode/mserv.c
index 78301f4d982bf1a532c3812b05db99c354d96e73..f603d78e5bf28ed937916559e8f4fe2493247be7 100644
--- a/src/netcode/mserv.c
+++ b/src/netcode/mserv.c
@@ -20,6 +20,7 @@
#include "../command.h"
#include "../i_threads.h"
#include "mserv.h"
+#include "client_connection.h"
#include "../m_menu.h"
#include "../z_zone.h"