From 088100d698d24d77a02675c23a553d6fe7da9c16 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 21 Jul 2020 12:59:03 -0400 Subject: Rename router_get_advertised_*() functions. These now (or_port and dir_port) now have "find" names, since they look at the portcfg first, then at the actual ports from the listeners. This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_get_advertised_or_port routerconf_find_or_port \ router_get_advertised_ipv6_or_ap routerconf_find_ipv6_or_ap \ router_has_advertised_ipv6_orport routerconf_has_ipv6_orport \ router_get_advertised_dir_port routerconf_find_dir_port --- src/feature/relay/router.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/feature/relay/router.h') diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h index e53f1dd3e2..c4e9af039f 100644 --- a/src/feature/relay/router.h +++ b/src/feature/relay/router.h @@ -65,13 +65,13 @@ int init_keys_client(void); uint16_t router_get_active_listener_port_by_type_af(int listener_type, sa_family_t family); -void router_get_advertised_ipv6_or_ap(const or_options_t *options, +void routerconf_find_ipv6_or_ap(const or_options_t *options, tor_addr_port_t *ipv6_ap_out); -bool router_has_advertised_ipv6_orport(const or_options_t *options); +bool routerconf_has_ipv6_orport(const or_options_t *options); MOCK_DECL(bool, router_can_extend_over_ipv6,(const or_options_t *options)); -uint16_t router_get_advertised_or_port(const or_options_t *options, +uint16_t routerconf_find_or_port(const or_options_t *options, sa_family_t family); -uint16_t router_get_advertised_dir_port(const or_options_t *options, +uint16_t routerconf_find_dir_port(const or_options_t *options, uint16_t dirport); int router_should_advertise_dirport(const or_options_t *options, -- cgit v1.2.3-54-g00ecf