torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Explain the "using anyway" log message better

Browse Source 
Also add a request to report any cases where we are not honoring
StrictNodes to the developers: These should now all be bugs.
This commit is contained in:
Sebastian Hahn
2011-04-08 04:01:23 +02:00
committed by Nick Mathewson
parent 8e2904e269
commit 92ec36a061
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/circuitbuild.c
+12 -6
View File
@@ -2896,7 +2896,7 @@ warn_if_last_router_excluded(origin_circuit_t *circ, const extend_info_t *exit)
case CIRCUIT_PURPOSE_C_GENERAL:
if (circ->build_state->is_internal)
return;
description = "Requested exit node";
description = "requested exit node";
rs = options->_ExcludeExitNodesUnion;
break;
case CIRCUIT_PURPOSE_C_INTRODUCING:
@@ -2911,22 +2911,28 @@ warn_if_last_router_excluded(origin_circuit_t *circ, const extend_info_t *exit)
case CIRCUIT_PURPOSE_C_REND_READY:
case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED:
case CIRCUIT_PURPOSE_C_REND_JOINED:
description = "Chosen rendezvous point";
description = "chosen rendezvous point";
domain = LD_BUG;
break;
case CIRCUIT_PURPOSE_CONTROLLER:
rs = options->_ExcludeExitNodesUnion;
description = "Controller-selected circuit target";
description = "controller-selected circuit target";
break;
}
if (routerset_contains_extendinfo(rs, exit)) {
log_fn(LOG_WARN, domain, "%s '%s' is in ExcludeNodes%s. Using anyway "
"(circuit purpose %d).",
/* We should never get here if StrictNodes is set to 1. */
if (options->StrictNodes)
log_warn(LD_BUG, "Using an excluded node with StrictNodes set. "
"Please report the following log message to the "
"developers.");
log_fn(LOG_WARN, domain, "Using %s '%s' which is listed in "
"ExcludeNodes%s, because no other options were available. To "
"prevent this, set the StrictNodes configuration option."
"(Circuit purpose is %d)",
description,exit->nickname,
rs==options->ExcludeNodes?"":" or ExcludeExitNodes",
(int)purpose);
/* XXX022-1090 "using anyway" is freaking people out -RD */
circuit_log_path(LOG_WARN, domain, circ);
}