From 2e0bf9d8bf99f6e9959e9e3ec545600e968c62d0 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 22 Apr 2008 17:44:36 +0000 Subject: [PATCH] r15284@tombo: nickm | 2008-04-22 13:44:22 -0400 Backport: Correctly notify one-hop connections when a circuit build has failed. possible fix for bug 669. found by lodger. svn:r14416 --- ChangeLog | 2 ++ src/or/circuituse.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4661325c83..b971fb6e10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,8 @@ Changes in version 0.2.0.24-rc - 2008-04-0? 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 (security): - Reject requests for reverse-dns lookup of names in a private diff --git a/src/or/circuituse.c b/src/or/circuituse.c index ffe18c05a0..e37b4153a6 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) {