mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

Stop logging 'Your Guard' in circpathbias.c

Browse Source
This commit is contained in:
rl1987 2018-12-23 19:21:37 +02:00 committed by Nick Mathewson
parent 09472791d0
commit 380ae2b74b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug28895 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (usability):
- Stop saying "Your Guard ..." in pathbias_measure_{use,close}_rate()
as that confusingly suggests that mentioned guard node is under control
and responsibility of end user, which it is not. Fixes bug 28895;
bugfix on Tor 0.3.0.1-alpha.

14
src/feature/client/circpathbias.c
View File

@ -1332,7 +1332,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) { if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) { if (!pb->path_bias_disabled) {
log_warn(LD_CIRC, log_warn(LD_CIRC,
"Your Guard %s is failing to carry an extremely large " "Guard %s is failing to carry an extremely large "
"amount of stream on its circuits. " "amount of stream on its circuits. "
"To avoid potential route manipulation attacks, Tor has " "To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. " "disabled use of this guard. "
@ -1356,7 +1356,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
} else if (!pb->path_bias_use_extreme) { } else if (!pb->path_bias_use_extreme) {
pb->path_bias_use_extreme = 1; pb->path_bias_use_extreme = 1;
log_warn(LD_CIRC, log_warn(LD_CIRC,
"Your Guard %s is failing to carry an extremely large " "Guard %s is failing to carry an extremely large "
"amount of streams on its circuits. " "amount of streams on its circuits. "
"This could indicate a route manipulation attack, network " "This could indicate a route manipulation attack, network "
"overload, bad local network connectivity, or a bug. " "overload, bad local network connectivity, or a bug. "
@ -1380,7 +1380,7 @@ pathbias_measure_use_rate(entry_guard_t *guard)
if (!pb->path_bias_use_noticed) { if (!pb->path_bias_use_noticed) {
pb->path_bias_use_noticed = 1; pb->path_bias_use_noticed = 1;
log_notice(LD_CIRC, log_notice(LD_CIRC,
"Your Guard %s is failing to carry more streams on its " "Guard %s is failing to carry more streams on its "
"circuits than usual. " "circuits than usual. "
"Most likely this means the Tor network is overloaded " "Most likely this means the Tor network is overloaded "
"or your network connection is poor. " "or your network connection is poor. "
@ -1437,7 +1437,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (pathbias_get_dropguards(options)) { if (pathbias_get_dropguards(options)) {
if (!pb->path_bias_disabled) { if (!pb->path_bias_disabled) {
log_warn(LD_CIRC, log_warn(LD_CIRC,
"Your Guard %s is failing an extremely large " "Guard %s is failing an extremely large "
"amount of circuits. " "amount of circuits. "
"To avoid potential route manipulation attacks, Tor has " "To avoid potential route manipulation attacks, Tor has "
"disabled use of this guard. " "disabled use of this guard. "
@ -1461,7 +1461,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
} else if (!pb->path_bias_extreme) { } else if (!pb->path_bias_extreme) {
pb->path_bias_extreme = 1; pb->path_bias_extreme = 1;
log_warn(LD_CIRC, log_warn(LD_CIRC,
"Your Guard %s is failing an extremely large " "Guard %s is failing an extremely large "
"amount of circuits. " "amount of circuits. "
"This could indicate a route manipulation attack, " "This could indicate a route manipulation attack, "
"extreme network overload, or a bug. " "extreme network overload, or a bug. "
@ -1485,7 +1485,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_warned) { if (!pb->path_bias_warned) {
pb->path_bias_warned = 1; pb->path_bias_warned = 1;
log_warn(LD_CIRC, log_warn(LD_CIRC,
"Your Guard %s is failing a very large " "Guard %s is failing a very large "
"amount of circuits. " "amount of circuits. "
"Most likely this means the Tor network is " "Most likely this means the Tor network is "
"overloaded, but it could also mean an attack against " "overloaded, but it could also mean an attack against "
@ -1510,7 +1510,7 @@ pathbias_measure_close_rate(entry_guard_t *guard)
if (!pb->path_bias_noticed) { if (!pb->path_bias_noticed) {
pb->path_bias_noticed = 1; pb->path_bias_noticed = 1;
log_notice(LD_CIRC, log_notice(LD_CIRC,
"Your Guard %s is failing more circuits than " "Guard %s is failing more circuits than "
"usual. " "usual. "
"Most likely this means the Tor network is overloaded. " "Most likely this means the Tor network is overloaded. "
"Success counts are %ld/%ld. Use counts are %ld/%ld. " "Success counts are %ld/%ld. Use counts are %ld/%ld. "