summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-06-18 10:25:10 -0400
committerNick Mathewson <nickm@torproject.org>2013-06-18 10:25:10 -0400
commitefa342f5fa2c6700ed8273557b7fb39bdc577120 (patch)
tree86b552538a3227360372db696e942670a34640cd
parentd3063da691d0006cf41f6406099f056ab47c543a (diff)
downloadtor-efa342f5fa2c6700ed8273557b7fb39bdc577120.tar.gz
tor-efa342f5fa2c6700ed8273557b7fb39bdc577120.zip
Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cells
-rw-r--r--src/or/circuitlist.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index ac33ecfed7..3dc362f500 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;
}