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

Check IPv6 subnets as well as IPv4 subnets where possible when choosing client paths

Browse Source
This commit is contained in:
Neel Chauhan 2018-09-05 10:12:35 -04:00 committed by David Goulet
parent aa1ae1343a
commit 067b16eae2
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug24393 Normal file
View File

@ -0,0 +1,6 @@
o Minor features (ipv6):
- When using addrs_in_same_network_family(), check IPv6 subnets as well as
IPv4 ones where possible when a client chooses circuit paths. Previously,
we used this function only for IPv4 subnets. Closes ticket 24393. Patch
by Neel Chauhan.

18
src/feature/nodelist/nodelist.c
View File

@ -1867,6 +1867,9 @@ int
addrs_in_same_network_family(const tor_addr_t *a1, addrs_in_same_network_family(const tor_addr_t *a1,
const tor_addr_t *a2) const tor_addr_t *a2)
{ {
if (tor_addr_is_null(a1) || tor_addr_is_null(a2))
return 0;
switch (tor_addr_family(a1)) { switch (tor_addr_family(a1)) {
case AF_INET: case AF_INET:
return 0 == tor_addr_compare_masked(a1, a2, 16, CMP_SEMANTIC); return 0 == tor_addr_compare_masked(a1, a2, 16, CMP_SEMANTIC);
@ -1917,7 +1920,13 @@ nodes_in_same_family(const node_t *node1, const node_t *node2)
tor_addr_t a1, a2; tor_addr_t a1, a2;
node_get_addr(node1, &a1); node_get_addr(node1, &a1);
node_get_addr(node2, &a2); node_get_addr(node2, &a2);
if (addrs_in_same_network_family(&a1, &a2))
tor_addr_port_t ap6_1, ap6_2;
node_get_pref_ipv6_orport(node1, &ap6_1);
node_get_pref_ipv6_orport(node2, &ap6_2);
if (addrs_in_same_network_family(&a1, &a2) ||
addrs_in_same_network_family(&ap6_1.addr, &ap6_2.addr))
return 1; return 1;
} }
@ -1974,12 +1983,17 @@ nodelist_add_node_and_family(smartlist_t *sl, const node_t *node)
/* First, add any nodes with similar network addresses. */ /* First, add any nodes with similar network addresses. */
if (options->EnforceDistinctSubnets) { if (options->EnforceDistinctSubnets) {
tor_addr_t node_addr; tor_addr_t node_addr;
tor_addr_port_t node_ap6;
node_get_addr(node, &node_addr); node_get_addr(node, &node_addr);
node_get_pref_ipv6_orport(node, &node_ap6);
SMARTLIST_FOREACH_BEGIN(all_nodes, const node_t *, node2) { SMARTLIST_FOREACH_BEGIN(all_nodes, const node_t *, node2) {
tor_addr_t a; tor_addr_t a;
tor_addr_port_t ap6;
node_get_addr(node2, &a); node_get_addr(node2, &a);
if (addrs_in_same_network_family(&a, &node_addr)) node_get_pref_ipv6_orport(node2, &ap6);
if (addrs_in_same_network_family(&a, &node_addr) ||
addrs_in_same_network_family(&ap6.addr, &node_ap6.addr))
smartlist_add(sl, (void*)node2); smartlist_add(sl, (void*)node2);
} SMARTLIST_FOREACH_END(node2); } SMARTLIST_FOREACH_END(node2);
} }