aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendclient.c
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2011-11-24 18:29:56 +0100
committerNick Mathewson <nickm@torproject.org>2011-11-30 11:55:45 -0500
commitf786307ab7f601a3cb41c46df0a09758671a0bcf (patch)
treef4176da46b8baf23f3055fc1240c0c1c4aca3ca6 /src/or/rendclient.c
parent5bee213d236943dac2e08e04c1525e96a62f13f7 (diff)
downloadtor-f786307ab7f601a3cb41c46df0a09758671a0bcf.tar
tor-f786307ab7f601a3cb41c46df0a09758671a0bcf.tar.gz
First chunk of support for bridges on IPv6
Comments below focus on changes, see diff for added code. New type tor_addr_port_t holding an IP address and a TCP/UDP port. New flag in routerinfo_t, ipv6_preferred. This should go in the node_t instead but not now. Replace node_get_addr() with - node_get_prim_addr() for primary address, i.e. IPv4 for now - node_get_pref_addr() for preferred address, IPv4 or IPv6. Rename node_get_addr_ipv4h() node_get_prim_addr_ipv4h() for consistency. The primary address will not allways be an IPv4 address. Same for node_get_orport() -> node_get_prim_orport(). Rewrite node_is_a_configured_bridge() to take all OR ports into account. Extend argument list to extend_info_from_node and extend_info_from_router with a flag indicating if we want to use the routers primary address or the preferred address. Use the preferred address in as few situtations as possible for allowing clients to connect to bridges over IPv6.
Diffstat (limited to 'src/or/rendclient.c')
-rw-r--r--src/or/rendclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 6a45207e2..cda03c21e 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1059,7 +1059,7 @@ rend_client_get_random_intro_impl(const rend_cache_entry_t *entry,
smartlist_del(usable_nodes, i);
goto again;
}
- new_extend_info = extend_info_from_node(node);
+ new_extend_info = extend_info_from_node(node, 0);
if (!new_extend_info) {
log_info(LD_REND, "We don't have a descriptor for the intro-point relay "
"'%s'; trying another.",