aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-24 23:45:24 -0400
committerNick Mathewson <nickm@torproject.org>2012-11-14 23:16:22 -0500
commitc3faa0ebd55f7de80db1a3aa5e64a79c72708722 (patch)
tree10528e633805fb1a643440352fd43bf880f38ea6 /src/or/router.c
parentc64ee7099f32c2630d8ed65febf92357cd5e9487 (diff)
downloadtor-c3faa0ebd55f7de80db1a3aa5e64a79c72708722.tar
tor-c3faa0ebd55f7de80db1a3aa5e64a79c72708722.tar.gz
Simplest version of server-side IPv6 support (no dns)
This is a relatively simple set of changes: we mostly need to remove a few "but not for IPv6" changes. We also needed to tweak the handling of DNS code to generate RESOLVED cells that could get an IPv6 answer in return.
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c
index cdd33bb6f..642656fc0 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1380,8 +1380,8 @@ router_compare_to_my_exit_policy(edge_connection_t *conn)
if (tor_addr_is_null(&conn->base_.addr))
return -1;
- /* XXXX IPv6 */
- if (tor_addr_family(&conn->base_.addr) != AF_INET)
+ if (tor_addr_family(&conn->base_.addr) != AF_INET &&
+ tor_addr_family(&conn->base_.addr) != AF_INET6)
return -1;
return compare_tor_addr_to_addr_policy(&conn->base_.addr, conn->base_.port,