From 818b44cc7c22696a3206229e4e15eeb9f130e2c0 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 8 Dec 2016 12:10:06 -0500 Subject: Repair the (deprecated, ugly) DROPGUARDS controller function. This actually is much easier to write now that guard_selection_t is first-class. --- src/or/entrynodes.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/or/entrynodes.h') diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 6bbdff1e66..bd501d001f 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -170,7 +170,8 @@ struct entry_guard_t { * we saw them in the state, even if we don't understand them. */ char *extra_state_fields; - /** Backpointer to the guard selection that this guard belongs to. */ + /** Backpointer to the guard selection that this guard belongs to. + * The entry_guard_t must never outlive its guard_selection. */ guard_selection_t *in_selection; /**@}*/ @@ -548,6 +549,9 @@ STATIC int entry_guard_has_higher_priority(entry_guard_t *a, entry_guard_t *b); STATIC char *getinfo_helper_format_single_entry_guard(const entry_guard_t *e); #endif +void remove_all_entry_guards_for_guard_selection(guard_selection_t *gs); +void remove_all_entry_guards(void); + struct bridge_info_t; void entry_guard_learned_bridge_identity(const tor_addr_port_t *addrport, const uint8_t *rsa_id_digest); -- cgit v1.2.3-54-g00ecf