nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'isis/bug4019'

Browse Source
This commit is contained in:
Nick Mathewson 2017-06-23 14:38:20 -04:00
commit 89d0261eb5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug4019 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging):
- Remove duplicate log messages regarding opening non-local SocksPorts
upon parsing config and opening listeners at startup. Fixes bug 4019;
bugfix on tor-0.2.3.3-alpha.

8
src/or/config.c
View File

@ -6258,8 +6258,9 @@ port_cfg_free(port_cfg_t *port)
/** Warn for every port in <b>ports</b> of type <b>listener_type</b> that is
* on a publicly routable address. */
static void
warn_nonlocal_client_ports(const smartlist_t *ports, const char *portname,
int listener_type)
warn_nonlocal_client_ports(const smartlist_t *ports,
const char *portname,
const int listener_type)
{
SMARTLIST_FOREACH_BEGIN(ports, const port_cfg_t *, port) {
if (port->type != listener_type)
@ -6943,7 +6944,8 @@ parse_ports(or_options_t *options, int validate_only,
options->SocksPort_lines,
"Socks", CONN_TYPE_AP_LISTENER,
"127.0.0.1", 9050,
CL_PORT_WARN_NONLOCAL|CL_PORT_TAKES_HOSTNAMES|gw_flag) < 0) {
((validate_only ? 0 : CL_PORT_WARN_NONLOCAL)
| CL_PORT_TAKES_HOSTNAMES | gw_flag)) < 0) {
*msg = tor_strdup("Invalid SocksPort configuration");
goto err;
}