From 46c82e7dbe462fd799d8a4c0e4232d510809fa6c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 8 Apr 2004 02:10:43 +0000 Subject: [PATCH] Set rend_query on exiting streams svn:r1551 --- src/or/connection_edge.c | 2 +- src/or/rendservice.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index a9cbafa87c..2f38646109 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1136,7 +1136,7 @@ static int connection_exit_begin_conn(cell_t *cell, circuit_t *circ) { 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 */); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index cee83efd02..234c35571d 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -425,6 +425,7 @@ rend_service_introduce(circuit_t *circuit, const char *request, int request_len) 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 @@ rend_service_launch_establish_intro(rend_service_t *service, char *nickname) nickname); return -1; } + strcpy(launched->rend_query, service->service_id); memcpy(launched->rend_pk_digest, service->pk_digest, DIGEST_LEN); return 0; -- 2.47.3