[or-cvs] r9930: (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-04-09 17:33:49 -0400 (Mon, 09 Apr 2007)
New Revision: 9930

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/circuitlist.c
   tor/trunk/src/or/connection_or.c
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/relay.c
   tor/trunk/src/or/routerlist.c
Log:



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12658] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================

Modified: tor/trunk/src/or/circuitlist.c
===================================================================
--- tor/trunk/src/or/circuitlist.c	2007-04-09 20:09:28 UTC (rev 9929)
+++ tor/trunk/src/or/circuitlist.c	2007-04-09 21:33:49 UTC (rev 9930)
@@ -158,9 +158,11 @@
                             or_connection_t *conn)
 {
   int active;
+  int active;
 
   active = circ->p_conn_cells.n > 0;
   tor_assert(bool_eq(active, circ->next_active_on_p_conn));
+  active = circ->p_conn_cells.n > 0;
 
   circuit_set_circid_orconn_helper(TO_CIRCUIT(circ), CELL_DIRECTION_IN,
                                    id, conn, active);
@@ -177,9 +179,11 @@
                             or_connection_t *conn)
 {
   int active;
+  int active;
 
   active = circ->n_conn_cells.n > 0;
   tor_assert(bool_eq(active, circ->next_active_on_n_conn));
+  active = circ->n_conn_cells.n > 0;
 
   circuit_set_circid_orconn_helper(circ, CELL_DIRECTION_OUT,
                                    id, conn, active);
@@ -410,6 +414,8 @@
       other->rend_splice = NULL;
     }
 
+    cell_queue_clear(&ocirc->p_conn_cells);
+
     tor_free(circ->onionskin);
 
     /* remove from map. */
@@ -420,6 +426,8 @@
     cell_queue_clear(&ocirc->p_conn_cells);
   }
 
+  cell_queue_clear(&circ->n_conn_cells);
+
   /* Remove from map. */
   circuit_set_n_circid_orconn(circ, 0, NULL);
 

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2007-04-09 20:09:28 UTC (rev 9929)
+++ tor/trunk/src/or/connection_or.c	2007-04-09 21:33:49 UTC (rev 9930)
@@ -792,6 +792,7 @@
 connection_or_send_destroy(uint16_t circ_id, or_connection_t *conn, int reason)
 {
   cell_t cell;
+  circuit_t *circ;
 
   tor_assert(conn);
 

Modified: tor/trunk/src/or/dirserv.c
===================================================================

Modified: tor/trunk/src/or/relay.c
===================================================================

Modified: tor/trunk/src/or/routerlist.c
===================================================================