nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename routers_have_same_or_addr() to reflect the fact that it now checks both OR ports.

Browse Source
This commit is contained in:
Linus Nordberg 2012-05-11 10:22:45 +02:00 committed by Linus Nordberg
parent 7c80a4502c
commit cdef2b181a
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/dirserv.c
View File

@ -3356,7 +3356,7 @@ dirserv_should_launch_reachability_test(const routerinfo_t *ri,
/* It just came out of hibernation; launch a reachability test */
return 1;
}
if (! routers_have_same_or_addr(ri, ri_old)) {
if (! routers_have_same_or_addrs(ri, ri_old)) {
/* Address or port changed; launch a reachability test */
return 1;
}

3
src/or/nodelist.c
View File

@ -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;

2
src/or/routerlist.c
View File

@ -1343,7 +1343,7 @@ mark_all_trusteddirservers_up(void)
/** Return true iff r1 and r2 have the same address and OR port. */
int
routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2)
routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2)
{
return r1->addr == r2->addr && r1->or_port == r2->or_port &&
tor_addr_eq(&r1->ipv6_addr, &r2->ipv6_addr) &&

2
src/or/routerlist.h
View File

@ -36,7 +36,7 @@ const routerstatus_t *router_pick_trusteddirserver(dirinfo_type_t type,
int router_get_my_share_of_directory_requests(double *v2_share_out,
double *v3_share_out);
void router_reset_status_download_failures(void);
int routers_have_same_or_addr(const routerinfo_t *r1, const routerinfo_t *r2);
int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2);
int router_nickname_is_in_list(const routerinfo_t *router, const char *list);
const routerinfo_t *routerlist_find_my_routerinfo(void);
const node_t *router_find_exact_exit_enclave(const char *address,