Bootstrap: allow internal-only onion service networks to bootstrap

This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.
This commit is contained in:
teor 2018-08-25 01:08:53 +10:00 committed by Nick Mathewson
parent 4748fd23da
commit 3ebbc1c84d

View File

@ -2240,11 +2240,11 @@ compute_frac_paths_available(const networkstatus_t *consensus,
np, np,
nu); nu);
/* We need at least 1 exit usable in the consensus to consider /* We need at least 1 exit (flag and policy) in the consensus to consider
* building exit paths */ * building exit paths */
/* Update our understanding of whether the consensus has exits */ /* Update our understanding of whether the consensus has exits */
consensus_path_type_t old_have_consensus_path = have_consensus_path; consensus_path_type_t old_have_consensus_path = have_consensus_path;
have_consensus_path = ((nu > 0) ? have_consensus_path = ((np > 0) ?
CONSENSUS_PATH_EXIT : CONSENSUS_PATH_EXIT :
CONSENSUS_PATH_INTERNAL); CONSENSUS_PATH_INTERNAL);
@ -2342,14 +2342,14 @@ compute_frac_paths_available(const networkstatus_t *consensus,
tor_asprintf(status_out, tor_asprintf(status_out,
"%d%% of guards bw, " "%d%% of guards bw, "
"%d%% of midpoint bw, and " "%d%% of midpoint bw, and "
"%d%% of exit bw%s = " "%d%% of %s = "
"%d%% of path bw", "%d%% of path bw",
(int)(f_guard*100), (int)(f_guard*100),
(int)(f_mid*100), (int)(f_mid*100),
(int)(f_exit*100), (int)(f_exit*100),
(router_have_consensus_path() == CONSENSUS_PATH_EXIT ? (router_have_consensus_path() == CONSENSUS_PATH_EXIT ?
"" : "exit bw" :
" (no exits in consensus)"), "end bw (no exits in consensus)"),
(int)(f_path*100)); (int)(f_path*100));
return f_path; return f_path;