Commit: 1708995e86ce66fd91958e94562e184867d434e3 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: 1708995e86ce66fd91958e94562e184867d434e3 (tree)
• Time: 2022-03-28 04:17:25
• Author: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Log Message

Restrict broadcasted net commands to clients who already have the full update (addresses 2667).

Change Summary

• modified: src/network/netcommand.cpp
• modified: src/sv_commands.h

Incremental Difference

diff -r d9afeaf60ce8 -r 1708995e86ce src/network/netcommand.cpp
--- a/src/network/netcommand.cpp	Sun Jan 23 23:29:50 2022 +0100
+++ b/src/network/netcommand.cpp	Sun Mar 27 21:17:25 2022 +0200
@@ -76,6 +76,9 @@
 	if ( ( _flags & SVCF_ONLY_CONNECTIONTYPE_1 ) && ( players[_current].userinfo.GetConnectionType() != 1 ) )
 		return false;
 
+	if ( ( _flags & SVCF_SKIP_CLIENTS_WITHOUT_FULLUPDATE ) && ( SERVER_GetClient( _current )->State == CLS_SPAWNED_BUT_NEEDS_AUTHENTICATION ) && ( gamestate == GS_LEVEL ) )
+		return false;
+
 	return true;
 }
 
@@ -277,6 +280,9 @@
 //
 void NetCommand::sendCommandToClients ( ULONG ulPlayerExtra, ServerCommandFlags flags )
 {
+	if ( ( flags == 0 ) && ( ulPlayerExtra == MAXPLAYERS ) && ( static_cast<SVC>( _buffer.pbData[0] ) != SVC_MAPAUTHENTICATE ) )
+		flags |= SVCF_SKIP_CLIENTS_WITHOUT_FULLUPDATE;
+
 	for ( ClientIterator it ( ulPlayerExtra, flags ); it.notAtEnd(); ++it )
 		sendCommandToOneClient( *it );
 }

diff -r d9afeaf60ce8 -r 1708995e86ce src/sv_commands.h
--- a/src/sv_commands.h	Sun Jan 23 23:29:50 2022 +0100
+++ b/src/sv_commands.h	Sun Mar 27 21:17:25 2022 +0200
@@ -71,7 +71,8 @@
 	SVCF_SKIPTHISCLIENT			= ( 1 << 0 ),
 	SVCF_ONLYTHISCLIENT			= ( 1 << 1 ),
 	SVCF_ONLY_CONNECTIONTYPE_0	= ( 1 << 2 ),
-	SVCF_ONLY_CONNECTIONTYPE_1	= ( 1 << 3 )
+	SVCF_ONLY_CONNECTIONTYPE_1	= ( 1 << 3 ),
+	SVCF_SKIP_CLIENTS_WITHOUT_FULLUPDATE	= ( 1 << 4 )
 };
 
 typedef TFlags<ServerCommandFlag, unsigned int> ServerCommandFlags;