July 2017 - tor-commits - lists.torproject.org

[tor/master] Comment that failure schedules always use exponential backoff
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 527c0735f11d5a36aa1fb84dc30b624139ba8406 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 5 01:45:28 2017 +1000 Comment that failure schedules always use exponential backoff --- src/or/directory.c | 2 ++ src/or/or.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index ccec810..fc21078 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3771,6 +3771,8 @@ find_dl_min_and_max_delay(download_status_t *dls, const or_options_t *options, const smartlist_t *schedule = find_dl_schedule(dls, options); tor_assert(schedule != NULL && smartlist_len(schedule) >= 2); *min = *((int *)(smartlist_get(schedule, 0))); + /* Increment on failure schedules always use exponential backoff, but they + * have a smaller limit when they're deterministic */ if (dls->backoff == DL_SCHED_DETERMINISTIC) *max = *((int *)((smartlist_get(schedule, smartlist_len(schedule) - 1)))); else diff --git a/src/or/or.h b/src/or/or.h index b7c67ba..8a217a0 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1981,7 +1981,9 @@ typedef struct download_status_t { * or after each failure? */ download_schedule_backoff_bitfield_t backoff : 1; /**< do we use the * deterministic schedule, or random - * exponential backoffs? */ + * exponential backoffs? + * Increment on failure schedules + * always use exponential backoff. */ uint8_t last_backoff_position; /**< number of attempts/failures, depending * on increment_on, when we last recalculated * the delay. Only updated if backoff

1 0

[tor/master] Add regression tests for 17750 and 20534
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit f30d355903343af3611ed2ec9828c4b6d1851168 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 5 01:31:23 2017 +1000 Add regression tests for 17750 and 20534 --- src/test/test_dir.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 127 insertions(+), 13 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 398398c..4fddf7a 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3602,32 +3602,59 @@ test_dir_download_status_schedule(void *arg) } static void -test_dir_download_status_random_backoff(void *arg) +download_status_random_backoff_helper(int min_delay, int max_delay) { download_status_t dls_random = { 0, 0, 0, DL_SCHED_GENERIC, DL_WANT_AUTHORITY, DL_SCHED_INCREMENT_FAILURE, DL_SCHED_RANDOM_EXPONENTIAL, 0, 0 }; int increment = -1; - int old_increment; + int old_increment = -1; time_t current_time = time(NULL); - const int min_delay = 0; - const int max_delay = 1000000; - - (void)arg; + const int exponent = 4; /* Check the random backoff cases */ - old_increment = 0; do { increment = download_status_schedule_get_delay(&dls_random, NULL, min_delay, max_delay, current_time); + + log_debug(LD_DIR, "Min: %d, Max: %d, Inc: %d, Old Inc: %d", + min_delay, max_delay, increment, old_increment); + + /* Regression test for 20534 and friends + * increment must always increase after the first */ + if (dls_random.last_backoff_position > 0 && max_delay > 0) { + /* Always increment the exponential backoff */ + tt_int_op(increment, OP_GE, 1); + } + /* Test */ tt_int_op(increment, OP_GE, min_delay); tt_int_op(increment, OP_LE, max_delay); - tt_int_op(increment, OP_GE, old_increment); - /* We at most quadruple, and maybe add one */ - tt_int_op(increment, OP_LE, 4 * old_increment + 1); + if (dls_random.last_backoff_position == 0) { + /* regression tests for 17750 + * Always use the minimum delay for the first increment */ + tt_int_op(increment, OP_EQ, min_delay); + } else { + /* It's times like these I'd love a good saturating arithmetic + * implementation */ + int min_inc = INT_MAX; + if (old_increment <= INT_MAX - 1) { + min_inc = old_increment + 1; + } + + int max_inc = INT_MAX; + if (old_increment <= (INT_MAX - 1)/exponent) { + max_inc = (exponent * old_increment) + 1; + } + + /* Regression test for 20534 and friends: + * increment must always increase after the first */ + tt_int_op(increment, OP_GE, min_inc); + /* We at most quadruple, and always add one */ + tt_int_op(increment, OP_LE, max_inc); + } /* Advance */ current_time += increment; @@ -3643,6 +3670,27 @@ test_dir_download_status_random_backoff(void *arg) } static void +test_dir_download_status_random_backoff(void *arg) +{ + (void)arg; + + /* Do a standard test */ + download_status_random_backoff_helper(0, 1000000); + /* Regression test for 20534 and friends: + * try tighter bounds */ + download_status_random_backoff_helper(0, 100); + /* regression tests for 17750: initial delay */ + download_status_random_backoff_helper(10, 1000); + download_status_random_backoff_helper(20, 30); + + /* Pathological cases */ + download_status_random_backoff_helper(0, 0); + download_status_random_backoff_helper(1, 1); + download_status_random_backoff_helper(0, INT_MAX); + download_status_random_backoff_helper(INT_MAX/2, INT_MAX); +} + +static void test_dir_download_status_increment(void *arg) { (void)arg; @@ -3654,32 +3702,97 @@ test_dir_download_status_increment(void *arg) DL_WANT_ANY_DIRSERVER, DL_SCHED_INCREMENT_ATTEMPT, DL_SCHED_DETERMINISTIC, 0, 0 }; + download_status_t dls_exp = { 0, 0, 0, DL_SCHED_GENERIC, + DL_WANT_ANY_DIRSERVER, + DL_SCHED_INCREMENT_ATTEMPT, + DL_SCHED_RANDOM_EXPONENTIAL, 0, 0 }; + int no_delay = 0; int delay0 = -1; int delay1 = -1; int delay2 = -1; smartlist_t *schedule = smartlist_new(); + smartlist_t *schedule_no_initial_delay = smartlist_new(); or_options_t test_options; time_t next_at = TIME_MAX; time_t current_time = time(NULL); - /* Provide some values for the schedule */ + /* Provide some values for the schedules */ delay0 = 10; delay1 = 99; delay2 = 20; - /* Make the schedule */ + /* Make the schedules */ smartlist_add(schedule, (void *)&delay0); smartlist_add(schedule, (void *)&delay1); smartlist_add(schedule, (void *)&delay2); + smartlist_add(schedule_no_initial_delay, (void *)&no_delay); + smartlist_add(schedule_no_initial_delay, (void *)&delay1); + smartlist_add(schedule_no_initial_delay, (void *)&delay2); + /* Put it in the options */ mock_options = &test_options; reset_options(mock_options, &mock_get_options_calls); - mock_options->TestingClientDownloadSchedule = schedule; mock_options->TestingBridgeDownloadSchedule = schedule; + mock_options->TestingClientDownloadSchedule = schedule; MOCK(get_options, mock_get_options); + /* Check that the initial value of the schedule is the first value used, + * whether or not it was reset before being used */ + + /* regression test for 17750: no initial delay */ + mock_options->TestingClientDownloadSchedule = schedule_no_initial_delay; + mock_get_options_calls = 0; + /* we really want to test that it's equal to time(NULL) + delay0, but that's + * an unrealiable test, because time(NULL) might change. */ + tt_assert(download_status_get_next_attempt_at(&dls_failure) + >= current_time + no_delay); + tt_assert(download_status_get_next_attempt_at(&dls_failure) + != TIME_MAX); + tt_assert(download_status_get_n_failures(&dls_failure) == 0); + tt_assert(download_status_get_n_attempts(&dls_failure) == 0); + tt_assert(mock_get_options_calls >= 1); + + /* regression test for 17750: initial delay */ + mock_options->TestingClientDownloadSchedule = schedule; + mock_get_options_calls = 0; + /* we really want to test that it's equal to time(NULL) + delay0, but that's + * an unrealiable test, because time(NULL) might change. */ + tt_assert(download_status_get_next_attempt_at(&dls_failure) + >= current_time + delay0); + tt_assert(download_status_get_next_attempt_at(&dls_failure) + != TIME_MAX); + tt_assert(download_status_get_n_failures(&dls_failure) == 0); + tt_assert(download_status_get_n_attempts(&dls_failure) == 0); + tt_assert(mock_get_options_calls >= 1); + + /* regression test for 17750: exponential, no initial delay */ + mock_options->TestingClientDownloadSchedule = schedule_no_initial_delay; + mock_get_options_calls = 0; + /* we really want to test that it's equal to time(NULL) + delay0, but that's + * an unrealiable test, because time(NULL) might change. */ + tt_assert(download_status_get_next_attempt_at(&dls_exp) + >= current_time + no_delay); + tt_assert(download_status_get_next_attempt_at(&dls_exp) + != TIME_MAX); + tt_assert(download_status_get_n_failures(&dls_exp) == 0); + tt_assert(download_status_get_n_attempts(&dls_exp) == 0); + tt_assert(mock_get_options_calls >= 1); + + /* regression test for 17750: exponential, initial delay */ + mock_options->TestingClientDownloadSchedule = schedule; + mock_get_options_calls = 0; + /* we really want to test that it's equal to time(NULL) + delay0, but that's + * an unrealiable test, because time(NULL) might change. */ + tt_assert(download_status_get_next_attempt_at(&dls_exp) + >= current_time + delay0); + tt_assert(download_status_get_next_attempt_at(&dls_exp) + != TIME_MAX); + tt_assert(download_status_get_n_failures(&dls_exp) == 0); + tt_assert(download_status_get_n_attempts(&dls_exp) == 0); + tt_assert(mock_get_options_calls >= 1); + /* Check that a failure reset works */ mock_get_options_calls = 0; download_status_reset(&dls_failure); @@ -3933,6 +4046,7 @@ test_dir_download_status_increment(void *arg) done: /* the pointers in schedule are allocated on the stack */ smartlist_free(schedule); + smartlist_free(schedule_no_initial_delay); UNMOCK(get_options); mock_options = NULL; mock_get_options_calls = 0;

1 0

[tor/master] Make clients try fallbacks before authorities
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit c21cfd28f43a969229ede02e20c6b554c1b88aae Author: teor <teor2345(a)gmail.com> Date: Fri May 26 16:16:37 2017 +1000 Make clients try fallbacks before authorities Make clients wait for 6 seconds before trying to download their consensus from an authority. Fixes bug 17750, bugfix on 0.2.8.1-alpha. --- changes/bug17750 | 4 ++++ src/or/directory.c | 31 +++++++++++++++++++++++++++---- src/or/directory.h | 7 ++++++- src/test/test_dir.c | 2 +- 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/changes/bug17750 b/changes/bug17750 new file mode 100644 index 0000000..eb77b77 --- /dev/null +++ b/changes/bug17750 @@ -0,0 +1,4 @@ + o Minor bugfixes (directory downloads): + - Make clients wait for 6 seconds before trying to download their + consensus from an authority. + Fixes bug 17750, bugfix on 0.2.8.1-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index fce48c6..7d6a060 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3701,7 +3701,7 @@ connection_dir_finished_connecting(dir_connection_t *conn) * Helper function for download_status_increment_failure(), * download_status_reset(), and download_status_increment_attempt(). */ STATIC const smartlist_t * -find_dl_schedule(download_status_t *dls, const or_options_t *options) +find_dl_schedule(const download_status_t *dls, const or_options_t *options) { const int dir_server = dir_server_mode(options); const int multi_d = networkstatus_consensus_can_use_multiple_directories( @@ -3954,6 +3954,11 @@ download_status_increment_failure(download_status_t *dls, int status_code, tor_assert(dls); + /* dls wasn't reset before it was used */ + if (dls->next_attempt_at == 0) { + download_status_reset(dls); + } + /* count the failure */ if (dls->n_download_failures < IMPOSSIBLE_TO_DOWNLOAD-1) { ++dls->n_download_failures; @@ -4006,6 +4011,11 @@ download_status_increment_attempt(download_status_t *dls, const char *item, tor_assert(dls); + /* dls wasn't reset before it was used */ + if (dls->next_attempt_at == 0) { + download_status_reset(dls); + } + if (dls->increment_on == DL_SCHED_INCREMENT_FAILURE) { /* this schedule should retry on failure, and not launch any concurrent attempts */ @@ -4029,6 +4039,15 @@ download_status_increment_attempt(download_status_t *dls, const char *item, return dls->next_attempt_at; } +static time_t +download_status_get_initial_delay_from_now(const download_status_t *dls) +{ + const smartlist_t *schedule = find_dl_schedule(dls, get_options()); + /* We use constant initial delays, even in exponential backoff + * schedules. */ + return time(NULL) + *(int *)smartlist_get(schedule, 0); +} + /** Reset dls so that it will be considered downloadable * immediately, and/or to show that we don't need it anymore. * @@ -4047,11 +4066,9 @@ download_status_reset(download_status_t *dls) || dls->n_download_attempts == IMPOSSIBLE_TO_DOWNLOAD) return; /* Don't reset this. */ - const smartlist_t *schedule = find_dl_schedule(dls, get_options()); - dls->n_download_failures = 0; dls->n_download_attempts = 0; - dls->next_attempt_at = time(NULL) + *(int *)smartlist_get(schedule, 0); + dls->next_attempt_at = download_status_get_initial_delay_from_now(dls); dls->last_backoff_position = 0; dls->last_delay_used = 0; /* Don't reset dls->want_authority or dls->increment_on */ @@ -4078,6 +4095,12 @@ download_status_get_n_attempts(const download_status_t *dls) time_t download_status_get_next_attempt_at(const download_status_t *dls) { + /* dls wasn't reset before it was used */ + if (dls->next_attempt_at == 0) { + /* so give the answer we would have given if it had been */ + return download_status_get_initial_delay_from_now(dls); + } + return dls->next_attempt_at; } diff --git a/src/or/directory.h b/src/or/directory.h index 629b3ea..8ff16b3 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -114,6 +114,11 @@ static inline int download_status_is_ready(download_status_t *dls, time_t now, int max_failures) { + /* dls wasn't reset before it was used */ + if (dls->next_attempt_at == 0) { + download_status_reset(dls); + } + if (dls->backoff == DL_SCHED_DETERMINISTIC) { /* Deterministic schedules can hit an endpoint; exponential backoff * schedules just wait longer and longer. */ @@ -162,7 +167,7 @@ STATIC char* authdir_type_to_string(dirinfo_type_t auth); STATIC const char * dir_conn_purpose_to_string(int purpose); STATIC int should_use_directory_guards(const or_options_t *options); STATIC zlib_compression_level_t choose_compression_level(ssize_t n_bytes); -STATIC const smartlist_t *find_dl_schedule(download_status_t *dls, +STATIC const smartlist_t *find_dl_schedule(const download_status_t *dls, const or_options_t *options); STATIC void find_dl_min_and_max_delay(download_status_t *dls, const or_options_t *options, diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cdc56ac..398398c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3806,7 +3806,7 @@ test_dir_download_status_increment(void *arg) tt_assert(next_at == TIME_MAX); tt_assert(download_status_get_n_failures(&dls_attempt) == 1); tt_assert(download_status_get_n_attempts(&dls_attempt) == 0); - tt_assert(mock_get_options_calls == 0); + tt_assert(mock_get_options_calls >= 1); /* Check that an attempt reset works */ mock_get_options_calls = 0;

1 0

[tor/master] Give correct bounds in next_random_exponential_delay() comment
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit f813b05202171a1b39d9428e68885b36fcceef11 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 5 01:27:17 2017 +1000 Give correct bounds in next_random_exponential_delay() comment --- src/or/directory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 7d6a060..3eb56c2 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3778,8 +3778,8 @@ find_dl_min_and_max_delay(download_status_t *dls, const or_options_t *options, /** Advance one delay step. The algorithm is to use the previous delay to * compute an increment, we construct a value uniformly at random between - * delay and MAX(delay*2,delay+1). We then clamp that value to be no larger - * than max_delay, and return it. + * delay+1 and (delay*4)+1 (or *3 in test networks). + * We then clamp that value to be no larger than max_delay, and return it. * * Requires that delay is less than INT_MAX, and delay is in [0,max_delay]. */

1 0

[tor/master] Merge branch 'bug17750_029_squashed'
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 948158df33c4cbfa03f2aa4990097b4e9de664a1 Merge: 8e8abbb 527c073 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 13:28:22 2017 -0400 Merge branch 'bug17750_029_squashed' changes/bug17750 | 4 ++ src/or/directory.c | 54 +++++++++++++++----- src/or/directory.h | 22 ++++++-- src/or/or.h | 4 +- src/test/test_dir.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 195 insertions(+), 31 deletions(-) diff --cc src/or/directory.c index 69479ad,fc21078..13daea3 --- a/src/or/directory.c +++ b/src/or/directory.c @@@ -13,12 -10,8 +13,11 @@@ #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "conscache.h" +#include "consdiff.h" +#include "consdiffmgr.h" #include "control.h" -#define DIRECTORY_PRIVATE +#include "compat.h" - #define DIRECTORY_PRIVATE #include "directory.h" #include "dirserv.h" #include "dirvote.h" diff --cc src/or/directory.h index 14d5ae9,0b54943..3e574cc --- a/src/or/directory.h +++ b/src/or/directory.h @@@ -151,25 -143,14 +158,24 @@@ download_status_mark_impossible(downloa int download_status_get_n_failures(const download_status_t *dls); int download_status_get_n_attempts(const download_status_t *dls); - time_t download_status_get_next_attempt_at(const download_status_t *dls); -/* Yes, these two functions are confusingly similar. - * Let's sort that out in #20077. */ -int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose); -int is_sensitive_dir_purpose(uint8_t dir_purpose); +int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose, + const char *resource); + +#ifdef DIRECTORY_PRIVATE + +struct get_handler_args_t; +STATIC int handle_get_hs_descriptor_v3(dir_connection_t *conn, + const struct get_handler_args_t *args); +STATIC int directory_handle_command(dir_connection_t *conn); +STATIC char *accept_encoding_header(void); +STATIC int allowed_anonymous_connection_compression_method(compress_method_t); +STATIC void warn_disallowed_anonymous_compression_method(compress_method_t); + +#endif #ifdef TOR_UNIT_TESTS -/* Used only by directory.c and test_dir.c */ +/* Used only by test_dir.c */ STATIC int parse_http_url(const char *headers, char **url); STATIC dirinfo_type_t dir_fetch_type(int dir_purpose, int router_purpose, @@@ -192,19 -167,25 +198,29 @@@ STATIC int handle_post_hs_descriptor(co STATIC char* authdir_type_to_string(dirinfo_type_t auth); STATIC const char * dir_conn_purpose_to_string(int purpose); STATIC int should_use_directory_guards(const or_options_t *options); -STATIC zlib_compression_level_t choose_compression_level(ssize_t n_bytes); +STATIC compression_level_t choose_compression_level(ssize_t n_bytes); - STATIC const smartlist_t *find_dl_schedule(download_status_t *dls, + STATIC const smartlist_t *find_dl_schedule(const download_status_t *dls, const or_options_t *options); STATIC void find_dl_min_and_max_delay(download_status_t *dls, const or_options_t *options, int *min, int *max); STATIC int next_random_exponential_delay(int delay, int max_delay); +STATIC int parse_hs_version_from_post(const char *url, const char *prefix, + const char **end_pos); + +STATIC unsigned parse_accept_encoding_header(const char *h); #endif + #if defined(TOR_UNIT_TESTS) || defined(DIRECTORY_PRIVATE) + /* Used only by directory.c and test_dir.c */ + + /* no more than quadruple the previous delay (multiplier + 1) */ + #define DIR_DEFAULT_RANDOM_MULTIPLIER (3) + /* no more than triple the previous delay */ + #define DIR_TEST_NET_RANDOM_MULTIPLIER (2) + + #endif + #endif

1 0

[tor/master] Refactor exponential backoff multipliers into macros
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 32f0cbc0f6fc7a53fc88a144e42fea9aca2cd073 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 5 01:32:06 2017 +1000 Refactor exponential backoff multipliers into macros There are only so many times you can type "4". --- src/or/directory.c | 8 +++++--- src/or/directory.h | 10 ++++++++++ src/test/test_dir.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index ea9d69b..ccec810 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -11,6 +11,7 @@ #include "connection.h" #include "connection_edge.h" #include "control.h" +#define DIRECTORY_PRIVATE #include "directory.h" #include "dirserv.h" #include "dirvote.h" @@ -3778,7 +3779,8 @@ find_dl_min_and_max_delay(download_status_t *dls, const or_options_t *options, /** Advance one delay step. The algorithm is to use the previous delay to * compute an increment, we construct a value uniformly at random between - * delay+1 and (delay*4)+1 (or *3 in test networks). + * delay+1 and (delay*(DIR_DEFAULT_RANDOM_MULTIPLIER+1))+1 (or + * DIR_TEST_NET_RANDOM_MULTIPLIER in test networks). * We then clamp that value to be no larger than max_delay, and return it. * * Requires that delay is less than INT_MAX, and delay is in [0,max_delay]. @@ -3798,11 +3800,11 @@ next_random_exponential_delay(int delay, int max_delay) /* How much are we willing to add to the delay? */ int max_increment; - int multiplier = 3; /* no more than quadruple the previous delay */ + int multiplier = DIR_DEFAULT_RANDOM_MULTIPLIER; if (get_options()->TestingTorNetwork) { /* Decrease the multiplier in testing networks. This reduces the variance, * so that bootstrap is more reliable. */ - multiplier = 2; /* no more than triple the previous delay */ + multiplier = DIR_TEST_NET_RANDOM_MULTIPLIER; } if (delay && delay < (INT_MAX-1) / multiplier) { diff --git a/src/or/directory.h b/src/or/directory.h index c473d8e..0b54943 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -177,5 +177,15 @@ STATIC int next_random_exponential_delay(int delay, int max_delay); #endif +#if defined(TOR_UNIT_TESTS) || defined(DIRECTORY_PRIVATE) +/* Used only by directory.c and test_dir.c */ + +/* no more than quadruple the previous delay (multiplier + 1) */ +#define DIR_DEFAULT_RANDOM_MULTIPLIER (3) +/* no more than triple the previous delay */ +#define DIR_TEST_NET_RANDOM_MULTIPLIER (2) + +#endif + #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4fddf7a..53911e8 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3610,7 +3610,7 @@ download_status_random_backoff_helper(int min_delay, int max_delay) int increment = -1; int old_increment = -1; time_t current_time = time(NULL); - const int exponent = 4; + const int exponent = DIR_DEFAULT_RANDOM_MULTIPLIER + 1; /* Check the random backoff cases */ do {

1 0

[tor/master] Use download_status_get_next_attempt_at() more often
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 344f5a71c5a2a697050c7e6545578c5a01eee0a5 Author: teor <teor2345(a)gmail.com> Date: Wed Jul 5 01:29:35 2017 +1000 Use download_status_get_next_attempt_at() more often This guards against future occurrences of 17750. --- src/or/directory.c | 11 +++++++---- src/or/directory.h | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 3eb56c2..ea9d69b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3983,14 +3983,16 @@ download_status_increment_failure(download_status_t *dls, int status_code, download_status_log_helper(item, !dls->increment_on, "failed", "concurrently", dls->n_download_failures, - increment, dls->next_attempt_at, now); + increment, + download_status_get_next_attempt_at(dls), + now); if (dls->increment_on == DL_SCHED_INCREMENT_ATTEMPT) { /* stop this schedule retrying on failure, it will launch concurrent * connections instead */ return TIME_MAX; } else { - return dls->next_attempt_at; + return download_status_get_next_attempt_at(dls); } } @@ -4034,9 +4036,10 @@ download_status_increment_attempt(download_status_t *dls, const char *item, download_status_log_helper(item, dls->increment_on, "attempted", "on failure", dls->n_download_attempts, - delay, dls->next_attempt_at, now); + delay, download_status_get_next_attempt_at(dls), + now); - return dls->next_attempt_at; + return download_status_get_next_attempt_at(dls); } static time_t diff --git a/src/or/directory.h b/src/or/directory.h index 8ff16b3..c473d8e 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -108,6 +108,8 @@ time_t download_status_increment_attempt(download_status_t *dls, void download_status_reset(download_status_t *dls); static int download_status_is_ready(download_status_t *dls, time_t now, int max_failures); +time_t download_status_get_next_attempt_at(const download_status_t *dls); + /** Return true iff, as of now, the resource tracked by dls is * ready to get its download reattempted. */ static inline int @@ -127,7 +129,7 @@ download_status_is_ready(download_status_t *dls, time_t now, if (!under_failure_limit) return 0; } - return dls->next_attempt_at <= now; + return download_status_get_next_attempt_at(dls) <= now; } static void download_status_mark_impossible(download_status_t *dl); @@ -141,7 +143,6 @@ download_status_mark_impossible(download_status_t *dl) int download_status_get_n_failures(const download_status_t *dls); int download_status_get_n_attempts(const download_status_t *dls); -time_t download_status_get_next_attempt_at(const download_status_t *dls); /* Yes, these two functions are confusingly similar. * Let's sort that out in #20077. */

1 0

[tor/master] Avoid a scan_build warning in dirvote_get_intermediate_param_value
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 67b6ba6f2f2cb95ab534052a0e25eb4f5185e41c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 11:07:30 2017 -0400 Avoid a scan_build warning in dirvote_get_intermediate_param_value Fixes bug 21495. --- src/or/dirvote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index f5e29eb..11cd020 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -737,12 +737,12 @@ dirvote_get_intermediate_param_value(const smartlist_t *param_list, } } SMARTLIST_FOREACH_END(k_v_pair); - if (n_found == 1) + if (n_found == 1) { return value; - else if (BUG(n_found > 1)) - return default_val; - else + } else { + tor_assert_nonfatal(n_found == 0); return default_val; + } } /** Minimum number of directory authorities voting for a parameter to

1 0

[tor/master] Merge branch 'bug21495'
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit eb01f35149d9222922fee2bb51a6246d58f7d25f Merge: c7d2a67 67b6ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 13:03:36 2017 -0400 Merge branch 'bug21495' src/or/dirvote.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix the expected bug warning in dir/param_voting_lookup tests
by nickm＠torproject.org 07 Jul '17

07 Jul '17

commit 8e8abbbbee68aa4ee474ca573efc8abeafa22f23 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 7 13:06:02 2017 -0400 Fix the expected bug warning in dir/param_voting_lookup tests --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index a9d9cba..847779a 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1785,7 +1785,7 @@ test_dir_param_voting_lookup(void *arg) dirvote_get_intermediate_param_value(lst, "moomin", -100)); tt_int_op(smartlist_len(tor_get_captured_bug_log_()), OP_EQ, 1); tt_str_op(smartlist_get(tor_get_captured_bug_log_(), 0), OP_EQ, - "!(n_found > 1)"); + "n_found == 0"); tor_end_capture_bugs_(); /* There is no 'fred=', so that is treated as not existing. */ tt_int_op(-100, OP_EQ,

1 0