diff options
Diffstat (limited to 'src/or/entrynodes.h')
| -rw-r--r-- | src/or/entrynodes.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 39bff14381..d177f6cff4 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -316,7 +316,7 @@ struct circuit_guard_state_t { */ entry_guard_restriction_t *restrictions; }; -#endif +#endif /* defined(ENTRYNODES_PRIVATE) */ /* Common entry points for old and new guard code */ int guards_update_all(void); @@ -342,7 +342,7 @@ int num_live_entry_guards_for_guard_selection( guard_selection_t *gs, int for_directory); int num_live_entry_guards(int for_directory); -#endif +#endif /* 1 */ const node_t *entry_guard_find_node(const entry_guard_t *guard); const char *entry_guard_get_rsa_id_digest(const entry_guard_t *guard); @@ -558,14 +558,12 @@ STATIC unsigned entry_guards_note_guard_success(guard_selection_t *gs, 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); -STATIC entry_guard_restriction_t * -guard_create_exit_restriction(const uint8_t *exit_id); +STATIC entry_guard_restriction_t *guard_create_exit_restriction( + const uint8_t *exit_id); -STATIC entry_guard_restriction_t * -guard_create_dirserver_md_restriction(void); +STATIC entry_guard_restriction_t *guard_create_dirserver_md_restriction(void); -STATIC void -entry_guard_restriction_free(entry_guard_restriction_t *rst); +STATIC void entry_guard_restriction_free(entry_guard_restriction_t *rst); #endif /* defined(ENTRYNODES_PRIVATE) */ @@ -589,9 +587,11 @@ int getinfo_helper_entry_guards(control_connection_t *conn, int entries_known_but_down(const or_options_t *options); void entries_retry_all(const or_options_t *options); -int guard_selection_have_enough_dir_info_to_build_circuits( - guard_selection_t *gs); -int entry_guards_have_enough_dir_info_to_build_circuits(void); +char *entry_guards_get_err_str_if_dir_info_missing(int using_mds, + int num_present, int num_usable); +char *guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, + int using_mds, + int num_present, int num_usable); void entry_guards_free_all(void); @@ -614,5 +614,5 @@ guard_get_guardfraction_bandwidth(guardfraction_bandwidth_t *guardfraction_bw, int orig_bandwidth, uint32_t guardfraction_percentage); -#endif +#endif /* !defined(TOR_ENTRYNODES_H) */ |