Commit 9c239ecc authored by rl1987's avatar rl1987
Browse files

Use END_CIRC_REASON_TORPROTOCOL instead of magic number.

parent 3c0e09ef

changes/bug13840

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Code simplifications and refactoring:

    - In connection_exit_begin_conn(), use END_CIRC_REASON_TORPROTOCOL

      constant instead of hardcoded value. Fixes issue 13840.

src/or/connection_edge.c

+2 −2
Original line number Diff line number Diff line
@@ -2461,7 +2461,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) 


  relay_header_unpack(&rh, cell->payload);

  if (rh.length > RELAY_PAYLOAD_SIZE)

    return -1;

    return -END_CIRC_REASON_TORPROTOCOL;



  /* Note: we have to use relay_send_command_from_edge here, not

   * connection_edge_end or connection_edge_send_command, since those require
@@ -2479,7 +2479,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) 


  r = begin_cell_parse(cell, &bcell, &end_reason);

  if (r < -1) {

    return -1;

    return -END_CIRC_REASON_TORPROTOCOL;

  } else if (r == -1) {

    tor_free(bcell.address);

    relay_send_end_cell_from_edge(rh.stream_id, circ, end_reason, NULL);