aboutsummaryrefslogtreecommitdiff
path: root/src/feature/nodelist/routerlist.c
diff options
context:
space:
mode:
authorteor <teor@riseup.net>2020-05-07 20:07:13 +1000
committerteor <teor@riseup.net>2020-05-07 20:07:13 +1000
commit05c56ae455de1f8e1dc9816ab9dcd7f0cdc2c994 (patch)
treeeb5e6f815ebd3fc039365174c0df30f3d07669ee /src/feature/nodelist/routerlist.c
parent4a36dfebee080ccd56501042b2943c114544d7eb (diff)
downloadtor-05c56ae455de1f8e1dc9816ab9dcd7f0cdc2c994.tar.gz
tor-05c56ae455de1f8e1dc9816ab9dcd7f0cdc2c994.zip
Replace several C identifiers.
This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_skip_orport_reachability_check router_should_skip_orport_reachability_check \ router_skip_dirport_reachability_check router_should_skip_dirport_reachability_check \ router_connect_assume_or_reachable client_or_conn_should_skip_reachable_address_check \ router_connect_assume_dir_reachable client_dir_conn_should_skip_reachable_address_check It was generated with --no-verify, so it probably breaks some commit hooks. The commiter should be sure to fix them up in a subsequent commit.
Diffstat (limited to 'src/feature/nodelist/routerlist.c')
-rw-r--r--src/feature/nodelist/routerlist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
index df94e1dced..0e8fff7c31 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
-router_connect_assume_or_reachable(const or_options_t *options,
+client_or_conn_should_skip_reachable_address_check(const or_options_t *options,
int try_ip_pref)
{
/* Servers always have and prefer IPv4.
@@ -491,7 +491,7 @@ router_connect_assume_or_reachable(const or_options_t *options,
* This function is obsolete, because clients only use ORPorts.
*/
int
-router_connect_assume_dir_reachable(const or_options_t *options,
+client_dir_conn_should_skip_reachable_address_check(const or_options_t *options,
int try_ip_pref)
{
/* Servers always have and prefer IPv4.
@@ -518,7 +518,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 = !router_connect_assume_or_reachable(get_options(),
+ const int check_reach = !client_or_conn_should_skip_reachable_address_check(get_options(),
pref_addr);
/* XXXX MOVE */
SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) {