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

Bug 40810: Improve validation checks to ignore 0-RTT legs

Browse Source 
Also add calls to dump the legs of a conflux set if we have too many
This commit is contained in:
Mike Perry 2023-06-10 16:00:56 +00:00
parent 0149c1ff98
commit dbd37c0e7b
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/or/conflux_util.c
View File

@ -20,6 +20,7 @@
#include "core/or/conflux.h" #include "core/or/conflux.h"
#include "core/or/conflux_params.h" #include "core/or/conflux_params.h"
#include "core/or/conflux_util.h" #include "core/or/conflux_util.h"
#include "core/or/conflux_pool.h"
#include "core/or/conflux_st.h" #include "core/or/conflux_st.h"
#include "lib/time/compat_time.h" #include "lib/time/compat_time.h"
#include "app/config/config.h" #include "app/config/config.h"
@ -372,22 +373,39 @@ void
conflux_validate_legs(const conflux_t *cfx) conflux_validate_legs(const conflux_t *cfx)
{ {
tor_assert(cfx); tor_assert(cfx);
// TODO-329-UDP: Eventually we want to allow three legs for the bool is_client = false;
// exit case, to allow reconnection of legs to hit an RTT target. int num_legs = 0;
// For now, this validation helps find bugs.
if (BUG(smartlist_len(cfx->legs) > conflux_params_get_num_legs_set())) {
log_warn(LD_BUG, "Number of legs is above maximum of %d allowed: %d\n",
conflux_params_get_num_legs_set(), smartlist_len(cfx->legs));
}
CONFLUX_FOR_EACH_LEG_BEGIN(cfx, leg) { CONFLUX_FOR_EACH_LEG_BEGIN(cfx, leg) {
/* Ensure we have no pending nonce on the circ */
tor_assert_nonfatal(leg->circ->conflux_pending_nonce == NULL);
tor_assert_nonfatal(leg->circ->conflux != NULL);
if (CIRCUIT_IS_ORIGIN(leg->circ)) { if (CIRCUIT_IS_ORIGIN(leg->circ)) {
tor_assert_nonfatal(leg->circ->purpose == tor_assert_nonfatal(leg->circ->purpose ==
CIRCUIT_PURPOSE_CONFLUX_LINKED); CIRCUIT_PURPOSE_CONFLUX_LINKED);
is_client = true;
}
/* Ensure we have no pending nonce on the circ */
if (BUG(leg->circ->conflux_pending_nonce != NULL)) {
conflux_log_set(cfx, is_client);
continue;
}
/* Ensure we have a conflux object */
if (BUG(leg->circ->conflux == NULL)) {
conflux_log_set(cfx, is_client);
continue;
}
/* Only count legs that have a valid RTT */
if (leg->circ_rtts_usec > 0) {
num_legs++;
} }
} CONFLUX_FOR_EACH_LEG_END(leg); } CONFLUX_FOR_EACH_LEG_END(leg);
// TODO-329-UDP: Eventually we want to allow three legs for the
// exit case, to allow reconnection of legs to hit an RTT target.
// For now, this validation helps find bugs.
if (BUG(num_legs > conflux_params_get_num_legs_set())) {
log_warn(LD_BUG, "Number of legs is above maximum of %d allowed: %d\n",
conflux_params_get_num_legs_set(), smartlist_len(cfx->legs));
conflux_log_set(cfx, is_client);
}
} }