[or-cvs] bugfix for cvs: we were needing a rendezvous circ, so we ca...

[Roger Dingledine]

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

Modified Files:
	circuituse.c rendclient.c 
Log Message:
bugfix for cvs: we were needing a rendezvous circ, so we cannibalized
a general circ, and called rend_client_rendcirc_has_opened(), which
called connection_ap_attach_pending(), which was needing a rendezvous
circ, so it cannibalized a general circuit, and called ...


Index: circuituse.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- circuituse.c	17 Jan 2005 18:49:13 -0000	1.44
+++ circuituse.c	19 Jan 2005 17:13:11 -0000	1.45
@@ -49,9 +49,9 @@
   /* if this circ isn't our purpose, skip. */
   if (purpose == CIRCUIT_PURPOSE_C_REND_JOINED && !must_be_open) {
     if (circ->purpose != CIRCUIT_PURPOSE_C_ESTABLISH_REND &&
-       circ->purpose != CIRCUIT_PURPOSE_C_REND_READY &&
-       circ->purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED &&
-       circ->purpose != CIRCUIT_PURPOSE_C_REND_JOINED)
+        circ->purpose != CIRCUIT_PURPOSE_C_REND_READY &&
+        circ->purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED &&
+        circ->purpose != CIRCUIT_PURPOSE_C_REND_JOINED)
       return 0;
   } else if (purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT && !must_be_open) {
     if (circ->purpose != CIRCUIT_PURPOSE_C_INTRODUCING &&
@@ -555,6 +555,7 @@
   switch (circ->purpose) {
     case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
       rend_client_rendcirc_has_opened(circ);
+      connection_ap_attach_pending();
       break;
     case CIRCUIT_PURPOSE_C_INTRODUCING:
       rend_client_introcirc_has_opened(circ);

Index: rendclient.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/rendclient.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- rendclient.c	17 Jan 2005 18:13:09 -0000	1.74
+++ rendclient.c	19 Jan 2005 17:13:11 -0000	1.75
@@ -164,8 +164,6 @@
   if (rend_client_send_establish_rendezvous(circ) < 0) {
     return;
   }
-
-  connection_ap_attach_pending();
 }
 
 /** Called when get an ACK or a NAK for a REND_INTRODUCE1 cell.
@@ -400,7 +398,7 @@
         connection_mark_for_close(conn);
       }
     } else { /* 404, or fetch didn't get that far */
-      log_fn(LOG_WARN,"Failed to fetch service id '%s', and not in cache. Closing conn.", query);
+      log_fn(LOG_NOTICE,"Failed to fetch service id '%s', and not in cache. Closing conn.", query);
       conn->has_sent_end = 1;
       connection_mark_for_close(conn);
     }