提交: be78ea8458798218f87a8efd4bf1b249385a6b60 - zandronum-macos-beta (hg)

This is a fork of Zandronum Beta for Mac Os (Silicon and Intel)

Commit MetaInfo

• 修訂: be78ea8458798218f87a8efd4bf1b249385a6b60 (tree)
• 時間: 2022-10-11 22:37:09
• 作者: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: Every client's ping would be stuck at zero on a Linux server that was running for more than 24 consecutive days.

Change Summary

• modified: docs/zandronum-history.txt
• modified: src/cl_commands.cpp
• modified: src/cl_commands.h
• modified: src/sv_commands.cpp
• modified: src/sv_commands.h
• modified: src/sv_main.cpp

差異

diff -r 6cbfdc124b05 -r be78ea845879 docs/zandronum-history.txt
--- a/docs/zandronum-history.txt	Sun Oct 09 16:35:32 2022 -0400
+++ b/docs/zandronum-history.txt	Tue Oct 11 09:37:09 2022 -0400
@@ -84,6 +84,7 @@
 -	- Fixed: cl_medals also affected the server and could prevent players from earning any medals if disabled. [Kaminsky]
 -	- Fixed: the server didn't always update the correct flagset (e.g. dmflags, compatflags, lmsspectatorsettings) to the clients. [Kaminsky]
 -	- Fixed: the server would still print which flags have changed for lmsallowedweapons when the current game mode wasn't (T)LMS. [Kaminsky]
+-	- Fixed: Every client's ping would be stuck at zero on a Linux server that was running for more than 24 consecutive days. [Kaminsky]
 !	- The result value of GAMEEVENT_MEDALS event scripts can now be used to determine whether or not the player receives the medal. [Kaminsky]
 !	- GAMEMODE flags are now validated after all GAMEMODE lumps have been parsed instead of after each one. The internal game mode name (e.g. "TeamLMS") is now printed with the error message instead of the actual name. [Kaminsky]
 !	- Added an extra check to ensure that game modes have a (short) name. [Kaminsky]

diff -r 6cbfdc124b05 -r be78ea845879 src/cl_commands.cpp
--- a/src/cl_commands.cpp	Sun Oct 09 16:35:32 2022 -0400
+++ b/src/cl_commands.cpp	Tue Oct 11 09:37:09 2022 -0400
@@ -475,7 +475,7 @@
 
 //*****************************************************************************
 //
-void CLIENTCOMMANDS_Pong( ULONG ulTime )
+void CLIENTCOMMANDS_Pong( unsigned int time )
 {
 	// [BB] CLIENTCOMMANDS_Pong is the only client command function that
 	// immediately launches a network packet. This is something that
@@ -490,7 +490,7 @@
 	TempBuffer.Init( MAX_UDP_PACKET, BUFFERTYPE_WRITE );
 	TempBuffer.Clear();
 	TempBuffer.ByteStream.WriteByte( CLC_PONG );
-	TempBuffer.ByteStream.WriteLong( ulTime );
+	TempBuffer.ByteStream.WriteLong( time );
 	NETWORK_LaunchPacket( &TempBuffer, NETWORK_GetFromAddress( ) );
 	TempBuffer.Free();
 }

diff -r 6cbfdc124b05 -r be78ea845879 src/cl_commands.h
--- a/src/cl_commands.h	Sun Oct 09 16:35:32 2022 -0400
+++ b/src/cl_commands.h	Tue Oct 11 09:37:09 2022 -0400
@@ -82,7 +82,7 @@
 void	CLIENTCOMMANDS_Ignore( ULONG ulPlayer, bool bIgnore, LONG lTicks = -1 );
 void	CLIENTCOMMANDS_ClientMove( void );
 void	CLIENTCOMMANDS_MissingPacket( void );
-void	CLIENTCOMMANDS_Pong( ULONG ulTime );
+void	CLIENTCOMMANDS_Pong( unsigned int time );
 void	CLIENTCOMMANDS_WeaponSelect( const PClass *pType );
 void	CLIENTCOMMANDS_SendBackupWeaponSelect( void );
 void	CLIENTCOMMANDS_Taunt( void );

diff -r 6cbfdc124b05 -r be78ea845879 src/sv_commands.cpp
--- a/src/sv_commands.cpp	Sun Oct 09 16:35:32 2022 -0400
+++ b/src/sv_commands.cpp	Tue Oct 11 09:37:09 2022 -0400
@@ -212,10 +212,10 @@
 
 //*****************************************************************************
 //
-void SERVERCOMMANDS_Ping( ULONG ulTime )
+void SERVERCOMMANDS_Ping( unsigned int time )
 {
 	ServerCommands::Ping command;
-	command.SetTime( ulTime );
+	command.SetTime( time );
 	command.sendCommandToClients();
 }
 

diff -r 6cbfdc124b05 -r be78ea845879 src/sv_commands.h
--- a/src/sv_commands.h	Sun Oct 09 16:35:32 2022 -0400
+++ b/src/sv_commands.h	Tue Oct 11 09:37:09 2022 -0400
@@ -82,7 +82,7 @@
 //	PROTOTYPES
 
 // General protocol commands. These handle connecting to and being part of the server.
-void	SERVERCOMMANDS_Ping( ULONG ulTime );
+void	SERVERCOMMANDS_Ping( unsigned int time );
 void	SERVERCOMMANDS_Nothing( ULONG ulPlayer, bool bReliable = false );
 void	SERVERCOMMANDS_BeginSnapshot( ULONG ulPlayer );
 void	SERVERCOMMANDS_EndSnapshot( ULONG ulPlayer );

diff -r 6cbfdc124b05 -r be78ea845879 src/sv_main.cpp
--- a/src/sv_main.cpp	Sun Oct 09 16:35:32 2022 -0400
+++ b/src/sv_main.cpp	Tue Oct 11 09:37:09 2022 -0400
@@ -6145,16 +6145,14 @@
 //
 static bool server_UpdateClientPing( BYTESTREAM_s *pByteStream )
 {
-	ULONG	ulPing;
-
-	ulPing = pByteStream->ReadLong();
-
+	const unsigned int oldTime = pByteStream->ReadLong( );
 	const unsigned int nowTime = I_MSTime( );
+
 	// [BB] This ping information from the client doesn't make sense.
-	if ( ulPing > nowTime )
+	if ( oldTime > nowTime )
 		return false;
 
-	ULONG currentPing = (nowTime - ulPing);
+	ULONG currentPing = nowTime - oldTime;
 	const ULONG ticLength = 1000 / TICRATE;
 	player_t *p = &players[g_lCurrentClient];
 	// [BB] Lag spike, reset the averaging.