From: Roger Dingledine <arma@torproject.org>
Date: Wed, 7 Apr 2004 19:22:55 +0000 (+0000)
Subject: let alice reuse recent rendjoin circs
X-Git-Tag: tor-0.0.6incompat-merged~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c683a9e7c70cfc2bfbe3f40c3e34b0f2a45dca3;p=thirdparty%2Ftor.git

let alice reuse recent rendjoin circs


svn:r1519
---

diff --git a/src/or/circuit.c b/src/or/circuit.c
index a4794dc113..9577af8a08 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -304,10 +304,14 @@ circuit_t *circuit_get_best(connection_t *conn,
     if(conn) {
       /* decide if this circ is suitable for this conn */
 
-      if(circ->state == CIRCUIT_STATE_OPEN && circ->n_conn) /* open */
-        exitrouter = router_get_by_addr_port(circ->cpath->prev->addr,
-                                             circ->cpath->prev->port);
-      else /* not open */
+//      if(circ->state == CIRCUIT_STATE_OPEN && circ->n_conn) /* open */
+//        exitrouter = router_get_by_addr_port(circ->cpath->prev->addr,
+//                                             circ->cpath->prev->port);
+//      else /* not open */
+/* for rend circs, circ->cpath->prev is not the last router in the
+ * circuit, it's the magical extra bob hop. so just check the nickname
+ * of the one we meant to finish at.
+ */
         exitrouter = router_get_by_nickname(circ->build_state->chosen_exit);
 
       if(!exitrouter) {