stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-13 22:33:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Call all packet handlers from the same place

Browse source
This commit is contained in:
LJ Sonic 2023-01-08 00:47:33 +01:00
parent cb634402a8
commit 5d5e2c78e4
2 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/netcode/d_clisrv.c
View file

@ -1352,6 +1352,9 @@ void SV_StartSinglePlayerServer(void)
*/ */
static void PT_ServerShutdown(SINT8 node) static void PT_ServerShutdown(SINT8 node)
{ {
if (node != servernode || server || cl_mode == CL_SEARCHING)
return;
(void)node; (void)node;
LUA_HookBool(false, HOOK(GameQuit)); LUA_HookBool(false, HOOK(GameQuit));
D_QuitNetGame(); D_QuitNetGame();
@ -1412,7 +1415,11 @@ static void PT_Login(SINT8 node, INT32 netconsole)
static void PT_ClientQuit(SINT8 node, INT32 netconsole) static void PT_ClientQuit(SINT8 node, INT32 netconsole)
{ {
if (client) if (client)
{
if (node == servernode && cl_mode != CL_SEARCHING && netbuffer->packettype == PT_NODETIMEOUT)
PT_NodeTimeout(node);
return; return;
}
if (!netnodes[node].ingame) if (!netnodes[node].ingame)
{ {
@ -1505,6 +1512,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
switch (netbuffer->packettype) switch (netbuffer->packettype)
{ {
case PT_ASKINFOVIAMS : PT_AskInfoViaMS (node ); break; case PT_ASKINFOVIAMS : PT_AskInfoViaMS (node ); break;
case PT_SERVERINFO : PT_ServerInfo (node ); break;
case PT_TELLFILESNEEDED: PT_TellFilesNeeded(node ); break; case PT_TELLFILESNEEDED: PT_TellFilesNeeded(node ); break;
case PT_MOREFILESNEEDED: PT_MoreFilesNeeded(node ); break; case PT_MOREFILESNEEDED: PT_MoreFilesNeeded(node ); break;
case PT_ASKINFO : PT_AskInfo (node ); break; case PT_ASKINFO : PT_AskInfo (node ); break;
@ -1517,6 +1525,8 @@ static void HandlePacketFromAwayNode(SINT8 node)
case PT_NODETIMEOUT : PT_ClientQuit (node, -1); break; case PT_NODETIMEOUT : PT_ClientQuit (node, -1); break;
case PT_CLIENTQUIT : PT_ClientQuit (node, -1); break; case PT_CLIENTQUIT : PT_ClientQuit (node, -1); break;
case PT_SERVERTICS : PT_ServerTics (node, -1); break; case PT_SERVERTICS : PT_ServerTics (node, -1); break;
case PT_CLIENTJOIN : PT_ClientJoin (node ); break;
case PT_SERVERSHUTDOWN : PT_ServerShutdown (node ); break;
case PT_CLIENTCMD : break; // This is not an "unknown packet" case PT_CLIENTCMD : break; // This is not an "unknown packet"
default: default:
@ -1566,6 +1576,7 @@ static void HandlePacketFromPlayer(SINT8 node)
case PT_ASKLUAFILE : PT_AskLuaFile (node ); break; case PT_ASKLUAFILE : PT_AskLuaFile (node ); break;
case PT_HASLUAFILE : PT_HasLuaFile (node ); break; case PT_HASLUAFILE : PT_HasLuaFile (node ); break;
case PT_RECEIVEDGAMESTATE : PT_ReceivedGamestate (node ); break; case PT_RECEIVEDGAMESTATE : PT_ReceivedGamestate (node ); break;
case PT_SERVERINFO : PT_ServerInfo (node ); break;
// CLIENT RECEIVE // CLIENT RECEIVE
case PT_SERVERTICS : PT_ServerTics (node, netconsole); break; case PT_SERVERTICS : PT_ServerTics (node, netconsole); break;
@ -1575,7 +1586,9 @@ static void HandlePacketFromPlayer(SINT8 node)
case PT_FILERECEIVED : PT_FileReceived (node ); break; case PT_FILERECEIVED : PT_FileReceived (node ); break;
case PT_WILLRESENDGAMESTATE: PT_WillResendGamestate(node ); break; case PT_WILLRESENDGAMESTATE: PT_WillResendGamestate(node ); break;
case PT_SENDINGLUAFILE : PT_SendingLuaFile (node ); break; case PT_SENDINGLUAFILE : PT_SendingLuaFile (node ); break;
case PT_SERVERSHUTDOWN : PT_ServerShutdown (node ); break;
case PT_SERVERCFG : break; case PT_SERVERCFG : break;
case PT_CLIENTJOIN : break;
default: default:
DEBFILE(va("UNKNOWN PACKET TYPE RECEIVED %d from host %d\n", DEBFILE(va("UNKNOWN PACKET TYPE RECEIVED %d from host %d\n",
@ -1598,34 +1611,6 @@ void GetPackets(void)
{ {
node = (SINT8)doomcom->remotenode; node = (SINT8)doomcom->remotenode;
if (netbuffer->packettype == PT_CLIENTJOIN && server)
{
PT_Connect(node);
continue;
}
if (node == servernode && client && cl_mode != CL_SEARCHING)
{
if (netbuffer->packettype == PT_SERVERSHUTDOWN)
{
PT_Shutdown(node);
continue;
}
if (netbuffer->packettype == PT_NODETIMEOUT)
{
PT_Timeout(node);
continue;
}
}
if (netbuffer->packettype == PT_SERVERINFO)
{
PT_ServerInfo(node);
continue;
}
if (netbuffer->packettype == PT_PLAYERINFO)
continue; // We do nothing with PLAYERINFO, that's for the MS browser.
// Packet received from someone already playing // Packet received from someone already playing
if (netnodes[node].ingame) if (netnodes[node].ingame)
HandlePacketFromPlayer(node); HandlePacketFromPlayer(node);

2
src/netcode/server_connection.c
View file

@ -430,7 +430,7 @@ void PT_ClientJoin(SINT8 node)
INT32 i; INT32 i;
// Ignore duplicate packets // Ignore duplicate packets
if (netnodes[node].ingame) if (client || netnodes[node].ingame)
return; return;
rejoinernum = FindRejoinerNum(node); rejoinernum = FindRejoinerNum(node);