[or-cvs] bugfix: it was expiring circuits that still had active conn...

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	circuit.c 
Log Message:
bugfix: it was expiring circuits that still had active connections


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- circuit.c	28 May 2003 02:03:25 -0000	1.48
+++ circuit.c	1 Jun 2003 02:09:36 -0000	1.49
@@ -621,7 +621,7 @@
   while(circ) {
     tmpcirc = circ;
     circ = circ->next;
-    if(tmpcirc != youngest && !tmpcirc->p_conn) {
+    if(tmpcirc != youngest && !tmpcirc->p_conn && !tmpcirc->p_streams) {
       log(LOG_DEBUG,"circuit_expire_unused_circuits(): Closing n_aci %d",tmpcirc->n_aci);
       circuit_close(tmpcirc);
     }