don't expire joined-rend circs that have an exit connection attached

and don't expire non-general excess circuits

svn:r1728

diff --git a/src/or/circuit.c b/src/or/circuit.c
index 731e5474268e75a6cf1da6e39be11b26364db9d9..37c9fa4abe24875b714c287d23330bfe35ae4e1d 100644 (file)
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -1231,13 +1231,16 @@ void circuit_expire_old_circuits(void) {
      */
     if (circ->timestamp_dirty &&
         circ->timestamp_dirty + options.NewCircuitPeriod < now &&
-        !circ->p_conn &&
-        !circ->p_streams) {
-      log_fn(LOG_DEBUG,"Closing n_circ_id %d",circ->n_circ_id);
+        !circ->p_conn && /* we're the origin */
+        !circ->p_streams && /* AP connections */
+        !circ->n_streams /* exit connections */ ) {
+      log_fn(LOG_DEBUG,"Closing n_circ_id %d (dirty %d secs ago)",circ->n_circ_id,
+             (int)(now - circ->timestamp_dirty));
       circuit_mark_for_close(circ);
     } else if (!circ->timestamp_dirty && CIRCUIT_IS_ORIGIN(circ) &&
-               circ->state == CIRCUIT_STATE_OPEN) {
-      /* Also, gather a list of open unused circuits that we created.
+               circ->state == CIRCUIT_STATE_OPEN &&
+               circ->purpose == CIRCUIT_PURPOSE_C_GENERAL) {
+      /* Also, gather a list of open unused general circuits that we created.
        * Because we add elements to the front of global_circuitlist,
        * the last elements of unused_open_circs will be the oldest
        * ones.