Index: README
===================================================================
--- README (revision 1952)
+++ README (working copy)
@@ -214,9 +214,15 @@
ipv6 servers on the local network
net_mcastiface - outgoing interface to use for scan
- protocol - Allow changing protocol version
+ oldprotocol - when encountering a server/client that
+ only supports the version configured in
+ this cvar, ioquake3 will use the old and
+ less secure protocol from quake3 1.32c.
(startup only)
+ protocol - Allow changing protocol version that is
+ sent to the server (startup only)
+
r_allowResize - make window resizable (SDL only)
r_ext_texture_filter_anisotropic - anisotropic texture filtering
r_zProj - distance of observer camera to projection
@@ -277,8 +283,9 @@
which <filename/path> - print out the path on disk to a loaded item
------------------------------------------------------------- Miscellaneous -----
+--------------------------------------------------------- README for Users -----
+
Using shared libraries instead of qvm
To force Q3 to use shared libraries instead of qvms run it with the following
parameters: +set sv_pure 0 +set vm_cgame 0 +set vm_game 0 +set vm_ui 0
@@ -305,6 +312,109 @@
In this case you can always revert back to the old behaviour by setting the
cvar com_busyWait to 1.
+Using HTTP/FTP Download Support (Server)
+ You can enable redirected downloads on your server even if it's not
+ an ioquake3 server. You simply need to use the 'sets' command to put
+ the sv_dlURL cvar into your SERVERINFO string and ensure sv_allowDownloads
+ is set to 1
+
+ sv_dlURL is the base of the URL that contains your custom .pk3 files
+ the client will append both fs_game and the filename to the end of
+ this value. For example, if you have sv_dlURL set to
+ "http://ioquake3.org", fs_game is "baseq3", and the client is
+ missing "test.pk3", it will attempt to download from the URL
+ "http://ioquake3.org/baseq3/test.pk3"
+
+ sv_allowDownload's value is now a bitmask made up of the following
+ flags:
+ 1 - ENABLE
+ 4 - do not use UDP downloads
+ 8 - do not ask the client to disconnect when using HTTP/FTP
+
+ Server operators who are concerned about potential "leeching" from their
+ HTTP servers from other ioquake3 servers can make use of the HTTP_REFERER
+ that ioquake3 sets which is "ioQ3://{SERVER_IP}:{SERVER_PORT}". For,
+ example, Apache's mod_rewrite can restrict access based on HTTP_REFERER.
+
+Using HTTP/FTP Download Support (Client)
+ Simply setting cl_allowDownload to 1 will enable HTTP/FTP downloads
+ assuming ioquake3 was compiled with USE_CURL=1 (the default).
+ like sv_allowDownload, cl_allowDownload also uses a bitmask value
+ supporting the following flags:
+ 1 - ENABLE
+ 2 - do not use HTTP/FTP downloads
+ 4 - do not use UDP downloads
+
+ When ioquake3 is built with USE_CURL_DLOPEN=1 (default on some platforms),
+ it will use the value of the cvar cl_cURLLib as the filename of the cURL
+ library to dynamically load.
+
+Multiuser Support on Windows systems
+ On Windows, all user specific files such as autogenerated configuration,
+ demos, videos, screenshots, and autodownloaded pk3s are now saved in a
+ directory specific to the user who is running ioquake3.
+
+ On NT-based such as Windows XP, this is usually a directory named:
+ "C:\Documents and Settings\%USERNAME%\Application Data\Quake3\"
+
+ Windows 95, Windows 98, and Windows ME will use a directory like:
+ "C:\Windows\Application Data\Quake3"
+ in single-user mode, or:
+ "C:\Windows\Profiles\%USERNAME%\Application Data\Quake3"
+ if multiple logins have been enabled.
+
+ In order to access this directory more easily, the installer may create a
+ Shortcut which has its target set to:
+ "%APPDATA%\Quake3\"
+ This Shortcut would work for all users on the system regardless of the
+ locale settings. Unfortunately, this environment variable is only
+ present on Windows NT based systems.
+
+ You can revert to the old single-user behaviour by setting the fs_homepath
+ cvar to the directory where ioquake3 is installed. For example:
+ ioquake3.exe +set fs_homepath "c:\ioquake3"
+ Note that this cvar MUST be set as a command line parameter.
+
+SDL Keyboard Differences
+ ioquake3 clients have different keyboard behaviour compared to the original
+ Quake3 clients.
+
+ * "Caps Lock" and "Num Lock" can not be used as normal binds since they
+ do not send a KEYUP event until the key is pressed again.
+
+ * SDL > 1.2.9 does not support disabling dead key recognition. In order to
+ send dead key characters (e.g. ~, ', `, and ^), you must key a Space (or
+ sometimes the same character again) after the character to send it on
+ many international keyboard layouts.
+
+ * The SDL client supports many more keys than the original Quake3 client.
+ For example the keys: "Windows", "SysReq", "ScrollLock", and "Break".
+ For non-US keyboards, all of the so called "World" keys are now supported
+ as well as F13, F14, F15, and the country-specific mode/meta keys.
+
+ On many international layouts the default console toggle keys are also dead
+ keys, meaning that dropping the console potentially results in
+ unintentionally initiating the keying of a dead key. Futhermore SDL 1.2's
+ dead key support is broken by design and Q3 doesn't support non-ASCII text
+ entry, so the chances are you won't get the correct character anyway.
+
+ If you use such a keyboard layout, you can set the cvar cl_consoleKeys. This
+ is a space delimited list of key names that will toggle the console. The key
+ names are the usual Q3 names e.g. "~", "`", "c", "BACKSPACE", "PAUSE",
+ "WINDOWS" etc. It's also possible to use ASCII characters, by hexadecimal
+ number. Some example values for cl_consoleKeys:
+
+ "~ ` 0x7e 0x60" Toggle on ~ or ` (the default)
+ "WINDOWS" Toggle on the Windows key
+ "c" Toggle on the c key
+ "0x43" Toggle on the C character (Shift-c)
+ "PAUSE F1 PGUP" Toggle on the Pause, F1 or Page Up keys
+
+ Note that when you elect a set of console keys or characters, they cannot
+ then be used for binding, nor will they generate characters when entering
+ text. Also, in addition to the nominated console keys, Shift-ESC is hard
+ coded to always toggle the console.
+
QuakeLive mouse acceleration (patch and this text written by TTimo from id)
I've been using an experimental mouse acceleration code for a while, and
decided to make it available to everyone. Don't be too worried if you don't
@@ -350,6 +460,9 @@
If you try the new acceleration code and start using it, I'd be very
interested by your feedback.
+
+---------------------------------------------------- README for Developers -----
+
64bit mods
If you wish to compile external mods as shared libraries on a 64bit platform,
and the mod source is derived from the id Q3 SDK, you will need to modify the
@@ -406,7 +519,7 @@
+set com_homepath <homedirname>
- to the command line. Then you can control which kind of messages to send to
+ to the command line. You can also control which kind of messages to send to
the master server:
+set sv_heartbeat <heartbeat> +set sv_flatline <flatline>
@@ -456,6 +569,36 @@
maps) created by yourself are your property and can be sold like every other
game you find in stores.
+Network protocols
+ There are now two cvars that give you some degree of freedom over the reported
+ protocol versions between clients and servers: "protocol" and "oldprotocol".
+ The reason for this is that some standalone games increased the protocol
+ number even though nothing really changed in their protocol and the ioquake3
+ engine is still fully compatible.
+
+ In order to fix a vulnerability in the network protocol as outlined in
+
+ http://aluigi.altervista.org/papers/q3noclient.txt
+
+ a new network protocol was introduced that defends against such attacks.
+ Unfortunately, this protocol will be incompatible to the original quake3 1.32c
+ which is the latest official release from id.
+ Luckily, ioquake3 has backwards compatibility, on the client as well as on the
+ server. This means ioquake3 players can play on old servers just as ioquake3
+ servers are able to service old clients.
+
+ The cvar "protocol" denotes the protocol version for the new hardened
+ protocol, whereas the "oldprotocol" cvar denotes the protocol version for the
+ legacy protocol.
+ If the value for "oldprotocol" and "protocol" is identical, then the legacy
+ protocol is always used. If oldprotocol is set to 0, then support for the
+ legacy protocol is disabled.
+
+ Mods that use a standalone engine obviously do not require dual protocol
+ support, and it is turned off if the engine is compiled with STANDALONE per
+ default. You can enable it in q_shared.h if desired by defining
+ PROTOCOL_SUPPORT_OLD.
+
cl_guid Support
cl_guid is a cvar which is part of the client's USERINFO string. Its value
is a 32 character string made up of [a-f] and [0-9] characters. This
@@ -474,109 +617,6 @@
than just name
2) granting some weak admin rights to players without requiring passwords
-Using HTTP/FTP Download Support (Server)
- You can enable redirected downloads on your server even if it's not
- an ioquake3 server. You simply need to use the 'sets' command to put
- the sv_dlURL cvar into your SERVERINFO string and ensure sv_allowDownloads
- is set to 1
-
- sv_dlURL is the base of the URL that contains your custom .pk3 files
- the client will append both fs_game and the filename to the end of
- this value. For example, if you have sv_dlURL set to
- "http://ioquake3.org", fs_game is "baseq3", and the client is
- missing "test.pk3", it will attempt to download from the URL
- "http://ioquake3.org/baseq3/test.pk3"
-
- sv_allowDownload's value is now a bitmask made up of the following
- flags:
- 1 - ENABLE
- 4 - do not use UDP downloads
- 8 - do not ask the client to disconnect when using HTTP/FTP
-
- Server operators who are concerned about potential "leeching" from their
- HTTP servers from other ioquake3 servers can make use of the HTTP_REFERER
- that ioquake3 sets which is "ioQ3://{SERVER_IP}:{SERVER_PORT}". For,
- example, Apache's mod_rewrite can restrict access based on HTTP_REFERER.
-
-Using HTTP/FTP Download Support (Client)
- Simply setting cl_allowDownload to 1 will enable HTTP/FTP downloads
- assuming ioquake3 was compiled with USE_CURL=1 (the default).
- like sv_allowDownload, cl_allowDownload also uses a bitmask value
- supporting the following flags:
- 1 - ENABLE
- 2 - do not use HTTP/FTP downloads
- 4 - do not use UDP downloads
-
- When ioquake3 is built with USE_CURL_DLOPEN=1 (default on some platforms),
- it will use the value of the cvar cl_cURLLib as the filename of the cURL
- library to dynamically load.
-
-Multiuser Support on Windows systems
- On Windows, all user specific files such as autogenerated configuration,
- demos, videos, screenshots, and autodownloaded pk3s are now saved in a
- directory specific to the user who is running ioquake3.
-
- On NT-based such as Windows XP, this is usually a directory named:
- "C:\Documents and Settings\%USERNAME%\Application Data\Quake3\"
-
- Windows 95, Windows 98, and Windows ME will use a directory like:
- "C:\Windows\Application Data\Quake3"
- in single-user mode, or:
- "C:\Windows\Profiles\%USERNAME%\Application Data\Quake3"
- if multiple logins have been enabled.
-
- In order to access this directory more easily, the installer may create a
- Shortcut which has its target set to:
- "%APPDATA%\Quake3\"
- This Shortcut would work for all users on the system regardless of the
- locale settings. Unfortunately, this environment variable is only
- present on Windows NT based systems.
-
- You can revert to the old single-user behaviour by setting the fs_homepath
- cvar to the directory where ioquake3 is installed. For example:
- ioquake3.exe +set fs_homepath "c:\ioquake3"
- Note that this cvar MUST be set as a command line parameter.
-
-SDL Keyboard Differences
- ioquake3 clients have different keyboard behaviour compared to the original
- Quake3 clients.
-
- * "Caps Lock" and "Num Lock" can not be used as normal binds since they
- do not send a KEYUP event until the key is pressed again.
-
- * SDL > 1.2.9 does not support disabling dead key recognition. In order to
- send dead key characters (e.g. ~, ', `, and ^), you must key a Space (or
- sometimes the same character again) after the character to send it on
- many international keyboard layouts.
-
- * The SDL client supports many more keys than the original Quake3 client.
- For example the keys: "Windows", "SysReq", "ScrollLock", and "Break".
- For non-US keyboards, all of the so called "World" keys are now supported
- as well as F13, F14, F15, and the country-specific mode/meta keys.
-
- On many international layouts the default console toggle keys are also dead
- keys, meaning that dropping the console potentially results in
- unintentionally initiating the keying of a dead key. Futhermore SDL 1.2's
- dead key support is broken by design and Q3 doesn't support non-ASCII text
- entry, so the chances are you won't get the correct character anyway.
-
- If you use such a keyboard layout, you can set the cvar cl_consoleKeys. This
- is a space delimited list of key names that will toggle the console. The key
- names are the usual Q3 names e.g. "~", "`", "c", "BACKSPACE", "PAUSE",
- "WINDOWS" etc. It's also possible to use ASCII characters, by hexadecimal
- number. Some example values for cl_consoleKeys:
-
- "~ ` 0x7e 0x60" Toggle on ~ or ` (the default)
- "WINDOWS" Toggle on the Windows key
- "c" Toggle on the c key
- "0x43" Toggle on the C character (Shift-c)
- "PAUSE F1 PGUP" Toggle on the Pause, F1 or Page Up keys
-
- Note that when you elect a set of console keys or characters, they cannot
- then be used for binding, nor will they generate characters when entering
- text. Also, in addition to the nominated console keys, Shift-ESC is hard
- coded to always toggle the console.
-
PNG support
ioquake3 supports the use of PNG (Portable Network Graphic) images as
textures. It should be noted that the use of such images in a map will
Index: code/server/sv_client.c
===================================================================
--- code/server/sv_client.c (revision 1952)
+++ code/server/sv_client.c (working copy)
@@ -55,8 +55,10 @@
int i;
int oldest;
int oldestTime;
- const char *clientChallenge = Cmd_Argv(1);
+ int oldestClientTime;
+ int clientChallenge;
challenge_t *challenge;
+ qboolean wasfound = qfalse;
// ignore if we are in single player
if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive")) {
@@ -64,15 +66,30 @@
}
oldest = 0;
- oldestTime = 0x7fffffff;
+ oldestClientTime = oldestTime = 0x7fffffff;
// see if we already have a challenge for this ip
challenge = &svs.challenges[0];
- for (i = 0 ; i < MAX_CHALLENGES ; i++, challenge++) {
- if (!challenge->connected && NET_CompareAdr( from, challenge->adr ) ) {
+ clientChallenge = atoi(Cmd_Argv(1));
+
+ for(i = 0 ; i < MAX_CHALLENGES ; i++, challenge++)
+ {
+ if(!challenge->connected && NET_CompareAdr(from, challenge->adr))
+ {
+ wasfound = qtrue;
+
+ if(challenge->time < oldestClientTime)
+ oldestClientTime = challenge->time;
+ }
+
+ if(wasfound && i >= MAX_CHALLENGES_MULTI)
+ {
+ i = MAX_CHALLENGES;
break;
}
- if ( challenge->time < oldestTime ) {
+
+ if(challenge->time < oldestTime)
+ {
oldestTime = challenge->time;
oldest = i;
}
@@ -82,18 +99,17 @@
{
// this is the first time this client has asked for a challenge
challenge = &svs.challenges[oldest];
- challenge->clientChallenge = 0;
+ challenge->clientChallenge = clientChallenge;
challenge->adr = from;
challenge->firstTime = svs.time;
- challenge->time = svs.time;
challenge->connected = qfalse;
}
// always generate a new challenge number, so the client cannot circumvent sv_maxping
challenge->challenge = ( (rand() << 16) ^ rand() ) ^ svs.time;
challenge->wasrefused = qfalse;
+ challenge->time = svs.time;
-
#ifndef STANDALONE
// Drop the authorize stuff if this client is coming in via v6 as the auth server does not support ipv6.
// Drop also for addresses coming in on local LAN and for stand-alone games independent from id's assets.
@@ -121,7 +137,7 @@
// if they have been challenging for a long time and we
// haven't heard anything from the authorize server, go ahead and
// let them in, assuming the id server is down
- else if(svs.time - challenge->firstTime > AUTHORIZE_TIMEOUT)
+ else if(svs.time - oldestClientTime > AUTHORIZE_TIMEOUT)
Com_DPrintf( "authorize server timed out\n" );
else
{
@@ -129,10 +145,6 @@
cvar_t *fs;
char game[1024];
- // If the client provided us with a client challenge, store it...
- if(*clientChallenge)
- challenge->clientChallenge = atoi(clientChallenge);
-
Com_DPrintf( "sending getIpAuthorize for %s\n", NET_AdrToString( from ));
strcpy(game, BASEGAME);
@@ -153,7 +165,7 @@
#endif
challenge->pingTime = svs.time;
- NET_OutOfBandPrint( NS_SERVER, challenge->adr, "challengeResponse %i %s", challenge->challenge, clientChallenge);
+ NET_OutOfBandPrint( NS_SERVER, challenge->adr, "challengeResponse %i %d", challenge->challenge, clientChallenge);
}
#ifndef STANDALONE
@@ -289,6 +301,9 @@
intptr_t denied;
int count;
char *ip;
+#ifdef PROTOCOL_SUPPORT_OLD
+ qboolean compat = qfalse;
+#endif
Com_DPrintf ("SVC_DirectConnect ()\n");
@@ -301,11 +316,21 @@
Q_strncpyz( userinfo, Cmd_Argv(1), sizeof(userinfo) );
- version = atoi( Info_ValueForKey( userinfo, "protocol" ) );
- if ( version != com_protocol->integer ) {
- NET_OutOfBandPrint( NS_SERVER, from, "print\nServer uses protocol version %i (yours is %i).\n", com_protocol->integer, version );
- Com_DPrintf (" rejected connect from version %i\n", version);
- return;
+ version = atoi(Info_ValueForKey(userinfo, "protocol"));
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(version > 0 && com_oldprotocol->integer == version)
+ compat = qtrue;
+ else
+#endif
+ {
+ if(version != com_protocol->integer)
+ {
+ NET_OutOfBandPrint(NS_SERVER, from, "print\nServer uses protocol version %i "
+ "(yours is %i).\n", com_protocol->integer, version);
+ Com_DPrintf(" rejected connect from version %i\n", version);
+ return;
+ }
}
challenge = atoi( Info_ValueForKey( userinfo, "challenge" ) );
@@ -487,7 +512,12 @@
newcl->challenge = challenge;
// save the address
- Netchan_Setup (NS_SERVER, &newcl->netchan , from, qport);
+#ifdef PROTOCOL_SUPPORT_OLD
+ newcl->compat = compat;
+ Netchan_Setup(NS_SERVER, &newcl->netchan, from, qport, challenge, compat);
+#else
+ Netchan_Setup(NS_SERVER, &newcl->netchan, from, qport, challenge);
+#endif
// init the netchan queue
newcl->netchan_end_queue = &newcl->netchan_start_queue;
@@ -508,7 +538,7 @@
SV_UserinfoChanged( newcl );
// send the connect packet to the client
- NET_OutOfBandPrint( NS_SERVER, from, "connectResponse" );
+ NET_OutOfBandPrint(NS_SERVER, from, "connectResponse %d", challenge);
Com_DPrintf( "Going from CS_FREE to CS_CONNECTED for %s\n", newcl->name );
Index: code/server/server.h
===================================================================
--- code/server/server.h (revision 1956)
+++ code/server/server.h (working copy)
@@ -188,7 +188,11 @@
#endif
int oldServerTime;
- qboolean csUpdated[MAX_CONFIGSTRINGS+1];
+ qboolean csUpdated[MAX_CONFIGSTRINGS+1];
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ qboolean compat;
+#endif
} client_t;
//=============================================================================
@@ -197,7 +201,11 @@
// MAX_CHALLENGES is made large to prevent a denial
// of service attack that could cycle all of them
// out before legitimate users connected
-#define MAX_CHALLENGES 1024
+#define MAX_CHALLENGES 2048
+// Allow a certain amount of challenges to have the same IP address
+// to make it a bit harder to DOS one single IP address from connecting
+// while not allowing a single ip to grab all challenge resources
+#define MAX_CHALLENGES_MULTI (MAX_CHALLENGES / 2)
#define AUTHORIZE_TIMEOUT 5000
Index: code/server/sv_main.c
===================================================================
--- code/server/sv_main.c (revision 1956)
+++ code/server/sv_main.c (working copy)
@@ -643,7 +643,13 @@
// to prevent timed spoofed reply packets that add ghost servers
Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) );
- Info_SetValueForKey( infostring, "protocol", va("%i", com_protocol->integer) );
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(com_oldprotocol->integer > 0)
+ Info_SetValueForKey(infostring, "protocol", va("%i", com_oldprotocol->integer));
+ else
+#endif
+ Info_SetValueForKey(infostring, "protocol", va("%i", com_protocol->integer));
+
Info_SetValueForKey( infostring, "hostname", sv_hostname->string );
Info_SetValueForKey( infostring, "mapname", sv_mapname->string );
Info_SetValueForKey( infostring, "clients", va("%i", count) );
@@ -871,7 +877,7 @@
// if we received a sequenced packet from an address we don't recognize,
// send an out of band disconnect packet to it
- NET_OutOfBandPrint( NS_SERVER, from, "disconnect" );
+ // NET_OutOfBandPrint( NS_SERVER, from, "disconnect" );
}
Index: code/qcommon/net_chan.c
===================================================================
--- code/qcommon/net_chan.c (revision 1952)
+++ code/qcommon/net_chan.c (working copy)
@@ -83,7 +83,12 @@
called to open a channel to a remote system
==============
*/
-void Netchan_Setup( netsrc_t sock, netchan_t *chan, netadr_t adr, int qport ) {
+void Netchan_Setup(netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, int challenge
+#ifdef PROTOCOL_SUPPORT_OLD
+ , qboolean compat
+#endif
+ )
+{
Com_Memset (chan, 0, sizeof(*chan));
chan->sock = sock;
@@ -91,6 +96,11 @@
chan->qport = qport;
chan->incomingSequence = 0;
chan->outgoingSequence = 1;
+ chan->challenge = challenge;
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ chan->compat = compat;
+#endif
}
// TTimo: unused, commenting out to make gcc happy
@@ -190,17 +200,24 @@
msg_t send;
byte send_buf[MAX_PACKETLEN];
int fragmentLength;
+ int outgoingSequence;
// write the packet header
MSG_InitOOB (&send, send_buf, sizeof(send_buf)); // <-- only do the oob here
- MSG_WriteLong( &send, chan->outgoingSequence | FRAGMENT_BIT );
+ outgoingSequence = chan->outgoingSequence | FRAGMENT_BIT;
+ MSG_WriteLong(&send, outgoingSequence);
// send the qport if we are a client
if ( chan->sock == NS_CLIENT ) {
MSG_WriteShort( &send, qport->integer );
}
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(!chan->compat)
+#endif
+ MSG_WriteLong(&send, NETCHAN_GENCHECKSUM(chan->challenge, chan->outgoingSequence));
+
// copy the reliable message to the packet first
fragmentLength = FRAGMENT_SIZE;
if ( chan->unsentFragmentStart + fragmentLength > chan->unsentLength ) {
@@ -268,13 +285,18 @@
MSG_InitOOB (&send, send_buf, sizeof(send_buf));
MSG_WriteLong( &send, chan->outgoingSequence );
- chan->outgoingSequence++;
// send the qport if we are a client
- if ( chan->sock == NS_CLIENT ) {
- MSG_WriteShort( &send, qport->integer );
- }
+ if(chan->sock == NS_CLIENT)
+ MSG_WriteShort(&send, qport->integer);
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(!chan->compat)
+#endif
+ MSG_WriteLong(&send, NETCHAN_GENCHECKSUM(chan->challenge, chan->outgoingSequence));
+
+ chan->outgoingSequence++;
+
MSG_WriteData( &send, data, length );
// send the datagram
@@ -327,6 +349,17 @@
qport = MSG_ReadShort( msg );
}
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(!chan->compat)
+#endif
+ {
+ int checksum = MSG_ReadLong(msg);
+
+ // UDP spoofing protection
+ if(NETCHAN_GENCHECKSUM(chan->challenge, sequence) != checksum)
+ return qfalse;
+ }
+
// read the fragment information
if ( fragmented ) {
fragmentStart = MSG_ReadShort( msg );
Index: code/qcommon/q_shared.c
===================================================================
--- code/qcommon/q_shared.c (revision 1952)
+++ code/qcommon/q_shared.c (working copy)
@@ -962,7 +962,7 @@
return count;
}
-void QDECL Com_sprintf(char *dest, int size, const char *fmt, ...)
+int QDECL Com_sprintf(char *dest, int size, const char *fmt, ...)
{
int len;
va_list argptr;
@@ -973,6 +973,8 @@
if(len >= size)
Com_Printf("Com_sprintf: Output length %d too short, require %d bytes.\n", size, len);
+
+ return len;
}
/*
Index: code/qcommon/q_shared.h
===================================================================
--- code/qcommon/q_shared.h (revision 1952)
+++ code/qcommon/q_shared.h (working copy)
@@ -34,6 +34,7 @@
#define GAMENAME_FOR_MASTER "iofoo3" // must NOT contain whitespaces
#define HEARTBEAT_FOR_MASTER GAMENAME_FOR_MASTER
#define FLATLINE_FOR_MASTER GAMENAME_FOR_MASTER "dead"
+// #define PROTOCOL_SUPPORT_OLD // You probably don't need this for your standalone game
#else
#define PRODUCT_NAME "ioq3"
#define BASEGAME "baseq3"
@@ -42,6 +43,7 @@
#define GAMENAME_FOR_MASTER "Quake3Arena"
#define HEARTBEAT_FOR_MASTER "QuakeArena-1"
#define FLATLINE_FOR_MASTER HEARTBEAT_FOR_MASTER
+ #define PROTOCOL_SUPPORT_OLD
#endif
#define BASETA "missionpack"
@@ -198,8 +200,8 @@
#define MIN_QINT (-MAX_QINT-1)
#define ARRAY_LEN(x) (sizeof(x) / sizeof(*(x)))
+#define STR_LEN(x) (ARRAY_LEN(x) - 1)
-
// angle indexes
#define PITCH 0 // up / down
#define YAW 1 // left / right
@@ -682,7 +684,7 @@
void Parse3DMatrix (char **buf_p, int z, int y, int x, float *m);
int Com_HexStrToInt( const char *str );
-void QDECL Com_sprintf (char *dest, int size, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
+int QDECL Com_sprintf (char *dest, int size, const char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
char *Com_SkipTokens( char *s, int numTokens, char *sep );
char *Com_SkipCharset( char *s, char *sep );
Index: code/qcommon/files.c
===================================================================
--- code/qcommon/files.c (revision 1952)
+++ code/qcommon/files.c (working copy)
@@ -1030,6 +1030,11 @@
if(protocol == com_protocol->integer)
return qtrue;
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(protocol == com_oldprotocol->integer)
+ return qtrue;
+#endif
+
for(index = 0; demo_protocols[index]; index++)
{
if(demo_protocols[index] == protocol)
Index: code/qcommon/qcommon.h
===================================================================
--- code/qcommon/qcommon.h (revision 1952)
+++ code/qcommon/qcommon.h (working copy)
@@ -194,8 +194,9 @@
#define MAX_DOWNLOAD_WINDOW 8 // max of eight download frames
#define MAX_DOWNLOAD_BLKSIZE 2048 // 2048 byte block chunks
-
+#define NETCHAN_GENCHECKSUM(challenge, sequence) ((challenge) ^ ((sequence) * (challenge)))
+
/*
Netchan handles packet fragmentation and out of order / duplicate suppression
*/
@@ -223,10 +224,20 @@
int unsentFragmentStart;
int unsentLength;
byte unsentBuffer[MAX_MSGLEN];
+
+ int challenge;
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ qboolean compat;
+#endif
} netchan_t;
void Netchan_Init( int qport );
-void Netchan_Setup( netsrc_t sock, netchan_t *chan, netadr_t adr, int qport );
+void Netchan_Setup(netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, int challenge
+#ifdef PROTOCOL_SUPPORT_OLD
+ , qboolean compat
+#endif
+);
void Netchan_Transmit( netchan_t *chan, int length, const byte *data );
void Netchan_TransmitNextFragment( netchan_t *chan );
@@ -242,7 +253,8 @@
==============================================================
*/
-#define PROTOCOL_VERSION 68
+#define PROTOCOL_VERSION 69
+#define PROTOCOL_OLD_VERSION 68
// 1.31 - 67
// maintain a list of compatible protocols for demo playing
@@ -857,6 +869,9 @@
extern cvar_t *sv_packetdelay;
extern cvar_t *com_protocol;
+#ifdef PROTOCOL_SUPPORT_OLD
+extern cvar_t *com_oldprotocol;
+#endif
// com_speeds times
extern int time_game;
Index: code/qcommon/common.c
===================================================================
--- code/qcommon/common.c (revision 1952)
+++ code/qcommon/common.c (working copy)
@@ -32,7 +32,7 @@
#endif
int demo_protocols[] =
-{ 66, 67, 68, 0 };
+{ 67, 66, 0 };
#define MAX_NUM_ARGVS 50
@@ -86,6 +86,9 @@
cvar_t *com_abnormalExit;
cvar_t *com_standalone;
cvar_t *com_protocol;
+#ifdef PROTOCOL_SUPPORT_OLD
+cvar_t *com_oldprotocol;
+#endif
cvar_t *com_basegame;
cvar_t *com_homepath;
cvar_t *com_busyWait;
@@ -2710,7 +2713,14 @@
s = va("%s %s %s", Q3_VERSION, PLATFORM_STRING, __DATE__ );
com_version = Cvar_Get ("version", s, CVAR_ROM | CVAR_SERVERINFO );
com_protocol = Cvar_Get ("protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_INIT);
+#ifdef PROTOCOL_SUPPORT_OLD
+ com_oldprotocol = Cvar_Get ("oldprotocol", va("%i", PROTOCOL_OLD_VERSION), CVAR_INIT);
+ #ifndef STANDALONE
+ Cvar_Get("debug_protocol", com_oldprotocol->string, CVAR_INIT | CVAR_PROTECTED);
+ #endif
+#endif
+
Sys_Init();
if( Sys_WritePIDFile( ) ) {
Index: code/qcommon/cvar.c
===================================================================
--- code/qcommon/cvar.c (revision 1951)
+++ code/qcommon/cvar.c (working copy)
@@ -631,17 +631,8 @@
{
int flags = Cvar_Flags( var_name );
- if( flags != CVAR_NONEXISTENT && flags & CVAR_PROTECTED )
- {
- if( value )
- Com_Error( ERR_DROP, "Restricted source tried to set "
- "\"%s\" to \"%s\"\n", var_name, value );
- else
- Com_Error( ERR_DROP, "Restricted source tried to "
- "modify \"%s\"\n", var_name );
- return;
- }
- Cvar_Set( var_name, value );
+ if(flags == CVAR_NONEXISTENT || !(flags & CVAR_PROTECTED))
+ Cvar_Set(var_name, value);
}
/*
Index: code/client/client.h
===================================================================
--- code/client/client.h (revision 1952)
+++ code/client/client.h (working copy)
@@ -260,6 +260,10 @@
float voipPower;
#endif
+#ifdef PROTOCOL_SUPPORT_OLD
+ qboolean compat;
+#endif
+
// big stuff at end of structure so most offsets are 15 bits or less
netchan_t netchan;
} clientConnection_t;
Index: code/client/cl_main.c
===================================================================
--- code/client/cl_main.c (revision 1957)
+++ code/client/cl_main.c (working copy)
@@ -533,7 +533,6 @@
len = clc.serverMessageSequence;
swlen = LittleLong( len );
FS_Write (&swlen, 4, clc.demofile);
-
// skip the packet sequencing information
len = msg->cursize - headerBytes;
swlen = LittleLong(len);
@@ -636,14 +635,24 @@
if ( Cmd_Argc() == 2 ) {
s = Cmd_Argv(1);
Q_strncpyz( demoName, s, sizeof( demoName ) );
- Com_sprintf (name, sizeof(name), "demos/%s.%s%d", demoName, DEMOEXT, com_protocol->integer );
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(clc.compat)
+ Com_sprintf(name, sizeof(name), "demos/%s.%s%d", demoName, DEMOEXT, com_oldprotocol->integer);
+ else
+#endif
+ Com_sprintf(name, sizeof(name), "demos/%s.%s%d", demoName, DEMOEXT, com_protocol->integer);
} else {
int number;
// scan for a free demo name
for ( number = 0 ; number <= 9999 ; number++ ) {
CL_DemoFilename( number, demoName );
- Com_sprintf (name, sizeof(name), "demos/%s.%s%d", demoName, DEMOEXT, com_protocol->integer );
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(clc.compat)
+ Com_sprintf(name, sizeof(name), "demos/%s.%s%d", demoName, DEMOEXT, com_oldprotocol->integer);
+ else
+#endif
+ Com_sprintf(name, sizeof(name), "demos/%s.%s%d", demoName, DEMOEXT, com_protocol->integer);
if (!FS_FileExists(name))
break; // file doesn't exist
@@ -665,7 +674,6 @@
clc.spDemoRecording = qfalse;
}
-
Q_strncpyz( clc.demoName, demoName, sizeof( clc.demoName ) );
// don't start saving messages until a non-delta compressed message is received
@@ -889,36 +897,62 @@
CL_WalkDemoExt
====================
*/
-static void CL_WalkDemoExt(char *arg, char *name, int *demofile)
+static int CL_WalkDemoExt(char *arg, char *name, int *demofile)
{
int i = 0;
*demofile = 0;
- Com_sprintf (name, MAX_OSPATH, "demos/%s.%s%d", arg, DEMOEXT, com_protocol->integer);
-
- FS_FOpenFileRead( name, demofile, qtrue );
-
- if (*demofile)
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(com_oldprotocol->integer > 0)
{
- Com_Printf("Demo file: %s\n", name);
- return;
+ Com_sprintf(name, MAX_OSPATH, "demos/%s.%s%d", arg, DEMOEXT, com_oldprotocol->integer);
+ FS_FOpenFileRead(name, demofile, qtrue);
+
+ if (*demofile)
+ {
+ Com_Printf("Demo file: %s\n", name);
+ return com_oldprotocol->integer;
+ }
}
+
+ if(com_protocol->integer != com_oldprotocol->integer)
+#endif
+ {
+ Com_sprintf(name, MAX_OSPATH, "demos/%s.%s%d", arg, DEMOEXT, com_protocol->integer);
+ FS_FOpenFileRead(name, demofile, qtrue);
+ if (*demofile)
+ {
+ Com_Printf("Demo file: %s\n", name);
+ return com_protocol->integer;
+ }
+ }
+
Com_Printf("Not found: %s\n", name);
while(demo_protocols[i])
{
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(demo_protocols[i] == com_oldprotocol->integer)
+ continue;
+#endif
+ if(demo_protocols[i] == com_protocol->integer)
+ continue;
+
Com_sprintf (name, MAX_OSPATH, "demos/%s.%s%d", arg, DEMOEXT, demo_protocols[i]);
FS_FOpenFileRead( name, demofile, qtrue );
if (*demofile)
{
Com_Printf("Demo file: %s\n", name);
- break;
+
+ return demo_protocols[i];
}
else
Com_Printf("Not found: %s\n", name);
i++;
}
+
+ return -1;
}
/*
@@ -978,7 +1012,11 @@
break;
}
- if(demo_protocols[i] || protocol == com_protocol->integer)
+ if(demo_protocols[i] || protocol == com_protocol->integer
+#ifdef PROTOCOL_SUPPORT_OLD
+ || protocol == com_oldprotocol->integer
+#endif
+ )
{
Com_sprintf(name, sizeof(name), "demos/%s", arg);
FS_FOpenFileRead(name, &clc.demofile, qtrue);
@@ -995,11 +1033,11 @@
Q_strncpyz(retry, arg, len + 1);
retry[len] = '\0';
- CL_WalkDemoExt(retry, name, &clc.demofile);
+ protocol = CL_WalkDemoExt(retry, name, &clc.demofile);
}
}
else
- CL_WalkDemoExt(arg, name, &clc.demofile);
+ protocol = CL_WalkDemoExt(arg, name, &clc.demofile);
if (!clc.demofile) {
Com_Error( ERR_DROP, "couldn't open %s", name);
@@ -1013,6 +1051,13 @@
clc.demoplaying = qtrue;
Q_strncpyz( cls.servername, Cmd_Argv(1), sizeof( cls.servername ) );
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(protocol <= com_oldprotocol->integer)
+ clc.compat = qtrue;
+ else
+ clc.compat = qfalse;
+#endif
+
// read demo messages until connected
while ( cls.state >= CA_CONNECTED && cls.state < CA_PRIMED ) {
CL_ReadDemoMessage();
@@ -2153,7 +2198,16 @@
port = Cvar_VariableValue ("net_qport");
Q_strncpyz( info, Cvar_InfoString( CVAR_USERINFO ), sizeof( info ) );
- Info_SetValueForKey( info, "protocol", va("%i", com_protocol->integer ) );
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(com_oldprotocol->integer == com_protocol->integer)
+ clc.compat = qtrue;
+
+ if(clc.compat)
+ Info_SetValueForKey(info, "protocol", va("%i", com_oldprotocol->integer));
+ else
+#endif
+ Info_SetValueForKey(info, "protocol", va("%i", com_protocol->integer));
Info_SetValueForKey( info, "qport", va("%i", port ) );
Info_SetValueForKey( info, "challenge", va("%i", clc.challenge ) );
@@ -2394,6 +2448,7 @@
void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
char *s;
char *c;
+ int challenge;
MSG_BeginReadingOOB( msg );
MSG_ReadLong( msg ); // skip the -1
@@ -2415,17 +2470,32 @@
return;
}
- if(!NET_CompareAdr(from, clc.serverAddress))
+ c = Cmd_Argv(2);
+ if(*c)
+ challenge = atoi(c);
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(clc.compat)
{
- // This challenge response is not coming from the expected address.
- // Check whether we have a matching client challenge to prevent
- // connection hi-jacking.
+ if(!NET_CompareAdr(from, clc.serverAddress))
+ {
+ // This challenge response is not coming from the expected address.
+ // Check whether we have a matching client challenge to prevent
+ // connection hi-jacking.
- c = Cmd_Argv(2);
-
- if(!*c || atoi(c) != clc.challenge)
+ if(!*c || challenge != clc.challenge)
+ {
+ Com_DPrintf("Challenge response received from unexpected source. Ignored.\n");
+ return;
+ }
+ }
+ }
+ else
+#endif
+ {
+ if(!*c || challenge != clc.challenge)
{
- Com_DPrintf("Challenge response received from unexpected source. Ignored.\n");
+ Com_Printf("Bad challenge for challengeResponse. Ignored.\n");
return;
}
}
@@ -2457,7 +2527,36 @@
Com_Printf( "connectResponse from wrong address. Ignored.\n" );
return;
}
- Netchan_Setup (NS_CLIENT, &clc.netchan, from, Cvar_VariableValue( "net_qport" ) );
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ if(!clc.compat)
+#endif
+ {
+ c = Cmd_Argv(1);
+
+ if(*c)
+ challenge = atoi(c);
+ else
+ {
+ Com_Printf("Bad connectResponse received. Ignored.\n");
+ return;
+ }
+
+ if(challenge != clc.challenge)
+ {
+ Com_Printf("ConnectResponse with bad challenge received. Ignored.\n");
+ return;
+ }
+ }
+
+#ifdef PROTOCOL_SUPPORT_OLD
+ Netchan_Setup(NS_CLIENT, &clc.netchan, from, Cvar_VariableValue("net_qport"),
+ clc.challenge, clc.compat);
+#else
+ Netchan_Setup(NS_CLIENT, &clc.netchan, from, Cvar_VariableValue("net_qport"),
+ clc.challenge);
+#endif
+
cls.state = CA_CONNECTED;
clc.lastPacketSentTime = -9999; // send first packet immediately
return;
@@ -2475,13 +2574,6 @@
return;
}
- // a disconnect message from the server, which will happen if the server
- // dropped the connection but it is still getting packets from us
- if (!Q_stricmp(c, "disconnect")) {
- CL_DisconnectPacket( from );
- return;
- }
-
// echo request from server
if ( !Q_stricmp(c, "echo") ) {
NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv(1) );
@@ -2501,10 +2593,35 @@
}
// echo request from server
- if ( !Q_stricmp(c, "print") ) {
+ if(!Q_stricmp(c, "print")){
s = MSG_ReadString( msg );
+
+ #ifdef PROTOCOL_SUPPORT_OLD
+ // Hack to detect legacy server protocol
+ if(cls.state == CA_CHALLENGING && com_oldprotocol->integer > 0 && !clc.compat)
+ {
+ char buf[] = "Server uses protocol version ";
+ int ver;
+
+ if(!Q_strncmp(s, buf, STR_LEN(buf)))
+ {
+ ver = atoi(s + STR_LEN(buf));
+
+ if(ver == com_oldprotocol->integer)
+ {
+ // This is an old, but compatible protocol version.
+ // Go back to connecting state.
+ clc.compat = qtrue;
+ cls.state = CA_CONNECTING;
+ return;
+ }
+ }
+ }
+ #endif
+
Q_strncpyz( clc.serverMessage, s, sizeof( clc.serverMessage ) );
Com_Printf( "%s", s );
+
return;
}
@@ -3445,7 +3562,13 @@
// if this isn't the correct protocol version, ignore it
prot = atoi( Info_ValueForKey( infoString, "protocol" ) );
- if ( prot != com_protocol->integer ) {
+
+ if(prot != com_protocol->integer
+#ifdef PROTOCOL_SUPPORT_OLD
+ && prot != com_oldprotocol->integer
+#endif
+ )
+ {
Com_DPrintf( "Different protocol info packet: %s\n", infoString );
return;
}
Index: code/client/cl_net_chan.c
===================================================================
--- code/client/cl_net_chan.c (revision 1952)
+++ code/client/cl_net_chan.c (working copy)
@@ -147,9 +147,6 @@
Netchan_Transmit( chan, msg->cursize, msg->data );
}
-extern int oldsize;
-int newsize = 0;
-
/*
=================
CL_Netchan_Process
@@ -161,7 +158,8 @@
ret = Netchan_Process( chan, msg );
if (!ret)
return qfalse;
+
CL_Netchan_Decode( msg );
- newsize += msg->cursize;
+
return qtrue;
}