diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-13 14:23:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-13 14:23:59 -0400 |
| commit | 902672eac6dc4cbdbdd7e410a6dc7580f0df7509 (patch) | |
| tree | 156db18fc10dbaba56fcb2622e5f6321d5d4b504 /src/or/hs_intropoint.c | |
| parent | 63e39b291e97438460814e6428f102aeb8528324 (diff) | |
| parent | f02868bb53f57e416094c7ebc9f6632ce6a3d007 (diff) | |
| download | tor-902672eac6dc4cbdbdd7e410a6dc7580f0df7509.tar.gz tor-902672eac6dc4cbdbdd7e410a6dc7580f0df7509.zip | |
Merge branch 'ticket21889_031_01_squashed'
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 c32d24480a..b3c76db0b0 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -196,7 +196,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); @@ -462,7 +462,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); |