If we're trying to fetch a bridge descriptor and there's no way

the bridge authority could help us (for example, we don't know
a digest, or there is no bridge authority), don't be so eager to
fall back to asking the bridge authority.


svn:r12512

2 files changed, 12 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index b562ee2c9a..ae8872301b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@ Changes in version 0.2.0.12-alpha - 2007-11-??
       rebuild the descriptor.
     - When picking v2 hidden service directories, don't pick ones that
       aren't listed as Running.
+    - If we're trying to fetch a bridge descriptor and there's no way
+      the bridge authority could help us (for example, we don't know
+      a digest, or there is no bridge authority), don't be so eager to
+      fall back to asking the bridge authority.
 
   o Minor features:
     - When we negotiate a v2 OR connection (not yet implemented), accept
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3a86b95b6c..847dfb1eaa 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2945,6 +2945,7 @@ fetch_bridge_descriptors(time_t now)
   or_options_t *options = get_options();
   int num_bridge_auths = get_n_authorities(BRIDGE_AUTHORITY);
   int ask_bridge_directly;
+  int can_use_bridge_authority;
 
   if (!bridge_list)
     return;
@@ -2960,9 +2961,10 @@ fetch_bridge_descriptors(time_t now)
       in.s_addr = htonl(bridge->addr);
       tor_inet_ntoa(&in, address_buf, sizeof(address_buf));
 
-      ask_bridge_directly = tor_digest_is_zero(bridge->identity) ||
-                            !options->UpdateBridgesFromAuthority ||
-                            !num_bridge_auths;
+      can_use_bridge_authority = !tor_digest_is_zero(bridge->identity) &&
+                                 num_bridge_auths;
+      ask_bridge_directly = !can_use_bridge_authority ||
+                            !options->UpdateBridgesFromAuthority;
       log_debug(LD_DIR, "ask_bridge_directly=%d (%d, %d, %d)",
                 ask_bridge_directly, tor_digest_is_zero(bridge->identity),
                 !options->UpdateBridgesFromAuthority, !num_bridge_auths);
@@ -2971,9 +2973,9 @@ fetch_bridge_descriptors(time_t now)
           !fascist_firewall_allows_address_or(bridge->addr, bridge->port)) {
         log_notice(LD_DIR, "Bridge at '%s:%d' isn't reachable by our "
                    "firewall policy. %s.", address_buf, bridge->port,
-                   num_bridge_auths ? "Asking bridge authority instead" :
-                                      "Skipping");
-        if (num_bridge_auths)
+                   can_use_bridge_authority ?
+                     "Asking bridge authority instead" : "Skipping");
+        if (can_use_bridge_authorit)
           ask_bridge_directly = 0;
         else
           continue;