diff options
| author | teor <teor2345@gmail.com> | 2017-11-22 01:50:46 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2017-11-22 02:00:34 +1100 |
| commit | 690f646bf8a5de9b099fb5295ba9ff252e5606f4 (patch) | |
| tree | e45732bbcfbcde8fc5b3aa384f13ffc7a2d65cd3 /src/or/entrynodes.c | |
| parent | da82e0b5795c449f4442c87e065e9a60da4892a8 (diff) | |
| download | tor-690f646bf8a5de9b099fb5295ba9ff252e5606f4.tar.gz tor-690f646bf8a5de9b099fb5295ba9ff252e5606f4.zip | |
Stop checking cached bridge descriptors for usable bridges
Stop checking for bridge descriptors when we actually want to know if
any bridges are usable. This avoids potential bootstrapping issues.
Fixes bug 24367; bugfix on 0.2.0.3-alpha.
Stop stalling when bridges are changed at runtime. Stop stalling when
old bridge descriptors are cached, but they are not in use.
Fixes bug 24367; bugfix on 23347 in 0.3.2.1-alpha.
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 866e593350..826c0e48a0 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3136,9 +3136,12 @@ entry_list_is_constrained(const or_options_t *options) /** Return the number of bridges that have descriptors that are marked with * purpose 'bridge' and are running. - */ -int -num_bridges_usable(void) + * + * We use this function to decide if we're ready to start building + * circuits through our bridges, or if we need to wait until the + * directory "server/authority" requests finish. */ +MOCK_IMPL(int, +num_bridges_usable,(void)) { int n_options = 0; |