implement part 2 of the multi-protocol functionality: pk3 control

this contains a simple method to control the serving of alternate pk3 files to clients using the alternate-2 protocol (69); there's also a fixup for the VoIP part

the new fs_pk3PrefixPairs cvar has the format "P1&A1|P2&A2|...", where, for each i, Pi and Ai are corresponding primary and alternate pk3 filename prefixes, one of which one may be empty (eg. "P1&|&A2|...") to denote no correspondence

2 files changed, 99 insertions, 20 deletions

diff --git a/src/server/sv_client.c b/src/server/sv_client.c
index 91743f8e..126a9d05 100644
--- a/src/server/sv_client.c
+++ b/src/server/sv_client.c
@@ -459,6 +459,8 @@ void SV_DropClient( client_t *drop, const char *reason ) {
 	}
 }
 
+extern char alternateInfos[2][2][BIG_INFO_STRING];
+
 /*
 ================
 SV_SendClientGameState
@@ -475,6 +477,7 @@ static void SV_SendClientGameState( client_t *client ) {
 	entityState_t	*base, nullstate;
 	msg_t		msg;
 	byte		msgBuffer[MAX_MSGLEN];
+	const char	*configstring;
 
  	Com_DPrintf ("SV_SendClientGameState() for %s\n", client->name);
 	Com_DPrintf( "Going from CS_CONNECTED to CS_PRIMED for %s\n", client->name );
@@ -505,10 +508,16 @@ static void SV_SendClientGameState( client_t *client ) {
 
 	// write the configstrings
 	for ( start = 0 ; start < MAX_CONFIGSTRINGS ; start++ ) {
-		if (sv.configstrings[start].s[0]) {
+		if ( start <= CS_SYSTEMINFO && client->netchan.alternateProtocol != 0 ) {
+			configstring = alternateInfos[start][ client->netchan.alternateProtocol - 1 ];
+		} else {
+			configstring = sv.configstrings[start].s;
+		}
+
+		if (configstring[0]) {
 			MSG_WriteByte( &msg, svc_configstring );
 			MSG_WriteShort( &msg, start );
-			MSG_WriteBigString( &msg, sv.configstrings[start].s );
+			MSG_WriteBigString( &msg, configstring );
 		}
 	}
 
@@ -713,7 +722,7 @@ int SV_WriteDownloadToClient(client_t *cl, msg_t *msg)
 			// Check for pk3 filename extension
 			if(!Q_stricmp(pakptr + 1, "pk3"))
 			{
-				const char *referencedPaks = FS_ReferencedPakNames();
+				const char *referencedPaks = FS_ReferencedPakNames( cl->netchan.alternateProtocol == 2 );
 
 				// Check whether the file appears in the list of referenced
 				// paks to prevent downloading of arbitrary files.
@@ -970,9 +979,9 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 
 		nChkSum1 = nChkSum2 = 0;
 		// we run the game, so determine which cgame and ui the client "should" be running
-		bGood = (FS_FileIsInPAK("vm/cgame.qvm", &nChkSum1) == 1);
+		bGood = (FS_FileIsInPAK_A(cl->netchan.alternateProtocol == 2, "vm/cgame.qvm", &nChkSum1) == 1);
 		if (bGood)
-			bGood = (FS_FileIsInPAK("vm/ui.qvm", &nChkSum2) == 1);
+			bGood = (FS_FileIsInPAK_A(cl->netchan.alternateProtocol == 2, "vm/ui.qvm", &nChkSum2) == 1);;
 
 		nClientPaks = Cmd_Argc();
 
@@ -1048,7 +1057,7 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 				break;
 
 			// get the pure checksums of the pk3 files loaded by the server
-			pPaks = FS_LoadedPakPureChecksums();
+			pPaks = FS_LoadedPakPureChecksums( cl->netchan.alternateProtocol == 2 );
 			Cmd_TokenizeString( pPaks );
 			nServerPaks = Cmd_Argc();
 			if (nServerPaks > 1024)
diff --git a/src/server/sv_init.c b/src/server/sv_init.c
index 16726b40..b661284a 100644
--- a/src/server/sv_init.c
+++ b/src/server/sv_init.c
@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "server.h"
 
 
+char alternateInfos[2][2][BIG_INFO_STRING];
+
 /*
 ===============
 SV_SendConfigstring
@@ -34,6 +36,7 @@ given client
 */
 static void SV_SendConfigstring(client_t *client, int index)
 {
+	const char *configstring;
 	int maxChunkSize = MAX_STRING_CHARS - 24;
 	int len;
 
@@ -44,7 +47,13 @@ static void SV_SendConfigstring(client_t *client, int index)
 		return;
 	}
 
