diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:08:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-09-27 17:08:03 -0400 |
| commit | c97072ef34c20fdf854444bb28446b53f67ba7bf (patch) | |
| tree | 85efe9f94380c938a3842d843cbc93319d837f13 /src/or/or.h | |
| parent | e3859615429ec8d3939e21cd65fa07cc56bb5d0c (diff) | |
| parent | 6c5b9ba6258c8e79be9f96a3ec377600d0066356 (diff) | |
| download | tor-c97072ef34c20fdf854444bb28446b53f67ba7bf.tar.gz tor-c97072ef34c20fdf854444bb28446b53f67ba7bf.zip | |
Merge branch 'bug1751_enabling' into maint-0.2.2
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/or/or.h b/src/or/or.h index 6332de83a1..a48df38cdb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2468,10 +2468,13 @@ 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, defaulting to 'refuse' if the consensus says + * nothing). */ + char *RefuseUnknownExits; + /** Parsed version of RefuseUnknownExits. -1 for auto. */ + int RefuseUnknownExits_; /** Application ports that require all nodes in circ to have sufficient * uptime. */ |