From f858370233a7d01d89949f79f92e8b67acd69f46 Mon Sep 17 00:00:00 2001 From: Mike Perry Date: Sat, 19 Jan 2013 21:16:24 -0800 Subject: Prevent early close of path bias testing circuits. We need to let them live long enough to perform the test. --- src/or/circuituse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/or/circuituse.c') diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 0b2fe9eb8d..48a774352e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1078,7 +1078,10 @@ circuit_expire_old_circuits_clientside(void) "purpose %d)", circ->n_circ_id, (long)(now.tv_sec - circ->timestamp_dirty), circ->purpose); - circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); + /* Don't do this magic for testing circuits. Their death is governed + * by circuit_expire_building */ + if (circ->purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) + circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!circ->timestamp_dirty && circ->state == CIRCUIT_STATE_OPEN) { if (timercmp(&circ->timestamp_began, &cutoff, <)) { if (circ->purpose == CIRCUIT_PURPOSE_C_GENERAL || -- cgit v1.2.3-54-g00ecf