nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs: Decode and cache the INTRODUCE cell congestion control extension

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2022-02-03 22:44:25 +00:00 committed by Mike Perry
parent 38e9d9b465
commit 729dd14fde
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/feature/hs/hs_cell.c
View File

@ -14,6 +14,7 @@
#include "feature/hs/hs_cell.h"
#include "feature/hs/hs_ob.h"
#include "core/crypto/hs_ntor.h"
#include "core/or/congestion_control_common.h"
#include "core/or/origin_circuit_st.h"
@ -783,6 +784,31 @@ get_introduce2_keys_and_verify_mac(hs_cell_introduce2_data_t *data,
return intro_keys_result;
}
/** Parse the given INTRODUCE cell extension. Update the data object
* accordingly depending on the extension. */
static void
parse_introduce_cell_extension(hs_cell_introduce2_data_t *data,
const trn_extension_field_t *field)
{
trn_extension_field_cc_t *cc_field = NULL;
tor_assert(data);
tor_assert(field);
switch (trn_extension_field_get_field_type(field)) {
case TRUNNEL_EXT_TYPE_CC_FIELD_REQUEST:
/* CC requests, enable it. */
data->cc_enabled = 1;
data->pv.protocols_known = 1;
data->pv.supports_congestion_control = data->cc_enabled;
break;
default:
break;
}
trn_extension_field_cc_free(cc_field);
}
/** Parse the INTRODUCE2 cell using data which contains everything we need to
* do so and contains the destination buffers of information we extract and
* compute from the cell. Return 0 on success else a negative value. The
@ -911,6 +937,21 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data,
smartlist_add(data->link_specifiers, lspec_dup);
}
/* Extract any extensions. */
const trn_extension_t *extensions =
trn_cell_introduce_encrypted_get_extensions(enc_cell);
if (extensions != NULL) {
for (size_t idx = 0; idx < trn_extension_get_num(extensions); idx++) {
const trn_extension_field_t *field =
trn_extension_getconst_fields(extensions, idx);
if (BUG(field == NULL)) {
/* The number of extensions should match the number of fields. */
break;
}
parse_introduce_cell_extension(data, field);
}
}
/* Success. */
ret = 0;
log_info(LD_REND, "Valid INTRODUCE2 cell. Launching rendezvous circuit.");

4
src/feature/hs/hs_cell.h
View File

@ -84,6 +84,10 @@ typedef struct hs_cell_introduce2_data_t {
smartlist_t *link_specifiers;
/** Replay cache of the introduction point. */
replaycache_t *replay_cache;
/** Flow control negotiation parameters. */
protover_summary_flags_t pv;
/** Congestion control parameters. */
unsigned int cc_enabled : 1;
} hs_cell_introduce2_data_t;
/* Build cell API. */