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

[tor/master] Fix comment for rend_service_parse_port_config()
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit a847e16cbb4cac45439ea02221751de2bc3dc380 Author: Ivan Markin <twim(a)riseup.net> Date: Thu Nov 10 22:10:31 2016 +0000 Fix comment for rend_service_parse_port_config() --- src/or/rendservice.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0819d8a..76447a4 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -344,9 +344,9 @@ rend_service_port_config_new(const char *socket_path) return conf; } -/** Parses a real-port to virtual-port mapping separated by the provided - * separator and returns a new rend_service_port_config_t, or NULL and an - * optional error string on failure. +/** Parses a virtual-port to real-port/socket mapping separated by + * the provided separator and returns a new rend_service_port_config_t, + * or NULL and an optional error string on failure. * * The format is: VirtualPort SEP (IP|RealPort|IP:RealPort|'socket':path)? *

1 0

[tor/master] fixup! Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit 150a2b39b0efc17205bef07845e7a6d68b8c5148 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 16 13:03:20 2016 +1100 fixup! Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4() Fix typos: * extra '(' * use assert_log_predicate (without 3 or 4 at the end) Tidy whitespace. Wrap long lines. --- src/test/log_test_helpers.h | 28 ++++++++++++++-------------- src/test/test_address.c | 15 ++++++++++----- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index a8ad7e8..922c68b 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -49,22 +49,22 @@ void mock_dump_saved_logs(void); #define expect_log_msg_containing_either(str1, str2) \ assert_log_predicate(mock_saved_log_has_message_containing(str1) || \ mock_saved_log_has_message_containing(str2), \ - "expected log to contain " # str1 " or " # str2); - -#define expect_log_msg_containing_either3(str1, str2, str3) \ - assert_log_predicate3(mock_saved_log_has_message_containing(str1) || \ - (mock_saved_log_has_message_containing(str2) || \ - mock_saved_log_has_message_containing(str3), \ - "expected log to contain " # str1 " or " # str2 " or " # str3); - -#define expect_log_msg_containing_either4(str1, str2, str3, str4) \ - assert_log_predicate4(mock_saved_log_has_message_containing(str1) || \ - (mock_saved_log_has_message_containing(str2) || \ - (mock_saved_log_has_message_containing(str3) || \ - mock_saved_log_has_message_containing(str4), \ - "expected log to contain " # str1 " or " # str2 " or " # str3 " or " # str4); + "expected log to contain " # str1 " or " # str2); +#define expect_log_msg_containing_either3(str1, str2, str3) \ + assert_log_predicate(mock_saved_log_has_message_containing(str1) || \ + mock_saved_log_has_message_containing(str2) || \ + mock_saved_log_has_message_containing(str3), \ + "expected log to contain " # str1 " or " # str2 \ + " or " # str3); +#define expect_log_msg_containing_either4(str1, str2, str3, str4) \ + assert_log_predicate(mock_saved_log_has_message_containing(str1) || \ + mock_saved_log_has_message_containing(str2) || \ + mock_saved_log_has_message_containing(str3) || \ + mock_saved_log_has_message_containing(str4), \ + "expected log to contain " # str1 " or " # str2 \ + " or " # str3 " or " # str4); #define expect_single_log_msg(str) \ do { \ diff --git a/src/test/test_address.c b/src/test/test_address.c index fa32cf9..0d142ad 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -810,8 +810,11 @@ test_address_get_if_addrs6_list_internal(void *arg) if (smartlist_len(mock_saved_logs()) == 1) { expect_log_msg_containing_either4("connect() failed", "unable to create socket", - "Address that we determined via UDP socket magic is unsuitable for public comms.", - "getsockname() to determine interface failed"); + "Address that we determined via UDP " + "socket magic is unsuitable for public " + "comms.", + "getsockname() to determine interface " + "failed"); } teardown_capture_of_logs(); @@ -850,9 +853,11 @@ test_address_get_if_addrs6_list_no_internal(void *arg) if (smartlist_len(mock_saved_logs()) == 1) { expect_log_msg_containing_either4("connect() failed", "unable to create socket", - "Address that we determined via UDP socket magic is unsuitable for public comms.", - "getsockname() to determine interface failed"); - + "Address that we determined via UDP " + "socket magic is unsuitable for public " + "comms.", + "getsockname() to determine interface " + "failed"); } teardown_capture_of_logs();

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20646_030_01'
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit b7db39e88ab6d97a5a0a5f1ff7e0d5b73e51e05e Merge: fe711c2 6b13612 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 17 20:08:00 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20646_030_01' changes/bug20646 | 5 +++++ src/common/util.c | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)

1 0

[tor/master] Add all four error messages to test_address_get_if_addrs6_list_internal()
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit 01492d3869a49ff005dd8590e11466dd3cc0045a Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Nov 15 20:35:48 2016 -0500 Add all four error messages to test_address_get_if_addrs6_list_internal() --- src/test/test_address.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index e52779c..e0a5ea4 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -808,8 +808,10 @@ test_address_get_if_addrs6_list_internal(void *arg) results = get_interface_address6_list(LOG_ERR, AF_INET6, 1); tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1); if (smartlist_len(mock_saved_logs()) == 1) { - expect_log_msg_containing_either("connect() failed", - "unable to create socket"); + expect_log_msg_containing_either4("connect() failed", + "unable to create socket", + "Address that we determined via UDP socket magic is unsuitable for public comms.", + "getsockname() to determine interface failed"); } teardown_capture_of_logs();

1 0

[tor/master] Merge remote-tracking branch 'public/bug20558'
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit b5d738e4819813569bcb768d176fc1e23a7c0a21 Merge: a742637 00bdd56 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 17 20:10:40 2016 -0500 Merge remote-tracking branch 'public/bug20558' src/or/torcert.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0

[tor/master] finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit db2dd8434e84b54b4196cd7e804ceae13f0c5ea7 Author: Fabian Keil <fk(a)fabiankeil.de> Date: Sat Nov 12 15:40:10 2016 +0100 finish_writing_to_file_impl(): Remove temporary file if replacing the existing one failed Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/util.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index cb5f128..3421d11 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2601,6 +2601,14 @@ finish_writing_to_file_impl(open_file_t *file_data, int abort_write) if (file_data->rename_on_close) { tor_assert(file_data->tempname && file_data->filename); + if (!abort_write) { + tor_assert(strcmp(file_data->filename, file_data->tempname)); + if (replace_file(file_data->tempname, file_data->filename)) { + log_warn(LD_FS, "Error replacing \"%s\": %s", file_data->filename, + strerror(errno)); + abort_write = r = -1; + } + } if (abort_write) { int res = unlink(file_data->tempname); if (res != 0) { @@ -2609,13 +2617,6 @@ finish_writing_to_file_impl(open_file_t *file_data, int abort_write) file_data->tempname, strerror(errno)); r = -1; } - } else { - tor_assert(strcmp(file_data->filename, file_data->tempname)); - if (replace_file(file_data->tempname, file_data->filename)) { - log_warn(LD_FS, "Error replacing \"%s\": %s", file_data->filename, - strerror(errno)); - r = -1; - } } }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20629_030_01'
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit ded58777c5332a343a4f427058c56a2e28f440ab Merge: b5d738e c82881a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 17 20:12:13 2016 -0500 Merge remote-tracking branch 'dgoulet/bug20629_030_01' src/or/hs_descriptor.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit 8a767ba7fbeedb3d8838ccfe57583203b783241d Merge: caf7422 44f3563 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 17 20:02:59 2016 -0500 Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9 changes/bug20634 | 3 +++ src/test/log_test_helpers.h | 17 ++++++++++++++++- src/test/test_address.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-)

1 0

[tor/master] Add all four error messages to test_address_get_if_addrs6_list_no_internal()
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit 0825fc6af90b2015cb6a4abe6b8682f6f44d64e2 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Nov 15 20:36:53 2016 -0500 Add all four error messages to test_address_get_if_addrs6_list_no_internal() --- src/test/test_address.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index e0a5ea4..fa32cf9 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -848,8 +848,11 @@ test_address_get_if_addrs6_list_no_internal(void *arg) results = get_interface_address6_list(LOG_ERR, AF_INET6, 0); tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1); if (smartlist_len(mock_saved_logs()) == 1) { - expect_log_msg_containing_either("connect() failed", - "unable to create socket"); + expect_log_msg_containing_either4("connect() failed", + "unable to create socket", + "Address that we determined via UDP socket magic is unsuitable for public comms.", + "getsockname() to determine interface failed"); + } teardown_capture_of_logs();

1 0

[tor/release-0.2.9] Changes file for bug 20634
by nickm＠torproject.org 17 Nov '16

17 Nov '16

commit 44f3563d872b56593c11a6e557b130714fa8916b Author: teor <teor2345(a)gmail.com> Date: Wed Nov 16 13:08:39 2016 +1100 Changes file for bug 20634 --- changes/bug20634 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug20634 b/changes/bug20634 new file mode 100644 index 0000000..62fc9f4 --- /dev/null +++ b/changes/bug20634 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Stop spurious failures in the local interface address discovery unit + tests. Fixes bug 20634; bugfix on 0.2.8.1-alpha; patch by Neel Chauhan.

1 0