diff options
| author | George Kadianakis <desnacked@riseup.net> | 2017-01-20 13:55:06 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-13 14:23:51 -0400 |
| commit | f02868bb53f57e416094c7ebc9f6632ce6a3d007 (patch) | |
| tree | f035286efbd230824b1f7be8ce4daceb9ac20d92 /src/or/hs_intropoint.c | |
| parent | 037ce360bd0a7b0db1d6b6e441c90b1773b4cb06 (diff) | |
| download | tor-f02868bb53f57e416094c7ebc9f6632ce6a3d007.tar.gz tor-f02868bb53f57e416094c7ebc9f6632ce6a3d007.zip | |
hs: Add service-side circuitmap API.
Now we have separate getters and setters for service-side and relay-side. I
took this approach over adding arguments to the already existing methods to
have more explicit type-checking, and also because some functions would grow
too large and dirty.
This commit also fixes every callsite to use the new function names which
modifies the legacy HS (v2) and the prop224 (v3) code.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/hs_intropoint.c')
| -rw-r--r-- | src/or/hs_intropoint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index a7282aba8f..6a63fd6e72 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -195,7 +195,7 @@ handle_verified_establish_intro_cell(or_circuit_t *circ, } /* Associate intro point auth key with this circuit. */ - hs_circuitmap_register_intro_circ_v3(circ, &auth_key); + hs_circuitmap_register_intro_circ_v3_relay_side(circ, &auth_key); /* Repurpose this circuit into an intro circuit. */ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT); @@ -461,7 +461,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, { ed25519_public_key_t auth_key; get_auth_key_from_cell(&auth_key, RELAY_COMMAND_INTRODUCE1, parsed_cell); - service_circ = hs_circuitmap_get_intro_circ_v3(&auth_key); + service_circ = hs_circuitmap_get_intro_circ_v3_relay_side(&auth_key); if (service_circ == NULL) { char b64_key[ED25519_BASE64_LEN + 1]; ed25519_public_to_base64(b64_key, &auth_key); |