[or-cvs] r9913: Comment out the "clear queue when sending a destroy" logic: (tor/trunk/src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-03-28 22:32:00 -0400 (Wed, 28 Mar 2007)
New Revision: 9913

Modified:
   tor/trunk/src/or/connection_or.c
Log:
Comment out the "clear queue when sending a destroy" logic: it seems potentially dangerous.  (see comment for details)

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2007-03-29 00:07:34 UTC (rev 9912)
+++ tor/trunk/src/or/connection_or.c	2007-03-29 02:32:00 UTC (rev 9913)
@@ -792,7 +792,6 @@
 connection_or_send_destroy(uint16_t circ_id, or_connection_t *conn, int reason)
 {
   cell_t cell;
-  circuit_t *circ;
 
   tor_assert(conn);
 
@@ -802,10 +801,14 @@
   cell.payload[0] = (uint8_t) reason;
   log_debug(LD_OR,"Sending destroy (circID %d).", circ_id);
 
+#if 0
+  /* XXXX020 Actually, don't kill the cell queue: it may have data that we're
+   * waiting to flush.  We need to do something more sensible here. */
   /* Clear the cell queue on the circuit, so that our destroy cell will
    * be the very next thing written.*/
   circ = circuit_get_by_circid_orconn(circ_id, conn);
   circuit_clear_cell_queue(circ, conn);
+#endif
 
   connection_or_write_cell_to_buf(&cell, conn);
   return 0;