[quake3-commits] r1655 - trunk/code/client
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Oct 11 14:31:00 EDT 2009
Author: thilo
Date: 2009-10-11 14:31:00 -0400 (Sun, 11 Oct 2009)
New Revision: 1655
Modified:
trunk/code/client/cl_cgame.c
trunk/code/client/cl_curl.c
trunk/code/client/cl_keys.c
trunk/code/client/cl_main.c
trunk/code/client/cl_parse.c
trunk/code/client/client.h
Log:
Fix recursive error for disconnect after reliable client command overflow. Thanks to /dev/humancontroller for reporting. https://bugzilla.icculus.org/show_bug.cgi?id=3616
Modified: trunk/code/client/cl_cgame.c
===================================================================
--- trunk/code/client/cl_cgame.c 2009-10-11 16:34:26 UTC (rev 1654)
+++ trunk/code/client/cl_cgame.c 2009-10-11 18:31:00 UTC (rev 1655)
@@ -467,7 +467,7 @@
Cmd_RemoveCommand( VMA(1) );
return 0;
case CG_SENDCLIENTCOMMAND:
- CL_AddReliableCommand( VMA(1) );
+ CL_AddReliableCommand(VMA(1), qfalse);
return 0;
case CG_UPDATESCREEN:
// this is used during lengthy level loading, so pump message loop
Modified: trunk/code/client/cl_curl.c
===================================================================
--- trunk/code/client/cl_curl.c 2009-10-11 16:34:26 UTC (rev 1654)
+++ trunk/code/client/cl_curl.c 2009-10-11 18:31:00 UTC (rev 1655)
@@ -292,7 +292,7 @@
if(!(clc.sv_allowDownload & DLF_NO_DISCONNECT) &&
!clc.cURLDisconnected) {
- CL_AddReliableCommand("disconnect");
+ CL_AddReliableCommand("disconnect", qtrue);
CL_WritePacket();
CL_WritePacket();
CL_WritePacket();
Modified: trunk/code/client/cl_keys.c
===================================================================
--- trunk/code/client/cl_keys.c 2009-10-11 16:34:26 UTC (rev 1654)
+++ trunk/code/client/cl_keys.c 2009-10-11 18:31:00 UTC (rev 1655)
@@ -740,7 +740,7 @@
- CL_AddReliableCommand( buffer );
+ CL_AddReliableCommand(buffer, qfalse);
}
Key_SetCatcher( Key_GetCatcher( ) & ~KEYCATCH_MESSAGE );
Field_Clear( &chatField );
Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c 2009-10-11 16:34:26 UTC (rev 1654)
+++ trunk/code/client/cl_main.c 2009-10-11 18:31:00 UTC (rev 1655)
@@ -189,7 +189,7 @@
if ((id >= 0) && (id < MAX_CLIENTS)) {
clc.voipIgnore[id] = ignore;
CL_AddReliableCommand(va("voip %s %d",
- ignore ? "ignore" : "unignore", id));
+ ignore ? "ignore" : "unignore", id), qfalse);
Com_Printf("VoIP: %s ignoring player #%d\n",
ignore ? "Now" : "No longer", id);
return;
@@ -251,11 +251,11 @@
}
} else if (strcmp(cmd, "muteall") == 0) {
Com_Printf("VoIP: muting incoming voice\n");
- CL_AddReliableCommand("voip muteall");
+ CL_AddReliableCommand("voip muteall", qfalse);
clc.voipMuteAll = qtrue;
} else if (strcmp(cmd, "unmuteall") == 0) {
Com_Printf("VoIP: unmuting incoming voice\n");
- CL_AddReliableCommand("voip unmuteall");
+ CL_AddReliableCommand("voip unmuteall", qfalse);
clc.voipMuteAll = qfalse;
} else {
Com_Printf("usage: voip [un]ignore <playerID#>\n"
@@ -459,17 +459,26 @@
not have future usercmd_t executed before it is executed
======================
*/
-void CL_AddReliableCommand( const char *cmd ) {
- int index;
-
+void CL_AddReliableCommand(const char *cmd, qboolean isDisconnectCmd)
+{
+ int unacknowledged = clc.reliableSequence - clc.reliableAcknowledge;
+
// if we would be losing an old command that hasn't been acknowledged,
// we must drop the connection
- if ( clc.reliableSequence - clc.reliableAcknowledge > MAX_RELIABLE_COMMANDS ) {
- Com_Error( ERR_DROP, "Client command overflow" );
+ // also leave one slot open for the disconnect command in this case.
+
+ if (!com_errorEntered &&
+ (
+ (isDisconnectCmd && unacknowledged > MAX_RELIABLE_COMMANDS) ||
+ (!isDisconnectCmd && unacknowledged >= MAX_RELIABLE_COMMANDS)
+ )
+ )
+ {
+ Com_Error(ERR_DROP, "Client command overflow");
}
- clc.reliableSequence++;
- index = clc.reliableSequence & ( MAX_RELIABLE_COMMANDS - 1 );
- Q_strncpyz( clc.reliableCommands[ index ], cmd, sizeof( clc.reliableCommands[ index ] ) );
+
+ Q_strncpyz(clc.reliableCommands[++clc.reliableSequence & (MAX_RELIABLE_COMMANDS - 1)],
+ cmd, sizeof(*clc.reliableCommands));
}
/*
@@ -1235,7 +1244,7 @@
// send a disconnect message to the server
// send it a few times in case one is dropped
if ( cls.state >= CA_CONNECTED ) {
- CL_AddReliableCommand( "disconnect" );
+ CL_AddReliableCommand("disconnect", qtrue);
CL_WritePacket();
CL_WritePacket();
CL_WritePacket();
@@ -1294,9 +1303,9 @@
}
if ( Cmd_Argc() > 1 ) {
- CL_AddReliableCommand( string );
+ CL_AddReliableCommand(string, qfalse);
} else {
- CL_AddReliableCommand( cmd );
+ CL_AddReliableCommand(cmd, qfalse);
}
}
@@ -1438,7 +1447,7 @@
// don't forward the first argument
if ( Cmd_Argc() > 1 ) {
- CL_AddReliableCommand( Cmd_Args() );
+ CL_AddReliableCommand(Cmd_Args(), qfalse);
}
}
@@ -1678,7 +1687,7 @@
// if we are pure we need to send back a command with our referenced pk3 checksums
Com_sprintf(cMsg, sizeof(cMsg), "cp %d %s", cl.serverId, FS_ReferencedPakPureChecksums());
- CL_AddReliableCommand( cMsg );
+ CL_AddReliableCommand(cMsg, qfalse);
}
/*
@@ -1687,7 +1696,7 @@
=================
*/
void CL_ResetPureClientAtServer( void ) {
- CL_AddReliableCommand( va("vdr") );
+ CL_AddReliableCommand(va("vdr"), qfalse);
}
/*
@@ -1866,7 +1875,7 @@
FS_Restart(clc.checksumFeed); // We possibly downloaded a pak, restart the file system to load it
// inform the server so we get new gamestate info
- CL_AddReliableCommand( "donedl" );
+ CL_AddReliableCommand("donedl", qfalse);
// by sending the donedl command we request a new gamestate
// so we don't want to load stuff yet
@@ -1933,7 +1942,7 @@
clc.downloadBlock = 0; // Starting new file
clc.downloadCount = 0;
- CL_AddReliableCommand( va("download %s", remoteName) );
+ CL_AddReliableCommand(va("download %s", remoteName), qfalse);
}
/*
@@ -2592,7 +2601,7 @@
if(cvar_modifiedFlags & CVAR_USERINFO)
{
cvar_modifiedFlags &= ~CVAR_USERINFO;
- CL_AddReliableCommand( va("userinfo \"%s\"", Cvar_InfoString( CVAR_USERINFO ) ) );
+ CL_AddReliableCommand(va("userinfo \"%s\"", Cvar_InfoString( CVAR_USERINFO ) ), qfalse);
}
}
Modified: trunk/code/client/cl_parse.c
===================================================================
--- trunk/code/client/cl_parse.c 2009-10-11 16:34:26 UTC (rev 1654)
+++ trunk/code/client/cl_parse.c 2009-10-11 18:31:00 UTC (rev 1655)
@@ -552,7 +552,7 @@
if (!*clc.downloadTempName) {
Com_Printf("Server sending download, but no download was requested\n");
- CL_AddReliableCommand( "stopdl" );
+ CL_AddReliableCommand("stopdl", qfalse);
return;
}
@@ -594,7 +594,7 @@
if (!clc.download) {
Com_Printf( "Could not create %s\n", clc.downloadTempName );
- CL_AddReliableCommand( "stopdl" );
+ CL_AddReliableCommand("stopdl", qfalse);
CL_NextDownload();
return;
}
@@ -603,7 +603,7 @@
if (size)
FS_Write( data, size, clc.download );
- CL_AddReliableCommand( va("nextdl %d", clc.downloadBlock) );
+ CL_AddReliableCommand(va("nextdl %d", clc.downloadBlock), qfalse);
clc.downloadBlock++;
clc.downloadCount += size;
Modified: trunk/code/client/client.h
===================================================================
--- trunk/code/client/client.h 2009-10-11 16:34:26 UTC (rev 1654)
+++ trunk/code/client/client.h 2009-10-11 18:31:00 UTC (rev 1655)
@@ -431,7 +431,7 @@
void CL_Init (void);
void CL_FlushMemory(void);
void CL_ShutdownAll(void);
-void CL_AddReliableCommand( const char *cmd );
+void CL_AddReliableCommand(const char *cmd, qboolean isDisconnectCmd);
void CL_StartHunkUsers( qboolean rendererOnly );
More information about the quake3-commits
mailing list