May 2016 - tor-commits - lists.torproject.org

[tor/master] Descriptors depend on more config options now they list begindir support
by nickm＠torproject.org 17 May '16

17 May '16

commit 75dd2a285bbb7b65420eb8e37ab4f259b2aedf2c Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:36:20 2016 +1000 Descriptors depend on more config options now they list begindir support Bugfix on #12538 in 0.2.8.1-alpha. --- src/or/config.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index f07ca64..0850013 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4343,8 +4343,10 @@ options_transition_affects_descriptor(const or_options_t *old_options, !opt_streq(old_options->MyFamily, new_options->MyFamily) || !opt_streq(old_options->AccountingStart, new_options->AccountingStart) || old_options->AccountingMax != new_options->AccountingMax || + old_options->AccountingRule != new_options->AccountingRule || public_server_mode(old_options) != public_server_mode(new_options) || - old_options->DirCache != new_options->DirCache) + old_options->DirCache != new_options->DirCache || + old_options->AssumeReachable != new_options->AssumeReachable) return 1; return 0;

1 0

[tor/master] Changes file for #18616
by nickm＠torproject.org 17 May '16

17 May '16

commit 2cfcf17cfc4377efcf10a036557fa3134bf8c1b1 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:43:44 2016 +1000 Changes file for #18616 --- changes/bug18616 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug18616 b/changes/bug18616 new file mode 100644 index 0000000..44695a1 --- /dev/null +++ b/changes/bug18616 @@ -0,0 +1,7 @@ + o Major bugfixes (directory mirrors): + - Fix broken DirPort self-checks. Decide to advertise begindir + support the same way we decide to advertise DirPorts. + Include additional config options in the list that might + change the content of a relay's descriptor. + Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in + 0.2.8.1-alpha. Patch by "teor".

1 0

[tor/master] Make mock function static to prevent future clashes
by nickm＠torproject.org 17 May '16

17 May '16

