mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'dgoulet/bug16706_031_01'

Browse source
This commit is contained in:
Nick Mathewson 2017-04-10 12:12:14 -04:00
commit 01fc93ffef
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug16706 Normal file
View file

@ -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.

9
src/or/relay.c
View file

@ -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;
}
}