summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-30 12:35:16 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-16 11:06:20 -0500
commit79d3e94f8b1769ee8d1957cb1d6dd35bd02a7271 (patch)
treee2e33bc9cb0cc32948a88e57643f54fbb7eacba4 /src/or
parent171981f8a0eebf3f00feabe36dc66e031d51c5bd (diff)
downloadtor-79d3e94f8b1769ee8d1957cb1d6dd35bd02a7271.tar.gz
tor-79d3e94f8b1769ee8d1957cb1d6dd35bd02a7271.zip
prop271: Tests for the highlevel or_state_t encode/decode functions
Diffstat (limited to 'src/or')
-rw-r--r--src/or/entrynodes.c4
-rw-r--r--src/or/entrynodes.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 9441be4c78..1f6d562fd8 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1115,8 +1115,8 @@ remove_guard_from_confirmed_and_primary_lists(guard_selection_t *gs,
/** Return true iff <b>guard</b> is currently "listed" -- that is, it
* appears in the consensus, or as a configured bridge (as
* appropriate) */
-static int
-entry_guard_is_listed(guard_selection_t *gs, const entry_guard_t *guard)
+MOCK_IMPL(STATIC int,
+entry_guard_is_listed,(guard_selection_t *gs, const entry_guard_t *guard))
{
if (gs->type == GS_TYPE_BRIDGE) {
return NULL != get_bridge_info_for_guard(guard);
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index b676172567..c05a3e3a2c 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -498,6 +498,8 @@ STATIC guard_selection_t *guard_selection_new(const char *name,
STATIC guard_selection_t *get_guard_selection_by_name(
const char *name, guard_selection_type_t type, int create_if_absent);
STATIC void guard_selection_free(guard_selection_t *gs);
+MOCK_DECL(STATIC int, entry_guard_is_listed,
+ (guard_selection_t *gs, const entry_guard_t *guard));
STATIC const char *choose_guard_selection(const or_options_t *options,
const networkstatus_t *ns,
const char *old_selection,