diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-07-26 19:05:34 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-07-26 19:05:34 +0000 |
| commit | a88ec48a39e5531fa80a0b5d5ec42dd31f268b67 (patch) | |
| tree | cb2386170a1f452e113720dd0ee7726e02f3dd9a /src/or/rendservice.c | |
| parent | f2dc012accd60312a67eb83c14691667235c9017 (diff) | |
| download | tor-a88ec48a39e5531fa80a0b5d5ec42dd31f268b67.tar.gz tor-a88ec48a39e5531fa80a0b5d5ec42dd31f268b67.zip | |
r6902@Kushana: nickm | 2006-07-25 17:30:27 -0400
Move rend_query to origin_circuit_t where it belongs; save another 17 bytes per OR circuit.
svn:r6903
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0dd417c7ad..619dbf2709 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -592,8 +592,8 @@ rend_service_introduce(origin_circuit_t *circuit, const char *request, memcpy(launched->_base.rend_pk_digest, circuit->_base.rend_pk_digest, DIGEST_LEN); memcpy(launched->_base.rend_cookie, r_cookie, REND_COOKIE_LEN); - strlcpy(launched->_base.rend_query, service->service_id, - sizeof(launched->_base.rend_query)); + strlcpy(launched->rend_query, service->service_id, + sizeof(launched->rend_query)); launched->build_state->pending_final_cpath = cpath = tor_malloc_zero(sizeof(crypt_path_t)); cpath->magic = CRYPT_PATH_MAGIC; @@ -663,8 +663,7 @@ rend_service_relaunch_rendezvous(origin_circuit_t *oldcirc) newstate->pending_final_cpath = oldstate->pending_final_cpath; oldstate->pending_final_cpath = NULL; - memcpy(newcirc->_base.rend_query, oldcirc->_base.rend_query, - REND_SERVICE_ID_LEN+1); + memcpy(newcirc->rend_query, oldcirc->rend_query, REND_SERVICE_ID_LEN+1); memcpy(newcirc->_base.rend_pk_digest, oldcirc->_base.rend_pk_digest, DIGEST_LEN); memcpy(newcirc->_base.rend_cookie, oldcirc->_base.rend_cookie, @@ -695,8 +694,8 @@ rend_service_launch_establish_intro(rend_service_t *service, nickname); return -1; } - strlcpy(launched->_base.rend_query, service->service_id, - sizeof(launched->_base.rend_query)); + strlcpy(launched->rend_query, service->service_id, + sizeof(launched->rend_query)); memcpy(launched->_base.rend_pk_digest, service->pk_digest, DIGEST_LEN); if (launched->_base.state == CIRCUIT_STATE_OPEN) |