diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-06 11:29:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-14 23:16:40 -0500 |
| commit | 004f3f4e5339bdb5bf8559a620343b919ba196c1 (patch) | |
| tree | 45580ce87b58f86e8901eecd7cfa63d68746b7ef /src/or/router.c | |
| parent | 2889bd2642ada3a2aa55fa4909825dfb7e90812e (diff) | |
| download | tor-004f3f4e5339bdb5bf8559a620343b919ba196c1.tar tor-004f3f4e5339bdb5bf8559a620343b919ba196c1.tar.gz | |
Actually advertise IPv6 exit policies.
I have a theory that my tests will work better if the code I'm testing
isn't disabled.
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/or/router.c b/src/or/router.c index a0950bec6..f51b74e11 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1622,11 +1622,13 @@ router_rebuild_descriptor(int force) } ri->policy_is_reject_star = policy_is_reject_star(ri->exit_policy); -#if 0 - /* XXXX024 Don't actually enable this code until exiting to an IPv6 - * address works. */ - ri->ipv6_exit_policy = policy_summarize(&ri->exit_policy, AF_INET6); -#endif + + if (options->IPv6Exit) { + char *p_tmp = policy_summarize(ri->exit_policy, AF_INET6); + if (p_tmp) + ri->ipv6_exit_policy = parse_short_policy(p_tmp); + tor_free(p_tmp); + } #if 0 /* XXXX NM NM I belive this is safe to remove */ |