commit e1eecac88866fa66e9d77c251a31d85131f11aef Author: teor teor@riseup.net Date: Thu May 7 20:17:57 2020 +1000

Replace several C identifiers.

This is an automated commit, generated by this command:

./scripts/maint/rename_c_identifier.py \ client_or_conn_should_skip_reachable_address_check router_or_conn_should_skip_reachable_address_check \ client_dir_conn_should_skip_reachable_address_check router_dir_conn_should_skip_reachable_address_check --- src/feature/nodelist/node_select.c | 8 ++++---- src/feature/nodelist/routerlist.c | 6 +++--- src/feature/nodelist/routerlist.h | 4 ++-- src/feature/relay/selftest.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index bd63cd3b6..40d0f2a5b 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -321,10 +321,10 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new();

- const int skip_or_fw = client_or_conn_should_skip_reachable_address_check( + const int skip_or_fw = router_or_conn_should_skip_reachable_address_check( options, try_ip_pref); - const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check( + const int skip_dir_fw = router_dir_conn_should_skip_reachable_address_check( options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); @@ -1124,10 +1124,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new();

- const int skip_or_fw = client_or_conn_should_skip_reachable_address_check( + const int skip_or_fw = router_or_conn_should_skip_reachable_address_check( options, try_ip_pref); - const int skip_dir_fw = client_dir_conn_should_skip_reachable_address_check( + const int skip_dir_fw = router_dir_conn_should_skip_reachable_address_check( options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 2a5353c56..e51125626 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -476,7 +476,7 @@ router_reload_router_list(void) * Finally, return true if ReachableAddresses is set. */ int -client_or_conn_should_skip_reachable_address_check( +router_or_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref) { @@ -492,7 +492,7 @@ client_or_conn_should_skip_reachable_address_check( * This function is obsolete, because clients only use ORPorts. */ int -client_dir_conn_should_skip_reachable_address_check( +router_dir_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref) { @@ -520,7 +520,7 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, int need_desc, int pref_addr, int direct_conn) { - const int check_reach = !client_or_conn_should_skip_reachable_address_check( + const int check_reach = !router_or_conn_should_skip_reachable_address_check( get_options(), pref_addr); /* XXXX MOVE */ diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 5256298d8..401ce5e35 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -50,10 +50,10 @@ typedef enum was_router_added_t {

int router_reload_router_list(void);

-int client_or_conn_should_skip_reachable_address_check( +int router_or_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref); -int client_dir_conn_should_skip_reachable_address_check( +int router_dir_conn_should_skip_reachable_address_check( const or_options_t *options, int try_ip_pref); void router_reset_status_download_failures(void); diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 23e4a7dec..4093218fb 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -154,7 +154,7 @@ extend_info_from_router(const routerinfo_t *r, int family)

/* Relays always assume that the first hop is reachable. They ignore * ReachableAddresses. */ - tor_assert_nonfatal(client_or_conn_should_skip_reachable_address_check( + tor_assert_nonfatal(router_or_conn_should_skip_reachable_address_check( get_options(), 0));

const ed25519_public_key_t *ed_id_key;