diff options
| author | teor <teor@torproject.org> | 2020-04-30 14:08:04 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-30 15:12:27 +1000 |
| commit | caab67d0c27ca44344fec05ec445015d9a6c6ff1 (patch) | |
| tree | bdb660102fe8b516a291fca542be2f84d23679b6 /src/feature/nodelist/routerlist.c | |
| parent | efcae919aea4611d9f4ec5815170c48fc67134cf (diff) | |
| download | tor-caab67d0c27ca44344fec05ec445015d9a6c6ff1.tar.gz tor-caab67d0c27ca44344fec05ec445015d9a6c6ff1.zip | |
nodelist: Distinguish client and relay reachability
Change some function names to distinguish between:
* client first hop reachability (ReachableAddresses)
* relay port reachability self-tests
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
router_skip_or_reachability router_connect_assume_or_reachable \
router_skip_dir_reachability router_connect_assume_dir_reachable
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.
Part of 33222.
Diffstat (limited to 'src/feature/nodelist/routerlist.c')
| -rw-r--r-- | src/feature/nodelist/routerlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 80c1aa6893..1cc813f17c 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -469,7 +469,7 @@ router_reload_router_list(void) * and reachability checks be skipped? */ int -router_skip_or_reachability(const or_options_t *options, int try_ip_pref) +router_connect_assume_or_reachable(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. * And if clients are checking against the firewall for reachability only, @@ -481,7 +481,7 @@ router_skip_or_reachability(const or_options_t *options, int try_ip_pref) * and reachability checks be skipped? */ int -router_skip_dir_reachability(const or_options_t *options, int try_ip_pref) +router_connect_assume_dir_reachable(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. * And if clients are checking against the firewall for reachability only, @@ -507,7 +507,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_skip_or_reachability(get_options(), + const int check_reach = !router_connect_assume_or_reachable(get_options(), pref_addr); /* XXXX MOVE */ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) { |