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

Clarify logic in router_should_skip_orport_reachability_check_family()

Browse Source 
The '!=' checks were confusing the issue of what the code was really
doing.
This commit is contained in:
Nick Mathewson 2020-06-23 11:24:20 -04:00
parent b365179ee0
commit ac648fa307
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,12 +96,16 @@ router_should_skip_orport_reachability_check_family(
return true;
}
if (family != AF_INET6) {
// Which reachability flags should we look at?
const bool checking_ipv4 = (family == AF_INET || family == 0);
const bool checking_ipv6 = (family == AF_INET6 || family == 0);
if (checking_ipv4) {
if (have_orport_for_family(AF_INET) && !can_reach_or_port_ipv4) {
return false;
}
}
if (family != AF_INET) {
if (checking_ipv6) {
if (have_orport_for_family(AF_INET6) && !can_reach_or_port_ipv6) {
return false;
}