diff options
author | George Kadianakis <desnacked@riseup.net> | 2016-12-06 14:35:31 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:06:22 -0500 |
commit | 50783d0123c38c649851421f33c616e0bf75d827 (patch) | |
tree | 499c39e92cf66196044a58a4761474fedd26d1f9 /src/or/entrynodes.h | |
parent | 7ab2678074e5d49628d948fadb80c5904950236c (diff) | |
download | tor-50783d0123c38c649851421f33c616e0bf75d827.tar.gz tor-50783d0123c38c649851421f33c616e0bf75d827.zip |
Easy code fixes.
- Correctly maintain the previous guard selection in choose_guard_selection().
- Print bridge identifier instead of nothing in entry_guard_describe()._
Diffstat (limited to 'src/or/entrynodes.h')
-rw-r--r-- | src/or/entrynodes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 116e5abb8c..11335255e2 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -519,9 +519,9 @@ 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, - guard_selection_type_t *type_out); + const networkstatus_t *ns, + const guard_selection_t *old_selection, + guard_selection_type_t *type_out); STATIC entry_guard_t *get_sampled_guard_with_id(guard_selection_t *gs, const uint8_t *rsa_id); |