mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-27 07:59:35 +01:00
Code Issues Projects Releases Wiki Activity

Refactor duplicate code in config.c into port_binds_ipv4/6

Browse source 
No behavioural change

Preserves and documents behaviour when passed AF_UNSPEC.
This commit is contained in:
teor (Tim Wilson-Brown) 2016-05-07 10:17:46 -07:00
parent 2da2718609
commit faec7956a9
No known key found for this signature in database
GPG key ID: 450CBA7F968F094B
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/or/config.c
View file

@ -6841,6 +6841,22 @@ parse_ports(or_options_t *options, int validate_only,
return retval; return retval;
} }
/* Does port bind to IPv4? */
static int port_binds_ipv4(const port_cfg_t *port)
{
return tor_addr_family(&port->addr) == AF_INET ||
(tor_addr_family(&port->addr) == AF_UNSPEC
&& !port->server_cfg.bind_ipv6_only);
}
/* Does port bind to IPv6? */
static int port_binds_ipv6(const port_cfg_t *port)
{
return tor_addr_family(&port->addr) == AF_INET6 ||
(tor_addr_family(&port->addr) == AF_UNSPEC
&& !port->server_cfg.bind_ipv4_only);
}
/** Given a list of <b>port_cfg_t</b> in <b>ports</b>, check them for internal /** Given a list of <b>port_cfg_t</b> in <b>ports</b>, check them for internal
* consistency and warn as appropriate. Set *<b>n_low_ports_out</b> to the * consistency and warn as appropriate. Set *<b>n_low_ports_out</b> to the
* number of sub-1024 ports we will be binding. */ * number of sub-1024 ports we will be binding. */
@ -6866,9 +6882,7 @@ check_server_ports(const smartlist_t *ports,
} else if (port->type == CONN_TYPE_OR_LISTENER) { } else if (port->type == CONN_TYPE_OR_LISTENER) {
if (! port->server_cfg.no_advertise) { if (! port->server_cfg.no_advertise) {
++n_orport_advertised; ++n_orport_advertised;
if (tor_addr_family(&port->addr) == AF_INET || if (port_binds_ipv4(port))
(tor_addr_family(&port->addr) == AF_UNSPEC &&
!port->server_cfg.bind_ipv6_only))
++n_orport_advertised_ipv4; ++n_orport_advertised_ipv4;
} }
if (! port->server_cfg.no_listen) if (! port->server_cfg.no_listen)
@ -7002,20 +7016,20 @@ get_first_listener_addrport_string(int listener_type)
} }
/** Return the first advertised port of type <b>listener_type</b> in /** Return the first advertised port of type <b>listener_type</b> in
<b>address_family</b>. */ * <b>address_family</b>. Returns 0 when no port is found, and when passed
* AF_UNSPEC. */
int int
get_first_advertised_port_by_type_af(int listener_type, int address_family) get_first_advertised_port_by_type_af(int listener_type, int address_family)
{ {
if (address_family == AF_UNSPEC)
return 0;
if (!configured_ports) if (!configured_ports)
return 0; return 0;
SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) {
if (cfg->type == listener_type && if (cfg->type == listener_type &&
!cfg->server_cfg.no_advertise && !cfg->server_cfg.no_advertise) {
(tor_addr_family(&cfg->addr) == address_family || if ((address_family == AF_INET && port_binds_ipv4(cfg)) ||
tor_addr_family(&cfg->addr) == AF_UNSPEC)) { (address_family == AF_INET6 && port_binds_ipv6(cfg))) {
if (tor_addr_family(&cfg->addr) != AF_UNSPEC ||
(address_family == AF_INET && !cfg->server_cfg.bind_ipv6_only) ||
(address_family == AF_INET6 && !cfg->server_cfg.bind_ipv4_only)) {
return cfg->port; return cfg->port;
} }
} }