commit 05cf2867131eaa1dc017605f67cb7ac433ea263d Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:39:09 2016 +1000 Make mock function static to prevent future clashes --- src/test/test_policy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 48e8255..a939ebf 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -716,10 +716,9 @@ test_policies_reject_exit_address(void *arg) } static smartlist_t *test_configured_ports = NULL; -const smartlist_t *mock_get_configured_ports(void); /** Returns test_configured_ports */ -const smartlist_t * +static const smartlist_t * mock_get_configured_ports(void) { return test_configured_ports;

1 0

[tor/master] Avoid checking ORPort reachability when the network is disabled
by nickm＠torproject.org 17 May '16

17 May '16

commit d3c60f2bd7430ed319406f89ba6e758038ecd5eb Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 11:13:14 2016 +1000 Avoid checking ORPort reachability when the network is disabled This is consistent with existing DirPort reachability checks. --- changes/bug18616 | 5 +++-- src/or/router.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug18616 b/changes/bug18616 index 44695a1..d760f15 100644 --- a/changes/bug18616 +++ b/changes/bug18616 @@ -1,7 +1,8 @@ o Major bugfixes (directory mirrors): - Fix broken DirPort self-checks. Decide to advertise begindir support the same way we decide to advertise DirPorts. - Include additional config options in the list that might - change the content of a relay's descriptor. + Add additional config options that might change the content of + a relay's descriptor. + Avoid checking ORPort reachability when the network is disabled. Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in 0.2.8.1-alpha. Patch by "teor". diff --git a/src/or/router.c b/src/or/router.c index 545753c..1083e24 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1085,6 +1085,7 @@ check_whether_orport_reachable(void) { const or_options_t *options = get_options(); return options->AssumeReachable || + net_is_disabled() || can_reach_or_port; }

1 0

[tor/master] Remove redundant descriptor checks for OR/Dir reachability
by nickm＠torproject.org 17 May '16

17 May '16

commit 211e56ad87740da1303832d900bf2943ed702526 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 11:36:27 2016 +1000 Remove redundant descriptor checks for OR/Dir reachability The ORPort and DirPort must be reachable, or we won't publish a descriptor. --- src/or/router.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index a9d992f..86fd787 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1247,9 +1247,6 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port) return dir_port; if (net_is_disabled()) return 0; - /* redundant - if DirPort is unreachable, we don't publish a descriptor */ - if (!check_whether_dirport_reachable()) - return 0; if (!router_get_advertised_dir_port(options, dir_port)) return 0; @@ -1280,9 +1277,6 @@ decide_to_advertise_begindir(const or_options_t *options, return 1; if (net_is_disabled()) return 0; - /* redundant - if ORPort is unreachable, we don't publish a descriptor */ - if (!check_whether_orport_reachable()) - return 0; if (!router_get_advertised_or_port(options)) return 0;

1 0

[tor/release-0.2.8] Changes file for #18616
by nickm＠torproject.org 17 May '16

17 May '16

commit 2cfcf17cfc4377efcf10a036557fa3134bf8c1b1 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:43:44 2016 +1000 Changes file for #18616 --- changes/bug18616 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/changes/bug18616 b/changes/bug18616 new file mode 100644 index 0000000..44695a1 --- /dev/null +++ b/changes/bug18616 @@ -0,0 +1,7 @@ + o Major bugfixes (directory mirrors): + - Fix broken DirPort self-checks. Decide to advertise begindir + support the same way we decide to advertise DirPorts. + Include additional config options in the list that might + change the content of a relay's descriptor. + Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in + 0.2.8.1-alpha. Patch by "teor".

1 0

[tor/master] Refactor common code out of reachability checks
by nickm＠torproject.org 17 May '16

17 May '16

commit b51316c0e77ed8d931d17263076af1e9787fa333 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Thu Apr 28 11:18:26 2016 +1000 Refactor common code out of reachability checks No actual changes in behavior --- src/or/router.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 1083e24..a9d992f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1079,24 +1079,51 @@ router_reset_reachability(void) can_reach_or_port = can_reach_dir_port = 0; } -/** Return 1 if ORPort is known reachable; else return 0. */ +/** Return 1 if we won't do reachability checks, because: + * - AssumeReachable is set, or + * - the network is disabled. + * Otherwise, return 0. + */ +static int +router_reachability_checks_disabled(const or_options_t *options) +{ + return options->AssumeReachable || + net_is_disabled(); +} + +/** Return 0 if we need to do an ORPort reachability check, because: + * - no reachability check has been done yet, or + * - we've initiated reachability checks, but none have succeeded. + * Return 1 if we don't need to do an ORPort reachability check, because: + * - we've seen a successful reachability check, or + * - AssumeReachable is set, or + * - the network is disabled. + */ int check_whether_orport_reachable(void) { const or_options_t *options = get_options(); - return options->AssumeReachable || - net_is_disabled() || + int reach_checks_disabled = router_reachability_checks_disabled(options); + return reach_checks_disabled || can_reach_or_port; } -/** Return 1 if we don't have a dirport configured, or if it's reachable. */ +/** Return 0 if we need to do a DirPort reachability check, because: + * - no reachability check has been done yet, or + * - we've initiated reachability checks, but none have succeeded. + * Return 1 if we don't need to do a DirPort reachability check, because: + * - we've seen a successful reachability check, or + * - there is no DirPort set, or + * - AssumeReachable is set, or + * - the network is disabled. + */ int check_whether_dirport_reachable(void) { const or_options_t *options = get_options(); - return !options->DirPort_set || - options->AssumeReachable || - net_is_disabled() || + int reach_checks_disabled = router_reachability_checks_disabled(options) || + !options->DirPort_set; + return reach_checks_disabled || can_reach_dir_port; }

1 0

[tor/master] Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
by nickm＠torproject.org 17 May '16

17 May '16

commit 548d14247e3c8a48e2efb2ca62ee7a05fca843ba Merge: 6cc3397 06031b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 10:48:12 2016 -0400 Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8 changes/bug18616 | 14 +++++ src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 5 +- src/or/config.c | 9 ++-- src/or/control.c | 15 +++--- src/or/dirserv.c | 7 ++- src/or/main.c | 4 +- src/or/rephist.c | 9 ++-- src/or/router.c | 140 ++++++++++++++++++++++++++++++++++--------------- src/or/router.h | 4 +- src/test/test_dir.c | 46 ++++++++++++++++ src/test/test_policy.c | 3 +- 12 files changed, 193 insertions(+), 65 deletions(-) diff --cc src/or/router.c index 3f94703,57c0618..d70756f --- a/src/or/router.c +++ b/src/or/router.c @@@ -1570,15 -1625,9 +1627,15 @@@ decide_if_publishable_server(void return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!check_whether_orport_reachable()) - - return check_whether_orport_reachable(options) && - check_whether_dirport_reachable(options); ++ if (!check_whether_orport_reachable(options)) + return 0; + if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { + /* All set: there are no exits in the consensus (maybe this is a tiny + * test network), so we can't check our DirPort reachability. */ + return 1; + } else { - return check_whether_dirport_reachable(); ++ return check_whether_dirport_reachable(options); + } } /** Initiate server descriptor upload as reasonable (if server is publishable,

1 0

[tor/release-0.2.8] Make mock function static to prevent future clashes
by nickm＠torproject.org 17 May '16

17 May '16

commit 05cf2867131eaa1dc017605f67cb7ac433ea263d Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Apr 20 17:39:09 2016 +1000 Make mock function static to prevent future clashes --- src/test/test_policy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 48e8255..a939ebf 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -716,10 +716,9 @@ test_policies_reject_exit_address(void *arg) } static smartlist_t *test_configured_ports = NULL; -const smartlist_t *mock_get_configured_ports(void); /** Returns test_configured_ports */ -const smartlist_t * +static const smartlist_t * mock_get_configured_ports(void) { return test_configured_ports;

1 0

[tor/master] Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
by nickm＠torproject.org 17 May '16

17 May '16

commit d6a2fec05ebcc39773a2f6666e1378410c64f047 Merge: ff5eb7f 548d142 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 17 11:09:54 2016 -0400 Merge branch 'bug18616-v4-merged_028' into maint-0.2.8 changes/bug18616 | 14 +++++ src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 5 +- src/or/config.c | 9 ++-- src/or/control.c | 15 +++--- src/or/dirserv.c | 7 ++- src/or/main.c | 4 +- src/or/rephist.c | 9 ++-- src/or/router.c | 140 ++++++++++++++++++++++++++++++++++--------------- src/or/router.h | 4 +- src/test/test_dir.c | 46 ++++++++++++++++ src/test/test_policy.c | 3 +- 12 files changed, 193 insertions(+), 65 deletions(-)

1 0