diff options
| author | Linus Nordberg <linus@torproject.org> | 2012-07-19 20:41:23 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 15:59:13 -0400 |
| commit | 9ed87b37d04705983b11cd995140e8864454bf5e (patch) | |
| tree | 0cec3d7d55de27a66a1db684d190e6b008072024 | |
| parent | 97602c9de432cc1d49d4441de858ab73b8bf41c0 (diff) | |
| download | tor-9ed87b37d04705983b11cd995140e8864454bf5e.tar.gz tor-9ed87b37d04705983b11cd995140e8864454bf5e.zip | |
Consider IPv6 OR ports when deciding whether a routerinfo change is cosmetic.
Closes #6423.
| -rw-r--r-- | changes/bug6423 | 3 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug6423 b/changes/bug6423 new file mode 100644 index 0000000000..2ea4f1410d --- /dev/null +++ b/changes/bug6423 @@ -0,0 +1,3 @@ + o Minor features: + - Consider new, removed or changed IPv6 OR ports a non cosmetic + change. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4979b933ad..3c39e362df 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) || |