summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2008-08-03 17:45:24 +0000
committerKarsten Loesing <karsten.loesing@gmx.net>2008-08-03 17:45:24 +0000
commit3c9cd463d25f1a1c7f890de723df8d448089eb04 (patch)
tree0dc09c2e138004fc697195ae8105db3bed4562e3 /src/or/circuitbuild.c
parent449174d796930b7bcb4269c012d9251ca2140ad8 (diff)
downloadtor-3c9cd463d25f1a1c7f890de723df8d448089eb04.tar.gz
tor-3c9cd463d25f1a1c7f890de723df8d448089eb04.zip
Fix a false assertion when extending a circuit to a relay to which a connection is already established. In that case the circuit should not need to memorize extend info for that relay. circuitbuild.c:389 contains a similar assertion.
svn:r16375
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 39e54bae3b..8c54209624 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -791,7 +791,7 @@ circuit_extend(cell_t *cell, circuit_t *circ)
return 0;
}
- tor_assert(circ->n_hop);
+ tor_assert(!circ->n_hop); /* Connection is already established. */
circ->n_conn = n_conn;
log_debug(LD_CIRC,"n_conn is %s:%u",
n_conn->_base.address,n_conn->_base.port);