Commit 1f87269c authored by George Kadianakis's avatar George Kadianakis
Browse files

Code improvements

parent 52c5b8aa
......@@ -3996,8 +3996,14 @@ get_max_lifetime_of_layer2_hs_guards(void)
static int
get_layer2_hs_guard_lifetime(void)
{
return crypto_rand_int_range(get_min_lifetime_of_layer2_hs_guards(),
get_max_lifetime_of_layer2_hs_guards());
int min = get_min_lifetime_of_layer2_hs_guards();
int max = get_max_lifetime_of_layer2_hs_guards();
if (BUG(min >= max)) {
return min;
}
return crypto_rand_int_range(min, max);
}
/** Maintain the L2 guard list. Make sure the list contains enough guards, do
......@@ -4107,9 +4113,10 @@ purge_vanguards_lite(void)
/** Return a routerset containing the L2 guards or NULL if it's not yet
* initialized. Callers must not free the routerset. Designed for use in
* pick_vanguard_middle_node() and should not be used anywhere else (because
* the routerset pointer can dangle under your feet) */
routerset_t *
* pick_vanguard_middle_node() and should not be used anywhere else. Do not
* store this pointer -- any future calls to maintain_layer2_guards() and
* purge_vanguards_lite() can invalidate it. */
const routerset_t *
get_layer2_guards(void)
{
if (!layer2_guards) {
......
......@@ -651,7 +651,7 @@ guard_get_guardfraction_bandwidth(guardfraction_bandwidth_t *guardfraction_bw,
int orig_bandwidth,
uint32_t guardfraction_percentage);
routerset_t *get_layer2_guards(void);
const routerset_t *get_layer2_guards(void);
void maintain_layer2_guards(void);
void purge_vanguards_lite(void);
......
......@@ -3102,7 +3102,7 @@ test_entry_guard_layer2_guards(void *arg)
/* Create the guardset */
maintain_layer2_guards();
routerset_t *l2_guards = get_layer2_guards();
const routerset_t *l2_guards = get_layer2_guards();
tt_assert(l2_guards);
tt_int_op(routerset_len(l2_guards), OP_EQ, 4);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment