diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-21 01:03:29 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-21 01:03:29 -0400 |
| commit | ef5925237d4712c40fb6d69b8de882ab39e6798f (patch) | |
| tree | db3ef32cb703879117bea8e354a7c59d99c21b69 /src/or/or.h | |
| parent | 5a55662a6b38dd5c70a514bd8cb7e4b2e0df7e97 (diff) | |
| download | tor-ef5925237d4712c40fb6d69b8de882ab39e6798f.tar.gz tor-ef5925237d4712c40fb6d69b8de882ab39e6798f.zip | |
First cut of code to enable RefuseUnknownExits
The RefuseUnknownExits config option is now a tristate, with "1"
meaning "enable it no matter what the consensus says", "0" meaning
"disable it no matter what the consensus says", and "auto" meaning "do
what the consensus says". If the consensus is silent, we enable
RefuseUnknownExits.
This patch also changes the dirserv logic so that refuseunknownexits
won't make us cache unless we're an exit.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index 3c109738d7..6c1c8efb8d 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2468,10 +2468,12 @@ typedef struct { int ConstrainedSockets; /**< Shrink xmit and recv socket buffers. */ uint64_t ConstrainedSockSize; /**< Size of constrained buffers. */ - /** Whether we should drop exit streams from Tors that we don't know - * are relays. XXX022 In here for 0.2.2.11 as a temporary test before - * we switch over to putting it in consensusparams. -RD */ - int RefuseUnknownExits; + /** Whether we should drop exit streams from Tors that we don't know are + * relays. One of "0" (never refuse), "1" (always refuse), or "auto" (do + * what the consensus says). -RD */ + const char *RefuseUnknownExits; + /** Parsed version of RefuseUnknownExits. -1 for auto. */ + int RefuseUnknownExits_; /** Application ports that require all nodes in circ to have sufficient * uptime. */ |