diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-10 12:12:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-10 12:12:14 -0400 |
| commit | 01fc93ffef3843a86710718c12ba9be67dcca2bc (patch) | |
| tree | d9a407ce9c70dbdf51e9a2c8fb4bfc191e5ed4b4 | |
| parent | f5258045c4cab07eea443563cac7608d5d3be5ab (diff) | |
| parent | 0fdad78fe1f20955ba1c0c93c752e20063c0bb58 (diff) | |
| download | tor-01fc93ffef3843a86710718c12ba9be67dcca2bc.tar.gz tor-01fc93ffef3843a86710718c12ba9be67dcca2bc.zip | |
Merge remote-tracking branch 'dgoulet/bug16706_031_01'
| -rw-r--r-- | changes/bug16706 | 3 | ||||
| -rw-r--r-- | src/or/relay.c | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/changes/bug16706 b/changes/bug16706 new file mode 100644 index 0000000000..9c1e315321 --- /dev/null +++ b/changes/bug16706 @@ -0,0 +1,3 @@ + o Minor bugfixes (hidden service): + - Stop printing cryptic warning when a client tries to connect on an + invalid port of the service. Fixes #16706.; bugfix on tor-0.2.6.3-alpha. diff --git a/src/or/relay.c b/src/or/relay.c index a7a5071198..5139036327 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -257,8 +257,13 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, log_debug(LD_OR,"Sending to origin."); if ((reason = connection_edge_process_relay_cell(cell, circ, conn, layer_hint)) < 0) { - log_warn(LD_OR, - "connection_edge_process_relay_cell (at origin) failed."); + /* If a client is trying to connect to unknown hidden service port, + * END_CIRC_AT_ORIGIN is sent back so we can then close the circuit. + * Do not log warn as this is an expected behavior for a service. */ + if (reason != END_CIRC_AT_ORIGIN) { + log_warn(LD_OR, + "connection_edge_process_relay_cell (at origin) failed."); + } return reason; } } |