diff options
| author | Robert Hogan <robert@roberthogan.net> | 2010-12-13 22:13:01 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:08:10 -0500 |
| commit | 909e9769ece9e89ad0c4bbb558a6f8247c6a62bd (patch) | |
| tree | 233006bc5a08a1d2c80ad6d43b8dda10876f4eae /doc | |
| parent | c6d8c6baaa983aecd6a5121ec6ed8e2d9a2a24be (diff) | |
| download | tor-909e9769ece9e89ad0c4bbb558a6f8247c6a62bd.tar.gz tor-909e9769ece9e89ad0c4bbb558a6f8247c6a62bd.zip | |
Address nickm's comments at https://trac.torproject.org/projects/tor/ticket/933#comment:4
1. Implement the following mapping rules:
MapAddress a.b.c d.e.f # This is what we have now
MapAddress .a.b.c d.e.f # Replaces any address ending with .a.b.c with d.e.f
MapAddress .a.b.c .d.e.f # Replaces the .a.b.c at the end of any addr with .d.e.f
(Note that 'a.b.c .d.e.f' is invalid, and will be rejected.)
2. Add tests for the new rules.
3. Allow proper wildcard annotation, i.e. '*.d.e' '.d.e' will still work.
4. Update addressmap_entry_t with an is_wildcard member.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 4d4ad9fdb7..1c9d387e43 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -659,12 +659,14 @@ The following options are useful only for clients (that is, if before processing it. For example, if you always want connections to www.indymedia.org to exit via __torserver__ (where __torserver__ is the nickname of the server), use "MapAddress www.indymedia.org - www.indymedia.org.torserver.exit". If the value is prepended with a \'.\', - it is treated as matching an entire domain.For example, if you always + www.indymedia.org.torserver.exit". If the value is prepended with a \'*.\', + it is treated as matching an entire domain. For example, if you always want connections to any sub-domain of indymedia.org to exit via __torserver__ (where __torserver__ is the nickname of the server), use - "MapAddress .indymedia.org .torserver.exit". (Note the leading '.' in - each part of the directive.) + "MapAddress *.indymedia.org *.indymedia.org.torserver.exit". (Note the + leading '*.' in each part of the directive.) You can also redirect all + subdomains of a domain to a single address. For example, "MapAddress + *.indymedia.org www.indymedia.org". **NewCircuitPeriod** __NUM__:: Every NUM seconds consider whether to build a new circuit. (Default: 30 |