mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug28656_035_squashed' into maint-0.4.0

Browse source
This commit is contained in:
Nick Mathewson 2019-03-15 08:59:19 -04:00
commit 1547fd99a6
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug28656 Normal file
View file

@ -0,0 +1,3 @@
o Minor bugfixes (logging):
- Stop logging a BUG() warning when tor is waiting for exit descriptors.
Fixes bug 28656; bugfix on 0.3.5.1-alpha.

16
src/feature/nodelist/nodelist.c
View file

@ -2493,12 +2493,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;
}
}