sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a NumDirectoryGuards consensus param too

This commit is contained in:
Roger Dingledine 2014-07-23 15:28:40 -04:00
parent 56ee61b8ae
commit 9fc276a1c7
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket12688
View File

@ -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.

12
src/or/entrynodes.c
View File

@ -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);
}