aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-11-12 03:01:38 +0000
committerNick Mathewson <nickm@torproject.org>2003-11-12 03:01:38 +0000
commite0ad4d08be4a6096455ffbf76965256dab85ccc3 (patch)
tree9782a03bcc3b6a509f4580f5ad585bd3e47c49d4 /src/or
parent2e05b9ccf91cfb23d623b176e39c6a358b27ba15 (diff)
downloadtor-e0ad4d08be4a6096455ffbf76965256dab85ccc3.tar
tor-e0ad4d08be4a6096455ffbf76965256dab85ccc3.tar.gz
Fix thinko: Failure and success are different things.
svn:r795
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c
index 206742e65..970cc410f 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -758,7 +758,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
assert(circ->state == CIRCUIT_STATE_BUILDING);
log_fn(LOG_DEBUG,"starting to send subsequent skin.");
r = onion_extend_cpath(&circ->cpath, circ->desired_cpath_len, &router);
- if (r==1 || !router) {
+ if (r==1) {
/* done building the circuit. whew. */
circ->state = CIRCUIT_STATE_OPEN;
log_fn(LOG_INFO,"circuit built! (%d hops long)",circ->desired_cpath_len);
@@ -766,7 +766,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
* circuit that one is ready. */
connection_ap_attach_pending();
return 0;
- } else if (r<0) {
+ } else if (r<0 || !router) {
log_fn(LOG_WARN,"Unable to extend circuit path.");
return -1;
}