-	len = strlen(sv.configstrings[index].s);
+	if ( index <= CS_SYSTEMINFO && client->netchan.alternateProtocol != 0 ) {
+		configstring = alternateInfos[index][ client->netchan.alternateProtocol - 1 ];
+	} else {
+		configstring = sv.configstrings[index].s;
+	}
+
+	len = strlen(configstring);
 
 	if( len >= maxChunkSize ) {
 		int		sent = 0;
@@ -62,7 +71,7 @@ static void SV_SendConfigstring(client_t *client, int index)
 			else {
 				cmd = "bcs1";
 			}
-			Q_strncpyz( buf, &sv.configstrings[index].s[sent],
+			Q_strncpyz( buf, &configstring[sent],
 				maxChunkSize );
 
 			SV_SendServerCommand( client, "%s %i \"%s\"\n", cmd,
@@ -74,7 +83,7 @@ static void SV_SendConfigstring(client_t *client, int index)
 	} else {
 		// standard cs, just send it
 		SV_SendServerCommand( client, "cs %i \"%s\"\n", index,
-			sv.configstrings[index].s );
+			configstring );
 	}
 }
 
@@ -112,6 +121,7 @@ SV_SetConfigstring
 ===============
 */
 void SV_SetConfigstring (int index, const char *val) {
+	qboolean modified[3] = { qfalse, qfalse, qfalse };
 	int		i;
 	client_t	*client;
 
@@ -123,14 +133,50 @@ void SV_SetConfigstring (int index, const char *val) {
 		val = "";
 	}
 
-	// don't bother broadcasting an update if no change
-	if ( !strcmp( val, sv.configstrings[ index ].s ) ) {
-		return;
-	}
+	if ( index <= CS_SYSTEMINFO ) {
+		for ( i = 1; i < 3; ++i ) {
+			char info[BIG_INFO_STRING];
 
-	// change the string in sv
-	Z_Free( sv.configstrings[index].s );
-	sv.configstrings[index].s = CopyString( val );
+			if ( index == CS_SERVERINFO ) {
+				Q_strncpyz( info, val, MAX_INFO_STRING );
+				Info_SetValueForKey( info, "protocol", ( i == 1 ? "70" : "69" ) );
+			} else {
+				Q_strncpyz( info, val, BIG_INFO_STRING );
+				Info_SetValueForKey_Big( info, "sv_voipProtocol", NULL );
+				Info_SetValueForKey_Big( info, "voip", va("%i", sv_voip->integer) );
+				if ( i == 2 ) {
+					Info_SetValueForKey_Big( info, "sv_paks", Cvar_VariableString( "sv_alternatePaks" ) );
+					Info_SetValueForKey_Big( info, "sv_pakNames", Cvar_VariableString( "sv_alternatePakNames" ) );
+					Info_SetValueForKey_Big( info, "sv_referencedPaks", Cvar_VariableString( "sv_referencedAlternatePaks" ) );
+					Info_SetValueForKey_Big( info, "sv_referencedPakNames", Cvar_VariableString( "sv_referencedAlternatePakNames" ) );
+				}
+			}
+
+			if ( strcmp( info, alternateInfos[index][i - 1] ) ) {
+				modified[i] = qtrue;
+				strcpy( alternateInfos[index][i - 1], info );
+			}
+		}
+
+		if ( strcmp( val, sv.configstrings[index].s ) ) {
+			modified[0] = qtrue;
+			Z_Free( sv.configstrings[index].s );
+			sv.configstrings[index].s = CopyString( val );
+		}
+
+		if ( !modified[0] && !modified[1] && !modified[2] ) {
+			return;
+		}
+	} else {
+		// don't bother broadcasting an update if no change
+		if ( !strcmp( val, sv.configstrings[ index ].s ) ) {
+			return;
+		}
+
+		// change the string in sv
+		Z_Free( sv.configstrings[index].s );
+		sv.configstrings[index].s = CopyString( val );
+	}
 
 	// send it to all the clients if we aren't
 	// spawning a new server
@@ -138,6 +184,10 @@ void SV_SetConfigstring (int index, const char *val) {
 
 		// send the data to all relevent clients
 		for (i = 0, client = svs.clients; i < sv_maxclients->integer ; i++, client++) {
+			if ( index <= CS_SYSTEMINFO && !modified[ client->netchan.alternateProtocol ] ) {
+				continue;
+			}
+
 			if ( client->state < CS_ACTIVE ) {
 				if ( client->state == CS_PRIMED )
 					client->csUpdated[ index ] = qtrue;
@@ -396,6 +446,9 @@ static void SV_ClearServer(void) {
 	int i;
 
 	for ( i = 0 ; i < MAX_CONFIGSTRINGS ; i++ ) {
+		if ( i <= CS_SYSTEMINFO ) {
+			alternateInfos[i][0][0] = alternateInfos[i][1][0] = '\0';
+		}
 		if ( sv.configstrings[i].s ) {
 			Z_Free( sv.configstrings[i].s );
 		}
@@ -486,6 +539,9 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
 	// wipe the entire per-level structure
 	SV_ClearServer();
 	for ( i = 0 ; i < MAX_CONFIGSTRINGS ; i++ ) {
+		if ( i <= CS_SYSTEMINFO ) {
+			alternateInfos[i][0][0] = alternateInfos[i][1][0] = '\0';
+		}
 		sv.configstrings[i].s = CopyString("");
 		sv.configstrings[i].restricted = qfalse;
 		Com_Memset(&sv.configstrings[i].clientList, 0, sizeof(clientList_t));
@@ -563,13 +619,17 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
 	if ( sv_pure->integer ) {
 		// the server sends these to the clients so they will only
 		// load pk3s also loaded at the server
-		p = FS_LoadedPakChecksums();
+		p = FS_LoadedPakChecksums( qfalse );
 		Cvar_Set( "sv_paks", p );
+		p = FS_LoadedPakChecksums( qtrue );
+		Cvar_Set( "sv_alternatePaks", p );
 		if (strlen(p) == 0) {
 			Com_Printf( "WARNING: sv_pure set but no PK3 files loaded\n" );
 		}
-		p = FS_LoadedPakNames();
+		p = FS_LoadedPakNames( qfalse );
 		Cvar_Set( "sv_pakNames", p );
+		p = FS_LoadedPakNames( qtrue );
+		Cvar_Set( "sv_alternatePakNames", p );
 
 		// if a dedicated pure server we need to touch the cgame because it could be in a
 		// seperate pk3 file and the client will need to load the latest cgame.qvm
@@ -580,13 +640,19 @@ void SV_SpawnServer( char *server, qboolean killBots ) {
 	else {
 		Cvar_Set( "sv_paks", "" );
 		Cvar_Set( "sv_pakNames", "" );
+		Cvar_Set( "sv_alternatePaks", "" );
+		Cvar_Set( "sv_alternatePakNames", "" );
 	}
 	// the server sends these to the clients so they can figure
 	// out which pk3s should be auto-downloaded
-	p = FS_ReferencedPakChecksums();
+	p = FS_ReferencedPakChecksums( qfalse );
 	Cvar_Set( "sv_referencedPaks", p );
-	p = FS_ReferencedPakNames();
+	p = FS_ReferencedPakChecksums( qtrue );
+	Cvar_Set( "sv_referencedAlternatePaks", p );
+	p = FS_ReferencedPakNames( qfalse );
 	Cvar_Set( "sv_referencedPakNames", p );
+	p = FS_ReferencedPakNames( qtrue );
+	Cvar_Set( "sv_referencedAlternatePakNames", p );
 
 	// save systeminfo and serverinfo strings
 	Q_strncpyz( systemInfo, Cvar_InfoString_Big( CVAR_SYSTEMINFO ), sizeof( systemInfo ) );
@@ -658,6 +724,10 @@ void SV_Init (void)
 	Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );
 	Cvar_Get ("sv_referencedPaks", "", CVAR_SYSTEMINFO | CVAR_ROM );
 	Cvar_Get ("sv_referencedPakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_alternatePaks", "", CVAR_ALTERNATE_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_alternatePakNames", "", CVAR_ALTERNATE_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_referencedAlternatePaks", "", CVAR_ALTERNATE_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_referencedAlternatePakNames", "", CVAR_ALTERNATE_SYSTEMINFO | CVAR_ROM );
 
 	// server vars
 	sv_rconPassword = Cvar_Get ("rconPassword", "", CVAR_TEMP );