diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-07-25 10:14:00 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2017-08-24 13:03:28 -0400 |
| commit | 9af311630626b920aa74c4fb8d36eb086ebfb8a4 (patch) | |
| tree | 23e604b15543db50e38186b69739ec29d659273f /src/or/rendclient.c | |
| parent | ee15c16742aecb4795ce12847068b7907be9e8a2 (diff) | |
| download | tor-9af311630626b920aa74c4fb8d36eb086ebfb8a4.tar.gz tor-9af311630626b920aa74c4fb8d36eb086ebfb8a4.zip | |
prop224: Handle RENDEZVOUS2 cell
The client can now handle RENDEZVOUS2 cell when they arrive. This consolidate
both hidden service version in one function.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/rendclient.c')
| -rw-r--r-- | src/or/rendclient.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 683a3916ec..cb7d99bed3 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -932,23 +932,12 @@ int rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request, size_t request_len) { - if ((circ->base_.purpose != CIRCUIT_PURPOSE_C_REND_READY && - circ->base_.purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) - || !circ->build_state->pending_final_cpath) { - log_warn(LD_PROTOCOL,"Got rendezvous2 cell from hidden service, but not " - "expecting it. Closing."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); - return -1; - } - if (request_len != DH_KEY_LEN+DIGEST_LEN) { log_warn(LD_PROTOCOL,"Incorrect length (%d) on RENDEZVOUS2 cell.", (int)request_len); goto err; } - log_info(LD_REND,"Got RENDEZVOUS2 cell from hidden service."); - if (hs_circuit_setup_e2e_rend_circ_legacy_client(circ, request) < 0) { log_warn(LD_GENERAL, "Failed to setup circ"); goto err; |