nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.0'

Browse Source
This commit is contained in:
Nick Mathewson 2019-02-26 07:27:50 -05:00
commit 732855c2e5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug13221 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (logging):
- Correct a misleading error message when IPv4Only or IPv6Only
is used but the resolved address can not be interpreted as an
address of the specified IP version. Fixes bug 13221; bugfix
on 0.2.3.9-alpha. Patch from Kris Katterjohn.

8
src/app/config/config.c
View File

@ -7042,13 +7042,13 @@ parse_port_config(smartlist_t *out,
portname, escaped(ports->value)); portname, escaped(ports->value));
goto err; goto err;
} }
if (bind_ipv4_only && tor_addr_family(&addr) == AF_INET6) { if (bind_ipv4_only && tor_addr_family(&addr) != AF_INET) {
log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv6", log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv4",
portname); portname);
goto err; goto err;
} }
if (bind_ipv6_only && tor_addr_family(&addr) == AF_INET) { if (bind_ipv6_only && tor_addr_family(&addr) != AF_INET6) {
log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv4", log_warn(LD_CONFIG, "Could not interpret %sPort address as IPv6",
portname); portname);
goto err; goto err;
} }