[or-cvs] Set rend_query on exiting streams

[Nick Mathewson]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv24205/src/or

Modified Files:
	rendservice.c connection_edge.c 
Log Message:
Set rend_query on exiting streams

Index: rendservice.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendservice.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- rendservice.c	8 Apr 2004 01:59:31 -0000	1.40
+++ rendservice.c	8 Apr 2004 02:10:43 -0000	1.41
@@ -425,6 +425,7 @@
   memcpy(launched->rend_pk_digest, circuit->rend_pk_digest,
          DIGEST_LEN);
   memcpy(launched->rend_cookie, r_cookie, REND_COOKIE_LEN);
+  strcpy(launched->rend_query, service->service_id);
   launched->build_state->pending_final_cpath = cpath =
     tor_malloc_zero(sizeof(crypt_path_t));
 
@@ -461,6 +462,7 @@
            nickname);
     return -1;
   }
+  strcpy(launched->rend_query, service->service_id);
   memcpy(launched->rend_pk_digest, service->pk_digest, DIGEST_LEN);
 
   return 0;

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- connection_edge.c	7 Apr 2004 22:41:00 -0000	1.150
+++ connection_edge.c	8 Apr 2004 02:10:43 -0000	1.151
@@ -1136,7 +1136,7 @@
 
   if(circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED) {
     n_stream->address = tor_strdup("(rendezvous)");
-    strcpy(n_stream->rend_query, "yes"); /* XXX kludge */
+    strcpy(n_stream->rend_query, circ->rend_query);
     if(rend_service_set_connection_addr_port(n_stream, circ) < 0) {
       log_fn(LOG_WARN,"Didn't find rendezvous service (port %d)",n_stream->port);
       connection_mark_for_close(n_stream,0 /* XXX */);