From 8f3bb66ebc2f4c16d76cf301932f7288094e577c Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 5 Jun 2006 08:25:02 +0000 Subject: [PATCH] simplify some code, since circuit_build_failed() is only called on non-open circuits. svn:r6540 --- src/or/circuituse.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ac77c35801..9e8d410813 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -691,12 +691,8 @@ circuit_build_failed(circuit_t *circ) switch (circ->purpose) { case CIRCUIT_PURPOSE_C_GENERAL: - if (circ->state != CIRCUIT_STATE_OPEN) { - /* If we never built the circuit, note it as a failure. */ - /* Note that we can't just check circ->cpath here, because if - * circuit-building failed immediately, it won't be set yet. */ - circuit_increment_failure_count(); - } + /* If we never built the circuit, note it as a failure. */ + circuit_increment_failure_count(); break; case CIRCUIT_PURPOSE_TESTING: circuit_testing_failed(circ, failed_at_last_hop); @@ -718,9 +714,7 @@ circuit_build_failed(circuit_t *circ) break; case CIRCUIT_PURPOSE_C_ESTABLISH_REND: /* at Alice, waiting for Bob */ - if (circ->state != CIRCUIT_STATE_OPEN) { - circuit_increment_failure_count(); - } + circuit_increment_failure_count(); /* Alice will pick a new rend point when this one dies, if * the stream in question still cares. No need to act here. */ break;