[or-cvs] fix assert while attachstream"ing a connect-wait or

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	control.c 
Log Message:
fix assert while attachstream'ing a connect-wait or
resolve-wait stream.


Index: control.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -d -r1.176 -r1.177
--- control.c	12 Mar 2006 04:07:21 -0000	1.176
+++ control.c	12 Mar 2006 04:33:29 -0000	1.177
@@ -1831,13 +1831,13 @@ handle_control_attachstream(connection_t
 
   /* Do we need to detach it first? */
   if (ap_conn->state != AP_CONN_STATE_CONTROLLER_WAIT) {
-    circuit_t *tmpcirc = circuit_get_by_edge_conn(conn);
-    connection_edge_end(conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer);
+    circuit_t *tmpcirc = circuit_get_by_edge_conn(ap_conn);
+    connection_edge_end(ap_conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer);
     /* Un-mark it as ending, since we're going to reuse it. */
-    conn->has_sent_end = 0;
+    ap_conn->has_sent_end = 0;
     if (tmpcirc)
-      circuit_detach_stream(tmpcirc,conn);
-    conn->state = AP_CONN_STATE_CONTROLLER_WAIT;
+      circuit_detach_stream(tmpcirc,ap_conn);
+    ap_conn->state = AP_CONN_STATE_CONTROLLER_WAIT;
   }
 
   if (zero_circ) {