diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-04-08 04:01:23 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-26 23:55:23 -0400 |
| commit | 92ec36a061de17dd4e378d5ce34d82f91eee9f86 (patch) | |
| tree | d7c9c459be9a5fbd46d8aabd92f70213a412f0ac /src | |
| parent | 8e2904e269e039713c2b2e7be10b82e11f239cd0 (diff) | |
| download | tor-92ec36a061de17dd4e378d5ce34d82f91eee9f86.tar tor-92ec36a061de17dd4e378d5ce34d82f91eee9f86.tar.gz | |
Explain the "using anyway" log message better
Also add a request to report any cases where we are not honoring
StrictNodes to the developers: These should now all be bugs.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuitbuild.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c58509f90..681f52402 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -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); } |