From ce5489eec0a032aa98622c3dc0af1af7220a3ad4 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 19 Mar 2012 04:55:17 +0100 Subject: [PATCH 1/4] Fix cut'n'paste bug (#5151). --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 0c699b021d..f9a3350184 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5774,7 +5774,7 @@ parse_port_config(smartlist_t *out, cfg->session_group = sessiongroup; cfg->isolation_flags = isolation; cfg->no_listen = no_listen; - cfg->no_listen = no_advertise; + cfg->no_advertise = no_advertise; cfg->all_addrs = all_addrs; cfg->ipv4_only = ipv4_only; cfg->ipv6_only = ipv6_only; From bb2135fea68b53b4e75795c7b1bd632ce4f0d459 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 19 Mar 2012 04:57:19 +0100 Subject: [PATCH 2/4] Reorder initialisation of port_cfg to match order of members in struct. --- src/or/config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f9a3350184..55fe615979 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5768,13 +5768,13 @@ parse_port_config(smartlist_t *out, if (out && port) { port_cfg_t *cfg = tor_malloc_zero(sizeof(port_cfg_t)); - cfg->type = listener_type; - cfg->port = port; tor_addr_copy(&cfg->addr, &addr); - cfg->session_group = sessiongroup; + cfg->port = port; + cfg->type = listener_type; cfg->isolation_flags = isolation; - cfg->no_listen = no_listen; + cfg->session_group = sessiongroup; cfg->no_advertise = no_advertise; + cfg->no_listen = no_listen; cfg->all_addrs = all_addrs; cfg->ipv4_only = ipv4_only; cfg->ipv6_only = ipv6_only; From 341e37e38c8b341097ed0fcd3d396dca00578f47 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Mon, 19 Mar 2012 05:12:19 +0100 Subject: [PATCH 3/4] Move the logging of 'My line' to debug level (#5151). --- src/or/router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index d86c5f3e39..fa89e614c0 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1997,7 +1997,7 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, if (a) { tor_asprintf(&extra_or_address, "or-address %s:%d\n", a, router->ipv6_orport); - log_notice(LD_OR, "My line is <%s>", extra_or_address); + log_debug(LD_OR, "My or-address line is <%s>", extra_or_address); } } From bd4d8fc744548a234bc35132abd07dcc25c7d51f Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 27 Mar 2012 15:00:34 +0200 Subject: [PATCH 4/4] Add changes file. --- changes/bug5151 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/bug5151 diff --git a/changes/bug5151 b/changes/bug5151 new file mode 100644 index 0000000000..f872aa4b7d --- /dev/null +++ b/changes/bug5151 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix bug stomping on ORPort option NoListen and ignoring option + NoAdvertise. Fixes bug 5151. + - Move a debug printout from notice to debug level.