nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Allow bootstrapping networks to have Exit flags

Browse Source
This commit is contained in:
Sebastian Hahn 2017-11-04 04:18:32 +01:00
parent 4d6b679318
commit e24df58245
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/dirserv.c
View File

@ -1521,15 +1521,19 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil)
continue; continue;
routerinfo_t *ri = node->ri; routerinfo_t *ri = node->ri;
/* resolve spurious clang shallow analysis null pointer errors */ if (ri) {
tor_assert(ri); node->is_exit = (!router_exit_policy_rejects_all(ri) &&
node->is_exit = (!router_exit_policy_rejects_all(ri) && exit_policy_is_general_exit(ri->exit_policy));
exit_policy_is_general_exit(ri->exit_policy)); }
if (router_counts_toward_thresholds(node, now, omit_as_sybil, if (router_counts_toward_thresholds(node, now, omit_as_sybil,
require_mbw)) { require_mbw)) {
const char *id = node->identity; const char *id = node->identity;
uint32_t bw_kb; uint32_t bw_kb;
/* resolve spurious clang shallow analysis null pointer errors */
tor_assert(ri);
uptimes[n_active] = (uint32_t)real_uptime(ri, now); uptimes[n_active] = (uint32_t)real_uptime(ri, now);
mtbfs[n_active] = rep_hist_get_stability(id, now); mtbfs[n_active] = rep_hist_get_stability(id, now);
tks [n_active] = rep_hist_get_weighted_time_known(id, now); tks [n_active] = rep_hist_get_weighted_time_known(id, now);