commit 074bf72a2cb9e641468b9ef92a8b16c7f0e2f00a Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 18 23:32:02 2012 -0400

If DisableNetwork, don't even try to open non-controller listeners

Fix for 5604; bugfix on 0.2.3.9-alpha, which introduced DisableNetwork. --- changes/bug5604 | 4 ++++ src/or/config.c | 3 ++- src/or/connection.c | 17 +++++++++++++---- src/or/connection.h | 3 ++- src/or/main.c | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/changes/bug5604 b/changes/bug5604 new file mode 100644 index 0000000..4c72f3c --- /dev/null +++ b/changes/bug5604 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't try to open non-control listeners when DisableNetwork is set. + Previousy, we'd open all listeners, then immediately close them. + Fixes bug 5604; bugfix on 0.2.3.9-alpha. diff --git a/src/or/config.c b/src/or/config.c index 696bbd0..8c44a71 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1119,7 +1119,8 @@ options_act_reversible(const or_options_t *old_options, char **msg) * networking is disabled, this will close all but the control listeners, * but disable those. */ if (!we_are_hibernating()) { - if (retry_all_listeners(replaced_listeners, new_listeners) < 0) { + if (retry_all_listeners(replaced_listeners, new_listeners, + options->DisableNetwork) < 0) { *msg = tor_strdup("Failed to bind one of the listener ports."); goto rollback; } diff --git a/src/or/connection.c b/src/or/connection.c index 1c034c6..642ee6e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1812,12 +1812,20 @@ connection_read_proxy_handshake(connection_t *conn) static int retry_listener_ports(smartlist_t *old_conns, const smartlist_t *ports, - smartlist_t *new_conns) + smartlist_t *new_conns, + int close_all_noncontrol) { smartlist_t *launch = smartlist_new(); int r = 0;

- smartlist_add_all(launch, ports); + if (close_all_noncontrol) { + SMARTLIST_FOREACH(ports, port_cfg_t *, p, { + if (p->type == CONN_TYPE_CONTROL_LISTENER) + smartlist_add(launch, p); + }); + } else { + smartlist_add_all(launch, ports); + }

/* Iterate through old_conns, comparing it to launch: remove from both lists * each pair of elements that corresponds to the same port. */ @@ -1920,7 +1928,7 @@ retry_listener_ports(smartlist_t *old_conns, */ int retry_all_listeners(smartlist_t *replaced_conns, - smartlist_t *new_conns) + smartlist_t *new_conns, int close_all_noncontrol) { smartlist_t *listeners = smartlist_new(); const or_options_t *options = get_options(); @@ -1935,7 +1943,8 @@ retry_all_listeners(smartlist_t *replaced_conns,

if (retry_listener_ports(listeners, get_configured_ports(), - new_conns) < 0) + new_conns, + close_all_noncontrol) < 0) retval = -1;

/* Any members that were still in 'listeners' don't correspond to diff --git a/src/or/connection.h b/src/or/connection.h index c4b8bf8..bdeefa2 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -64,7 +64,8 @@ int get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, const connection_t *conn);

int retry_all_listeners(smartlist_t *replaced_conns, - smartlist_t *new_conns); + smartlist_t *new_conns, + int close_all_noncontrol);

void connection_mark_all_noncontrol_listeners(void); void connection_mark_all_noncontrol_connections(void); diff --git a/src/or/main.c b/src/or/main.c index 9022f2e..f104b66 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1428,7 +1428,7 @@ run_scheduled_events(time_t now)

/** 3d. And every 60 seconds, we relaunch listeners if any died. */ if (!net_is_disabled() && time_to_check_listeners < now) { - retry_all_listeners(NULL, NULL); + retry_all_listeners(NULL, NULL, 0); time_to_check_listeners = now+60; }