[or-cvs] let alice reuse recent rendjoin circs

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	circuit.c 
Log Message:
let alice reuse recent rendjoin circs


Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- circuit.c	7 Apr 2004 19:14:33 -0000	1.189
+++ circuit.c	7 Apr 2004 19:22:55 -0000	1.190
@@ -304,10 +304,14 @@
     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) {