summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-03-05 12:53:14 +1000
committerNick Mathewson <nickm@torproject.org>2019-03-15 08:57:28 -0400
commit532f4c9103315bff1de21b3e0eeeee6fcf790647 (patch)
treeefaaca3f56c18b9dbdf4d332bdfed1aecd5d09c7 /src
parent1c248fa27d978a3a20f29ea76cc23c4c4604d1a0 (diff)
downloadtor-532f4c9103315bff1de21b3e0eeeee6fcf790647.tar.gz
tor-532f4c9103315bff1de21b3e0eeeee6fcf790647.zip
Stop logging a BUG() warning when tor is waiting for exit descriptors
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
Diffstat (limited to 'src')
-rw-r--r--src/feature/nodelist/nodelist.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c
index 935ac78403..99d7f746a8 100644
--- a/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@ -2449,12 +2449,18 @@ compute_frac_paths_available(const networkstatus_t *consensus,
f_exit = f_myexit;
}
- /* if the consensus has no exits, we can only build onion service paths,
- * which are G - M - M. So use the middle fraction for the exit fraction. */
+ /* If the consensus has no exits that pass flag, descriptor, and policy
+ * checks, we can only build onion service paths, which are G - M - M. */
if (router_have_consensus_path() != CONSENSUS_PATH_EXIT) {
- /* If there are no exits in the consensus, then f_exit is always 0, so
- * it is safe to replace f_exit with f_mid. */
- if (!BUG(f_exit > 0.0)) {
+ /* If the exit bandwidth weight fraction is not zero, we need to wait for
+ * descriptors for those exits. (The bandwidth weight fraction does not
+ * check for descriptors.)
+ * If the exit bandwidth fraction is zero, there are no exits in the
+ * consensus at all. So it is safe to replace f_exit with f_mid.
+ *
+ * f_exit is non-negative, but some compilers complain about float and ==
+ */
+ if (f_exit <= 0.0) {
f_exit = f_mid;
}
}