aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay/router.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-21 12:34:56 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-21 12:47:33 -0400
commitf478080bd08033473dfedcf0f51f0be767b985f5 (patch)
tree74cd3af16cd6e9f2572a88e262a7ae88642c6141 /src/feature/relay/router.h
parent39146383fc30ee7cce61e3d5d753ae8605dddc22 (diff)
downloadtor-f478080bd08033473dfedcf0f51f0be767b985f5.tar.gz
tor-f478080bd08033473dfedcf0f51f0be767b985f5.zip
Combine router_get_advertised_or_port{,by_af_}() functions
Diffstat (limited to 'src/feature/relay/router.h')
-rw-r--r--src/feature/relay/router.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h
index fab109be7c..e53f1dd3e2 100644
--- a/src/feature/relay/router.h
+++ b/src/feature/relay/router.h
@@ -65,13 +65,12 @@ int init_keys_client(void);
uint16_t router_get_active_listener_port_by_type_af(int listener_type,
sa_family_t family);
-uint16_t router_get_advertised_or_port(const or_options_t *options);
void router_get_advertised_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);
MOCK_DECL(bool, router_can_extend_over_ipv6,(const or_options_t *options));
-uint16_t router_get_advertised_or_port_by_af(const or_options_t *options,
- sa_family_t family);
+uint16_t router_get_advertised_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 dirport);