[or-cvs] r12048: Make authority_certs_fetch_missing() honor should_delay_dir_ (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-10-19 12:41:30 -0400 (Fri, 19 Oct 2007)
New Revision: 12048

Modified:
   tor/trunk/
   tor/trunk/doc/TODO
   tor/trunk/src/or/routerlist.c
Log:
 r15960 at catbus:  nickm | 2007-10-19 12:30:17 -0400
 Make authority_certs_fetch_missing() honor should_delay_dir_fetches()



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15960] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-10-19 16:28:13 UTC (rev 12047)
+++ tor/trunk/doc/TODO	2007-10-19 16:41:30 UTC (rev 12048)
@@ -53,11 +53,12 @@
     - Delay consensus download retry when there's a unverified consensus we're
       downloading the certs to check
       - But don't delay forever.
-    - Make new download types comply with should_delay_dir_fetches()
+    o Make new download types comply with should_delay_dir_fetches()
     - When DownloadExtraInfo is turned on for the first time, don't flip
       out and download the ancient history of the universe.
     o List IP addresses in certificates?
-    - Make the address in votes be an actual IP address.
+    o Make the address in votes be an actual IP address.
+    - Change 'mismatched digest' message to first check timestamps instead.
 
   - Proposals:
     . 101: Voting on the Tor Directory System (plus 103)

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-10-19 16:28:13 UTC (rev 12047)
+++ tor/trunk/src/or/routerlist.c	2007-10-19 16:41:30 UTC (rev 12048)
@@ -295,6 +295,9 @@
   smartlist_t *missing_digests = smartlist_create();
   char *resource = NULL;
 
+  if (should_delay_dir_fetches(get_options()))
+    return;
+
   list_pending_downloads(pending, DIR_PURPOSE_FETCH_CERTIFICATE, "fp/");
   if (status) {
     SMARTLIST_FOREACH(status->voters, networkstatus_voter_info_t *, voter,