diff options
| author | Linus Nordberg <linus@nordberg.se> | 2012-05-11 10:22:45 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@torproject.org> | 2012-07-19 18:21:22 +0200 |
| commit | cdef2b181a0a7690736132542fbc5307d5c38955 (patch) | |
| tree | d3dd215dbb2b3e754c3179bf2f964cdf067a3bb0 /src/or/nodelist.c | |
| parent | 7c80a4502ce3f0b6d95bf2cee134a89765894b74 (diff) | |
| download | tor-cdef2b181a0a7690736132542fbc5307d5c38955.tar.gz tor-cdef2b181a0a7690736132542fbc5307d5c38955.zip | |
Rename routers_have_same_or_addr() to reflect the fact that it now checks both OR ports.
Diffstat (limited to 'src/or/nodelist.c')
| -rw-r--r-- | src/or/nodelist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/nodelist.c b/src/or/nodelist.c index cb94173985..bbbb9ebc3a 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -135,8 +135,7 @@ nodelist_replace_routerinfo(routerinfo_t *old, routerinfo_t *new) node = node_get_mutable_by_id(old->cache_info.identity_digest); if (node) { tor_assert(node->ri == old); - /* XXXX prop186 we may have more than one address. */ - if (!routers_have_same_or_addr(old, new)) { + if (!routers_have_same_or_addrs(old, new)) { /* These mustn't carry over when the address and orport change. */ node->last_reachable = node->last_reachable6 = 0; |