sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cells

This commit is contained in:
Nick Mathewson 2013-06-18 10:25:10 -04:00
parent d3063da691
commit efa342f5fa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/circuitlist.c
View File

@ -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;
}