August 2016 - tor-commits - lists.torproject.org

[tor/master] fix 8625 description a little
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit 8fb49e4df278817e6d44c4de44666db11ca7aadc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 10:14:45 2016 -0400 fix 8625 description a little --- changes/bug8625 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/changes/bug8625 b/changes/bug8625 index b0a5196..e398d07 100644 --- a/changes/bug8625 +++ b/changes/bug8625 @@ -1,6 +1,5 @@ o Major bugfixes (directory downloads): - - Avoid resetting download status for consensuses hourly, and add a - SimulateDirDownloadFailures config option to test behavior when all - downloads from directory servers fail. Fixes bug 8625; bugfix on + - Avoid resetting download status for consensuses hourly, since we + already have another, smarter retry mechanism. Fixes bug 8625; bugfix on 0.2.0.9-alpha.

1 0

[tor/master] Fix some comments in sandbox.c
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit 40d05983c4dd437dbaa4a99f90aefe4e1f1a64c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 10:02:11 2016 -0400 Fix some comments in sandbox.c Closes ticket 19942; patch from "cypherpunks" --- src/common/sandbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 42e40c6..37c1a94 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -838,7 +838,7 @@ sb_epoll_ctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } /** - * Function responsible for setting up the fcntl64 syscall for + * Function responsible for setting up the prctl syscall for * the seccomp filter sandbox. * * NOTE: if multiple filters need to be added, the PR_SECCOMP parameter needs @@ -859,7 +859,7 @@ sb_prctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter) } /** - * Function responsible for setting up the fcntl64 syscall for + * Function responsible for setting up the mprotect syscall for * the seccomp filter sandbox. * * NOTE: does not NEED to be here.. currently only occurs before filter; will

1 0

[tor/master] Prevents negative number of written bytes on error message.
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit 4f19f85eda9fa096fcca2b8ce34b1db0b757d4a7 Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Tue Aug 16 17:12:18 2016 +0100 Prevents negative number of written bytes on error message. Fixes #17758. --- src/or/microdesc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 130259a..a81dc54 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -108,6 +108,7 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) md->off = tor_fd_getpos(fd); written = write_all(fd, md->body, md->bodylen, 0); if (written != (ssize_t)md->bodylen) { + written = written < 0 ? 0 : written; log_warn(LD_DIR, "Couldn't dump microdescriptor (wrote %ld out of %lu): %s", (long)written, (unsigned long)md->bodylen,

1 0

[tor/master] Merge remote-tracking branch 'jigsaw/fix-17758'
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit a0398dd3486b5e489b8e6db7490b9c24337161b0 Merge: ff65618 4f19f85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 09:57:14 2016 -0400 Merge remote-tracking branch 'jigsaw/fix-17758' src/or/microdesc.c | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/master] changes file for bug 17758
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit 6ca87e393b284c3279f4a1bda7b10e1c5d603e50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 10:00:54 2016 -0400 changes file for bug 17758 --- changes/bug17758 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug17758 b/changes/bug17758 new file mode 100644 index 0000000..cd72d68 --- /dev/null +++ b/changes/bug17758 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Log a more accurate message when we fail to dump a microdescriptor. + Fixes bug 17758; bugfix on 0.2.2.8-alpha. Patch from Daniel Pinto.

1 0

[tor/master] Fixes inconsistent version prefix in log messages.
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit 3d6ae798cf502d5b4ee08811a57b6c69c5de31eb Author: Daniel Pinto <danielpinto52(a)gmail.com> Date: Tue Aug 16 17:22:16 2016 +0100 Fixes inconsistent version prefix in log messages. Fixes #15381. --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 261118a..4dbd9a0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2800,7 +2800,7 @@ tor_init(int argc, char *argv[]) { const char *version = get_version(); - log_notice(LD_GENERAL, "Tor v%s running on %s with Libevent %s, " + log_notice(LD_GENERAL, "Tor %s running on %s with Libevent %s, " "OpenSSL %s and Zlib %s.", version, get_uname(), tor_libevent_get_version_str(),

1 0

[tor/master] Merge remote-tracking branch 'jigsaw/fix-15381'
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit ff65618f16a1ae01b0d8267fa658b214581af524 Merge: e8d7953 3d6ae79 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 09:55:37 2016 -0400 Merge remote-tracking branch 'jigsaw/fix-15381' src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'bug13953_squashed'
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit bd45f7c6685f887ead3432104cea156cbcc3e3a6 Merge: a3d4196 a60ef72 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 09:22:04 2016 -0400 Merge branch 'bug13953_squashed' changes/bug13953 | 3 ++ src/or/config.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++----- src/or/config.h | 6 +++ src/or/router.c | 81 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 196 insertions(+), 10 deletions(-) diff --cc src/or/config.c index 941393a,2fd97de..6fb3614 --- a/src/or/config.c +++ b/src/or/config.c @@@ -7063,15 -7021,15 +7078,15 @@@ get_first_listener_addrport_string(int int get_first_advertised_port_by_type_af(int listener_type, int address_family) { + if (address_family == AF_UNSPEC) + return 0; - if (!configured_ports) - return 0; - SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { ++ + const smartlist_t *conf_ports = get_configured_ports(); + SMARTLIST_FOREACH_BEGIN(conf_ports, const port_cfg_t *, cfg) { if (cfg->type == listener_type && - !cfg->server_cfg.no_advertise && - (tor_addr_family(&cfg->addr) == address_family || - tor_addr_family(&cfg->addr) == AF_UNSPEC)) { - if (tor_addr_family(&cfg->addr) != AF_UNSPEC || - (address_family == AF_INET && !cfg->server_cfg.bind_ipv6_only) || - (address_family == AF_INET6 && !cfg->server_cfg.bind_ipv4_only)) { + !cfg->server_cfg.no_advertise) { + if ((address_family == AF_INET && port_binds_ipv4(cfg)) || + (address_family == AF_INET6 && port_binds_ipv6(cfg))) { return cfg->port; } }

1 0

[tor/master] Reword the router_check_descriptor_address_port_consistency log message
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit a60ef723450672740eb2d5b0801af78704b77236 Author: teor <teor2345(a)gmail.com> Date: Tue Aug 16 14:40:16 2016 +1000 Reword the router_check_descriptor_address_port_consistency log message The new message covers static and dynamic public IPv4 addresses, and external / internal addresses in NAT setups. --- src/or/router.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 8fed36c..acb5bc1 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1929,18 +1929,16 @@ router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr, tor_addr_from_ipv4h(&desc_addr, ipv4h_desc_addr); tor_addr_to_str(desc_addr_str, &desc_addr, TOR_ADDR_BUF_LEN, 0); - log_warn(LD_CONFIG, "The configured IPv4 %sPort address %s does not " - "match the address %s in the descriptor. Please configure " - "the matching IPv4 addresses for this Tor relay as " - "Address <IPv4 address> in the torrc configuration file if " - "you have multiple public IP addresses. If you are behind a " - "NAT and have the right ports forwarded, you can ignore this " - "warning or, to remove it, use 2 %sPort lines with options " - "NoListen (for the public IPv4 address line) and NoAdvertise " - "(for the internal NAT IPv4 address line).", - listener_type ? "OR" : "Dir", - port_addr_str, desc_addr_str, - listener_type ? "OR" : "Dir"); + const char *listener_str = (listener_type == CONN_TYPE_OR_LISTENER ? + "OR" : "Dir"); + log_warn(LD_CONFIG, "The IPv4 %sPort address %s does not match the " + "descriptor address %s. If you have a static public IPv4 " + "address, use 'Address <IPv4>' and 'OutboundBindAddress " + "<IPv4>'. If you are behind a NAT, use two %sPort lines: " + "'%sPort <PublicPort> NoListen' and '%sPort <InternalPort> " + "NoAdvertise'.", + listener_str, port_addr_str, desc_addr_str, listener_str, + listener_str, listener_str); } }

1 0

[tor/master] Use tor_assert, not assert.
by nickm＠torproject.org 23 Aug '16

23 Aug '16

commit e8d7953c611200835d4011b12e210e878f0d13fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 23 09:24:20 2016 -0400 Use tor_assert, not assert. --- src/or/router.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 40aae29..e9961d4 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1970,8 +1970,8 @@ static void router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr, int listener_type) { - assert(listener_type == CONN_TYPE_OR_LISTENER || - listener_type == CONN_TYPE_DIR_LISTENER); + tor_assert(listener_type == CONN_TYPE_OR_LISTENER || + listener_type == CONN_TYPE_DIR_LISTENER); /* The first advertised Port may be the magic constant CFG_AUTO_PORT. */ @@ -1985,7 +1985,7 @@ router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr, AF_INET); /* If we're building a descriptor with no advertised address, * something is terribly wrong. */ - assert(port_addr); + tor_assert(port_addr); tor_addr_t desc_addr; char port_addr_str[TOR_ADDR_BUF_LEN];

1 0