summaryrefslogtreecommitdiff
path: root/src/feature/relay/router.h
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-03-21 04:01:00 +1000
committerteor <teor@torproject.org>2020-03-21 04:01:00 +1000
commit52f61ec83ea8fd2641ca8cae111b2437d8114aa1 (patch)
tree228f84c0c72c0f214c98e473a3e8b894f9145170 /src/feature/relay/router.h
parente380396d423deded74e6c0e6f6f767a1cc93df04 (diff)
parent5e2f31f177d106388021f18c9077b656bf494fec (diff)
downloadtor-52f61ec83ea8fd2641ca8cae111b2437d8114aa1.tar.gz
tor-52f61ec83ea8fd2641ca8cae111b2437d8114aa1.zip
Merge branch 'bug32588_042' into bug32588_043
Merge static function declaration deletions from bug32588_042 and maint-0.4.3 in app/config/config.c.
Diffstat (limited to 'src/feature/relay/router.h')
-rw-r--r--src/feature/relay/router.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h
index 782609d8ab..061daa0628 100644
--- a/src/feature/relay/router.h
+++ b/src/feature/relay/router.h
@@ -66,6 +66,8 @@ 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);
uint16_t router_get_advertised_or_port_by_af(const or_options_t *options,
sa_family_t family);
uint16_t router_get_advertised_dir_port(const or_options_t *options,