X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cvar.c;h=8f3abc390a64e94d92aa8998b7df4c53154506ca;hb=5d279c535afff8e7745989a7a4f35731e8e7ed00;hp=3de5a8838d23ce1dd2b210e904962669461a8d18;hpb=8b7eab5c38f9c564b4ef9bb72901a6658eba3ae6;p=xonotic%2Fdarkplaces.git diff --git a/cvar.c b/cvar.c index 3de5a883..8f3abc39 100644 --- a/cvar.c +++ b/cvar.c @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. char *cvar_dummy_description = "custom cvar"; cvar_t *cvar_vars = NULL; -cvar_t *cvar_hashtable[65536]; +cvar_t *cvar_hashtable[CVAR_HASHSIZE]; char *cvar_null_string = ""; /* @@ -38,9 +38,9 @@ cvar_t *Cvar_FindVar (const char *var_name) cvar_t *var; // use hash lookup to minimize search time - hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)); + hashindex = CRC_Block((const unsigned char *)var_name, strlen(var_name)) % CVAR_HASHSIZE; for (var = cvar_hashtable[hashindex];var;var = var->nextonhashchain) - if (!strcasecmp (var_name, var->name)) + if (!strcmp (var_name, var->name)) return var; return NULL; @@ -220,7 +220,7 @@ void Cvar_CompleteCvarPrint (const char *partial) // Loop through the command list and print all matches for (cvar = cvar_vars; cvar; cvar = cvar->next) if (!strncasecmp(partial, cvar->name, len)) - Con_Printf ("%c3%s%s : \"%s\" (\"%s\") : %s\n", STRING_COLOR_TAG, cvar->name, STRING_COLOR_DEFAULT_STR, cvar->string, cvar->defstring, cvar->description); + Con_Printf ("^3%s^7 is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); } @@ -233,8 +233,10 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value) { qboolean changed; size_t valuelen; + prvm_prog_t *tmpprog; + int i; - changed = strcmp(var->string, value); + changed = strcmp(var->string, value) != 0; // LordHavoc: don't reallocate when there is no change if (!changed) return; @@ -294,7 +296,60 @@ void Cvar_SetQuick_Internal (cvar_t *var, const char *value) CL_SetInfo("playermodel", var->string, true, false, false, false); else if (!strcmp(var->name, "_cl_name")) CL_SetInfo("name", var->string, true, false, false, false); + else if (!strcmp(var->name, "rcon_secure")) + { + // whenever rcon_secure is changed to 0, clear rcon_password for + // security reasons (prevents a send-rcon-password-as-plaintext + // attack based on NQ protocol session takeover and svc_stufftext) + if(var->integer <= 0) + Cvar_Set("rcon_password", ""); + } + else if (!strcmp(var->name, "net_slist_favorites")) + NetConn_UpdateFavorites(); + } + + tmpprog = prog; + for(i = 0; i < PRVM_MAXPROGS; ++i) + { + if(PRVM_ProgLoaded(i)) + { + PRVM_SetProg(i); + if(var->globaldefindex_progid[i] == prog->id) + { + // MUST BE SYNCED WITH prvm_edict.c PRVM_LoadProgs + int j; + const char *s; + prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[var->globaldefindex[i]].ofs); + switch(prog->globaldefs[var->globaldefindex[i]].type & ~DEF_SAVEGLOBAL) + { + case ev_float: + val->_float = var->value; + break; + case ev_vector: + s = var->string; + VectorClear(val->vector); + for (j = 0;j < 3;j++) + { + while (*s && ISWHITESPACE(*s)) + s++; + if (!*s) + break; + val->vector[j] = atof(s); + while (!ISWHITESPACE(*s)) + s++; + if (!*s) + break; + } + break; + case ev_string: + PRVM_ChangeEngineString(var->globaldefindex_stringno[i], var->string); + val->string = var->globaldefindex_stringno[i]; + break; + } + } + } } + prog = tmpprog; } void Cvar_SetQuick (cvar_t *var, const char *value) @@ -305,8 +360,8 @@ void Cvar_SetQuick (cvar_t *var, const char *value) return; } - if (developer.integer >= 100) - Con_Printf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value); + if (developer_extra.integer) + Con_DPrintf("Cvar_SetQuick({\"%s\", \"%s\", %i, \"%s\"}, \"%s\");\n", var->name, var->string, var->flags, var->defstring, value); Cvar_SetQuick_Internal(var, value); } @@ -364,8 +419,8 @@ void Cvar_RegisterVariable (cvar_t *variable) char *oldstr; size_t alloclen; - if (developer.integer >= 100) - Con_Printf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags); + if (developer_extra.integer) + Con_DPrintf("Cvar_RegisterVariable({\"%s\", \"%s\", %i});\n", variable->name, variable->string, variable->flags); // first check to see if it has already been defined cvar = Cvar_FindVar (variable->name); @@ -373,8 +428,8 @@ void Cvar_RegisterVariable (cvar_t *variable) { if (cvar->flags & CVAR_ALLOCATED) { - if (developer.integer >= 100) - Con_Printf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags); + if (developer_extra.integer) + Con_DPrintf("... replacing existing allocated cvar {\"%s\", \"%s\", %i}\n", cvar->name, cvar->string, cvar->flags); // fixed variables replace allocated ones // (because the engine directly accesses fixed variables) // NOTE: this isn't actually used currently @@ -406,7 +461,7 @@ void Cvar_RegisterVariable (cvar_t *variable) Z_Free(cvar); } else - Con_Printf("Can't register variable %s, already defined\n", variable->name); + Con_DPrintf("Can't register variable %s, already defined\n", variable->name); return; } @@ -439,7 +494,7 @@ void Cvar_RegisterVariable (cvar_t *variable) variable->next = next; // link to head of list in this hash table index - hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)); + hashindex = CRC_Block((const unsigned char *)variable->name, strlen(variable->name)) % CVAR_HASHSIZE; variable->nextonhashchain = cvar_hashtable[hashindex]; cvar_hashtable[hashindex] = variable; } @@ -457,8 +512,8 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne cvar_t *current, *next, *cvar; size_t alloclen; - if (developer.integer >= 100) - Con_Printf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags); + if (developer_extra.integer) + Con_DPrintf("Cvar_Get(\"%s\", \"%s\", %i);\n", name, value, flags); // first check to see if it has already been defined cvar = Cvar_FindVar (name); @@ -483,6 +538,13 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne return cvar; } +// check for pure evil + if (!*name) + { + Con_Printf("Cvar_Get: invalid variable name\n"); + return NULL; + } + // check for overlap with a command if (Cmd_Exists (name)) { @@ -526,7 +588,7 @@ cvar_t *Cvar_Get (const char *name, const char *value, int flags, const char *ne cvar->next = next; // link to head of list in this hash table index - hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)); + hashindex = CRC_Block((const unsigned char *)cvar->name, strlen(cvar->name)) % CVAR_HASHSIZE; cvar->nextonhashchain = cvar_hashtable[hashindex]; cvar_hashtable[hashindex] = cvar; @@ -553,11 +615,11 @@ qboolean Cvar_Command (void) // perform a variable print or set if (Cmd_Argc() == 1) { - Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, v->string, v->defstring); + Con_Printf("\"%s\" is \"%s\" [\"%s\"]\n", v->name, ((v->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : v->string), v->defstring); return true; } - if (developer.integer >= 100) + if (developer_extra.integer) Con_DPrint("Cvar_Command: "); if (v->flags & CVAR_READONLY) @@ -566,7 +628,7 @@ qboolean Cvar_Command (void) return true; } Cvar_Set (v->name, Cmd_Argv(1)); - if (developer.integer >= 100) + if (developer_extra.integer) Con_DPrint("\n"); return true; } @@ -607,7 +669,8 @@ void Cvar_ResetToDefaults_All_f (void) cvar_t *var; // restore the default values of all cvars for (var = cvar_vars ; var ; var = var->next) - Cvar_SetQuick(var, var->defstring); + if((var->flags & CVAR_NORESETTODEFAULTS) == 0) + Cvar_SetQuick(var, var->defstring); } @@ -616,7 +679,7 @@ void Cvar_ResetToDefaults_NoSaveOnly_f (void) cvar_t *var; // restore the default values of all cvars for (var = cvar_vars ; var ; var = var->next) - if (!(var->flags & CVAR_SAVE)) + if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == 0) Cvar_SetQuick(var, var->defstring); } @@ -626,7 +689,7 @@ void Cvar_ResetToDefaults_SaveOnly_f (void) cvar_t *var; // restore the default values of all cvars for (var = cvar_vars ; var ; var = var->next) - if (var->flags & CVAR_SAVE) + if ((var->flags & (CVAR_NORESETTODEFAULTS | CVAR_SAVE)) == CVAR_SAVE) Cvar_SetQuick(var, var->defstring); } @@ -642,11 +705,16 @@ with the archive flag set to true. void Cvar_WriteVariables (qfile_t *f) { cvar_t *var; + char buf1[MAX_INPUTLINE], buf2[MAX_INPUTLINE]; // don't save cvars that match their default value for (var = cvar_vars ; var ; var = var->next) if ((var->flags & CVAR_SAVE) && (strcmp(var->string, var->defstring) || (var->flags & CVAR_ALLOCATED))) - FS_Printf(f, "%s%s \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", var->name, var->string); + { + Cmd_QuoteString(buf1, sizeof(buf1), var->name, "\"\\$"); + Cmd_QuoteString(buf2, sizeof(buf2), var->string, "\"\\$"); + FS_Printf(f, "%s\"%s\" \"%s\"\n", var->flags & CVAR_ALLOCATED ? "seta " : "", buf1, buf2); + } } @@ -663,6 +731,7 @@ void Cvar_List_f (void) const char *partial; size_t len; int count; + qboolean ispattern; if (Cmd_Argc() > 1) { @@ -675,18 +744,25 @@ void Cvar_List_f (void) len = 0; } + ispattern = partial && (strchr(partial, '*') || strchr(partial, '?')); + count = 0; for (cvar = cvar_vars; cvar; cvar = cvar->next) { - if (partial && strncasecmp (partial,cvar->name,len)) + if (len && (ispattern ? !matchpattern_with_separator(cvar->name, partial, false, "", false) : strncmp (partial,cvar->name,len))) continue; - Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, cvar->string, cvar->defstring, cvar->description); + Con_Printf("%s is \"%s\" [\"%s\"] %s\n", cvar->name, ((cvar->flags & CVAR_PRIVATE) ? "********"/*hunter2*/ : cvar->string), cvar->defstring, cvar->description); count++; } - if (partial) - Con_Printf("%i cvar(s) beginning with \"%s\"\n", count, partial); + if (len) + { + if(ispattern) + Con_Printf("%i cvar%s matching \"%s\"\n", count, (count > 1) ? "s" : "", partial); + else + Con_Printf("%i cvar%s beginning with \"%s\"\n", count, (count > 1) ? "s" : "", partial); + } else Con_Printf("%i cvar(s)\n", count); } @@ -711,7 +787,7 @@ void Cvar_Set_f (void) return; } - if (developer.integer >= 100) + if (developer_extra.integer) Con_DPrint("Set: "); // all looks ok, create/modify the cvar @@ -737,11 +813,46 @@ void Cvar_SetA_f (void) return; } - if (developer.integer >= 100) + if (developer_extra.integer) Con_DPrint("SetA: "); // all looks ok, create/modify the cvar Cvar_Get(Cmd_Argv(1), Cmd_Argv(2), CVAR_SAVE, Cmd_Argc() > 3 ? Cmd_Argv(3) : NULL); } - +#ifdef FILLALLCVARSWITHRUBBISH +void Cvar_FillAll_f() +{ + char *buf, *p, *q; + int n, i; + cvar_t *var; + qboolean verify; + if(Cmd_Argc() != 2) + { + Con_Printf("Usage: %s length to plant rubbish\n", Cmd_Argv(0)); + Con_Printf("Usage: %s -length to verify that the rubbish is still there\n", Cmd_Argv(0)); + return; + } + n = atoi(Cmd_Argv(1)); + verify = (n < 0); + if(verify) + n = -n; + buf = Z_Malloc(n + 1); + buf[n] = 0; + for(var = cvar_vars; var; var = var->next) + { + for(i = 0, p = buf, q = var->name; i < n; ++i) + { + *p++ = *q++; + if(!*q) + q = var->name; + } + if(verify && strcmp(var->string, buf)) + { + Con_Printf("\n%s does not contain the right rubbish, either this is the first run or a possible overrun was detected, or something changed it intentionally; it DOES contain: %s\n", var->name, var->string); + } + Cvar_SetQuick(var, buf); + } + Z_Free(buf); +} +#endif /* FILLALLCVARSWITHRUBBISH */