commit 1498a6e84a871b2d1b05ab64e2a564a23e03e668 Author: Andrea Shepard andrea@torproject.org Date: Mon Oct 1 14:24:08 2012 -0700

Fix some circuitmux-related asserts in relay.c --- src/or/relay.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/or/relay.c b/src/or/relay.c index d034162..7c81273 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1779,7 +1779,7 @@ circuit_consider_sending_sendme(circuit_t *circ, crypt_path_t *layer_hint)

#ifdef ACTIVE_CIRCUITS_PARANOIA #define assert_cmux_ok_paranoid(chan) \ - assert_cmux_okay(chan) + assert_circuit_mux_okay(chan) #else #define assert_cmux_ok_paranoid(chan) #endif @@ -2117,6 +2117,9 @@ channel_flush_from_first_active_circuit(channel_t *chan, int max) streams_blocked = circ->streams_blocked_on_p_chan; }

+ /* Circuitmux told us this was active, so it should have cells */ + tor_assert(queue->n > 0); + /* * Get just one cell here; once we've sent it, that can change the circuit * selection, so we have to loop around for another even if this circuit