summaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2009-01-06 21:28:48 +0000
committerRoger Dingledine <arma@torproject.org>2009-01-06 21:28:48 +0000
commitb36a98ff5a03b316ba781486faabf31ab83b15fa (patch)
tree2860113d4c83dcae0850adc79dccc584ebe724e5 /src/or/circuituse.c
parent462f64b6b993d46f5b61c7e2333cc526d15ba884 (diff)
downloadtor-b36a98ff5a03b316ba781486faabf31ab83b15fa.tar.gz
tor-b36a98ff5a03b316ba781486faabf31ab83b15fa.zip
When our circuit fails at the first hop (e.g. we get a destroy
cell back), avoid using that OR connection anymore, and also tell all the one-hop directory requests waiting for it that they should fail. Bugfix on 0.2.1.3-alpha. svn:r17984
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index e6feb2250d..84aae1768c 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -802,7 +802,7 @@ circuit_build_failed(origin_circuit_t *circ)
/* We failed at the first hop. If there's an OR connection
to blame, blame it. */
or_connection_t *n_conn = NULL;
- const char *n_conn_id = NULL;
+ const char *n_conn_id = circ->_base.n_hop->identity_digest;
if (circ->_base.n_conn) {
n_conn = circ->_base.n_conn;
if (n_conn) n_conn_id = n_conn->identity_digest;