[or-cvs] when the or-connect succeeded and the tls handshake succeeded

[arma@xxxxxxxx (Roger Dingledine)]

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

Modified Files:
	circuituse.c 
Log Message:
when the or-connect succeeded and the tls handshake succeeded
but we didn't like the result, we were closing the connection
without sending any destroys back for the pending circuits. now
send those destroys anyway; i hope this doesn't break too much.


Index: circuituse.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- circuituse.c	31 Mar 2005 19:26:33 -0000	1.62
+++ circuituse.c	1 Apr 2005 07:25:18 -0000	1.63
@@ -479,10 +479,8 @@
 
   switch (conn->type) {
     case CONN_TYPE_OR:
-      if (conn->state != OR_CONN_STATE_OPEN) {
-        /* Inform any pending (not attached) circs that they should give up. */
-        circuit_n_conn_done(conn, 0);
-      }
+      /* Inform any pending (not attached) circs that they should give up. */
+      circuit_n_conn_done(conn, 0);
       /* Now close all the attached circuits on it. */
       while ((circ = circuit_get_by_conn(conn))) {
         if (circ->n_conn == conn) /* it's closing in front of us */