From: Roger Dingledine <arma@torproject.org>
Date: Sun, 2 May 2004 03:32:00 +0000 (+0000)
Subject: stop the circuit_receive_relay_cell warning
X-Git-Tag: tor-0.0.6~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbbc063ed9aee85a3e8e8997fd7ce8f3684bbbf8;p=thirdparty%2Ftor.git

stop the circuit_receive_relay_cell warning
mark the circ for close if circuit_extend fails because the next
hop is not up yet; don't just return -1


svn:r1765
---

diff --git a/src/or/circuit.c b/src/or/circuit.c
index b97ea14eba..184bfb93c5 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -1585,7 +1585,8 @@ int circuit_extend(cell_t *cell, circuit_t *circ) {
                                  NULL, 0, NULL);
     return 0;
 #endif
-    return -1;
+    circuit_mark_for_close(circ);
+    return 0;
   }
 
   circ->n_addr = n_conn->addr; /* these are different if we found a twin instead */