[or-cvs] make rendezvous points work again

[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:
	connection_edge.c rendclient.c 
Log Message:
make rendezvous points work again
(yay. now time to mess them up again.)


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- connection_edge.c	13 Apr 2004 22:56:24 -0000	1.160
+++ connection_edge.c	14 Apr 2004 05:18:21 -0000	1.161
@@ -905,7 +905,7 @@
 
     if(retval > 0) {
       /* one is already established, attach */
-      log_fn(LOG_INFO,"rend joined circ already here. reusing.");
+      log_fn(LOG_INFO,"rend joined circ already here. attaching.");
       link_apconn_to_circ(conn, rendcirc);
       if(connection_ap_handshake_send_begin(conn, rendcirc) < 0)
         return 0; /* already marked, let them fade away */

Index: rendclient.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendclient.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- rendclient.c	13 Apr 2004 23:01:10 -0000	1.37
+++ rendclient.c	14 Apr 2004 05:18:21 -0000	1.38
@@ -263,8 +263,9 @@
   crypt_path_t *hop;
   char keys[DIGEST_LEN+CPATH_KEY_MATERIAL_LEN];
 
-  if(circ->purpose != CIRCUIT_PURPOSE_C_REND_READY ||
-     !circ->build_state->pending_final_cpath) {
+  if( (circ->purpose != CIRCUIT_PURPOSE_C_REND_READY &&
+       circ->purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED)
+      || !circ->build_state->pending_final_cpath) {
     log_fn(LOG_WARN,"Got rendezvous2 cell from Bob, but not expecting it. Closing.");
     circuit_mark_for_close(circ);
     return -1;