[or-cvs] ok, i know this one was a bug. we were expiring open general

[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:
	circuituse.c 
Log Message:
ok, i know this one was a bug. we were expiring open general
circuits after they had been around for 30 seconds.


Index: circuituse.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- circuituse.c	4 Dec 2005 21:59:15 -0000	1.97
+++ circuituse.c	4 Dec 2005 22:19:04 -0000	1.98
@@ -223,19 +223,13 @@
      * intro or rend, then mark it for close */
     if (victim->state == CIRCUIT_STATE_OPEN) {
       switch (victim->purpose) {
-        case CIRCUIT_PURPOSE_OR:
-        case CIRCUIT_PURPOSE_INTRO_POINT:
-        case CIRCUIT_PURPOSE_REND_POINT_WAITING:
-        case CIRCUIT_PURPOSE_REND_ESTABLISHED:
-          /* OR-side. We can't actually reach this point because of the
-           * IS_ORIGIN test above. */
+        default: /* most open circuits can be left alone. */
           continue; /* yes, continue inside a switch refers to the nearest
                      * enclosing loop. C is smart. */
-
         case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
         case CIRCUIT_PURPOSE_C_INTRODUCING:
         case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO:
-          break;
+          break; /* too old, need to die */
         case CIRCUIT_PURPOSE_C_REND_READY:
           /* it's a rend_ready circ -- has it already picked a query? */
           /* c_rend_ready circs measure age since timestamp_dirty,