commit efa342f5fa2c6700ed8273557b7fb39bdc577120 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 18 10:25:10 2013 -0400

Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cells --- src/or/circuitlist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index ac33ecf..3dc362f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1508,18 +1508,18 @@ marked_circuit_free_cells(circuit_t *circ) log_warn(LD_BUG, "Called on non-marked circuit"); return; } - cell_queue_clear(&circ->n_conn_cells); + cell_queue_clear(&circ->n_chan_cells); if (! CIRCUIT_IS_ORIGIN(circ)) - cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_conn_cells); + cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells); }

/** Return the number of cells used by the circuit <b>c</b>'s cell queues. */ static size_t n_cells_in_circ_queues(const circuit_t *c) { - size_t n = c->n_conn_cells.n; + size_t n = c->n_chan_cells.n; if (! CIRCUIT_IS_ORIGIN(c)) - n += TO_OR_CIRCUIT((circuit_t*)c)->p_conn_cells.n; + n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n; return n; }