nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tweak bug6783 patch.

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-06 15:19:04 -05:00 committed by Roger Dingledine
parent e4614d30e5
commit 926b3d77f1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/config.c
View File

@ -2380,6 +2380,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("TokenBucketRefillInterval must be between 1 and 1000 inclusive.");
}
if (options->DisableV2DirectoryInfo_ && ! authdir_mode(options)) {
REJECT("DisableV2DirectoryInfo_ set, but we aren't an authority.");
}
if (options->ExcludeExitNodes || options->ExcludeNodes) {
options->ExcludeExitNodesUnion_ = routerset_new();
routerset_union(options->ExcludeExitNodesUnion_,options->ExcludeExitNodes);

3
src/or/or.h
View File

@ -4005,7 +4005,8 @@ typedef struct {
* make it temporarily disableable, in order to do fast testing and be
* able to turn it back on if it turns out to be non-workable.
*
* XXXX024 Don't actually leave this in.
* XXXX025 Make this always-on, or always-off. Right now, it's only
* enableable for authorities.
*/
int DisableV2DirectoryInfo_;