Bridge relays that had DirPort set to 0 would stop fetching

descriptors shortly after startup, and then briefly resume
after a new bandwidth test and/or after publishing a new bridge
descriptor. Bridge users that try to bootstrap from them would
get a recent networkstatus but would get descriptors from up to
18 hours earlier, meaning most of the descriptors were obsolete
already. Reported by Tas; bugfix on 0.2.0.13-alpha.

svn:r17920

diff --git a/ChangeLog b/ChangeLog
index a3a180ffcfc204f22c9d6903996834f4016e53b3..160acb93505f5a348317675006dbccc52fa06914 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,13 @@ Changes in version 0.2.1.10-alpha - 2009-01-??
       practice it just means we spend many minutes trying directory
       mirrors that are long gone from the network. Helps bug 887 a bit;
       bugfix on 0.2.0.x.
+    - Bridge relays that had DirPort set to 0 would stop fetching
+      descriptors shortly after startup, and then briefly resume
+      after a new bandwidth test and/or after publishing a new bridge
+      descriptor. Bridge users that try to bootstrap from them would
+      get a recent networkstatus but would get descriptors from up to
+      18 hours earlier, meaning most of the descriptors were obsolete
+      already. Reported by Tas; bugfix on 0.2.0.13-alpha.
 
   o Minor features:
     - New controller event "clients_seen" to report a geoip-based summary

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 00ebf5d14a9fe153fad8b5002e82c55f3eb398ef..eff0a380dcbbd32779b389ee2741c2b1a36b589d 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1215,7 +1215,8 @@ directory_permits_controller_requests(or_options_t *options)
 int
 directory_too_idle_to_fetch_descriptors(or_options_t *options, time_t now)
 {
-  return !options->DirPort && !options->FetchUselessDescriptors &&
+  return !directory_caches_dir_info(options) &&
+         !options->FetchUselessDescriptors &&
          rep_hist_circbuilding_dormant(now);
 }