From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Nov 2012 16:29:41 +0000 (-0500)
Subject: Actually advertise IPv6 exit policies.
X-Git-Tag: tor-0.2.4.7-alpha~35^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=004f3f4e5339bdb5bf8559a620343b919ba196c1;p=thirdparty%2Ftor.git

Actually advertise IPv6 exit policies.

I have a theory that my tests will work better if the code I'm testing
isn't disabled.
---

diff --git a/src/or/router.c b/src/or/router.c
index a0950bec63..f51b74e112 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 */