Skip to content

conflux: Avoid noting a cell was sent on a closed circuit

David Goulet requested to merge dgoulet/tor:ticket40921_048_01 into maint-0.4.8

It turns out that circuit_package_relay_cell() returns 0 in order to drop a cell but there is a code path, if the circuit queue is full, that also silently closes the circuit and returns 0.

This lead to Conflux thinking a cell was sent but actually the cell was not and the circuit was closed leading to the hard assert.

And so this function makes sure that circuit_package_relay_cell() and append_cell_to_circuit_queue() returns a value that indicate what happened with the cell and circuit so the caller can make an informed decision with it.

This change makes it that we do NOT enter the Conflux subsystem if the cell is not queued on the circuit.

Fixes #40921 (closed)

Signed-off-by: David Goulet dgoulet@torproject.org

Merge request reports