diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-03-15 10:15:59 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-03-21 13:24:09 -0400 |
commit | 48f8229504a00085676a737d9b519548ffc9d145 (patch) | |
tree | 964e9b717a9dcb084d3c0b602978ee706666ba7d /src/or/networkstatus.c | |
parent | fa07c60c67d69ff25c4e64172e3a38b29a2e6143 (diff) | |
download | tor-48f8229504a00085676a737d9b519548ffc9d145.tar.gz tor-48f8229504a00085676a737d9b519548ffc9d145.zip |
After we strip out duplicate entries from 'routers', don't use 'rl'.
We've got to make sure that every single subsequent calculation in
dirserv_generate_networkstatus_vote_obj() are based on the list of
routerinfo_t *after* we've removed possible duplicates, not before.
Fortunately, none of the functions that were taking a routerlist_t
as an argument were actually using any fields other than this list
of routers.
Resolves issue 18318.DG3.
Diffstat (limited to 'src/or/networkstatus.c')
-rw-r--r-- | src/or/networkstatus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 71a2c0f121..a9b22ed1cc 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1701,7 +1701,7 @@ networkstatus_dump_bridge_status_to_file(time_t now) char published[ISO_TIME_LEN+1]; format_iso_time(published, now); - dirserv_compute_bridge_flag_thresholds(rl); + dirserv_compute_bridge_flag_thresholds(rl->routers); thresholds = dirserv_get_flag_thresholds_line(); tor_asprintf(&published_thresholds_and_status, "published %s\nflag-thresholds %s\n%s", |