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

circuitbuild: Refactor build state node selection flags

Browse Source 
Move common build state to node selection flags conversion code into its
own function.

Part of 33222.
This commit is contained in:
teor 2020-05-14 21:42:03 +10:00
parent 6a0fdf381d
commit 2e41d82cc5
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/or/circuitbuild.c
View File

@ -1982,6 +1982,23 @@ warn_if_last_router_excluded(origin_circuit_t *circ,
return;
}
/* Return a set of generic CRN_* flags based on <b>state</b>.
*
* Called for every position in the circuit. */
STATIC int
cpath_build_state_to_crn_flags(const cpath_build_state_t *state)
{
router_crn_flags_t flags = 0;
/* These flags apply to entry, middle, and exit nodes.
* If a flag only applies to a specific position, it should be checked in
* that function. */
if (state->need_uptime)
flags |= CRN_NEED_UPTIME;
if (state->need_capacity)
flags |= CRN_NEED_CAPACITY;
return flags;
}
/** Decide a suitable length for circ's cpath, and pick an exit
* router (or use <b>exit</b> if provided). Store these in the
* cpath.
@ -2015,14 +2032,13 @@ onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei,
exit_ei = extend_info_dup(exit_ei);
} else { /* we have to decide one */
router_crn_flags_t flags = CRN_NEED_DESC;
if (state->need_uptime)
flags |= CRN_NEED_UPTIME;
if (state->need_capacity)
flags |= CRN_NEED_CAPACITY;
if (is_hs_v3_rp_circuit)
flags |= CRN_RENDEZVOUS_V3;
flags |= cpath_build_state_to_crn_flags(state);
/* Some internal exits are one hop, for example directory connections.
* (Guards are always direct, middles are never direct.) */
if (state->onehop_tunnel)
flags |= CRN_DIRECT_CONN;
if (is_hs_v3_rp_circuit)
flags |= CRN_RENDEZVOUS_V3;
const node_t *node =
choose_good_exit_server(circ, flags, state->is_internal);
if (!node) {
@ -2303,10 +2319,7 @@ choose_good_middle_server(uint8_t purpose,
excluded = build_middle_exclude_list(purpose, state, head, cur_len);
if (state->need_uptime)
flags |= CRN_NEED_UPTIME;
if (state->need_capacity)
flags |= CRN_NEED_CAPACITY;
flags |= cpath_build_state_to_crn_flags(state);
/* Picking the second-last node. (The last node is the relay doing the
* self-test.) */
if (state->is_ipv6_selftest && cur_len == state->desired_path_len - 2)
@ -2386,10 +2399,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state,
}
if (state) {
if (state->need_uptime)
flags |= CRN_NEED_UPTIME;
if (state->need_capacity)
flags |= CRN_NEED_CAPACITY;
flags |= cpath_build_state_to_crn_flags(state);
}
choice = router_choose_random_node(excluded, options->ExcludeNodes, flags);

1
src/core/or/circuitbuild.h
View File

@ -97,6 +97,7 @@ STATIC int onion_extend_cpath(origin_circuit_t *circ);
STATIC int
onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei,
int is_hs_v3_rp_circuit);
STATIC int cpath_build_state_to_crn_flags(const cpath_build_state_t *state);
#endif /* defined(CIRCUITBUILD_PRIVATE) */