Commit c96167a6 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

r15906@catbus: nickm | 2007-10-18 10:00:08 -0400

 Remove the obsolete warned_conflicts field: a v3 consensus cannot conflict with itself.


svn:r12019
parent 59b1b087
......@@ -48,10 +48,6 @@ static time_t time_to_download_next_consensus = 0;
/** Download status for the current consensus networkstatus. */
static download_status_t consensus_dl_status = { 0, 0};
/** List of strings for nicknames or fingerprints we've already warned about
* and that are still conflicted. */ /*XXXX020 obsoleted by v3 dirs? */
static smartlist_t *warned_conflicts = NULL;
/** True iff we have logged a warning about this OR not being valid or
* not being named. */
static int have_warned_about_invalid_status = 0;
......@@ -76,11 +72,6 @@ networkstatus_reset_warnings(void)
rs->name_lookup_warned = 0);
}
if (!warned_conflicts)
warned_conflicts = smartlist_create();
SMARTLIST_FOREACH(warned_conflicts, char *, cp, tor_free(cp));
smartlist_clear(warned_conflicts); /* now the list is empty. */
have_warned_about_invalid_status = 0;
have_warned_about_old_version = 0;
have_warned_about_new_version = 0;
......@@ -1312,11 +1303,6 @@ networkstatus_free_all(void)
current_consensus = NULL;
}
tor_free(consensus_waiting_for_certs_body);
if (warned_conflicts) {
SMARTLIST_FOREACH(warned_conflicts, char *, cp, tor_free(cp));
smartlist_free(warned_conflicts);
warned_conflicts = NULL;
}
if (named_server_map) {
strmap_free(named_server_map, _tor_free);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment