aboutsummaryrefslogtreecommitdiff
path: root/src/feature/dirauth
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-01-19 13:20:43 -0500
committerNick Mathewson <nickm@torproject.org>2021-01-19 13:20:43 -0500
commitb0af4ddc7c2fe80a79e41e31b7050d949561e044 (patch)
treeff741bb39328907361cbc5c51a8931a5175307ad /src/feature/dirauth
parentdeb445e94b5004ef4bcabe2e2368d082572a0e9c (diff)
parent27ee12836d67a0cfa123a2f2fad378c93848519a (diff)
downloadtor-b0af4ddc7c2fe80a79e41e31b7050d949561e044.tar.gz
tor-b0af4ddc7c2fe80a79e41e31b7050d949561e044.zip
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/feature/dirauth')
-rw-r--r--src/feature/dirauth/dirvote.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 4f494a75a3..86a3fa8f01 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -4232,8 +4232,7 @@ compare_routerinfo_addrs_by_family(const routerinfo_t *a,
{
const tor_addr_t *addr1 = (family==AF_INET) ? &a->ipv4_addr : &a->ipv6_addr;
const tor_addr_t *addr2 = (family==AF_INET) ? &b->ipv4_addr : &b->ipv6_addr;
- const int maskbits = (family==AF_INET) ? 32 : 64;
- return tor_addr_compare_masked(addr1, addr2, maskbits, CMP_EXACT);
+ return tor_addr_compare(addr1, addr2, CMP_EXACT);
}
/** Helper for sorting: compares two ipv4 routerinfos first by ipv4 address,