summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-07-30 18:55:24 -0400
committerNick Mathewson <nickm@torproject.org>2010-07-30 18:55:24 -0400
commit6f45101327592333dcc54e08800fbc2cb68ccd49 (patch)
tree6ed550c89289a454c4436fc9facec1d7de206b8d /src/or/connection_or.c
parent15424bf800a56007d802db3a9d3fe40fbdf2bee5 (diff)
downloadtor-6f45101327592333dcc54e08800fbc2cb68ccd49.tar.gz
tor-6f45101327592333dcc54e08800fbc2cb68ccd49.zip
Clear cell queues when marking or truncating a circuit.
At best, this patch helps us avoid sending queued relayed cells that would get ignored during the time between when a destroy cell is sent and when the circuit is finally freed. At worst, it lets us release some memory a little earlier than it would otherwise. Fix for bug #1184. Bugfix on 0.2.0.1-alpha.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 405df1578b..c94325a5b7 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1291,10 +1291,6 @@ connection_or_send_destroy(circid_t circ_id, or_connection_t *conn, int reason)
cell.payload[0] = (uint8_t) reason;
log_debug(LD_OR,"Sending destroy (circID %d).", circ_id);
- /* XXXX It's possible that under some circumstances, we want the destroy
- * to take precedence over other data waiting on the circuit's cell queue.
- */
-
connection_or_write_cell_to_buf(&cell, conn);
return 0;
}