aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerlist.c
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2012-05-09 17:58:01 +0200
committerLinus Nordberg <linus@torproject.org>2012-07-19 18:21:20 +0200
commit4cce8ab742999900a4c5f1f3f8faf13d217014e0 (patch)
treef891650b4bc6fd3c0f8cb6b2f31590eb16425cc7 /src/or/routerlist.c
parentc1ff07440e67f1ae690acbfceddb6174fdb092df (diff)
downloadtor-4cce8ab742999900a4c5f1f3f8faf13d217014e0.tar.gz
tor-4cce8ab742999900a4c5f1f3f8faf13d217014e0.zip
Add last_reachable and testing_since for IPv6 OR port.
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r--src/or/routerlist.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f984d93e8e..cc47299fce 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1345,7 +1345,9 @@ mark_all_trusteddirservers_up(void)
int
routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2)
{
- return r1->addr == r2->addr && r1->or_port == r2->or_port;
+ return r1->addr == r2->addr && r1->or_port == r2->or_port &&
+ tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) &&
+ r1->ipv6_orport == r2->ipv6_orport;
}
/** Reset all internal variables used to count failed downloads of network