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

hs-v3: Rename validation function in hs_intropoint.c

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2019-08-20 10:59:04 -04:00 committed by Nick Mathewson
parent 385f6bcfcc
commit 622c2c7884
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/feature/hs/hs_intropoint.c
View File

@ -186,8 +186,8 @@ hs_intro_send_intro_established_cell,(or_circuit_t *circ))
* bound check and can be used. Else return false. See proposal 305 for
* details and reasons about this validation. */
STATIC bool
validate_cell_dos_extension_parameters(uint64_t intro2_rate_per_sec,
uint64_t intro2_burst_per_sec)
cell_dos_extension_parameters_are_valid(uint64_t intro2_rate_per_sec,
uint64_t intro2_burst_per_sec)
{
bool ret = false;
@ -296,8 +296,8 @@ handle_establish_intro_cell_dos_extension(
}
/* If invalid, we disable the defense on the circuit. */
if (!validate_cell_dos_extension_parameters(intro2_rate_per_sec,
intro2_burst_per_sec)) {
if (!cell_dos_extension_parameters_are_valid(intro2_rate_per_sec,
intro2_burst_per_sec)) {
circ->introduce2_dos_defense_enabled = 0;
log_info(LD_REND, "Disabling INTRO2 DoS defenses on circuit id %u",
circ->p_circ_id);

6
src/feature/hs/hs_intropoint.h
View File

@ -57,9 +57,9 @@ STATIC int handle_introduce1(or_circuit_t *client_circ,
const uint8_t *request, size_t request_len);
STATIC int validate_introduce1_parsed_cell(const trn_cell_introduce1_t *cell);
STATIC int circuit_is_suitable_for_introduce1(const or_circuit_t *circ);
STATIC bool validate_cell_dos_extension_parameters(
uint64_t intro2_rate_per_sec,
uint64_t intro2_burst_per_sec);
STATIC bool cell_dos_extension_parameters_are_valid(
uint64_t intro2_rate_per_sec,
uint64_t intro2_burst_per_sec);
#endif /* defined(HS_INTROPOINT_PRIVATE) */

14
src/test/test_hs_dos.c
View File

@ -135,23 +135,23 @@ test_validate_dos_extension_params(void *arg)
(void) arg;
/* Validate the default values. */
ret = validate_cell_dos_extension_parameters(
get_intro2_rate_consensus_param(NULL),
get_intro2_burst_consensus_param(NULL));
ret = cell_dos_extension_parameters_are_valid(
get_intro2_rate_consensus_param(NULL),
get_intro2_burst_consensus_param(NULL));
tt_assert(ret);
/* Valid custom rate/burst. */
ret = validate_cell_dos_extension_parameters(17, 42);
ret = cell_dos_extension_parameters_are_valid(17, 42);
tt_assert(ret);
ret = cell_dos_extension_parameters_are_valid(INT32_MAX, INT32_MAX);
tt_assert(ret);
/* Invalid rate. */
ret = validate_cell_dos_extension_parameters(UINT64_MAX, 42);
ret = cell_dos_extension_parameters_are_valid(UINT64_MAX, 42);
tt_assert(!ret);
/* Invalid burst. */
ret = validate_cell_dos_extension_parameters(42, UINT64_MAX);
ret = cell_dos_extension_parameters_are_valid(42, UINT64_MAX);
tt_assert(!ret);
/* Value of 0 is valid (but should disable defenses) */
@ -159,7 +159,7 @@ test_validate_dos_extension_params(void *arg)
tt_assert(ret);
/* Can't have burst smaller than rate. */
ret = validate_cell_dos_extension_parameters(42, 40);
ret = cell_dos_extension_parameters_are_valid(42, 40);
tt_assert(!ret);
done: