nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Evaluate TestingDirAuthVoteGuard only after filling all rs elements.

Browse Source
This commit is contained in:
George Kadianakis 2014-09-06 14:37:41 +03:00
parent 00ffccd9a6
commit 0f50f5f373
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug13064 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes:
- Fix TestingDirAuthVoteGuard to properly give out Guard flags in
a testing network. Fixes bug 13064; bugfix on 0.2.5.2-alpha.

13
src/or/dirserv.c
View File

@ -2320,11 +2320,6 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
} else { } else {
rs->is_possible_guard = 0; rs->is_possible_guard = 0;
} }
if (options->TestingTorNetwork &&
routerset_contains_routerstatus(options->TestingDirAuthVoteGuard,
rs, 0)) {
rs->is_possible_guard = 1;
}
rs->is_bad_directory = listbaddirs && node->is_bad_directory; rs->is_bad_directory = listbaddirs && node->is_bad_directory;
rs->is_bad_exit = listbadexits && node->is_bad_exit; rs->is_bad_exit = listbadexits && node->is_bad_exit;
@ -2350,6 +2345,14 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs,
tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr);
rs->ipv6_orport = ri->ipv6_orport; rs->ipv6_orport = ri->ipv6_orport;
} }
/* Iff we are in a testing network, use TestingDirAuthVoteGuard to
give out Guard flags. */
if (options->TestingTorNetwork &&
routerset_contains_routerstatus(options->TestingDirAuthVoteGuard,
rs, 0)) {
rs->is_possible_guard = 1;
}
} }
/** Routerstatus <b>rs</b> is part of a group of routers that are on /** Routerstatus <b>rs</b> is part of a group of routers that are on