Commit 01fc93ff authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'dgoulet/bug16706_031_01'

parents f5258045 0fdad78f

changes/bug16706

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/or/relay.c

+7 −2
Original line number Diff line number Diff line
@@ -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) {

        /* 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;

      }

    }