Use global \sv_referencedPakNames cvar to check for download files

 \sv_referencedPakNames is set only once at server startup and never changes while further FS_ReferencedPakNames() may return different (longer) output during server run
 so either \sv_referencedPakNames must be updated after each FS_ReferencedPakNames() call or we must use initial cvar all the time - what we will do for now
Code cleanup

Author: Artevilli

src/qcommon/files.cpp

@@ -1765,7 +1765,7 @@ long FS_ReadFileDir(const char *qpath, void *searchPath, bool unpure, void **buf
             fs_loadStack++;
 
             // guarantee that it will have a trailing 0 for string operations
-            buf[len] = 0;
+            buf[len] = '\0';
 
             return len;
         }
@@ -1825,7 +1825,7 @@ long FS_ReadFileDir(const char *qpath, void *searchPath, bool unpure, void **buf
     FS_Read(buf, len, h);
 
     // guarantee that it will have a trailing 0 for string operations
-    buf[len] = 0;
+    buf[len] = '\0';
     FS_FCloseFile(h);
 
     // if we are journalling and it is a config file, write it to the journal file
@@ -2087,7 +2087,7 @@ static int FS_ReturnPath(const char *zname, char *zpath, int *depth)
     int newdep = 0;
     int len = 0;
     int at = 0;
-    zpath[0] = 0;
+    zpath[0] = '\0';
 
     while (zname[at] != 0)
     {
@@ -2099,7 +2099,7 @@ static int FS_ReturnPath(const char *zname, char *zpath, int *depth)
         at++;
     }
     strcpy(zpath, zname);
-    zpath[len] = 0;
+    zpath[len] = '\0';
     *depth = newdep;
 
     return len;
@@ -3488,7 +3488,7 @@ Servers with sv_pure set will get this string and pass it to clients.
 const char *FS_LoadedPakChecksums(bool alternate)
 {
     static char info[BIG_INFO_STRING];
-    info[0] = 0;
+    info[0] = '\0';
 
     for (auto search = fs_searchpaths; search; search = search->next)
     {
@@ -3513,7 +3513,7 @@ Servers with sv_pure set will get this string and pass it to clients.
 const char *FS_LoadedPakNames(bool alternate)
 {
     static char info[BIG_INFO_STRING];
-    info[0] = 0;
+    info[0] = '\0';
 
     for (auto search = fs_searchpaths; search; search = search->next)
     {
@@ -3540,7 +3540,7 @@ back to the server.
 const char *FS_LoadedPakPureChecksums(bool alternate)
 {
     static char info[BIG_INFO_STRING];
-    info[0] = 0;
+    info[0] = '\0';
 
     for (auto search = fs_searchpaths; search; search = search->next)
     {
@@ -3565,7 +3565,7 @@ The server will send this to the clients so they can check which files should be
 const char *FS_ReferencedPakChecksums(bool alternate)
 {
     static char info[BIG_INFO_STRING];
-    info[0] = 0;
+    info[0] = '\0';
 
     for (auto search = fs_searchpaths; search; search = search->next)
     {
@@ -3602,7 +3602,7 @@ The string has a specific order, "cgame ui @ ref1 ref2 ref3 ..."
 const char *FS_ReferencedPakPureChecksums(void)
 {
     static char info[BIG_INFO_STRING];
-    info[0] = 0;
+    info[0] = '\0';
 
     int checksum = fs_checksumFeed;
     int numPaks = 0;
@@ -3648,7 +3648,7 @@ The server will send this to the clients so they can check which files should be
 const char *FS_ReferencedPakNames(bool alternate)
 {
     static char info[BIG_INFO_STRING];
-    info[0] = 0;
+    info[0] = '\0';
 
     // we want to return ALL pk3's from the fs_game path
     // and referenced one's from base

src/server/server.h

@@ -341,6 +341,8 @@ extern cvar_t *sv_padPackets;
 extern cvar_t *sv_killserver;
 extern cvar_t *sv_mapname;
 extern cvar_t *sv_mapChecksum;
+extern cvar_t *sv_referencedPakNames;
+extern cvar_t *sv_referencedAlternatePakNames;
 extern cvar_t *sv_serverid;
 extern cvar_t *sv_minRate;
 extern cvar_t *sv_maxRate;

src/server/sv_client.cpp

@@ -857,11 +857,17 @@ 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( cl->netchan.alternateProtocol == 2 );
-
 				// Check whether the file appears in the list of referenced
 				// paks to prevent downloading of arbitrary files.
-				Cmd_TokenizeStringIgnoreQuotes(referencedPaks);
+				if (cl->netchan.alternateProtocol == 2)
+				{
+					Cmd_TokenizeStringIgnoreQuotes(sv_referencedAlternatePakNames->string);
+				}
+				else
+				{
+					Cmd_TokenizeStringIgnoreQuotes(sv_referencedPakNames->string);
+				}
+
 				numRefPaks = Cmd_Argc();
 
 				for(curindex = 0; curindex < numRefPaks; curindex++)

src/server/sv_init.cpp

@@ -892,11 +892,11 @@ void SV_Init(void)
     Cvar_Get("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM);
     Cvar_Get("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM);
     Cvar_Get("sv_referencedPaks", "", CVAR_SYSTEMINFO | CVAR_ROM);
-    Cvar_Get("sv_referencedPakNames", "", CVAR_SYSTEMINFO | CVAR_ROM);
+    sv_referencedPakNames = 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);
+    sv_referencedAlternatePakNames = Cvar_Get("sv_referencedAlternatePakNames", "", CVAR_ALTERNATE_SYSTEMINFO | CVAR_ROM);
 
     // server vars
     sv_rconPassword = Cvar_Get("rconPassword", "", CVAR_TEMP);

src/server/sv_main.cpp

@@ -52,6 +52,8 @@ cvar_t	*sv_padPackets;			// add nop bytes to messages
 cvar_t	*sv_killserver;			// menu system can set to 1 to shut server down
 cvar_t	*sv_mapname;
 cvar_t	*sv_mapChecksum;
+cvar_t	*sv_referencedPakNames;
+cvar_t	*sv_referencedAlternatePakNames;
 cvar_t	*sv_serverid;
 cvar_t	*sv_minRate;
 cvar_t	*sv_maxRate;