diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-24 22:15:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-24 22:15:47 -0400 |
| commit | f8bb0064d6a06770e6187ba57a2f4a764336aa84 (patch) | |
| tree | 95c4e9e5bc7a0e8432977d6037e006253335b180 /src/or/router.h | |
| parent | cab5f82d125d721fa4b73568323ac1b6009002c3 (diff) | |
| parent | 07e26005a6cb7e47f1f90fcf6a377dfaaaa56789 (diff) | |
| download | tor-f8bb0064d6a06770e6187ba57a2f4a764336aa84.tar.gz tor-f8bb0064d6a06770e6187ba57a2f4a764336aa84.zip | |
Merge remote-tracking branch 'public/bug6026' into maint-0.2.4
Diffstat (limited to 'src/or/router.h')
| -rw-r--r-- | src/or/router.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/router.h b/src/or/router.h index 93ca22a933..60095d087b 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -58,8 +58,11 @@ int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); -uint16_t router_get_active_listener_port_by_type(int listener_type); +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); +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, uint16_t dirport); |