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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit fe0bfbf755de7aff7dfbf4db11fce4f78c0b5950 Merge: c8bcbf5 e7ade23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:25:54 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/test/test_options.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit ab013719e5f00e44c45d2bbc3bc54c8833321d82 Merge: 1d45438 e7ade23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:26:02 2016 -0500 Merge branch 'maint-0.2.9' src/test/test_options.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.9] Increase verbosity on options/validate__transproxy
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit e7ade23f9723f55a504ebd8279cbadf0aca108c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:24:58 2016 -0500 Increase verbosity on options/validate__transproxy This is an attempt to figure out what's up with #19960 --- src/test/test_options.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 0eada98..6770c16 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1076,21 +1076,27 @@ test_options_validate__transproxy(void *ignored) "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif #if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif #if defined(__OpenBSD__) tdata = get_options_test_data("TransProxyType pf-divert\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif // Assert that a test has run for some TransProxyType

1 0

[tor/master] Increase verbosity on options/validate__transproxy
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit e7ade23f9723f55a504ebd8279cbadf0aca108c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:24:58 2016 -0500 Increase verbosity on options/validate__transproxy This is an attempt to figure out what's up with #19960 --- src/test/test_options.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 0eada98..6770c16 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1076,21 +1076,27 @@ test_options_validate__transproxy(void *ignored) "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif #if defined(__FreeBSD_kernel__) || defined( DARWIN ) || defined(__NetBSD__) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif #if defined(__OpenBSD__) tdata = get_options_test_data("TransProxyType pf-divert\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_assert(!msg); + if (msg) { + TT_DIE(("Expected NULL but got '%s'", msg)); + } #endif // Assert that a test has run for some TransProxyType

1 0

[tor/master] Capture warning in dir/purpose_needs_anonymity_returns_true_by_default
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 1d45438ef03564b7af2f3a5b4b0e3ff7a9570a97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:19:49 2016 -0500 Capture warning in dir/purpose_needs_anonymity_returns_true_by_default --- src/test/test_dir.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6f83cef..fa0a174 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3501,10 +3501,15 @@ test_dir_purpose_needs_anonymity_returns_true_by_default(void *arg) (void)arg; tor_capture_bugs_(1); + setup_full_capture_of_logs(LOG_WARN); tt_int_op(1, ==, purpose_needs_anonymity(0, 0, NULL)); tt_int_op(1, ==, smartlist_len(tor_get_captured_bug_log_())); + expect_single_log_msg_containing("Called with dir_purpose=0"); + tor_end_capture_bugs_(); - done: ; + done: + tor_end_capture_bugs_(); + teardown_capture_of_logs(); } static void

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit c8bcbf5ac2d61d1befdf2333bffe9d6a09a800ea Merge: 78cb55e 0815f96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:14:46 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20875 | 4 ++++ src/or/directory.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/release-0.2.9] Fix a BUG() warning from next_random_exponential_delay().
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 0815f96416676ace7cfdb5c29000d8cd6ee3459f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:13:11 2016 -0500 Fix a BUG() warning from next_random_exponential_delay(). Fixes 20875; this code is as suggested by teor on the ticket. Thanks! --- changes/bug20875 | 4 ++++ src/or/directory.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug20875 b/changes/bug20875 new file mode 100644 index 0000000..6bba2cb --- /dev/null +++ b/changes/bug20875 @@ -0,0 +1,4 @@ + o Minor bugfixes (download scheduling) + - Resolve a "bug" warning when considering a download schedule whose + delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index f4fd521..fce48c6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3787,10 +3787,12 @@ STATIC int next_random_exponential_delay(int delay, int max_delay) { /* Check preconditions */ + if (BUG(max_delay < 0)) + max_delay = 0; if (BUG(delay > max_delay)) delay = max_delay; - if (BUG(delay == INT_MAX)) - delay -= 1; /* prevent overflow */ + if (delay == INT_MAX) + return INT_MAX; /* prevent overflow */ if (BUG(delay < 0)) delay = 0;

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 2499ea359ab149343e10c38fb87ba903a0e8e049 Merge: b0a8429 0815f96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:14:56 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20875 | 4 ++++ src/or/directory.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.9] Fix a BUG() warning from next_random_exponential_delay().
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 0815f96416676ace7cfdb5c29000d8cd6ee3459f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:13:11 2016 -0500 Fix a BUG() warning from next_random_exponential_delay(). Fixes 20875; this code is as suggested by teor on the ticket. Thanks! --- changes/bug20875 | 4 ++++ src/or/directory.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug20875 b/changes/bug20875 new file mode 100644 index 0000000..6bba2cb --- /dev/null +++ b/changes/bug20875 @@ -0,0 +1,4 @@ + o Minor bugfixes (download scheduling) + - Resolve a "bug" warning when considering a download schedule whose + delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index f4fd521..fce48c6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3787,10 +3787,12 @@ STATIC int next_random_exponential_delay(int delay, int max_delay) { /* Check preconditions */ + if (BUG(max_delay < 0)) + max_delay = 0; if (BUG(delay > max_delay)) delay = max_delay; - if (BUG(delay == INT_MAX)) - delay -= 1; /* prevent overflow */ + if (delay == INT_MAX) + return INT_MAX; /* prevent overflow */ if (BUG(delay < 0)) delay = 0;

1 0

[tor/master] Fix a BUG() warning from next_random_exponential_delay().
by nickm＠torproject.org 07 Dec '16

07 Dec '16

commit 0815f96416676ace7cfdb5c29000d8cd6ee3459f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 11:13:11 2016 -0500 Fix a BUG() warning from next_random_exponential_delay(). Fixes 20875; this code is as suggested by teor on the ticket. Thanks! --- changes/bug20875 | 4 ++++ src/or/directory.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug20875 b/changes/bug20875 new file mode 100644 index 0000000..6bba2cb --- /dev/null +++ b/changes/bug20875 @@ -0,0 +1,4 @@ + o Minor bugfixes (download scheduling) + - Resolve a "bug" warning when considering a download schedule whose + delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha. + diff --git a/src/or/directory.c b/src/or/directory.c index f4fd521..fce48c6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3787,10 +3787,12 @@ STATIC int next_random_exponential_delay(int delay, int max_delay) { /* Check preconditions */ + if (BUG(max_delay < 0)) + max_delay = 0; if (BUG(delay > max_delay)) delay = max_delay; - if (BUG(delay == INT_MAX)) - delay -= 1; /* prevent overflow */ + if (delay == INT_MAX) + return INT_MAX; /* prevent overflow */ if (BUG(delay < 0)) delay = 0;

1 0