Browse Source

minor cleanups

svn:r12571
Roger Dingledine 16 years ago
parent
commit
b02e154470
3 changed files with 3 additions and 3 deletions
  1. 1 1
      src/or/circuitbuild.c
  2. 1 1
      src/or/circuituse.c
  3. 1 1
      src/or/or.h

+ 1 - 1
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);
 }

+ 1 - 1
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.");

+ 1 - 1
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);