diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 14:50:01 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 14:50:01 -0400 |
commit | 26639b7798b5f5dae93e40bd7d050cb218a8aad2 (patch) | |
tree | 4e267e2dee87d5e3ffe6c1f4c94dd882961269e3 /src/or/or.h | |
parent | 173efa10515e23b45e37f96a3755a2f16411a71a (diff) | |
parent | 44095312fa63c2623418346eb0cb487b45cf9c50 (diff) | |
download | tor-26639b7798b5f5dae93e40bd7d050cb218a8aad2.tar.gz tor-26639b7798b5f5dae93e40bd7d050cb218a8aad2.zip |
Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4
Diffstat (limited to 'src/or/or.h')
-rw-r--r-- | src/or/or.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 43fe5485da..8acd7365e3 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2249,6 +2249,9 @@ typedef struct node_t { /** Local info: we treat this node as if it rejects everything */ unsigned int rejects_all:1; + /** Local info: this node is in our list of guards */ + unsigned int using_as_guard:1; + /* Local info: derived. */ /** True if the IPv6 OR port is preferred over the IPv4 OR port. */ @@ -4784,6 +4787,10 @@ typedef struct dir_server_t { #define PDS_NO_EXISTING_SERVERDESC_FETCH (1<<3) #define PDS_NO_EXISTING_MICRODESC_FETCH (1<<4) +/** This node is to be chosen as a directory guard, so don't choose any + * node that's currently a guard. */ +#define PDS_FOR_GUARD (1<<5) + #define PDS_PREFER_TUNNELED_DIR_CONNS_ (1<<16) /** Possible ways to weight routers when choosing one randomly. See |