Commit d6fa8239 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'origin/maint-0.2.5'

parents 573d6274 4a6f5bb2

changes/bug12997

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Log more specific warnings when we get an ESTABLISH_RENDEZVOUS cell

      on a cannibalized or non-OR circuit. Resolves ticket 12997.

src/or/rendmid.c

+9 −2
Original line number Diff line number Diff line
@@ -224,9 +224,16 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, 
  log_info(LD_REND, "Received an ESTABLISH_RENDEZVOUS request on circuit %u",

           (unsigned)circ->p_circ_id);



  if (circ->base_.purpose != CIRCUIT_PURPOSE_OR || circ->base_.n_chan) {

  if (circ->base_.purpose != CIRCUIT_PURPOSE_OR) {

    log_warn(LD_PROTOCOL,

             "Tried to establish rendezvous on non-OR circuit with purpose %s",

             circuit_purpose_to_string(circ->base_.purpose));

    goto err;

  }



  if (circ->base_.n_chan) {

    log_warn(LD_PROTOCOL,

             "Tried to establish rendezvous on non-OR or non-edge circuit.");

             "Tried to establish rendezvous on non-edge circuit");

    goto err;

  }