diff options
| author | George Kadianakis <desnacked@riseup.net> | 2017-10-03 15:50:54 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2017-10-03 15:55:19 +0300 |
| commit | f7306b16ecaeb07eb64d0fcbfcc43754533818c2 (patch) | |
| tree | 1f0f90f0cfc1433918ee33d61bb57db9ab9a621c /src/or | |
| parent | d891faddc79c8cb58723edd431895927871d3803 (diff) | |
| download | tor-f7306b16ecaeb07eb64d0fcbfcc43754533818c2.tar.gz tor-f7306b16ecaeb07eb64d0fcbfcc43754533818c2.zip | |
entrynodes: Better naming for dir info check functions.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/entrynodes.c | 7 | ||||
| -rw-r--r-- | src/or/entrynodes.h | 4 | ||||
| -rw-r--r-- | src/or/nodelist.c | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index c71a93beae..9fbf426433 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -3446,7 +3446,7 @@ guards_retry_optimistic(const or_options_t *options) * the genreal descriptor information <b>using_mds</b>, <b>num_present</b> and * <b>num_usable</b> to improve the error message. */ char * -guard_selection_get_dir_info_status_str(guard_selection_t *gs, +guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, int using_mds, int num_present, int num_usable) { @@ -3492,10 +3492,11 @@ guard_selection_get_dir_info_status_str(guard_selection_t *gs, /** As guard_selection_have_enough_dir_info_to_build_circuits, but uses * the default guard selection. */ char * -entry_guards_get_dir_info_status_str(int using_mds, +entry_guards_get_err_str_if_dir_info_missing(int using_mds, int num_present, int num_usable) { - return guard_selection_get_dir_info_status_str(get_guard_selection_info(), + return guard_selection_get_err_str_if_dir_info_missing( + get_guard_selection_info(), using_mds, num_present, num_usable); } diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index ca9fb489e6..9e1e729930 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -572,9 +572,9 @@ 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); -char *entry_guards_get_dir_info_status_str(int using_mds, +char *entry_guards_get_err_str_if_dir_info_missing(int using_mds, int num_present, int num_usable); -char *guard_selection_get_dir_info_status_str(guard_selection_t *gs, +char *guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs, int using_mds, int num_present, int num_usable); diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 6ca9bd6d4b..eae74e18b5 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -2325,7 +2325,7 @@ update_router_have_minimum_dir_info(void) } { /* Check entry guard dirinfo status */ - char *guard_error = entry_guards_get_dir_info_status_str(using_md, + char *guard_error = entry_guards_get_err_str_if_dir_info_missing(using_md, num_present, num_usable); if (guard_error) { |