summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-24 12:33:18 -0400
committerNick Mathewson <nickm@torproject.org>2012-11-14 23:16:21 -0500
commit2eb7eafc9d789cb5063dd36021412434b656bf75 (patch)
tree6fb621cd10a3d41a242d2588c9a533a743570194 /src/or/config.c
parent462ebb270a10f02573b1847649db45b94c0e0fc3 (diff)
downloadtor-2eb7eafc9d789cb5063dd36021412434b656bf75.tar.gz
tor-2eb7eafc9d789cb5063dd36021412434b656bf75.zip
Add a new family-specific syntax for tor_addr_parse_mask_ports
By default, "*" means "All IPv4 addresses" with tor_addr_parse_mask_ports, so I won't break anything. But if the new EXTENDED_STAR flag is provided, then * means "any address", *4 means "any IPv4 address" (that is, 0.0.0.0/0), and "*6" means "any IPv6 address" (that is, [::]/0). This is going to let us have a syntax for specifying exit policies in torrc that won't drive people mad. Also, add a bunch of unit tests for tor_addr_parse_mask_ports to test these new features, and to increase coverage.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 9af55e9233..f8ac67ed38 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -276,6 +276,7 @@ static config_var_t option_vars_[] = {
V(HTTPProxyAuthenticator, STRING, NULL),
V(HTTPSProxy, STRING, NULL),
V(HTTPSProxyAuthenticator, STRING, NULL),
+ // V(IPv6EXit, BOOL, "0"),
VAR("ServerTransportPlugin", LINELIST, ServerTransportPlugin, NULL),
V(Socks4Proxy, STRING, NULL),
V(Socks5Proxy, STRING, NULL),