[or-cvs] r17947: {tor} backport r17920: bridge relays don't fetch descriptors much (in tor/branches/tor-0_2_0-patches: . doc src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2009-01-06 02:22:07 -0500 (Tue, 06 Jan 2009)
New Revision: 17947

Modified:
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/doc/TODO.020
   tor/branches/tor-0_2_0-patches/src/or/dirserv.c
Log:
backport r17920: bridge relays don't fetch descriptors much


Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-06 07:19:49 UTC (rev 17946)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2009-01-06 07:22:07 UTC (rev 17947)
@@ -11,6 +11,13 @@
       combination. Now that we can have multiple OR connections between
       the same ORs, it is no longer possible to use addr:port to uniquely
       identify a connection.
+    - 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 bugfixes:
     - Do not mark smartlist_bsearch_idx() function as ATTR_PURE. This bug

Modified: tor/branches/tor-0_2_0-patches/doc/TODO.020
===================================================================
--- tor/branches/tor-0_2_0-patches/doc/TODO.020	2009-01-06 07:19:49 UTC (rev 17946)
+++ tor/branches/tor-0_2_0-patches/doc/TODO.020	2009-01-06 07:22:07 UTC (rev 17947)
@@ -5,7 +5,7 @@
 Backport for 0.2.0:
    o r17891: Fix a fun OpenBSD warning.
    o r17892: Fix another fun OpenBSD warning.
-   - r17920: bridge relays don't fetch descriptors much
+   o r17920: bridge relays don't fetch descriptors much
 
 Backport for 0.2.0 once better tested:
   Xo r16621: Make some DNS code more robust (partial; see also libevent

Modified: tor/branches/tor-0_2_0-patches/src/or/dirserv.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/dirserv.c	2009-01-06 07:19:49 UTC (rev 17946)
+++ tor/branches/tor-0_2_0-patches/src/or/dirserv.c	2009-01-06 07:22:07 UTC (rev 17947)
@@ -1199,7 +1199,8 @@
 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);
 }