[or-cvs] tmp patch to also expire old clean rend_ready circs for now

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	circuit.c 
Log Message:
tmp patch to also expire old clean rend_ready circs for now
will have to be fixed once we build-and-open rend circs preemptively


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- circuit.c	18 Apr 2004 07:37:15 -0000	1.216
+++ circuit.c	18 Apr 2004 09:27:05 -0000	1.217
@@ -449,10 +449,10 @@
   return NULL;
 }
 
-#define MIN_SECONDS_BEFORE_EXPIRING_CIRC 20
+#define MIN_SECONDS_BEFORE_EXPIRING_CIRC 30
 /* circuits that were born at the end of their second might be expired
- * after 10.1 seconds; circuits born at the beginning might be expired
- * after closer to 11 seconds.
+ * after 30.1 seconds; circuits born at the beginning might be expired
+ * after closer to 31 seconds.
  */
 
 /* close all circuits that start at us, aren't open, and were born
@@ -493,6 +493,10 @@
        victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING ||
        victim->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO ||
 
+       /* it's a rend_ready circ, but it's already picked a query */
+       (victim->purpose == CIRCUIT_PURPOSE_C_REND_READY &&
+        victim->rend_query[0]) ||
+
        /* c_rend_ready circs measure age since timestamp_dirty,
         * because that's set when they switch purposes
         */