[tor-commits] [tor/master] refetch bridge descriptors in a timely fashion

[arma at torproject.org]

commit 07c5026efa4c5fac64e5f3e843eae6bea0de54db
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon May 16 12:58:44 2011 -0400

    refetch bridge descriptors in a timely fashion
    
    When we configure a new bridge via the controller, don't wait up to ten
    seconds before trying to fetch its descriptor. This wasn't so bad when
    you listed your bridges in torrc, but it's dreadful if you configure
    your bridges via vidalia.
---
 changes/bug3198 |    4 ++++
 src/or/main.c   |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug3198 b/changes/bug3198
new file mode 100644
index 0000000..29c1685
--- /dev/null
+++ b/changes/bug3198
@@ -0,0 +1,4 @@
+  o Major bugfixes:
+    - When we configure a new bridge via the controller, don't wait up
+      to ten seconds before trying to fetch its descriptor. Bugfix on
+      0.2.0.3-alpha; fixes bug 3198 (suggested by 2355).
diff --git a/src/or/main.c b/src/or/main.c
index d700f0e..2c95024 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -924,8 +924,6 @@ run_scheduled_events(time_t now)
   if (time_to_try_getting_descriptors < now) {
     update_router_descriptor_downloads(now);
     update_extrainfo_downloads(now);
-    if (options->UseBridges)
-      fetch_bridge_descriptors(options, now);
     if (router_have_minimum_dir_info())
       time_to_try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL;
     else
@@ -938,6 +936,9 @@ run_scheduled_events(time_t now)
       now + DESCRIPTOR_FAILURE_RESET_INTERVAL;
   }
 
+  if (options->UseBridges)
+    fetch_bridge_descriptors(options, now);
+
   /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */
   if (!last_rotated_x509_certificate)
     last_rotated_x509_certificate = now;