summaryrefslogtreecommitdiff
path: root/src/or/entrynodes.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-28 11:04:28 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-16 11:06:18 -0500
commit89f5f149df984bab00de9868a9305b611c4aa17e (patch)
tree41d0e28d4d96659eddf1f8e44b9580d24d9fc94c /src/or/entrynodes.h
parent6dcbc24a4e9da3d46dc9fa1c225982f7088a6e34 (diff)
downloadtor-89f5f149df984bab00de9868a9305b611c4aa17e.tar.gz
tor-89f5f149df984bab00de9868a9305b611c4aa17e.zip
Remove guard_selection argument from status-reporting functions
This prevents us from mixing up multiple guard_selections
Diffstat (limited to 'src/or/entrynodes.h')
-rw-r--r--src/or/entrynodes.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index 97cc4d254b..0abbea8cb6 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -351,14 +351,10 @@ void circuit_guard_state_free(circuit_guard_state_t *state);
int entry_guard_pick_for_circuit(guard_selection_t *gs,
const node_t **chosen_node_out,
circuit_guard_state_t **guard_state_out);
-int entry_guard_succeeded(guard_selection_t *gs,
- circuit_guard_state_t **guard_state_p);
-void entry_guard_failed(guard_selection_t *gs,
- circuit_guard_state_t **guard_state_p);
-void entry_guard_cancel(guard_selection_t *gs,
- circuit_guard_state_t **guard_state_p);
-void entry_guard_chan_failed(guard_selection_t *gs,
- channel_t *chan);
+int entry_guard_succeeded(circuit_guard_state_t **guard_state_p);
+void entry_guard_failed(circuit_guard_state_t **guard_state_p);
+void entry_guard_cancel(circuit_guard_state_t **guard_state_p);
+void entry_guard_chan_failed(channel_t *chan);
int entry_guards_update_all(guard_selection_t *gs);
int entry_guards_upgrade_waiting_circuits(guard_selection_t *gs,
const smartlist_t *all_circuits,