Client: only store download names in client static

Not in client connection and client static. This was some oversight in transitioning from ioq3/q3e downloads which moves all download data only into client connection which may be causing some weird issues in our client. Most likely unrelated to server illegible error issue.

Author: ensiform

src/client/cl_input.c

@@ -805,15 +805,15 @@ static qboolean CL_ReadyToSendPacket( void ) {
 	}
 
 	// If we are downloading, we send no less than 50ms between packets
-	if ( *clc.downloadTempName && cls.realtime - clc.lastPacketSentTime < 50 ) {
+	if ( *cls.downloadTempName && cls.realtime - clc.lastPacketSentTime < 50 ) {
 		return qfalse;
 	}
 
 	// if we don't have a valid gamestate yet, only send
 	// one packet a second
 	if ( cls.state != CA_ACTIVE &&
 		cls.state != CA_PRIMED &&
-		!*clc.downloadTempName &&
+		!*cls.downloadTempName &&
 		cls.realtime - clc.lastPacketSentTime < 1000 ) {
 		return qfalse;
 	}

src/client/cl_main.c

@@ -1401,7 +1401,7 @@ qboolean CL_Disconnect( qboolean showMainMenu ) {
 			FS_FCloseFile( clc.download );
 			clc.download = FS_INVALID_HANDLE;
 		}
-		*clc.downloadTempName = *clc.downloadName = '\0';
+		*cls.downloadTempName = *cls.downloadName = '\0';
 		Cvar_Set( "cl_downloadName", "" );
 	}
 
@@ -2208,9 +2208,7 @@ static void CL_BeginDownload( const char *localName, const char *remoteName ) {
 				"Remotename: %s\n"
 				"****************************\n", localName, remoteName);
 
-	Q_strncpyz ( clc.downloadName, localName, sizeof(clc.downloadName) );
 	Q_strncpyz ( cls.downloadName, localName, sizeof(cls.downloadName) );
-	Com_sprintf( clc.downloadTempName, sizeof(clc.downloadTempName), "%s.tmp", localName );
 	Com_sprintf( cls.downloadTempName, sizeof(cls.downloadTempName), "%s.tmp", localName );
 
 	// Set so UI gets access to it
@@ -2239,15 +2237,15 @@ void CL_NextDownload( void )
 	char *remoteName, *localName;
 
 	// A download has finished, check whether this matches a referenced checksum
-	if(*clc.downloadName)
+	if(*cls.downloadName)
 	{
-		const char *zippath = FS_BuildOSPath(Cvar_VariableString("fs_homepath"), clc.downloadName, NULL );
+		const char *zippath = FS_BuildOSPath(Cvar_VariableString("fs_homepath"), cls.downloadName, NULL );
 
 		if(!FS_CompareZipChecksum(zippath))
-			Com_Error(ERR_DROP, "Incorrect checksum for file: %s", clc.downloadName);
+			Com_Error(ERR_DROP, "Incorrect checksum for file: %s", cls.downloadName);
 	}
 
-	*clc.downloadTempName = *clc.downloadName = '\0';
+	*cls.downloadTempName = *cls.downloadName = '\0';
 	Cvar_Set("cl_downloadName", "");
 
 	// We are looking to start a download here
@@ -2330,7 +2328,7 @@ void CL_InitDownloads( void ) {
 			// if autodownloading is not enabled on the server
 			cls.state = CA_CONNECTED;
 
-			*clc.downloadTempName = *clc.downloadName = '\0';
+			*cls.downloadTempName = *cls.downloadName = '\0';
 			Cvar_Set( "cl_downloadName", "" );
 
 			CL_NextDownload();
@@ -2340,7 +2338,7 @@ void CL_InitDownloads( void ) {
 	}
 
 #ifdef USE_CURL
-	if ( cl_mapAutoDownload->integer && ( clc.demoplaying || (clc.download == FS_INVALID_HANDLE && !*clc.downloadName) ) )
+	if ( cl_mapAutoDownload->integer && ( clc.demoplaying || (clc.download == FS_INVALID_HANDLE && !*cls.downloadName) ) )
 	{
 		const char *info, *mapname, *bsp;
 
@@ -3254,8 +3252,8 @@ void CL_WWWDownload( void ) {
 				// just to be safe
 				Com_Printf( "ERROR: redirectedList overflow (%s)\n", clc.redirectedList );
 			} else {
-				strcat( clc.redirectedList, "@" );
-				strcat( clc.redirectedList, cls.originalDownloadName );
+				Q_strcat( clc.redirectedList, sizeof( clc.redirectedList), "@" );
+				Q_strcat( clc.redirectedList, sizeof( clc.redirectedList), cls.originalDownloadName );
 			}
 		}
 	} else
