nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

relay: Log IPv4 and IPv6 ORPorts when testing reachability

Browse Source 
When a relay starts testing reachability, log its IPv6 ORPort.
The existing code logs the IPv4 ORPort and DirPort.

The IPv4 ORPort is required. The other ports are only logged if they
are present.

Part of 33222.
This commit is contained in:
teor 2020-04-30 22:30:02 +10:00
parent 2a0e48385d
commit aade9f31e7
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/feature/relay/selftest.c
View File

@ -272,7 +272,7 @@ router_do_reachability_checks(int test_or, int test_dir)
int int
inform_testing_reachability(void) inform_testing_reachability(void)
{ {
char dirbuf[128]; char extra_addrbuf[128];
char *address; char *address;
const routerinfo_t *me = router_get_my_routerinfo(); const routerinfo_t *me = router_get_my_routerinfo();
if (!me) if (!me)
@ -281,20 +281,28 @@ inform_testing_reachability(void)
control_event_server_status(LOG_NOTICE, control_event_server_status(LOG_NOTICE,
"CHECKING_REACHABILITY ORADDRESS=%s:%d", "CHECKING_REACHABILITY ORADDRESS=%s:%d",
address, me->or_port); address, me->or_port);
const bool has_ipv6 = tor_addr_port_is_valid(&me->ipv6_addr,
me->ipv6_orport, 0);
if (has_ipv6) {
tor_snprintf(extra_addrbuf, sizeof(extra_addrbuf), " and %s",
fmt_addrport(&me->ipv6_addr, me->ipv6_orport));
/* We'll add an IPv6 control event in #34068. */
}
if (me->dir_port) { if (me->dir_port) {
tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", tor_snprintf(extra_addrbuf, sizeof(extra_addrbuf), " and DirPort %s:%d",
address, me->dir_port); address, me->dir_port);
control_event_server_status(LOG_NOTICE, control_event_server_status(LOG_NOTICE,
"CHECKING_REACHABILITY DIRADDRESS=%s:%d", "CHECKING_REACHABILITY DIRADDRESS=%s:%d",
address, me->dir_port); address, me->dir_port);
} }
log_notice(LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... " log_notice(LD_OR, "Now checking whether ORPort%s %s:%d%s %s reachable... "
"(this may take up to %d minutes -- look for log " "(this may take up to %d minutes -- look for log "
"messages indicating success)", "messages indicating success)",
address, me->or_port, has_ipv6 ? "s" : "",
me->dir_port ? dirbuf : "", address, me->or_port,
me->dir_port ? "are" : "is", has_ipv6 || me->dir_port ? extra_addrbuf : "",
TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); has_ipv6 || me->dir_port ? "are" : "is",
TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60);
tor_free(address); tor_free(address);
return 1; return 1;