[or-cvs] Make arguments to circuit_set_circid_orconn match the conne...

Nick Mathewson nickm at seul.org
Tue Nov 29 17:13:36 UTC 2005


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv14056/src/or

Modified Files:
	circuituse.c 
Log Message:
Make arguments to circuit_set_circid_orconn match the connection that is closing in circuit_about_to_close_connection. This accounts for our mysterious "arbitrary ram gets decremented!" bug.

Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- circuituse.c	26 Nov 2005 01:43:57 -0000	1.92
+++ circuituse.c	29 Nov 2005 17:13:34 -0000	1.93
@@ -516,10 +516,10 @@
       SMARTLIST_FOREACH(circs, circuit_t *, circ, {
         if (circ->n_conn == conn)
           /* it's closing in front of us */
-          circuit_set_circid_orconn(circ, 0, NULL, P_CONN_CHANGED);
+          circuit_set_circid_orconn(circ, 0, NULL, N_CONN_CHANGED);
         if (circ->p_conn == conn)
           /* it's closing behind us */
-          circuit_set_circid_orconn(circ, 0, NULL, N_CONN_CHANGED);
+          circuit_set_circid_orconn(circ, 0, NULL, P_CONN_CHANGED);
         circuit_mark_for_close(circ);
       });
       smartlist_free(circs);



More information about the tor-commits mailing list