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

Raise common code for creating circuit_guard_state_t

Browse Source 
This will help if we ever need to add more fields or change the
semantics of existing fields.
This commit is contained in:
Nick Mathewson 2017-05-22 09:13:18 -04:00
parent 3d27954f2e
commit e5a929fef8
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/or/entrynodes.c
View File

@ -2073,6 +2073,23 @@ circuit_guard_state_free(circuit_guard_state_t *state)
tor_free(state); tor_free(state);
} }
/** Allocate and return a new circuit_guard_state_t to track the result
* of using <b>guard</b> for a given operation. */
static circuit_guard_state_t *
circuit_guard_state_new(entry_guard_t *guard, unsigned state,
entry_guard_restriction_t *rst)
{
circuit_guard_state_t *result;
result = tor_malloc_zero(sizeof(circuit_guard_state_t));
result->guard = entry_guard_handle_new(guard);
result->state = state;
result->state_set_at = approx_time();
result->restrictions = rst;
return result;
}
/** /**
* Pick a suitable entry guard for a circuit in, and place that guard * Pick a suitable entry guard for a circuit in, and place that guard
* in *<b>chosen_node_out</b>. Set *<b>guard_state_out</b> to an opaque * in *<b>chosen_node_out</b>. Set *<b>guard_state_out</b> to an opaque
@ -2111,11 +2128,7 @@ entry_guard_pick_for_circuit(guard_selection_t *gs,
goto fail; goto fail;
*chosen_node_out = node; *chosen_node_out = node;
*guard_state_out = tor_malloc_zero(sizeof(circuit_guard_state_t)); *guard_state_out = circuit_guard_state_new(guard, state, rst);
(*guard_state_out)->guard = entry_guard_handle_new(guard);
(*guard_state_out)->state = state;
(*guard_state_out)->state_set_at = approx_time();
(*guard_state_out)->restrictions = rst;
return 0; return 0;
fail: fail:
@ -2945,11 +2958,9 @@ get_guard_state_for_bridge_desc_fetch(const char *digest)
guard->last_tried_to_connect = approx_time(); guard->last_tried_to_connect = approx_time();
/* Create the guard state */ /* Create the guard state */
guard_state = tor_malloc_zero(sizeof(circuit_guard_state_t)); guard_state = circuit_guard_state_new(guard,
guard_state->guard = entry_guard_handle_new(guard); GUARD_CIRC_STATE_USABLE_ON_COMPLETION,
guard_state->state = GUARD_CIRC_STATE_USABLE_ON_COMPLETION; NULL);
guard_state->state_set_at = approx_time();
guard_state->restrictions = NULL;
return guard_state; return guard_state;
} }