summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2015-05-06 23:40:23 +1000
committerteor <teor2345@gmail.com>2015-08-18 14:51:57 +1000
commit359faf5e4b4a88663201c2b42dd89a6f77569856 (patch)
tree6dcdbca4db4bfd23dddbb5113f139efd298a77fc /src/or/or.h
parent0cb82013cceba8ade6ae83e983b609df3a848f72 (diff)
downloadtor-359faf5e4b4a88663201c2b42dd89a6f77569856.tar.gz
tor-359faf5e4b4a88663201c2b42dd89a6f77569856.zip
New TestingDirAuthVote{Exit,Guard,HSDir}IsStrict flags
"option to prevent guard,exit,hsdir flag assignment" "A node will never receive the corresponding flag unless that node is specified in the TestingDirAuthVote{Exit,Guard,HSDir} list, regardless of its uptime, bandwidth, exit policy, or DirPort". Patch modified by "teor": VoteOnHidServDirectoriesV2 is now obsolete, so TestingDirAuthVoteHSDir always votes on HSDirs. Closes ticket 14882. Patch by "robgjansen". Commit message and changes file by "teor" with quotes from "robgjansen".
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 4a313515f4..cf9f2b1414 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4094,15 +4094,18 @@ typedef struct {
/** Relays in a testing network which should be voted Exit
* regardless of exit policy. */
routerset_t *TestingDirAuthVoteExit;
+ int TestingDirAuthVoteExitIsStrict;
/** Relays in a testing network which should be voted Guard
* regardless of uptime and bandwidth. */
routerset_t *TestingDirAuthVoteGuard;
+ int TestingDirAuthVoteGuardIsStrict;
/** Relays in a testing network which should be voted HSDir
* regardless of uptime and DirPort.
* Respects VoteOnHidServDirectoriesV2. */
routerset_t *TestingDirAuthVoteHSDir;
+ int TestingDirAuthVoteHSDirIsStrict;
/** Enable CONN_BW events. Only altered on testing networks. */
int TestingEnableConnBwEvent;