aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-04-22 17:44:28 +0000
committerNick Mathewson <nickm@torproject.org>2008-04-22 17:44:28 +0000
commitbc95a4dbcb8689c40521d442dd149e553b7e3880 (patch)
tree4b9811f3692da1a309a219257292994cc2fe8746 /src/or/circuituse.c
parent21592ad429c1921e4033697aaf6ddb5ababe7bce (diff)
downloadtor-bc95a4dbcb8689c40521d442dd149e553b7e3880.tar.gz
tor-bc95a4dbcb8689c40521d442dd149e553b7e3880.zip
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
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c6
1 files changed, 3 insertions, 3 deletions
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) {