Directory authorities should only automatically download Extra Info

documents if they're v1, v2, or v3 authorities.

svn:r12898

diff --git a/ChangeLog b/ChangeLog
index 4efa274f25c851f20e871a0ddc0c7eba26ee153d..f28eb564ee0486dd45ab08f0ada1bccf3fbe8b0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,8 @@ Changes in version 0.2.0.13-alpha - 2007-12-21
     - Only Tors that want to mirror the v2 directory info should
       create the "cached-status" directory in their datadir. All Tors
       used to create it. Bugfix on 0.1.2.x.
+    - Directory authorities should only automatically download Extra Info
+      documents if they're v1, v2, or v3 authorities.
 
   o Minor features:
     - On USR1, when dmalloc is in use, log the top 10 memory

diff --git a/src/or/config.c b/src/or/config.c
index 6d9ab48c3c8d137e7ba50b3be67330e219b75ad1..0a0c014377ff2654be480df6f788cc006228f46b 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2785,7 +2785,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
                "UseEntryGuards. Disabling.");
       options->UseEntryGuards = 0;
     }
-    if (!options->DownloadExtraInfo) {
+    if (!options->DownloadExtraInfo && authdir_mode_any_main(options)) {
       log_info(LD_CONFIG, "Authoritative directories always try to download "
                "extra-info documents. Setting DownloadExtraInfo.");
       options->DownloadExtraInfo = 1;

diff --git a/src/or/or.h b/src/or/or.h
index 70a088a6a490f5ae64d001760a729bc8c53e3a3b..0c8fa593b3793cb76c14d4dfc4a24c264d6e702a 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3732,11 +3732,13 @@ int authdir_mode(or_options_t *options);
 int authdir_mode_v1(or_options_t *options);
 int authdir_mode_v2(or_options_t *options);
 int authdir_mode_v3(or_options_t *options);
+int authdir_mode_any_main(or_options_t *options);
+int authdir_mode_any_nonhidserv(or_options_t *options);
 int authdir_mode_handles_descs(or_options_t *options, int purpose);
 int authdir_mode_publishes_statuses(or_options_t *options);
 int authdir_mode_tests_reachability(or_options_t *options);
 int authdir_mode_bridge(or_options_t *options);
-int authdir_mode_any_nonhidserv(or_options_t *options);
+
 int clique_mode(or_options_t *options);
 int server_mode(or_options_t *options);
 int advertised_server_mode(void);

diff --git a/src/or/router.c b/src/or/router.c
index aded6e77c61f2ba96091311fc5b10050f3e2f512..a64320f11b078fe47e308590ee697d9ec2801c89 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -823,7 +823,8 @@ authdir_mode_v3(or_options_t *options)
 {
   return authdir_mode(options) && options->V3AuthoritativeDir != 0;
 }
-static int
+/** Return true iff we are a v1, v2, or v3 directory authority. */
+int
 authdir_mode_any_main(or_options_t *options)
 {
   return options->V1AuthoritativeDir ||