diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-03-28 17:18:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-03-28 17:18:30 -0400 |
| commit | 04a1696095f936e68b524ac3c4881bf404e450a5 (patch) | |
| tree | 8533ff0dc01a744238b2c20e6a456ee7940ba719 | |
| parent | 77bc1b803e0d58b23ff48c2359300ef812f10ee1 (diff) | |
| parent | bd4d8fc744548a234bc35132abd07dcc25c7d51f (diff) | |
| download | tor-04a1696095f936e68b524ac3c4881bf404e450a5.tar.gz tor-04a1696095f936e68b524ac3c4881bf404e450a5.zip | |
Merge remote-tracking branch 'linus/bug5151'
| -rw-r--r-- | changes/bug5151 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 8 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
3 files changed, 9 insertions, 5 deletions
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. diff --git a/src/or/config.c b/src/or/config.c index 05f53bdd2d..30ffbd71df 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5772,13 +5772,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->session_group = sessiongroup; + cfg->no_advertise = no_advertise; cfg->no_listen = no_listen; - cfg->no_listen = no_advertise; cfg->all_addrs = all_addrs; cfg->ipv4_only = ipv4_only; cfg->ipv6_only = ipv6_only; 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); } } |