Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
343a694344
|
@ -0,0 +1,6 @@
|
||||||
|
o Major bugfixes (directory authority):
|
||||||
|
- During voting, when marking a node as a probable sybil, do not
|
||||||
|
clear its BadExit flag: sybils can still be bad in other ways
|
||||||
|
too. (We still clear the other flags.) Fixes bug 21108; bugfix
|
||||||
|
on 0.2.0.13-alpha.
|
||||||
|
|
|
@ -2233,13 +2233,17 @@ dirserv_set_routerstatus_testing(routerstatus_t *rs)
|
||||||
/** 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
|
||||||
* too narrow an IP-space. Clear out its flags: we don't want people
|
* too narrow an IP-space. Clear out its flags: we don't want people
|
||||||
* using it.
|
* using it.
|
||||||
|
*
|
||||||
|
* Leave its BadExit flag alone though, since if we think it's a bad exit,
|
||||||
|
* we want to vote that way in case all the other authorities are voting
|
||||||
|
* Running and Exit.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
clear_status_flags_on_sybil(routerstatus_t *rs)
|
clear_status_flags_on_sybil(routerstatus_t *rs)
|
||||||
{
|
{
|
||||||
rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast =
|
rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast =
|
||||||
rs->is_flagged_running = rs->is_named = rs->is_valid =
|
rs->is_flagged_running = rs->is_named = rs->is_valid =
|
||||||
rs->is_hs_dir = rs->is_possible_guard = rs->is_bad_exit = 0;
|
rs->is_hs_dir = rs->is_v2_dir = rs->is_possible_guard = 0;
|
||||||
/* FFFF we might want some mechanism to check later on if we
|
/* FFFF we might want some mechanism to check later on if we
|
||||||
* missed zeroing any flags: it's easy to add a new flag but
|
* missed zeroing any flags: it's easy to add a new flag but
|
||||||
* forget to add it to this clause. */
|
* forget to add it to this clause. */
|
||||||
|
|
Loading…
Reference in New Issue