[or-cvs] r12571: minor cleanups (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-11-26 01:26:17 -0500 (Mon, 26 Nov 2007)
New Revision: 12571

Modified:
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/circuituse.c
   tor/trunk/src/or/or.h
Log:
minor cleanups


Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2007-11-26 02:18:57 UTC (rev 12570)
+++ tor/trunk/src/or/circuitbuild.c	2007-11-26 06:26:17 UTC (rev 12571)
@@ -3087,7 +3087,7 @@
 /** 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);
 }

Modified: tor/trunk/src/or/circuituse.c
===================================================================
--- tor/trunk/src/or/circuituse.c	2007-11-26 02:18:57 UTC (rev 12570)
+++ tor/trunk/src/or/circuituse.c	2007-11-26 06:26:17 UTC (rev 12571)
@@ -970,7 +970,7 @@
 
   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.");

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-11-26 02:18:57 UTC (rev 12570)
+++ tor/trunk/src/or/or.h	2007-11-26 06:26:17 UTC (rev 12571)
@@ -2468,7 +2468,7 @@
 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);