[tor-commits] [tor/master] Actually advertise IPv6 exit policies.

[nickm at torproject.org]

commit 004f3f4e5339bdb5bf8559a620343b919ba196c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 11:29:41 2012 -0500

    Actually advertise IPv6 exit policies.
    
    I have a theory that my tests will work better if the code I'm testing
    isn't disabled.
---
 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 a0950be..f51b74e 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 */