@@ -3299,8 +3297,8 @@ qboolean CL_WWWBadChecksum( const char *pakname ) {
 			Com_Printf( "ERROR: badChecksumList overflowed (%s)\n", clc.badChecksumList );
 			return qfalse;
 		}
-		strcat( clc.badChecksumList, "@" );
-		strcat( clc.badChecksumList, pakname );
+		Q_strcat( clc.badChecksumList, sizeof(clc.badChecksumList), "@" );
+		Q_strcat( clc.badChecksumList, sizeof(clc.badChecksumList), pakname );
 		Com_DPrintf( "bad checksums: %s\n", clc.badChecksumList );
 		return qtrue;
 	}

src/client/cl_parse.c

@@ -929,11 +929,11 @@ A download message has been received from the server
 =====================
 */
 static void CL_ParseDownload( msg_t *msg ) {
-	int		size;
+	int		size, dummy;
 	unsigned char data[ MAX_MSGLEN ];
 	uint16_t block;
 
-	if (!*clc.downloadTempName) {
+	if (!*cls.downloadTempName) {
 		Com_Printf("Server sending download, but no download was requested\n");
 		CL_AddReliableCommand( "stopdl", qfalse );
 		return;
@@ -944,11 +944,12 @@ static void CL_ParseDownload( msg_t *msg ) {
 	}
 
 	// read the data
-	block = MSG_ReadShort ( msg );
+	dummy = MSG_ReadShort ( msg );
+	block = (uint16_t)dummy;
 
 	// TTimo - www dl
 	// if we haven't acked the download redirect yet
-	if ( block == UINT16_MAX ) {
+	if ( dummy == -1 ) {
 		if ( !clc.bWWWDl ) {
 			// server is sending us a www download
 			Q_strncpyz( cls.originalDownloadName, cls.downloadName, sizeof( cls.originalDownloadName ) );
@@ -1037,17 +1038,17 @@ static void CL_ParseDownload( msg_t *msg ) {
 	{
 		if ( !CL_ValidPakSignature( data, size ) )
 		{
-			Com_Printf( S_COLOR_YELLOW "Invalid pak signature for %s\n", clc.downloadName );
+			Com_Printf( S_COLOR_YELLOW "Invalid pak signature for %s\n", cls.downloadName );
 			CL_AddReliableCommand( "stopdl", qfalse );
 			CL_NextDownload();
 			return;
 		}
 
-		clc.download = FS_SV_FOpenFileWrite( clc.downloadTempName );
+		clc.download = FS_SV_FOpenFileWrite( cls.downloadTempName );
 
 		if ( clc.download == FS_INVALID_HANDLE )
 		{
-			Com_Printf( "Could not create %s\n", clc.downloadTempName );
+			Com_Printf( "Could not create %s\n", cls.downloadTempName );
 			CL_AddReliableCommand( "stopdl", qfalse );
 			CL_NextDownload();
 			return;
@@ -1065,13 +1066,13 @@ static void CL_ParseDownload( msg_t *msg ) {
 	// So UI gets access to it
 	Cvar_SetIntegerValue( "cl_downloadCount", clc.downloadCount );
 
-	if (!size) { // A zero length block means EOF
+	if ( size == 0 ) { // A zero length block means EOF
 		if ( clc.download != FS_INVALID_HANDLE ) {
 			FS_FCloseFile( clc.download );
 			clc.download = FS_INVALID_HANDLE;
 
 			// rename the file
-			FS_SV_Rename( clc.downloadTempName, clc.downloadName );
+			FS_SV_Rename( cls.downloadTempName, cls.downloadName );
 		}
 		*cls.downloadTempName = *cls.downloadName = '\0';
 		Cvar_Set( "cl_downloadName", "" );

src/client/client.h

@@ -258,8 +258,6 @@ typedef struct {
 
 	// file transfer from server
 	fileHandle_t download;
-	char		downloadName[MAX_OSPATH];
-	char		downloadTempName[MAX_OSPATH + 4]; // downloadName + ".tmp"
 	int downloadNumber;
 	int downloadBlock;          // block we are waiting for
 	int downloadCount;          // how many bytes we got
@@ -270,8 +268,8 @@ typedef struct {
 	// www downloading
 	qboolean bWWWDl;    // we have a www download going
 	qboolean bWWWDlAborting;    // disable the CL_WWWDownload until server gets us a gamestate (used for aborts)
-	char redirectedList[MAX_INFO_STRING];        // list of files that we downloaded through a redirect since last FS_ComparePaks
-	char badChecksumList[MAX_INFO_STRING];        // list of files for which wwwdl redirect is broken (wrong checksum)
+	char redirectedList[BIG_INFO_STRING];        // list of files that we downloaded through a redirect since last FS_ComparePaks
+	char badChecksumList[BIG_INFO_STRING];        // list of files for which wwwdl redirect is broken (wrong checksum)
 
 	// demo information
 	char		demoName[MAX_OSPATH];