diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-11-26 06:26:17 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-11-26 06:26:17 +0000 |
| commit | b02e154470e958cea1989b68ae64436a7ffd25a4 (patch) | |
| tree | 0db8de949694de33da15c5ad105e3d32098e6925 /src | |
| parent | 91bb09cb28246f8ae2fe7525be61eba58f6bf814 (diff) | |
| download | tor-b02e154470e958cea1989b68ae64436a7ffd25a4.tar tor-b02e154470e958cea1989b68ae64436a7ffd25a4.tar.gz | |
minor cleanups
svn:r12571
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/or/circuituse.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 995978b57..a83d43e8f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3087,7 +3087,7 @@ bridges_retry_helper(int act) /** Do we know any descriptors for our bridges, and are they all * down? */ int -bridges_should_be_retried(void) +bridges_known_but_down(void) { return bridges_retry_helper(0); } diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ca1f4d333..4289e0f62 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -970,7 +970,7 @@ circuit_get_open_circ_or_launch(edge_connection_t *conn, if (!want_onehop && !router_have_minimum_dir_info()) { if (!connection_get_by_type(CONN_TYPE_DIR)) { - if (options->UseBridges && bridges_should_be_retried()) { + if (options->UseBridges && bridges_known_but_down()) { log_notice(LD_APP|LD_DIR, "Application request when we're believed to be " "offline. Optimistically trying known bridges again."); diff --git a/src/or/or.h b/src/or/or.h index f32fa4ea9..ccae45efe 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2468,7 +2468,7 @@ void retry_bridge_descriptor_fetch_directly(char *digest); void fetch_bridge_descriptors(time_t now); void learned_bridge_descriptor(routerinfo_t *ri); int any_bridge_descriptors_known(void); -int bridges_should_be_retried(void); +int bridges_known_but_down(void); void bridges_retry_all(void); void entry_guards_free_all(void); |