r15960@catbus: nickm | 2007-10-19 12:30:17 -0400

 Make authority_certs_fetch_missing() honor should_delay_dir_fetches()

svn:r12048

diff --git a/doc/TODO b/doc/TODO
index 8a9df0546461e2e6b31dd369e5c54b27ee1a90ee..b9e3a35e9b1b4701723e72e19d0c0e43613656f9 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -53,11 +53,12 @@ Things we'd like to do in 0.2.0.x:
     - 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)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 27fb2dbf81151def3b6e506f8e3ee0e7832c483e..b2a12d28d65e370360206b268097101d6b4b70d6 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -295,6 +295,9 @@ authority_certs_fetch_missing(networkstatus_vote_t *status, time_t now)
   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,