Commit 74c05959 authored by George Kadianakis's avatar George Kadianakis
Browse files

Ignore regular cells in padding circuits. 

Padding circuits were regular cells that got closed before their padding
machine could finish. This means that they can still receive regular cells from
their past life, but they have no way or reason to answer them anymore. Hence
let's ignore them before they even get to the proper subsystems.
parent 1d6054f7

changes/bug30942

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (circuit padding):

    - Ignore non-padding cells on padding circuits. This addresses various

      warning messages from subsystems that were not expecting padding

      circuits. Fixes bug 30942; bugfix on 0.4.1.1-alpha.
 
 No newline at end of file

src/core/or/relay.c

+11 −0
Original line number Diff line number Diff line
@@ -1663,6 +1663,17 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, 
      if (circpad_handle_padding_negotiated(circ, cell, layer_hint) == 0)

        circuit_read_valid_data(TO_ORIGIN_CIRCUIT(circ), rh.length);

      return 0;

  }



  /* If this is a padding circuit we don't need to parse any other commands

   * than the padding ones. Just drop them to the floor. */

  if (circ->purpose == CIRCUIT_PURPOSE_C_CIRCUIT_PADDING) {

    log_info(domain, "Ignored cell (%d) that arrived in padding circuit.",

             rh.command);

    return 0;

  }



  switch (rh.command) {

    case RELAY_COMMAND_BEGIN:

    case RELAY_COMMAND_BEGIN_DIR:

      if (layer_hint &&