diff options
author | David Goulet <dgoulet@torproject.org> | 2017-02-21 14:20:39 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-08-08 20:29:33 -0400 |
commit | d765cf30b51dfcd58756b6b3d24a14ac2c47f3e8 (patch) | |
tree | 91abef47c708dd4d30b50f5a8e31bf50389dedd2 /src/or/rendservice.c | |
parent | 6a21ac7f9809963287dd678c9f2c494b3f9ebba3 (diff) | |
download | tor-d765cf30b51dfcd58756b6b3d24a14ac2c47f3e8.tar.gz tor-d765cf30b51dfcd58756b6b3d24a14ac2c47f3e8.zip |
prop224: Circuit has opened and ESTABLISH_INTRO cell
Add the entry point from the circuit subsystem of "circuit has opened" which
is for all type of hidden service circuits. For the introduction point, this
commit actually adds the support for handling those circuits when opened and
sending ESTABLISH_INTRO on a circuit.
Rendevzou point circuit aren't supported yet at this commit.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r-- | src/or/rendservice.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4641e110d8..8239803fb2 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3116,10 +3116,11 @@ count_intro_point_circuits(const rend_service_t *service) crypto material. On success, fill <b>cell_body_out</b> and return the number of bytes written. On fail, return -1. */ -STATIC ssize_t -encode_establish_intro_cell_legacy(char *cell_body_out, - size_t cell_body_out_len, - crypto_pk_t *intro_key, char *rend_circ_nonce) +ssize_t +rend_service_encode_establish_intro_cell(char *cell_body_out, + size_t cell_body_out_len, + crypto_pk_t *intro_key, + const char *rend_circ_nonce) { int retval = -1; int r; @@ -3256,7 +3257,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) /* Send the ESTABLISH_INTRO cell */ { ssize_t len; - len = encode_establish_intro_cell_legacy(buf, sizeof(buf), + len = rend_service_encode_establish_intro_cell(buf, sizeof(buf), circuit->intro_key, circuit->cpath->prev->rend_circ_nonce); if (len < 0) { |