nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

save and validate TorVersion in the state file.

Browse Source 
svn:r5694
This commit is contained in:
Roger Dingledine 2006-01-02 04:14:52 +00:00
parent 2efa056777
commit 0bd25f5d43
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/config.c
View File

@ -385,7 +385,7 @@ static config_format_t state_format = {
static or_options_t *global_options = NULL; static or_options_t *global_options = NULL;
/** Name of most recently read torrc file. */ /** Name of most recently read torrc file. */
static char *torrc_fname = NULL; static char *torrc_fname = NULL;
/** Persistant serialized state. */ /** Persistent serialized state. */
static or_state_t *global_state = NULL; static or_state_t *global_state = NULL;
/** DOCDOC */ /** DOCDOC */
static addr_policy_t *reachable_addr_policy = NULL; static addr_policy_t *reachable_addr_policy = NULL;
@ -3526,8 +3526,13 @@ static int
or_state_validate(or_state_t *old_state, or_state_t *state) or_state_validate(or_state_t *old_state, or_state_t *state)
{ {
const char *err; const char *err;
tor_version_t v;
if (entry_nodes_parse_state(state, 0, &err)<0) { if (entry_nodes_parse_state(state, 0, &err)<0) {
warn(LD_GENERAL, "Unable to parse helper nodes: %s", err); warn(LD_GENERAL, "Unable to parse entry nodes: %s", err);
return -1;
}
if (tor_version_parse(state->TorVersion, &v)) {
warn(LD_GENERAL, "Unable to parse Tor version '%s'", state->TorVersion);
return -1; return -1;
} }
return 0; return 0;
@ -3617,6 +3622,8 @@ or_state_save(void)
size_t len; size_t len;
char *fname; char *fname;
tor_assert(global_state);
entry_nodes_update_state(global_state); entry_nodes_update_state(global_state);
rep_hist_update_state(global_state); rep_hist_update_state(global_state);
@ -3624,6 +3631,8 @@ or_state_save(void)
return 0; return 0;
global_state->LastWritten = time(NULL); global_state->LastWritten = time(NULL);
tor_free(global_state->TorVersion);
global_state->TorVersion = tor_strdup("Tor " VERSION);
state = config_dump(&state_format, global_state, 0); state = config_dump(&state_format, global_state, 0);
len = strlen(state)+128; len = strlen(state)+128;
contents = tor_malloc(len); contents = tor_malloc(len);