commit 4d6b679318c07ee71bd549d0a53defcf86ca82e4 Author: Sebastian Hahn sebastian@torproject.org Date: Fri Nov 3 23:02:24 2017 +0100
Allow bootstrapping networks to have Exit flags
Relevant for non-test networks --- changes/bug24137 | 3 +++ src/or/dirserv.c | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/changes/bug24137 b/changes/bug24137 new file mode 100644 index 000000000..588e68d19 --- /dev/null +++ b/changes/bug24137 @@ -0,0 +1,3 @@ + o Minor bugfixes (Private Networks): + - Give out Exit flags in bootstrapping networks. Fixes bug 24137; + bugfix on 0.2.3.1-alpha. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ddee92da5..e1a572ec1 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1519,15 +1519,17 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil) node->ri && node->ri->purpose != ROUTER_PURPOSE_BRIDGE) continue; + + routerinfo_t *ri = node->ri; + /* resolve spurious clang shallow analysis null pointer errors */ + tor_assert(ri); + node->is_exit = (!router_exit_policy_rejects_all(ri) && + exit_policy_is_general_exit(ri->exit_policy)); + if (router_counts_toward_thresholds(node, now, omit_as_sybil, require_mbw)) { - routerinfo_t *ri = node->ri; const char *id = node->identity; uint32_t bw_kb; - /* resolve spurious clang shallow analysis null pointer errors */ - tor_assert(ri); - node->is_exit = (!router_exit_policy_rejects_all(ri) && - exit_policy_is_general_exit(ri->exit_policy)); uptimes[n_active] = (uint32_t)real_uptime(ri, now); mtbfs[n_active] = rep_hist_get_stability(id, now); tks [n_active] = rep_hist_get_weighted_time_known(id, now);