From bc95a4dbcb8689c40521d442dd149e553b7e3880 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 22 Apr 2008 17:44:28 +0000 Subject: [PATCH] r15283@tombo: nickm | 2008-04-22 13:43:45 -0400 Correctly notify one-hop connections when a circuit build has failed. possible fix for bug 669. found by lodger. svn:r14415 --- ChangeLog | 2 ++ src/or/circuituse.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd40bfda93..27388c36d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? by adding "new stream" events for DNS requests, and removing spurious "stream closed" events" for cached reverse resolves. Patch from mwenge. Fixes bug 646. + - Correctly notify one-hop connections when a circuit build has + failed. Possible fix for bug 669. Found by lodger. o Minor features: - Allow separate log levels to be configured for different logging diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 73c31144dd..92e1d94d23 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -745,10 +745,10 @@ circuit_build_failed(origin_circuit_t *circ) n_conn->_base.or_is_obsolete = 1; entry_guard_register_connect_status(n_conn->identity_digest, 0, time(NULL)); - /* if there are any one-hop streams waiting on this circuit, fail - * them now so they can retry elsewhere. */ - connection_ap_fail_onehop(n_conn->identity_digest); } + /* if there are any one-hop streams waiting on this circuit, fail + * them now so they can retry elsewhere. */ + connection_ap_fail_onehop(circ->_base.n_conn_id_digest); } switch (circ->_base.purpose) {