diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-23 09:22:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-23 09:22:04 -0400 |
| commit | bd45f7c6685f887ead3432104cea156cbcc3e3a6 (patch) | |
| tree | cfc2ac95cf16de63a22170a13922d0a3c510a9c2 /src/or/config.h | |
| parent | a3d419634bef0bbac4118d08272d59c9fe66a1bb (diff) | |
| parent | a60ef723450672740eb2d5b0801af78704b77236 (diff) | |
| download | tor-bd45f7c6685f887ead3432104cea156cbcc3e3a6.tar.gz tor-bd45f7c6685f887ead3432104cea156cbcc3e3a6.zip | |
Merge branch 'bug13953_squashed'
Diffstat (limited to 'src/or/config.h')
| -rw-r--r-- | src/or/config.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.h b/src/or/config.h index 9d020b37b9..7db66a31b9 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -89,6 +89,12 @@ int get_first_advertised_port_by_type_af(int listener_type, (get_first_advertised_port_by_type_af(CONN_TYPE_OR_LISTENER, AF_INET)) #define get_primary_dir_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_DIR_LISTENER, AF_INET)) +const tor_addr_t *get_first_advertised_addr_by_type_af(int listener_type, + int address_family); +int port_exists_by_type_addr_port(int listener_type, const tor_addr_t *addr, + int port, int check_wildcard); +int port_exists_by_type_addr32h_port(int listener_type, uint32_t addr_ipv4h, + int port, int check_wildcard); char *get_first_listener_addrport_string(int listener_type); |