add a NumDirectoryGuards consensus param too

diff --git a/changes/ticket12688 b/changes/ticket12688
index d8e56c153704ab3bc885584827268aec5f02deef..88228e55061317836fafedeee87e541b9e0aa631 100644 (file)
--- a/changes/ticket12688
+++ b/changes/ticket12688
@@ -1,5 +1,6 @@
   Major features:
-    - Make the number of entry guards (and thus, by default, directory
-      guards too) configurable via a new NumEntryGuards consensus
+    - Make the number of entry guards configurable via a new
+      NumEntryGuards consensus parameter, and the number of directory
+      guards configurable via a new NumDirectoryGuards consensus
       parameter. Implements ticket 12688.
 

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index abd10e385e14a7e3c53b066db621e5d89c180fe0..484b88dbf811c9502afcdf1a338919557f680f73 100644 (file)
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -433,10 +433,18 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend,
 static int
 decide_num_guards(const or_options_t *options, int for_directory)
 {
-  if (for_directory && options->NumDirectoryGuards != 0)
-    return options->NumDirectoryGuards;
+  if (for_directory) {
+    int answer;
+    if (options->NumDirectoryGuards != 0)
+      return options->NumDirectoryGuards;
+    answer = networkstatus_get_param(NULL, "NumDirectoryGuards", 0, 0, 10);
+    if (answer) /* non-zero means use the consensus value */
+      return answer;
+  }
+
   if (options->NumEntryGuards)
     return options->NumEntryGuards;
+
   /* Use the value from the consensus, or 3 if no guidance. */
   return networkstatus_get_param(NULL, "NumEntryGuards", 3, 1, 10);
 }