March 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge branch 'bug28656_035_squashed' into maint-0.4.0
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit 1547fd99a68cb22410ed0842267fb0a1f1de925f Merge: 560ba98dd 532f4c910 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:59:19 2019 -0400 Merge branch 'bug28656_035_squashed' into maint-0.4.0 changes/bug28656 | 3 +++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.0] Stop logging a BUG() warning when tor is waiting for exit descriptors
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit 532f4c9103315bff1de21b3e0eeeee6fcf790647 Author: teor <teor(a)torproject.org> Date: Tue Mar 5 12:53:14 2019 +1000 Stop logging a BUG() warning when tor is waiting for exit descriptors Fixes bug 28656; bugfix on 0.3.5.1-alpha. --- changes/bug28656 | 3 +++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/bug28656 b/changes/bug28656 new file mode 100644 index 000000000..d3a13d196 --- /dev/null +++ b/changes/bug28656 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Stop logging a BUG() warning when tor is waiting for exit descriptors. + Fixes bug 28656; bugfix on 0.3.5.1-alpha. diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 935ac7840..99d7f746a 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -2449,12 +2449,18 @@ compute_frac_paths_available(const networkstatus_t *consensus, f_exit = f_myexit; } - /* if the consensus has no exits, we can only build onion service paths, - * which are G - M - M. So use the middle fraction for the exit fraction. */ + /* If the consensus has no exits that pass flag, descriptor, and policy + * checks, we can only build onion service paths, which are G - M - M. */ if (router_have_consensus_path() != CONSENSUS_PATH_EXIT) { - /* If there are no exits in the consensus, then f_exit is always 0, so - * it is safe to replace f_exit with f_mid. */ - if (!BUG(f_exit > 0.0)) { + /* If the exit bandwidth weight fraction is not zero, we need to wait for + * descriptors for those exits. (The bandwidth weight fraction does not + * check for descriptors.) + * If the exit bandwidth fraction is zero, there are no exits in the + * consensus at all. So it is safe to replace f_exit with f_mid. + * + * f_exit is non-negative, but some compilers complain about float and == + */ + if (f_exit <= 0.0) { f_exit = f_mid; } }

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit dfb8f0feeb587b49d2203cdffdf42a0480767064 Merge: aed893798 1547fd99a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:59:30 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug28656 | 3 +++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/master] test/sr: Clear SRVs after init, and before setup
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit a9c3101e2140ceacc47498a8d15c8b54ad2616c5 Author: teor <teor(a)torproject.org> Date: Wed Mar 13 15:27:48 2019 +1000 test/sr: Clear SRVs after init, and before setup Part of 29706. --- src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 991d73128..6324fa68b 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -61,6 +61,9 @@ init_authority_state(void) * the phase we are currently in which uses "now" as the starting * timestamp. Delete it before we do any testing below. */ sr_state_delete_commits(); + /* It's also possible that a current SRV has been generated, if we are at + * state transition time. But let's just forget about that SRV. */ + sr_state_clean_srvs(); done: UNMOCK(get_my_v3_authority_cert); @@ -545,22 +548,24 @@ test_encoding(void *arg) ; } -/** Setup some SRVs in our SR state. If also_current is set, then set - * both current and previous SRVs. - * Helper of test_vote() and test_sr_compute_srv(). +/** Setup some SRVs in our SR state. + * If also_current is set, then set both current and previous SRVs. + * Otherwise, just set the previous SRV. (And clear the current SRV.) + * * You must call sr_state_free_all() to free the state at the end of each test * function (on pass or fail). */ static void test_sr_setup_srv(int also_current) { + /* Clear both SRVs before starting. */ + sr_state_clean_srvs(); + sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); srv->num_reveals = 42; memcpy(srv->value, "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old previous srv. */ - state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -570,8 +575,6 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old current srv. */ - state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0

[tor/maint-0.4.0] test/sr: Clear SRVs after init, and before setup
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit a9c3101e2140ceacc47498a8d15c8b54ad2616c5 Author: teor <teor(a)torproject.org> Date: Wed Mar 13 15:27:48 2019 +1000 test/sr: Clear SRVs after init, and before setup Part of 29706. --- src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 991d73128..6324fa68b 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -61,6 +61,9 @@ init_authority_state(void) * the phase we are currently in which uses "now" as the starting * timestamp. Delete it before we do any testing below. */ sr_state_delete_commits(); + /* It's also possible that a current SRV has been generated, if we are at + * state transition time. But let's just forget about that SRV. */ + sr_state_clean_srvs(); done: UNMOCK(get_my_v3_authority_cert); @@ -545,22 +548,24 @@ test_encoding(void *arg) ; } -/** Setup some SRVs in our SR state. If also_current is set, then set - * both current and previous SRVs. - * Helper of test_vote() and test_sr_compute_srv(). +/** Setup some SRVs in our SR state. + * If also_current is set, then set both current and previous SRVs. + * Otherwise, just set the previous SRV. (And clear the current SRV.) + * * You must call sr_state_free_all() to free the state at the end of each test * function (on pass or fail). */ static void test_sr_setup_srv(int also_current) { + /* Clear both SRVs before starting. */ + sr_state_clean_srvs(); + sr_srv_t *srv = tor_malloc_zero(sizeof(sr_srv_t)); srv->num_reveals = 42; memcpy(srv->value, "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old previous srv. */ - state_del_previous_srv(); sr_state_set_previous_srv(srv); if (also_current) { @@ -570,8 +575,6 @@ test_sr_setup_srv(int also_current) "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN", sizeof(srv->value)); - /* sr_state_set_previous_srv() does not free() the old current srv. */ - state_del_current_srv(); sr_state_set_current_srv(srv); } }

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit 560ba98dd7e5e4c4a2e3c06ab80e4cf97d8f6f8d Merge: 94523bffd a9c3101e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:54:30 2019 -0400 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit 560ba98dd7e5e4c4a2e3c06ab80e4cf97d8f6f8d Merge: 94523bffd a9c3101e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:54:30 2019 -0400 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.0'
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit 1cffacdaf5eac1929b47e827c3654a7e97b76687 Merge: af56dece0 560ba98dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:54:39 2019 -0400 Merge branch 'maint-0.4.0' src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit aed893798f5cd9a08ac0440a8970d33ce133d068 Merge: 0fced1949 560ba98dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:54:39 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
by nickm＠torproject.org 15 Mar '19

15 Mar '19

commit 560ba98dd7e5e4c4a2e3c06ab80e4cf97d8f6f8d Merge: 94523bffd a9c3101e2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 15 08:54:30 2019 -0400 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0