aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorLinus Nordberg <linus@torproject.org>2012-07-19 20:41:23 +0200
committerNick Mathewson <nickm@torproject.org>2012-08-17 15:59:13 -0400
commit9ed87b37d04705983b11cd995140e8864454bf5e (patch)
tree0cec3d7d55de27a66a1db684d190e6b008072024 /src/or
parent97602c9de432cc1d49d4441de858ab73b8bf41c0 (diff)
downloadtor-9ed87b37d04705983b11cd995140e8864454bf5e.tar
tor-9ed87b37d04705983b11cd995140e8864454bf5e.tar.gz
Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic.
Closes #6423.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/routerlist.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 4979b933a..3c39e362d 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5160,6 +5160,8 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
if (strcasecmp(r1->address, r2->address) ||
strcasecmp(r1->nickname, r2->nickname) ||
r1->or_port != r2->or_port ||
+ !tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) ||
+ r1->ipv6_orport != r2->ipv6_orport ||
r1->dir_port != r2->dir_port ||
r1->purpose != r2->purpose ||
crypto_pk_cmp_keys(r1->onion_pkey, r2->onion_pkey) ||