diff -wrubN quake3_1.32b/code/client/cl_console.c dfengine_1.08_src/code/client/cl_console.c --- quake3_1.32b/code/client/cl_console.c 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/client/cl_console.c 2009-12-31 16:09:29.000000000 +0100 @@ -23,13 +23,14 @@ #include "client.h" +#include // Cgg int g_console_field_width = 78; #define NUM_CON_TIMES 4 -#define CON_TEXTSIZE 32768 +#define CON_TEXTSIZE 0x10000 // Cgg - doubled typedef struct { qboolean initialized; @@ -45,7 +46,7 @@ float displayFrac; // aproaches finalFrac at scr_conspeed float finalFrac; // 0.0 to 1.0 lines of console to display - + float userFrac; // 0.0 to 1.0 - for user Configurations. Don't want to mess with finalFrac - marky int vislines; // in scanlines int times[NUM_CON_TIMES]; // cls.realtime time the line was generated @@ -59,6 +60,15 @@ cvar_t *con_conspeed; cvar_t *con_notifytime; +// Cgg +cvar_t *con_useshader; +cvar_t *con_opacity; +cvar_t *con_rgb; + +#define MAX_CON_FILTERS 20 +cvar_t *con_filters[MAX_CON_FILTERS]; +pcre *con_filters_compiled[MAX_CON_FILTERS]; +// !Cgg #define DEFAULT_CONSOLE_WIDTH 78 @@ -67,6 +77,15 @@ /* ================ +Con_ShowPCREVersion_f (Cgg - pcre support) +================ +*/ +static void Con_ShowPCREVersion_f(void) { + Com_Printf("%s\n", pcre_version()); +} + +/* +================ Con_ToggleConsole_f ================ */ @@ -82,6 +101,8 @@ Con_ClearNotify (); cls.keyCatchers ^= KEYCATCH_CONSOLE; + + in_keyboardShortcuts->modified = qtrue; // drakkar } /* @@ -93,7 +114,10 @@ chat_playerNum = -1; chat_team = qfalse; Field_Clear( &chatField ); - chatField.widthInChars = 30; + // Cgg + chatField.widthInChars = cls.glconfig.vidWidth / TINYCHAR_WIDTH -7; // -7: "say: " + padding + //chatField.widthInChars = 30; + // !Cgg cls.keyCatchers ^= KEYCATCH_MESSAGE; } @@ -107,7 +131,10 @@ chat_playerNum = -1; chat_team = qtrue; Field_Clear( &chatField ); - chatField.widthInChars = 25; + // Cgg + chatField.widthInChars = cls.glconfig.vidWidth / TINYCHAR_WIDTH -12; // -12: "say_team: " + padding +// chatField.widthInChars = 25; + // !Cgg cls.keyCatchers ^= KEYCATCH_MESSAGE; } @@ -124,7 +151,10 @@ } chat_team = qfalse; Field_Clear( &chatField ); - chatField.widthInChars = 30; + // Cgg + chatField.widthInChars = cls.glconfig.vidWidth / TINYCHAR_WIDTH -7; // -7: "say: " + padding +// chatField.widthInChars = 30; + // !Cgg cls.keyCatchers ^= KEYCATCH_MESSAGE; } @@ -141,7 +171,10 @@ } chat_team = qfalse; Field_Clear( &chatField ); - chatField.widthInChars = 30; + // Cgg + chatField.widthInChars = cls.glconfig.vidWidth / TINYCHAR_WIDTH -7; // -7: "say: " + padding +// chatField.widthInChars = 30; + // !Cgg cls.keyCatchers ^= KEYCATCH_MESSAGE; } @@ -250,7 +283,7 @@ int i, j, width, oldwidth, oldtotallines, numlines, numchars; MAC_STATIC short tbuf[CON_TEXTSIZE]; - width = (SCREEN_WIDTH / SMALLCHAR_WIDTH) - 2; + width = (cls.glconfig.vidWidth / SMALLCHAR_WIDTH) - 2; // Cgg - was SCREEN_WIDTH if (width == con.linewidth) return; @@ -315,6 +348,15 @@ con_notifytime = Cvar_Get ("con_notifytime", "3", 0); con_conspeed = Cvar_Get ("scr_conspeed", "3", 0); + // Cgg + con_useshader = Cvar_Get("con_useshader", "0", CVAR_ARCHIVE); + con_opacity = Cvar_Get("con_opacity", "0.95", CVAR_ARCHIVE); + con_rgb = Cvar_Get("con_rgb", ".05 .05 .1", CVAR_ARCHIVE); + for (i=0; i=0; i--) { + ch = con.text[(con.current%con.totallines)*con.linewidth+i] &0xff; + if (ch != ' ') { + copy = qtrue; + } + txt[i] = (copy) ? ch : 0; + } + for (re=con_filters_compiled; re-con_filters_compiled 0) { + con.x = 0; + for(i=0; i= 0) @@ -367,12 +436,14 @@ If no console is visible, the text will appear at the top of the game window ================ */ +#define Q_RAW_ESCAPE 1 // Cgg: see below void CL_ConsolePrint( char *txt ) { int y; int c, l; int color; qboolean skipnotify = qfalse; // NERVE - SMF int prev; // NERVE - SMF + char raw; // Cgg: Q_RAW_ESCAPE char stops color sequences from being interpreted. // TTimo - prefix for text that shows up in console but not in notify // backported from RTCW @@ -398,12 +469,20 @@ color = ColorIndex(COLOR_WHITE); + raw = 0; while ( (c = *txt) != 0 ) { + if (!raw) { if ( Q_IsColorString( txt ) ) { color = ColorIndex( *(txt+1) ); txt += 2; continue; } + // Cgg - repeated escape codes (^^) were broken + if (*txt == Q_COLOR_ESCAPE && *(txt+1) == Q_COLOR_ESCAPE) { + txt++; + } + // !Cgg + } // count word length for (l=0 ; l< con.linewidth ; l++) { @@ -423,7 +502,11 @@ switch (c) { + case Q_RAW_ESCAPE: + raw = raw^1; + break; case '\n': + raw = 0; Con_Linefeed (skipnotify); break; case '\r': @@ -532,8 +615,8 @@ if ( ( text[x] & 0xff ) == ' ' ) { continue; } - if ( ( (text[x]>>8)&7 ) != currentColor ) { - currentColor = (text[x]>>8)&7; + if ( ( ((text[x]>>8)&15)%10 ) != currentColor ) { + currentColor = ((text[x]>>8)&15)%10; re.SetColor( g_color_table[currentColor] ); } SCR_DrawSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*SMALLCHAR_WIDTH, v, text[x] & 0xff ); @@ -553,17 +636,28 @@ { if (chat_team) { - SCR_DrawBigString (8, v, "say_team:", 1.0f ); + // Cgg + SCR_DrawSmallStringExt(8, v, "say_team:", colorWhite, qfalse, qfalse); + //SCR_DrawBigString (8, v, "say_team:", 1.0f ); + // !Cgg skip = 11; } else { - SCR_DrawBigString (8, v, "say:", 1.0f ); - skip = 5; + // Cgg + SCR_DrawSmallStringExt(8, v, "say:", colorWhite, qfalse, qfalse); + skip = 6; + //skip = 5; + //SCR_DrawBigString (8, v, "say:", 1.0f ); + // !Cgg } - Field_BigDraw( &chatField, skip * BIGCHAR_WIDTH, v, - SCREEN_WIDTH - ( skip + 1 ) * BIGCHAR_WIDTH, qtrue ); + // Cgg + Field_Draw(&chatField, skip * TINYCHAR_WIDTH, v, + SCREEN_WIDTH - ( skip + 1 ) * TINYCHAR_WIDTH, qtrue ); + //Field_BigDraw( &chatField, skip * BIGCHAR_WIDTH, v, + // SCREEN_WIDTH - ( skip + 1 ) * BIGCHAR_WIDTH, qtrue ); + // !Cgg v += BIGCHAR_HEIGHT; } @@ -585,7 +679,6 @@ int lines; // qhandle_t conShader; int currentColor; - vec4_t color; lines = cls.glconfig.vidHeight * frac; if (lines <= 0) @@ -599,24 +692,31 @@ SCR_AdjustFrom640( &con.xadjust, NULL, NULL, NULL ); // draw the background - y = frac * SCREEN_HEIGHT - 2; + y = frac * SCREEN_HEIGHT - 1; // Cgg - was 2 if ( y < 1 ) { y = 0; } else { + // Cgg + if (con_useshader->integer) { SCR_DrawPic( 0, 0, SCREEN_WIDTH, y, cls.consoleShader ); + } else { + vec4_t color; + char *c = con_rgb->string; + color[0] = atof(COM_Parse(&c)); + color[1] = atof(COM_Parse(&c)); + color[2] = atof(COM_Parse(&c)); + color[3] = con_opacity->value; + SCR_FillRect( 0, 0, SCREEN_WIDTH, y, color ); + } + // !Cgg } - color[0] = 1; - color[1] = 0; - color[2] = 0; - color[3] = 1; - SCR_FillRect( 0, y, SCREEN_WIDTH, 2, color ); - + SCR_FillRect( 0, y, SCREEN_WIDTH, 1, colorOrange ); // Cgg - orange & 1px instead of 2 // draw the version number - re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); + re.SetColor( g_color_table[ColorIndex(COLOR_ORANGE)] ); // Cgg - orange i = strlen( Q3_VERSION ); @@ -639,7 +739,7 @@ if (con.display != con.current) { // draw arrows to show the buffer is backscrolled - re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); + re.SetColor( g_color_table[ColorIndex(COLOR_ORANGE)] ); // Cgg - orange for (x=0 ; x>8)&7 ) != currentColor ) { - currentColor = (text[x]>>8)&7; + if ( ( ((text[x]>>8)&15)%10 ) != currentColor ) { + currentColor = ((text[x]>>8)&15)%10; re.SetColor( g_color_table[currentColor] ); } SCR_DrawSmallChar( con.xadjust + (x+1)*SMALLCHAR_WIDTH, y, text[x] & 0xff ); @@ -724,9 +824,34 @@ ================== */ void Con_RunConsole (void) { + // Cgg - check for updated con_filters + cvar_t **cvar; + pcre **re; + const char *errptr; + int erroffset; + for (cvar=con_filters; cvar-con_filtersmodified) { + continue; + } + re = con_filters_compiled+(cvar-con_filters); + (*cvar)->modified = qfalse; + if (!strlen((*cvar)->string)) { + *re = NULL; + continue; + } + *re = pcre_compile((*cvar)->string, 0, &errptr, &erroffset, NULL); + if (!*re) { + Com_Printf("Failed to compile %c%s\n", Q_RAW_ESCAPE, (*cvar)->string); + Com_Printf(va("%c%%%ic %%s\n", Q_RAW_ESCAPE, erroffset+19), '^', errptr); + Cvar_Set((*cvar)->name, ""); + (*cvar)->modified = qfalse; + } + } + // !Cgg + // decide on the destination height of the console if ( cls.keyCatchers & KEYCATCH_CONSOLE ) - con.finalFrac = 0.5; // half screen + con.finalFrac = con.userFrac; // marky else con.finalFrac = 0; // none visible @@ -747,6 +872,25 @@ } +// marky +/* +================== +Con_SetFrac +================== +*/ +void Con_SetFrac(const float conFrac) +{ + // clamp the cvar value + if (conFrac < .1f) { // don't let the console be hidden + con.userFrac = .1f; + } else if (conFrac > 1.0f) { + con.userFrac = 1.0f; + } else { + con.userFrac = conFrac; + } +} +// !marky + void Con_PageUp( void ) { con.display -= 2; @@ -783,4 +927,6 @@ cls.keyCatchers &= ~KEYCATCH_CONSOLE; con.finalFrac = 0; // none visible con.displayFrac = 0; + + in_keyboardShortcuts->modified = qtrue; // drakkar } diff -wrubN quake3_1.32b/code/client/cl_download.c dfengine_1.08_src/code/client/cl_download.c --- quake3_1.32b/code/client/cl_download.c 1970-01-01 01:00:00.000000000 +0100 +++ dfengine_1.08_src/code/client/cl_download.c 2010-01-20 13:22:16.000000000 +0100 @@ -0,0 +1,685 @@ +/* +=========================================================================== +Copyright (C) 2009 Cyril Gantin + +This file is part of Quake III Arena source code. + +Quake III Arena source code is free software; you can redistribute it +and/or modify it under the terms of the GNU General Public License as +published by the Free Software Foundation; either version 2 of the License, +or (at your option) any later version. + +Quake III Arena source code is distributed in the hope that it will be +useful, but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with Foobar; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +=========================================================================== + +Integration of libcurl for requesting maps from an online repository. + +Usage: + \download - blocking download ( hold ESC to abort ) + \download & - background download + \download - - abort current background download + \download - show help or background download progress + +Cvar dl_source defines the url from which to query maps, eg: http://someserver/somescript.php?q=%m +The %m token is replaced with the actual map name in the query. + +The server MUST return an appropriate content-type. Accepted content-type values are either application/zip +or application/octet-stream. Other content-type values will be treated as errors or queries that didn't +yield results. + +The server MAY return a content-disposition header with the actual name of the pk3 file. In the absence +of a content-disposition header, the client will write the pack to a default .pk3 location. The +filename MUST have a pk3 extension. The filename MUST NOT have directory path information - slashes (/), +backslashes (\) and colons (:) are not accepted. Finally the filename MUST consist of us-ascii characters +only (chars 32 to 126, included). A filename that doesn't comply to these specifications will raise an +error and abort the transfer. + +The server MAY redirect the query to another url. Multiple redirections are permitted - limit depends on +libcurl's default settings. The end query MUST return a "200 OK" http status code. + +It is desirable that the server returns a content-length header with the size of the pk3 file. + +The server MAY return a custom x-dfengine-motd header. Its value is a string that MUST NOT exceed 127 +chars. The x-dfengine-motd string will be displayed after the download is complete. This is the place +where you take credits for setting up a server. :) + +Downloaded files are written to the current gamedir of the home directory - eg. C:\quake3\mymod\ in +windows; ~/.q3a/mymod/ in linux. Name collision with an existing pk3 file will result in a failure and +be left to the user to sort out. + +*/ + +#include +#include "client.h" + +static cvar_t *dl_verbose; // 1: show http headers; 2: http headers +curl debug info +static cvar_t *dl_showprogress; // 0: do not show; 1: show console progress; 2: show progress in one line +static cvar_t *dl_showmotd; // show server message +static cvar_t *dl_source; // url to query maps from; %m token will be replaced by mapname +static cvar_t *dl_usebaseq3; // whether to download pk3 files in baseq3 (default is off) + +static qboolean curl_initialized; +static char useragent[256]; +static CURL *curl = NULL; +static CURLM *curlm = NULL; +static fileHandle_t f = 0; +static char path[MAX_OSPATH]; +static char dl_error[1024]; // if set, will be used in place of libcurl's error message. +static char motd[128]; + + +static size_t Curl_WriteCallback_f(void *ptr, size_t size, size_t nmemb, void *stream) { + if (!f) { + char dir[MAX_OSPATH]; + char *c; + // make sure Content-Type is either "application/octet-stream" or "application/zip". + if (curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &c) != CURLE_OK + || !c + || (stricmp(c, "application/octet-stream") + && stricmp(c, "application/zip"))) { + Q_strncpyz(dl_error, "No pk3 returned - requested map is probably unknown.", sizeof(dl_error)); + return 0; + } + // make sure the path doesn't have directory information. + for (c=path; *c; c++) { + if (*c == '\\' || *c == '/' || *c == ':') { + Com_sprintf(dl_error, sizeof(dl_error), "Destination filename \"%s\" is not valid.", path); + return 0; + } + } + // make sure the file has an appropriate extension. + c = path +strlen(path) -4; + if (c <= path || strcmp(c, ".pk3")) { + Com_sprintf(dl_error, sizeof(dl_error), "Returned file \"%s\" has wrong extension.", path); + return 0; + } + // make out the directory in which to place the file + Q_strncpyz(dir, (dl_usebaseq3->integer)?"baseq3":FS_GetGameDir(), sizeof(dir)); + if (strlen(path) +strlen(dir) +1 >= sizeof(path)) { + Com_sprintf(dl_error, sizeof(dl_error), "Returned filename is too large."); + return 0; + } + Com_sprintf(path, sizeof(path), "%s/%s", dir, path); + // in case of a name collision, just fail - leave it to the user to sort out. + if (FS_SV_FileExists(path)) { + Com_sprintf(dl_error, sizeof(dl_error), "Failed to download \"%s\", a pk3 by that name exists locally.", path); + return 0; + } + // change the extension to .tmp - it will be changed back once the download is complete. + c = path +strlen(path) -4; + strcpy(c, ".tmp"); + + // FS should write the file in the appropriate gamedir and catch unsanitary paths. + f = FS_SV_FOpenFileWrite(path); + if (!f) { + Com_sprintf(dl_error, sizeof(dl_error), "Failed to open \"%s\" for writing.\n", path); + return 0; + } + Com_Printf("Writing to: %s\n", path); + } + return FS_Write(ptr, size*nmemb, f); +} + +static size_t Curl_HeaderCallback_f(void *ptr, size_t size, size_t nmemb, void *stream) { + char buf[1024]; + char *c; + + // make a copy and remove the trailing crlf chars. + if (size*nmemb >= sizeof(buf)) { + Q_strncpyz(dl_error, "Curl_HeaderCallback_f() overflow.", sizeof(dl_error)); + return (size_t)-1; + } + Q_strncpyz(buf, ptr, size*nmemb+1); + c = buf +strlen(buf)-1; + while (c>buf && (*c == '\r' || *c == '\n')) { + *(c--) = 0; + } + + // make sure it's not empty. + if (c <= buf) { + return size*nmemb; + } + + // verbose output + if (dl_verbose->integer > 0) { + Com_Printf("< %s\n", buf); + } + /** + * Check whether this is a content-disposition header. + * Apparently RFC2183 has precise rules for the presentation of the filename attribute. + * No one seems to respect those, though. + * Accepted presentations: + * filename="somefile.pk3" + * filename='somefile.pk3' + * filename=somefile.pk3 + * Quoted strings won't support escaping (eg. "some\"file.pk3"). + * Malformed quoted strings that miss the trailing quotation mark will pass. + * Only us-ascii chars are accepted. + * The actual filename will be validated later, when the transfer is started. + */ + if (!strncasecmp(buf, "content-disposition:", 20)) { + const char *c = strstr(buf, "filename=") +9; + if (c != (char*)9) { + const char *e; + char token=0; + if (*c == '"' || *c == '\'') { + token = *c++; + } + for (e=c; *e && *e != token; e++) { + if (*e<32 || *e > 126) { + Q_strncpyz(dl_error, "Server returned an invalid filename.", sizeof(dl_error)); + return (size_t)-1; + } + } + if (e == c || e-c >= sizeof(path)) { + Q_strncpyz(dl_error, "Server returned an invalid filename.", sizeof(dl_error)); + return (size_t)-1; + } + Q_strncpyz(path, c, e-c+1); // +1 makes room for the trailing \0 + } + } + + // catch x-dfengine-motd headers + if (!strncasecmp(buf, "x-dfengine-motd: ", 17)) { + if (strlen(buf) >= 17+sizeof(motd)) { + if (dl_showmotd->integer) { + Com_Printf("Warning: server motd string too large.\n"); + } + } else { + Q_strncpyz(motd, buf+17, sizeof(motd)); + Cvar_Set( "cl_downloadMotd", motd ); + } + } + return size*nmemb; +} + +static size_t Curl_VerboseCallback_f(CURL *curl, curl_infotype type, char *data, size_t size, void *userptr) { + char buf[1024]; + char *c, *l; + + if ((type != CURLINFO_HEADER_OUT || dl_verbose->integer < 1) + && (type != CURLINFO_TEXT || dl_verbose->integer < 2)) { + return 0; + } + if (size >= sizeof(buf)) { + Com_Printf("Curl_VerboseCallback_f() warning: overflow.\n"); + return 0; + } + Q_strncpyz(buf, data, size+1); // +1 makes room for the trailing \0 + if (type == CURLINFO_HEADER_OUT) { + for (l=c=buf; c-bufl) { + Com_Printf("> %s\n", l); + } + l = c+1; + } + } + return 0; + } + // CURLINFO_TEXT (has its own linefeeds) + Com_Printf("%s", buf); // Com_Printf(buf) would result in random output/segfault if buf has % chars. + return 0; +} + +/** + * This callback is called on regular intervals, whether data is being transferred or not. + */ +static int Curl_ProgressCallback_f(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { + + if( curlm ) // dont print progress in console if nonblocking download + { + DL_Info( qfalse ); + } + else // print progress if blocking download + { + DL_Info( qtrue ); + + // pump events and refresh screen + Com_EventLoop(); + SCR_UpdateScreen(); + if (Key_IsDown(K_ESCAPE)) { + Q_strncpyz(dl_error, "Download aborted.", sizeof(dl_error)); + return -1; + } + } + + return 0; +} + + + +static void Curl_ShowVersion_f(void) { + Com_Printf("%s\n", curl_version()); +} + + + +static void Curl_Download_f( void ) +{ + qboolean nonblocking; + int state; + + // interrupt download: \download - + if( Cmd_Argc() >= 2 && !Q_strncmp( "-", Cmd_Argv(1), 1 ) ) + { + if( DL_Active() ) + DL_Interrupt(); + else + Com_Printf( "No download in progress.\n" ); + return; + } + + if( DL_Active() ) + { + Com_Printf( "Already downloading map '%s'.\n", Cvar_VariableString("cl_downloadName") ); + DL_Info( qtrue ); + return; + } + + // help: \download + if( Cmd_Argc() < 2 ) + { + Com_Printf( "How to use:\n" + " \\download - blocking download ( hold ESC to abort )\n" + " \\download & - background download\n" + " \\download - - abort current background download\n" + " \\download - show help or background download progress\n" + ); + return; + } + + // non blocking download: \download & + nonblocking = ( Cmd_Argc() >= 3 ) && ( !Q_strncmp( "&", Cmd_Argv(2), 1 ) ); + + // initialize download + state = DL_Begin( Cmd_Argv(1), nonblocking ); + if( state != 1 ) return; + + // if blocking, download all file now + if( !nonblocking ) DL_Continue(); +} + + + + + +// +// Interface +// +void DL_Init() { + if (!curl_global_init(CURL_GLOBAL_ALL)) { + char *c; + Cmd_AddCommand("curl_version", Curl_ShowVersion_f); + Cmd_AddCommand("download", Curl_Download_f); + curl_initialized = qtrue; + + // set user-agent, something along the lines of "dfengine/1.## (libcurl/#.##.# linked libs...)" + Q_strncpyz(useragent, Q3_VERSION, sizeof(useragent)); + for (c=useragent; *c; c++) { + if (*c == ' ') *c = '/'; + } + Com_sprintf(useragent, sizeof(useragent), "%s (%s) ", useragent, curl_version()); + } else { + Com_Printf("Failed to initialize libcurl.\n"); + } + dl_verbose = Cvar_Get("dl_verbose", "0", 0); + dl_source = Cvar_Get("dl_source", "http://q3a.ath.cx/getpk3bymapname.php/%m", CVAR_ARCHIVE); + dl_showprogress = Cvar_Get("dl_showprogress", "1", CVAR_ARCHIVE); + dl_showmotd = Cvar_Get("dl_showmotd", "1", CVAR_ARCHIVE); + dl_usebaseq3 = Cvar_Get("dl_usebaseq3", "0", CVAR_ARCHIVE); +} + +// 0 : no active, 1 : active blocking, 2 : active nonblocking +int DL_Active() { + if( curlm && curl ) return 2; + if( curl ) return 1; + return 0; +} + +// the engine might be going dedicated, remove client commands +void DL_Shutdown() { + if (curl_initialized) { + if (curlm) { + curl_multi_cleanup(curlm); + curlm = NULL; + } + if (curl) { + curl_easy_cleanup(curl); + curl = NULL; + } + if (f) { + FS_FCloseFile(f); + f = 0; + } + curl_global_cleanup(); + curl_initialized = qfalse; + Cmd_RemoveCommand("curl_version"); + Cmd_RemoveCommand("download"); + } +} + + + +// -1 : error, 0 : map already exists, 1 : ok +int DL_Begin( const char *map, qboolean nonblocking ) +{ + char url[1024]; + CURLMcode resm; + char *c; + + if( DL_Active() ) { + Com_Printf("Already downloading map '%s'.\n", Cvar_VariableString("cl_downloadName") ); + return -1; + } + + if (FS_FileIsInPAK(va("maps/%s.bsp", map), NULL) != -1) { + Com_Printf("Map already exists locally.\n"); + return 0; + } + if (strncasecmp(dl_source->string, "http://", 7)) { + if (strstr(dl_source->string, "://")) { + Com_Printf("Invalid dl_source.\n"); + return -1; + } + Cvar_Set("dl_source", va("http://%s", dl_source->string)); + } + if ((c = strstr(dl_source->string, "%m")) == 0) { + Com_Printf("Cvar dl_source is missing a %%m token.\n"); + return -1; + } + if (strlen(dl_source->string) -2 +strlen(map) >= sizeof(url)) { + Com_Printf("Cvar dl_source too large.\n"); + return -1; + } + + Q_strncpyz(url, dl_source->string, c-dl_source->string +1); // +1 makes room for the trailing 0 + Com_sprintf(url, sizeof(url), "%s%s%s", url, map, c+2); + + // set a default destination filename; Content-Disposition headers will override. + Com_sprintf(path, sizeof(path), "%s.pk3", map); + + curl = curl_easy_init(); + if (!curl) { + Com_Printf("Download failed to initialize.\n"); + return -1; + } + + *dl_error = 0; + *motd = 0; + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1); // fail if http returns an error code + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, Curl_WriteCallback_f); + curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, Curl_HeaderCallback_f); + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); + curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, Curl_VerboseCallback_f); + curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0); + curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, Curl_ProgressCallback_f); + //curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t)(4*1024) ); // 4 KB/s for testing timeouts + + if( nonblocking ) + { + curlm = curl_multi_init(); + if( !curlm ) + { + curl_easy_cleanup( curl ); + curl = NULL; + Com_Printf("Download failed to initialize ( nonblocking ).\n"); + return -1; + } + resm = curl_multi_add_handle( curlm, curl ); + if( resm != CURLM_OK ) + { + curl_multi_cleanup( curlm ); + curl_easy_cleanup( curl ); + curlm = NULL; + curl = NULL; + Com_Printf("Download failed to initialize ( nonblocking ).\n"); + return -1; + } + } + + Com_Printf("Attempting download: %s\n", url); + + Cvar_Set( "cl_downloadName", map ); // show the ui download progress screen + Cvar_SetValue( "cl_downloadSize", 0 ); + Cvar_SetValue( "cl_downloadCount", 0 ); + Cvar_SetValue( "cl_downloadTime", cls.realtime ); // download start time offset + + return 1; +} + + + +void DL_End( CURLcode res, CURLMcode resm ) +{ + CURLMsg *msg; + int msgs; + + if( dl_verbose->integer == 0 && dl_showprogress->integer == 2 && !curlm ) + Com_Printf( "\n" ); + + if( curlm ) + { + // res = final download result + while( msg = curl_multi_info_read( curlm, &msgs ) ) + { + if( msg->msg != CURLMSG_DONE ) + { + if( dl_error[0] == '\0' ) + Q_strncpyz( dl_error, "Download Interrupted.", sizeof(dl_error) ); + } + else if( msg->easy_handle == curl ) + { + if( msg->data.result != CURLE_OK ); + res = msg->data.result; + } + else + { + Com_Printf( "Invalid cURL handle.\n" ); + } + } + + curl_multi_cleanup( curlm ); + curlm = NULL; + } + + if( curl ) + { + curl_easy_cleanup( curl ); + curl = NULL; + } + + // get possible error messages + if( !*dl_error && res != CURLE_OK ) + Q_strncpyz( dl_error, curl_easy_strerror(res), sizeof(dl_error) ); + if( !*dl_error && resm != CURLM_OK ) + Q_strncpyz( dl_error, curl_multi_strerror(resm), sizeof(dl_error) ); + if( !*dl_error && !f ) + Q_strncpyz( dl_error, "File is not opened.", sizeof(dl_error) ); + + if (f) { + FS_FCloseFile(f); + f = 0; + if (!*dl_error) { // download succeeded + char dest[MAX_OSPATH]; + Com_Printf("Download complete, restarting filesystem.\n"); + Q_strncpyz(dest, path, strlen(path)-3); // -4 +1 for the trailing \0 + Q_strcat(dest, sizeof(dest), ".pk3"); + if (!FS_SV_FileExists(dest)) { + FS_SV_Rename(path, dest); + FS_Restart(clc.checksumFeed); + if (dl_showmotd->integer && *motd) { + Com_Printf("Server motd: %s\n", motd); + } + } else { + // normally such errors should be caught upon starting the transfer. Anyway better do + // it here again - the filesystem might have changed, plus this may help contain some + // bugs / exploitable flaws in the code. + Com_Printf("Failed to copy downloaded file to its location - file already exists.\n"); + FS_SV_RemoveFile(path); + } + } else { + FS_SV_RemoveFile(path); + } + } + + Cvar_Set( "cl_downloadName", "" ); // hide the ui downloading screen + Cvar_SetValue( "cl_downloadSize", 0 ); + Cvar_SetValue( "cl_downloadCount", 0 ); + Cvar_SetValue( "cl_downloadTime", 0 ); + Cvar_Set( "cl_downloadMotd", "" ); + + if( *dl_error ) + { + if( cls.state == CA_CONNECTED ) + Com_Error( ERR_DROP, "%s\n", dl_error ); // download error while connecting, can not continue loading + else + Com_Printf( "%s\n", dl_error ); // download error while in game, do not disconnect + + *dl_error = '\0'; + } + else + { + // download completed, request new gamestate to check possible new map if we are not already in game + if( cls.state == CA_CONNECTED ) + CL_AddReliableCommand( "donedl" ); // get new gamestate info from server + } +} + + + +// -1 : error, 0 : done, 1 : continue +int DL_Continue( void ) +{ + CURLcode res = CURLE_OK; + CURLMcode resm = CURLM_OK; + int running = 1; + int state = -1; + + if( !curl ) return 0; + + if( curlm ) // non blocking + { + resm = CURLM_CALL_MULTI_PERFORM; + while( resm == CURLM_CALL_MULTI_PERFORM ) + resm = curl_multi_perform( curlm, &running ); + if( resm == CURLM_OK ) + state = ( running ? 1 : 0 ); + } + else // blocking + { + // NOTE: + // blocking download has its own curl loop, so we need check events and update screen in Curl_ProgressCallback_f, + // this loop is not updating time cvars ( com_frameMsec, cls.realFrametime, cls.frametime, cls.realtime, ... ) + // and this will cause client-server desynchronization, if download takes long time timeout can occur. + res = curl_easy_perform( curl ); // returns when error or download is completed/aborted + state = ( res == CURLE_OK ? 0 : -1 ); + } + + if( state != 1 ) // no continue ( done or error ) + DL_End( res, resm ); + + return state; +} + + + +void DL_Interrupt( void ) +{ + if( !curl ) return; + Q_strncpyz( dl_error, "Download Interrupted.", sizeof(dl_error) ); + DL_End( CURLE_OK, CURLM_OK ); +} + + + +void DL_Info( qboolean console ) +{ + static double lastTime = 0.0; + double dltotal, dlnow, speed, time; + int timeleft; + CURLcode res; + + if( !DL_Active() ) return; + if( cls.state != CA_CONNECTED && !console ) return; + + res = curl_easy_getinfo( curl, CURLINFO_TOTAL_TIME, &time ); // total downloading time + if( res != CURLE_OK ) time = -1.0; + + res = curl_easy_getinfo( curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &dltotal ); // file size bytes + if( res != CURLE_OK || dltotal < 0.0 ) dltotal = 0.0; + + res = curl_easy_getinfo( curl, CURLINFO_SIZE_DOWNLOAD, &dlnow ); // current bytes + if( res != CURLE_OK || dlnow < 0.0 ) dlnow = 0.0; + if( dltotal > 0.0 && dlnow > dltotal ) dlnow = 0.0; + + res = curl_easy_getinfo( curl, CURLINFO_SPEED_DOWNLOAD, &speed ); // download rate bytes/sec + if( res != CURLE_OK ) speed = -1.0; + + // update ui download progress screen cvars + if( cls.state == CA_CONNECTED ) + { + Cvar_SetValue( "cl_downloadSize", (float)dltotal ); + Cvar_SetValue( "cl_downloadCount", (float)dlnow ); + } + + // print download progress in console + if( console && dl_showprogress->integer && dlnow > 0.0 ) + { + // 8 times per second is enough + if( time-lastTime > 1.0/8.0 || time-lastTime < 0.0 || dlnow == dltotal ) + { + lastTime = time; + + if( dl_verbose->integer == 0 && dl_showprogress->integer == 2 && !curlm ) + Com_Printf( "\r" ); // overwrite old progress line + + if (dltotal != 0.0 // content-size is known + && dlnow <= dltotal) { // and appropriate + if (dltotal > 1024.0 * 1024.0) { // MB range + Com_Printf("%.1f/%.1fMB", dlnow/1024.0/1024.0, dltotal/1024.0/1024.0); + } else if (dltotal > 10240.0) { // KB range (>10KB) + Com_Printf("%.1f/%.1fKB", dlnow/1024.0, dltotal/1024.0); + } else { // byte range + Com_Printf("%.0f/%.0fB", dlnow, dltotal); + } + } else { // unknown content-size + if (dlnow > 1024.0 * 1024.0) { // MB range + Com_Printf("%.1fMB", dlnow/1024.0/1024.0); + } else if (dlnow > 10240.0) { // KB range (>10KB) + Com_Printf("%.1fKB", dlnow/1024.0); + } else { // byte range + Com_Printf("%.0fB", dlnow); + } + } + if (speed >= 0.0) { + Com_Printf(" @%.1fKB/s", speed/1024.0); + } + if (dltotal != 0.0 && dlnow <= dltotal) { + Com_Printf(" (%2.1f%%)", 100.0*dlnow/dltotal); + if( time > 0.0 && dlnow > 0.0 ) { + timeleft = (int) ( (dltotal-dlnow) * time/dlnow ); + Com_Printf(" time left: %d:%0.2d", timeleft/60, timeleft%60); + } + } + + if( dl_verbose->integer == 0 && dl_showprogress->integer == 2 && !curlm ) + Com_Printf( " " ); // make sure line is totally overwriten + else + Com_Printf( "\n" ); // or start a new line + } + } +} + diff -wrubN quake3_1.32b/code/client/client.h dfengine_1.08_src/code/client/client.h --- quake3_1.32b/code/client/client.h 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/client/client.h 2009-12-31 16:09:29.000000000 +0100 @@ -346,9 +346,13 @@ extern cvar_t *cl_activeAction; extern cvar_t *cl_allowDownload; +extern cvar_t *cl_mapAutoDownload; // drakkar + extern cvar_t *cl_conXOffset; extern cvar_t *cl_inGameVideo; +extern cvar_t *in_keyboardShortcuts; // drakkar + //================================================= // @@ -449,6 +453,7 @@ void Con_Bottom( void ); void Con_Close( void ); +void Con_SetFrac( const float conFrac ); // marky // // cl_scrn.c @@ -468,7 +473,7 @@ void SCR_DrawBigString( int x, int y, const char *s, float alpha ); // draws a string with embedded color control characters with fade void SCR_DrawBigStringColor( int x, int y, const char *s, vec4_t color ); // ignores embedded color control characters -void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor ); +void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, qboolean rawmode ); void SCR_DrawSmallChar( int x, int y, int ch ); @@ -517,3 +522,14 @@ void CL_Netchan_Transmit( netchan_t *chan, msg_t* msg); //int length, const byte *data ); void CL_Netchan_TransmitNextFragment( netchan_t *chan ); qboolean CL_Netchan_Process( netchan_t *chan, msg_t *msg ); + +// +// cl_download.c +// +void DL_Init(); +void DL_Shutdown(); +int DL_Active(); +int DL_Begin( const char *map, qboolean nonblocking ); +int DL_Continue( void ); +void DL_Interrupt( void ); +void DL_Info( qboolean console ); diff -wrubN quake3_1.32b/code/client/cl_keys.c dfengine_1.08_src/code/client/cl_keys.c --- quake3_1.32b/code/client/cl_keys.c 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/client/cl_keys.c 2009-12-31 16:09:29.000000000 +0100 @@ -45,6 +45,8 @@ qboolean anykeydown; qkey_t keys[MAX_KEYS]; +cvar_t *con_height; //marky + typedef struct { char *name; @@ -68,6 +70,10 @@ {"ALT", K_ALT}, {"CTRL", K_CTRL}, {"SHIFT", K_SHIFT}, +// drakkar + {"WIN", K_WIN}, + {"MENU", K_MENU}, +// !drakkar {"COMMAND", K_COMMAND}, @@ -245,7 +251,7 @@ float color[4]; color[0] = color[1] = color[2] = color[3] = 1.0; - SCR_DrawSmallStringExt( x, y, str, color, qfalse ); + SCR_DrawSmallStringExt( x, y, str, color, qfalse, qtrue ); } else { // draw big string with drop shadow SCR_DrawBigString( x, y, str, 1.0 ); @@ -266,7 +272,7 @@ cursorChar = 10; } - i = drawLen - ( Q_PrintStrlen( str ) + 1 ); + i = drawLen - ( strlen( str ) + 1 ); // Cgg - was Q_PrintStrlen() if ( size == SMALLCHAR_WIDTH ) { SCR_DrawSmallChar( x + ( edit->cursor - prestep - i ) * size, y, cursorChar ); @@ -510,10 +516,16 @@ } } +// drakkar - do not insert this lines in history buffer ( empty lines ) +if( Q_stricmp( g_consoleField.buffer, "" ) + && Q_stricmp( g_consoleField.buffer, "/" ) + && Q_stricmp( g_consoleField.buffer, "\\" ) ) +{ // !drakkar // copy line to history buffer historyEditLines[nextHistoryLine % COMMAND_HISTORY] = g_consoleField; nextHistoryLine++; historyLine = nextHistoryLine; +} Field_Clear( &g_consoleField ); @@ -534,7 +546,7 @@ // command history (ctrl-p ctrl-n for unix style) - if ( (key == K_MWHEELUP && keys[K_SHIFT].down) || ( key == K_UPARROW ) || ( key == K_KP_UPARROW ) || + if ( (key == K_MWHEELUP && keys[K_SHIFT].down) || ( key == K_UPARROW ) || /*( key == K_KP_UPARROW ) ||*/ // drakkar - K_KP_UPARROW writes '8' ( ( tolower(key) == 'p' ) && keys[K_CTRL].down ) ) { if ( nextHistoryLine - historyLine < COMMAND_HISTORY && historyLine > 0 ) { @@ -544,7 +556,7 @@ return; } - if ( (key == K_MWHEELDOWN && keys[K_SHIFT].down) || ( key == K_DOWNARROW ) || ( key == K_KP_DOWNARROW ) || + if ( (key == K_MWHEELDOWN && keys[K_SHIFT].down) || ( key == K_DOWNARROW ) || /*( key == K_KP_DOWNARROW ) ||*/ // drakkar - K_KP_DOWNARROW writes '2' ( ( tolower(key) == 'n' ) && keys[K_CTRL].down ) ) { if (historyLine == nextHistoryLine) return; @@ -1040,37 +1052,34 @@ } } -#ifdef __linux__ - if (key == K_ENTER) - { - if (down) - { - if (keys[K_ALT].down) +// drakkar - alt-enter swaps fullscreen +#if ( __linux__ || _WIN32 ) + if( keys[K_ALT].down && keys[K_ENTER].repeats == 1 ) { Key_ClearStates(); - if (Cvar_VariableValue("r_fullscreen") == 0) - { - Com_Printf("Switching to fullscreen rendering\n"); - Cvar_Set("r_fullscreen", "1"); - } - else - { - Com_Printf("Switching to windowed rendering\n"); - Cvar_Set("r_fullscreen", "0"); - } - Cbuf_ExecuteText( EXEC_APPEND, "vid_restart\n"); + Cbuf_ExecuteText( EXEC_APPEND, "windowMode swapFullscreen\n" ); return; } - } - } #endif +// !drakkar // console key is hardcoded, so the user can never unbind it if (key == '`' || key == '~') { if (!down) { return; } + //marky + con_height = Cvar_Get("con_height", "0.5", CVAR_ARCHIVE); //called early, used as default (set by user) + Con_SetFrac(con_height->value); + if(key == '`' || key == '~') { + if(keys[K_ALT].down) + Con_SetFrac(1.0f); + else if (keys[K_SHIFT].down) // We use shift because CTRL doesn't want to work... + Con_SetFrac(.25f); + } + // !marky Con_ToggleConsole_f (); +// Key_ClearStates(); // marky return; } @@ -1087,6 +1096,14 @@ // escape is always handled special if ( key == K_ESCAPE && down ) { + // Cgg + if (DL_Active()) { + if( cls.state == CA_CONNECTED ) { // drakkar - escape key aborts current download if we are connecting + DL_Interrupt(); + } + return; + } + // !Cgg if ( cls.keyCatchers & KEYCATCH_MESSAGE ) { // clear message mode Message_Key( key ); @@ -1204,8 +1221,9 @@ =================== */ void CL_CharEvent( int key ) { - // the console key should never be used as a char - if ( key == '`' || key == '~' ) { + + // ignore chars when console is opening/closing + if( keys['~'].down || keys['`'].down ) { return; } diff -wrubN quake3_1.32b/code/client/cl_main.c dfengine_1.08_src/code/client/cl_main.c --- quake3_1.32b/code/client/cl_main.c 2009-04-18 19:32:30.000000000 +0200 +++ dfengine_1.08_src/code/client/cl_main.c 2010-01-20 14:29:58.000000000 +0100 @@ -63,6 +63,8 @@ cvar_t *cl_motdString; cvar_t *cl_allowDownload; +cvar_t *cl_mapAutoDownload; // drakkar + cvar_t *cl_conXOffset; cvar_t *cl_inGameVideo; @@ -500,12 +502,13 @@ char retry[MAX_OSPATH]; if (Cmd_Argc() != 2) { - Com_Printf ("playdemo \n"); + Com_Printf ("usage: demo \n"); return; } // make sure a local server is killed Cvar_Set( "sv_killserver", "1" ); + SV_Frame(0); // Cgg - kill it now CL_Disconnect( qtrue ); @@ -1389,6 +1392,7 @@ Cvar_Set( "cl_downloadSize", "0" ); Cvar_Set( "cl_downloadCount", "0" ); Cvar_SetValue( "cl_downloadTime", cls.realtime ); + Cvar_Set( "cl_downloadMotd", "" ); // Cgg clc.downloadBlock = 0; // Starting new file clc.downloadCount = 0; @@ -1480,6 +1484,25 @@ } + // drakkar + if( cl_mapAutoDownload->integer ) + { + const char *info, *mapname, *bsp; + + // get map name and BSP file name + info = cl.gameState.stringData + cl.gameState.stringOffsets[ CS_SERVERINFO ]; + mapname = Info_ValueForKey( info, "mapname" ); + bsp = va( "maps/%s.bsp", mapname ); + + if( !FS_FileExists( bsp ) && FS_FileIsInPAK( bsp, NULL ) == -1 ) + { + cls.state = CA_CONNECTED; // prevent continue loading and shows the ui download progress screen + DL_Begin( mapname, qtrue ); // nonblocking download continues in CL_Frame() : DL_Continue() + return; + } + } + // !drakkar + CL_DownloadsComplete(); } @@ -1973,7 +1996,7 @@ */ void CL_CheckUserinfo( void ) { // don't add reliable commands when not yet connected - if ( cls.state < CA_CHALLENGING ) { + if ( cls.state < CA_CONNECTED && cls.state != CA_CINEMATIC ) { // Cgg - was < CA_CHALLENGING return; } // don't overflow the reliable command buffer when paused @@ -2036,6 +2059,12 @@ SCR_DebugGraph ( cls.realFrametime * 0.25, 0 ); } + // drakkar - if nonblocking download in progress try to download some bytes more + if( DL_Active() == 2 ) { + DL_Continue(); + } + // !drakkar + // see if we need to update any userinfo CL_CheckUserinfo(); @@ -2279,7 +2308,10 @@ // register our variables // cl_noprint = Cvar_Get( "cl_noprint", "0", 0 ); - cl_motd = Cvar_Get ("cl_motd", "1", 0); + cl_motd = Cvar_Get ("cl_motd", "0", 0); // Cgg - global q3 motd + // Id's server replies with icmp "port unreachable". + // Making it disabled by default - saves a dns query, + // an udp packet + the resulting icmp message. cl_timeout = Cvar_Get ("cl_timeout", "200", 0); @@ -2312,6 +2344,7 @@ cl_showMouseRate = Cvar_Get ("cl_showmouserate", "0", 0); cl_allowDownload = Cvar_Get ("cl_allowDownload", "0", CVAR_ARCHIVE); + cl_mapAutoDownload = Cvar_Get ("cl_mapAutoDownload", "1", CVAR_ARCHIVE); // drakkar cl_conXOffset = Cvar_Get ("cl_conXOffset", "0", 0); #ifdef MACOS_X @@ -2396,6 +2429,8 @@ SCR_Init (); + DL_Init(); // Cgg - client download + Cbuf_Execute (); Cvar_Set( "cl_running", "1" ); @@ -2448,6 +2483,8 @@ Cmd_RemoveCommand ("showip"); Cmd_RemoveCommand ("model"); + DL_Shutdown(); // Cgg + Cvar_Set( "cl_running", "0" ); recursive = qfalse; @@ -3320,5 +3357,3 @@ return qfalse; } - - diff -wrubN quake3_1.32b/code/client/cl_parse.c dfengine_1.08_src/code/client/cl_parse.c --- quake3_1.32b/code/client/cl_parse.c 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/client/cl_parse.c 2009-08-11 16:53:20.000000000 +0200 @@ -255,6 +255,16 @@ // read areamask len = MSG_ReadByte( msg ); + // Cgg - ioquake3 rev 796 + // Fix remotely exploitable parse download overflow reported by Luigi Auriemma. + // See http://lists.grok.org.uk/pipermail/full-disclosure/2006-June/046578.html + // for the advisory. + if(len > sizeof(newSnap.areamask)) + { + Com_Error (ERR_DROP,"CL_ParseSnapshot: Invalid size %d for areamask.", len); + return; + } + // !Cgg MSG_ReadData( msg, &newSnap.areamask, len); // read playerinfo @@ -370,6 +380,14 @@ gameSet = qtrue; } + // Cgg - this shouldn't apply to loopback clients. + // They already have a proper set of values and in some cases + // the engine may end up in a race condition when fast cvar + // transitions occur. + if (clc.serverAddress.type == NA_LOOPBACK) { + continue; + } + // !Cgg Cvar_Set( key, value ); } // if game folder should not be set and it is set at the client side @@ -475,6 +493,17 @@ unsigned char data[MAX_MSGLEN]; int block; + // Cgg - ioquake3 rev 796 + // Fix remotely exploitable parse download overflow reported by Luigi Auriemma. + // See http://lists.grok.org.uk/pipermail/full-disclosure/2006-June/046578.html + // for the advisory. + if (!*clc.downloadTempName) { + Com_Printf("Server sending download, but no download was requested\n"); + CL_AddReliableCommand( "stopdl" ); + return; + } + // !Cgg + // read the data block = MSG_ReadShort ( msg ); @@ -493,8 +522,17 @@ } size = MSG_ReadShort ( msg ); - if (size > 0) + // Cgg - ioquake3 rev 796 + // Fix remotely exploitable parse download overflow reported by Luigi Auriemma. + // See http://lists.grok.org.uk/pipermail/full-disclosure/2006-June/046578.html + // for the advisory. + if (size < 0 || size > sizeof(data)) + { + Com_Error(ERR_DROP, "CL_ParseDownload: Invalid size %d for download chunk.", size); + return; + } MSG_ReadData( msg, data, size ); + // !Cgg if (clc.downloadBlock != block) { Com_DPrintf( "CL_ParseDownload: Expected block %d, got %d\n", clc.downloadBlock, block); @@ -504,11 +542,17 @@ // open the file if not opened yet if (!clc.download) { + // Cgg - ioquake3 rev 796 + // Fix remotely exploitable parse download overflow reported by Luigi Auriemma. + // See http://lists.grok.org.uk/pipermail/full-disclosure/2006-June/046578.html + // for the advisory. + /* if (!*clc.downloadTempName) { Com_Printf("Server sending download, but no download was requested\n"); CL_AddReliableCommand( "stopdl" ); return; - } + }*/ + // !Cgg clc.download = FS_SV_FOpenFileWrite( clc.downloadTempName ); diff -wrubN quake3_1.32b/code/client/cl_scrn.c dfengine_1.08_src/code/client/cl_scrn.c --- quake3_1.32b/code/client/cl_scrn.c 2009-04-18 19:32:30.000000000 +0200 +++ dfengine_1.08_src/code/client/cl_scrn.c 2009-04-18 19:35:58.000000000 +0200 @@ -30,7 +30,7 @@ cvar_t *cl_graphheight; cvar_t *cl_graphscale; cvar_t *cl_graphshift; -cvar_t *cl_showRecording; // Cgg +cvar_t *ch_recordMessage; // Cgg /* ================ @@ -213,6 +213,11 @@ s += 2; continue; } + // Cgg - repeated escape codes (^^) were broken + if (*s == Q_COLOR_ESCAPE && *(s+1) == Q_COLOR_ESCAPE) { + s++; + } + // !Cgg SCR_DrawChar( xx+2, y+2, size, *s ); xx += size; s++; @@ -233,6 +238,11 @@ s += 2; continue; } + // Cgg - repeated escape codes (^^) were broken + if (*s == Q_COLOR_ESCAPE && *(s+1) == Q_COLOR_ESCAPE) { + s++; + } + // !Cgg SCR_DrawChar( xx, y, size, *s ); xx += size; s++; @@ -264,7 +274,8 @@ Coordinates are at 640 by 480 virtual resolution ================== */ -void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor ) { +// Cgg - added rawmode: stops color sequences from being interpreted +void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, qboolean rawmode ) { vec4_t color; const char *s; int xx; @@ -274,7 +285,7 @@ xx = x; re.SetColor( setColor ); while ( *s ) { - if ( Q_IsColorString( s ) ) { + if ( !rawmode && Q_IsColorString( s ) ) { if ( !forceColor ) { Com_Memcpy( color, g_color_table[ColorIndex(*(s+1))], sizeof( color ) ); color[3] = setColor[3]; @@ -283,6 +294,11 @@ s += 2; continue; } + // Cgg - repeated escape codes (^^) failed + if (!rawmode && *s == Q_COLOR_ESCAPE && *(s+1) == Q_COLOR_ESCAPE) { + s++; + } + // !Cgg SCR_DrawSmallChar( xx, y, *s ); xx += SMALLCHAR_WIDTH; s++; @@ -302,10 +318,15 @@ while ( *s ) { if ( Q_IsColorString( s ) ) { s += 2; - } else { - count++; + continue; + } + // Cgg - repeated escape codes (^^) were broken + if (*s == Q_COLOR_ESCAPE && *(s+1) == Q_COLOR_ESCAPE) { s++; } + // !Cgg + count++; + s++; } return count; @@ -331,7 +352,7 @@ int pos; // Cgg - off by default - if (!cl_showRecording->integer) { + if (!ch_recordMessage->integer) { return; } // !Cgg @@ -428,7 +449,7 @@ cl_graphheight = Cvar_Get ("graphheight", "32", CVAR_CHEAT); cl_graphscale = Cvar_Get ("graphscale", "1", CVAR_CHEAT); cl_graphshift = Cvar_Get ("graphshift", "0", CVAR_CHEAT); - cl_showRecording = Cvar_Get ("cl_showRecording", "0", CVAR_ARCHIVE); // Cgg + ch_recordMessage = Cvar_Get ("ch_recordMessage", "0", CVAR_ARCHIVE); // Cgg scr_initialized = qtrue; } diff -wrubN quake3_1.32b/code/client/snd_dma.c dfengine_1.08_src/code/client/snd_dma.c --- quake3_1.32b/code/client/snd_dma.c 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/client/snd_dma.c 2009-05-26 12:06:05.000000000 +0200 @@ -181,7 +181,9 @@ S_StopAllSounds (); - S_SoundInfo_f(); + // Cgg - spammy + //S_SoundInfo_f(); + // !Cgg } } diff -wrubN quake3_1.32b/code/game/q_math.c dfengine_1.08_src/code/game/q_math.c --- quake3_1.32b/code/game/q_math.c 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/game/q_math.c 2009-04-18 19:35:58.000000000 +0200 @@ -36,11 +36,12 @@ vec4_t colorMagenta= {1, 0, 1, 1}; vec4_t colorCyan = {0, 1, 1, 1}; vec4_t colorWhite = {1, 1, 1, 1}; +vec4_t colorOrange = {1, 0.5, 0, 1}; vec4_t colorLtGrey = {0.75, 0.75, 0.75, 1}; vec4_t colorMdGrey = {0.5, 0.5, 0.5, 1}; vec4_t colorDkGrey = {0.25, 0.25, 0.25, 1}; -vec4_t g_color_table[8] = +vec4_t g_color_table[10] = { {0.0, 0.0, 0.0, 1.0}, {1.0, 0.0, 0.0, 1.0}, @@ -50,6 +51,8 @@ {0.0, 1.0, 1.0, 1.0}, {1.0, 0.0, 1.0, 1.0}, {1.0, 1.0, 1.0, 1.0}, + {1.0, 0.5, 0.0, 1.0}, + {0.5, 0.5, 0.5, 1.0} }; diff -wrubN quake3_1.32b/code/game/q_shared.c dfengine_1.08_src/code/game/q_shared.c --- quake3_1.32b/code/game/q_shared.c 2009-04-18 19:29:36.000000000 +0200 +++ dfengine_1.08_src/code/game/q_shared.c 2009-04-18 19:35:58.000000000 +0200 @@ -837,6 +837,11 @@ p += 2; continue; } + // Cgg - repeated escape codes (^^) were broken + if (*p == Q_COLOR_ESCAPE && *(p+1) == Q_COLOR_ESCAPE) { + p++; + } + // !Cgg p++; len++; } @@ -848,20 +853,25 @@ char *Q_CleanStr( char *string ) { char* d; char* s; - int c; s = string; d = string; - while ((c = *s) != 0 ) { + // Cgg - repeated escape codes (^^) were broken + while (*s) { if ( Q_IsColorString( s ) ) { + s += 2; + continue; + } + if (*s == Q_COLOR_ESCAPE && *(s+1) == Q_COLOR_ESCAPE) { s++; } - else if ( c >= 0x20 && c <= 0x7E ) { - *d++ = c; + if (*s >= 0x20 && *s <= 0x7E) { + *d++ = *s; } s++; } *d = '\0'; + // !Cgg return string; } diff -wrubN quake3_1.32b/code/game/q_shared.h dfengine_1.08_src/code/game/q_shared.h --- quake3_1.32b/code/game/q_shared.h 2009-04-18 19:32:30.000000000 +0200 +++ dfengine_1.08_src/code/game/q_shared.h 2010-01-20 13:23:26.000000000 +0100 @@ -26,8 +26,11 @@ // q_shared.h -- included first by ALL program modules. // A user mod should never modify this file -#define Q3_VERSION "Q3 1.32b" +// Cgg +#define Q3_VERSION "dfengine 1.08" // 1.32 released 7-10-2002 +#define Q3_WINDOW_TITLE Q3_VERSION +// !Cgg #define MAX_TEAMNAME 32 @@ -54,7 +57,13 @@ #pragma warning(disable : 4702) // unreachable code #pragma warning(disable : 4711) // selected for automatic inline expansion #pragma warning(disable : 4220) // varargs matches remaining parameters -#define _CRT_SECURE_NO_WARNINGS 1 // Cgg - disabling deprecated warnings in crt functions with msvc 2008 +// Cgg - disable various recent msvc warnings regarding "deprecated" C library functions. +// Complying with this would impede the code portability either way. +// Besides quake for the most part provides its own "secure" implementation of libc functions. +#define _CRT_SECURE_NO_WARNINGS 1 +#define _CRT_SECURE_NO_DEPRECATE 1 +#pragma warning(disable : 4996) +// !Cgg #endif /********************************************************************** @@ -160,6 +169,9 @@ #define PATH_SEP '\\' +// Cgg - portability +#define strncasecmp strnicmp + #endif //======================= MAC OS X DEFINES ===================== @@ -526,6 +538,7 @@ extern vec4_t colorMagenta; extern vec4_t colorCyan; extern vec4_t colorWhite; +extern vec4_t colorOrange; extern vec4_t colorLtGrey; extern vec4_t colorMdGrey; extern vec4_t colorDkGrey; @@ -541,7 +554,9 @@ #define COLOR_CYAN '5' #define COLOR_MAGENTA '6' #define COLOR_WHITE '7' -#define ColorIndex(c) ( ( (c) - '0' ) & 7 ) +#define COLOR_ORANGE '8' +#define COLOR_MDGREY '9' +#define ColorIndex(c) ( ( ( (c) - '0' ) &15 ) %10 ) #define S_COLOR_BLACK "^0" #define S_COLOR_RED "^1" @@ -551,8 +566,10 @@ #define S_COLOR_CYAN "^5" #define S_COLOR_MAGENTA "^6" #define S_COLOR_WHITE "^7" +#define S_COLOR_ORANGE "^8" +#define S_COLOR_MDGREY "^9" -extern vec4_t g_color_table[8]; +extern vec4_t g_color_table[10]; #define MAKERGB( v, r, g, b ) v[0]=r;v[1]=g;v[2]=b #define MAKERGBA( v, r, g, b, a ) v[0]=r;v[1]=g;v[2]=b;v[3]=a diff -wrubN quake3_1.32b/code/qcommon/cmd.c dfengine_1.08_src/code/qcommon/cmd.c --- quake3_1.32b/code/qcommon/cmd.c 2009-04-18 19:32:30.000000000 +0200 +++ dfengine_1.08_src/code/qcommon/cmd.c 2009-04-18 19:34:04.000000000 +0200 @@ -24,7 +24,10 @@ #include "../game/q_shared.h" #include "qcommon.h" -#define MAX_CMD_BUFFER 16384 +// Cgg - expanding command buffer from 16k to 64k +//#define MAX_CMD_BUFFER 16384 +#define MAX_CMD_BUFFER 0x10000 +// !Cgg #define MAX_CMD_LINE 1024 typedef struct { @@ -240,7 +243,6 @@ char *f; int len; char filename[MAX_QPATH]; - char *c, *lf, *s; // Cgg if (Cmd_Argc () != 2) { Com_Printf ("exec : execute a script file\n"); @@ -256,23 +258,7 @@ } Com_Printf ("execing %s\n",Cmd_Argv(1)); - // Cgg - execute the file buffer incrementally - Cbuf_Execute(); - for (c=f,s=f,lf=f; *c; c++) { - if (*c == '\n') { - lf = c; - } - if (c - s >= 0x4000 -1) { - *lf = 0; - Cbuf_InsertText(s); - Cbuf_Execute(); - s = lf+1; - } - } - Cbuf_InsertText(s); - Cbuf_Execute(); - //was: Cbuf_InsertText (f); - // !Cgg + Cbuf_InsertText (f); FS_FreeFile (f); } diff -wrubN quake3_1.32b/code/qcommon/common.c dfengine_1.08_src/code/qcommon/common.c --- quake3_1.32b/code/qcommon/common.c 2009-04-18 19:32:30.000000000 +0200 +++ dfengine_1.08_src/code/qcommon/common.c 2009-12-09 16:44:14.000000000 +0100 @@ -45,8 +45,8 @@ #define DEF_COMHUNKMEGS "64" #define DEF_COMZONEMEGS "24" #else -#define DEF_COMHUNKMEGS "56" -#define DEF_COMZONEMEGS "16" +#define DEF_COMHUNKMEGS "64" // Cgg: was 56 +#define DEF_COMZONEMEGS "24" // Cgg: was 16 #endif int com_argc; @@ -69,6 +69,7 @@ cvar_t *com_dropsim; // 0.0 to 1.0, simulated packet drops cvar_t *com_journal; cvar_t *com_maxfps; +cvar_t *com_sleepfps; // Cgg: fps limit applied when the game loses focus cvar_t *com_timedemo; cvar_t *com_sv_running; cvar_t *com_cl_running; @@ -237,7 +238,7 @@ #if defined(_WIN32) && defined(_DEBUG) if ( code != ERR_DISCONNECT && code != ERR_NEED_CD ) { - if (!com_noErrorInterrupt->integer) { + if ( !com_noErrorInterrupt || !com_noErrorInterrupt->integer ) { // drakkar - check null pointer __asm { int 0x03 } @@ -1387,7 +1388,8 @@ void Com_InitZoneMemory( void ) { cvar_t *cv; // allocate the random block zone - cv = Cvar_Get( "com_zoneMegs", DEF_COMZONEMEGS, CVAR_LATCH | CVAR_ARCHIVE ); + Com_StartupVariable("com_zoneMegs"); // Cgg: config files and command line options haven't been taken in account yet + cv = Cvar_Get( "com_zoneMegs", DEF_COMZONEMEGS, CVAR_LATCH ); // Cgg: was CVAR_ARCHIVE. Does not have meaning as this cvar can only be set through the command line if ( cv->integer < 20 ) { s_zoneTotal = 1024 * 1024 * 16; @@ -2417,6 +2419,7 @@ // init commands and vars // com_maxfps = Cvar_Get ("com_maxfps", "85", CVAR_ARCHIVE); + com_sleepfps = Cvar_Get ("com_sleepfps", "10", CVAR_ARCHIVE); // Cgg com_blood = Cvar_Get ("com_blood", "1", CVAR_ARCHIVE); com_developer = Cvar_Get ("developer", "0", CVAR_TEMP ); @@ -3209,11 +3212,14 @@ } // cut shortestMatch to the amount common with s - for ( i = 0 ; s[i] ; i++ ) { + // Cgg - was wrong when s had fewer chars than shortestMatch + i = 0; + do { if ( tolower(shortestMatch[i]) != tolower(s[i]) ) { shortestMatch[i] = 0; } - } + } while (s[i++]); + // !Cgg } /* @@ -3314,6 +3320,9 @@ } Maps_CommandCompletion(FindMatches); Com_sprintf(completionField->buffer, sizeof(completionField->buffer), "\\%s %s", cmd, (shortestMatch[0]) ? shortestMatch : Cmd_Argv(1)); + if (matchCount == 1) { // drakkar - space on match, like in linux console + Q_strcat( completionField->buffer, sizeof( completionField->buffer ), " " ); + } completionField->cursor = strlen(completionField->buffer); if (matchCount < 2) { return; @@ -3334,6 +3343,9 @@ } Demos_CommandCompletion(FindMatches); Com_sprintf(completionField->buffer, sizeof(completionField->buffer), "\\%s %s", cmd, (shortestMatch[0]) ? shortestMatch : Cmd_Argv(1)); + if (matchCount == 1) { // drakkar - space on match, like in linux console + Q_strcat( completionField->buffer, sizeof( completionField->buffer ), " " ); + } completionField->cursor = strlen(completionField->buffer); if (matchCount < 2) { return; diff -wrubN quake3_1.32b/code/qcommon/files.c dfengine_1.08_src/code/qcommon/files.c --- quake3_1.32b/code/qcommon/files.c 2009-04-18 19:32:30.000000000 +0200 +++ dfengine_1.08_src/code/qcommon/files.c 2009-04-18 19:37:40.000000000 +0200 @@ -565,8 +565,9 @@ =========== */ -static void FS_Remove( const char *osPath ) { - remove( osPath ); +// Cgg - returns qboolean +static qboolean FS_Remove( const char *osPath ) { + return !remove( osPath ); } /* @@ -2511,8 +2512,40 @@ } FS_FreeFileList(matches); - // demos - matches = FS_ListFilteredFiles(searchpath, ".dm_6?", NULL, &n); + // .dm_68 + matches = FS_ListFilteredFiles(searchpath, ".dm_68", NULL, &n); + for (i=0; i