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

Merge branch 'maint-0.4.5'

Browse Source
This commit is contained in:
David Goulet 2020-12-08 14:51:43 -05:00
commit 6e83a52077
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket40205 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (relay, logging, reachability):
- When launching bandwidth testing circuit, don't log notice that we are
doing a reachability test. Furthermore, avoid to trigger a
"CHECKING_REACHABILITY" control event. Fixes bug 40205; bugfix on
0.4.5.1-alpha.

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

@ -274,7 +274,12 @@ router_do_orport_reachability_checks(const routerinfo_t *me,
!orport_reachable ? "reachability" : "bandwidth", !orport_reachable ? "reachability" : "bandwidth",
family_name, fmt_addrport_ap(ap)); family_name, fmt_addrport_ap(ap));
inform_testing_reachability(&ap->addr, ap->port, false); if (!orport_reachable) {
/* Only log if we are actually doing a reachability test to learn if our
* ORPort is reachable. Else, this prints a log notice if we are simply
* opening a bandwidth testing circuit even do we are reachable. */
inform_testing_reachability(&ap->addr, ap->port, false);
}
circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei, circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei,
CIRCLAUNCH_NEED_CAPACITY| CIRCLAUNCH_NEED_CAPACITY|