nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Take IPv6 into account when rewriting routerinfo for a bridge and maintain ipv6_preferred.

Browse Source 
Don't touch the string representation in routerinfo_t->address.

Also, set or clear the routerinfo_t->ipv6_preferred flag based on the
address family of the bridge.
This commit is contained in:
Linus Nordberg 2011-11-24 18:54:20 +01:00 committed by Nick Mathewson
parent 6048f01971
commit f6ce9e4ea5
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/or/circuitbuild.c
View File

@ -5152,10 +5152,13 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
routerinfo_t *ri = node->ri; routerinfo_t *ri = node->ri;
tor_addr_from_ipv4h(&addr, ri->addr); tor_addr_from_ipv4h(&addr, ri->addr);
if (!tor_addr_compare(&bridge->addr, &addr, CMP_EXACT) && if ((!tor_addr_compare(&bridge->addr, &addr, CMP_EXACT) &&
bridge->port == ri->or_port) { bridge->port == ri->or_port) ||
(!tor_addr_compare(&bridge->addr, &ri->ipv6_addr, CMP_EXACT) &&
bridge->port == ri->ipv6_orport)) {
/* they match, so no need to do anything */ /* they match, so no need to do anything */
} else { } else {
if (tor_addr_family(&bridge->addr) == AF_INET) {
ri->addr = tor_addr_to_ipv4h(&bridge->addr); ri->addr = tor_addr_to_ipv4h(&bridge->addr);
tor_free(ri->address); tor_free(ri->address);
ri->address = tor_dup_ip(ri->addr); ri->address = tor_dup_ip(ri->addr);
@ -5164,8 +5167,25 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
"Adjusted bridge routerinfo for '%s' to match configured " "Adjusted bridge routerinfo for '%s' to match configured "
"address %s:%d.", "address %s:%d.",
ri->nickname, ri->address, ri->or_port); ri->nickname, ri->address, ri->or_port);
} else if (tor_addr_family(&bridge->addr) == AF_INET6) {
tor_addr_copy(&ri->ipv6_addr, &bridge->addr);
ri->ipv6_orport = bridge->port;
log_info(LD_DIR,
"Adjusted bridge routerinfo for '%s' to match configured "
"address %s:%d.",
ri->nickname, fmt_addr(&ri->ipv6_addr), ri->ipv6_orport);
} else {
log_err(LD_BUG, "Address family not supported: %d.",
tor_addr_family(&bridge->addr));
return;
} }
} }
/* Indicate that we prefer connecting to this bridge over the
protocol that the bridge address indicates. Last bridge
descriptor handled wins. */
ri->ipv6_preferred = tor_addr_family(&bridge->addr) == AF_INET6;
}
if (node->rs) { if (node->rs) {
routerstatus_t *rs = node->rs; routerstatus_t *rs = node->rs;
tor_addr_from_ipv4h(&addr, rs->addr); tor_addr_from_ipv4h(&addr, rs->addr);