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

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 15 May '19

15 May '19

commit 4dedab0e63cf29cce4dbaebd426bd7cb9100eaef Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 14:50:57 2019 +0000 Update translations for support-portal_completed --- contents+pt-BR.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index daf553fb8..b2b6a5fa8 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -4179,6 +4179,9 @@ msgid "" "software without errors, the given checksum and the … [View More]

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 15 May '19

15 May '19

commit 07359b46cd65b9afacae2e4b341398f9b85661cc Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 14:50:50 2019 +0000 Update translations for support-portal --- contents+pt-BR.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index daf553fb8..b2b6a5fa8 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -4179,6 +4179,9 @@ msgid "" "software without errors, the given checksum and the checksum of … [View More]

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 15 May '19

15 May '19

commit 39ccc2e718a6e6e05bcadece6e7261661dde3097 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 13:51:02 2019 +0000 Update translations for support-portal_completed --- contents+fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 155fe9881..41cada2d2 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1615,7 +1615,7 @@ msgid "" msgstr "" "Sélectionner cette option fermera tous … [View More]

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 15 May '19

15 May '19

commit 58a6811261bba0773b6a6f76b85b95f4c506633a Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 13:50:56 2019 +0000 Update translations for support-portal --- contents+fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 155fe9881..41cada2d2 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -1615,7 +1615,7 @@ msgid "" msgstr "" "Sélectionner cette option fermera tous vos … [View More]

1 0

[translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed
by translation＠torproject.org 15 May '19

15 May '19

commit 542752dcb1ae2a432ad7fa9cd0e92672ef823fdc Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 13:48:01 2019 +0000 Update translations for tbmanual-contentspot_completed --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 755bf3ce0..6740418a9 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -984,7 +984,7 @@ msgstr "" "Le Navigateur Tor centre votre expérience Web … [View More]

1 0

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation＠torproject.org 15 May '19

15 May '19

commit 3273592b30c18349a729cf402eda930e927b48f6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 13:47:54 2019 +0000 Update translations for tbmanual-contentspot --- contents+fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 755bf3ce0..6740418a9 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -984,7 +984,7 @@ msgstr "" "Le Navigateur Tor centre votre expérience Web sur votre … [View More]

1 0

[translation/tpo-web_completed] Update translations for tpo-web_completed
by translation＠torproject.org 15 May '19

15 May '19

commit b57a713c70c35137d14f961c2d9687899ec3bb63 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 13:20:47 2019 +0000 Update translations for tpo-web_completed --- contents+ka.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index e4e9fad05..a1e7ec984 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1116,7 +1116,7 @@ msgstr "თარიღი" #: templates/press.html:62 msgid "Publication" -msgstr "გამო… [View More]

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 15 May '19

15 May '19

commit 642602299827ce483ed25af64ae51383bd05362d Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 15 13:20:41 2019 +0000 Update translations for tpo-web --- contents+ka.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ka.po b/contents+ka.po index e4e9fad05..a1e7ec984 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -1116,7 +1116,7 @@ msgstr "თარიღი" #: templates/press.html:62 msgid "Publication" -msgstr "გამოქვეყნებული… [View More]

1 0

[tor/master] Bug 29085: Minor unit test updates for refactoring.
by asn＠torproject.org 15 May '19

15 May '19

commit 57e5e940d39754ec5b3ca1c7055ff7ca9a47c238 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 7 23:37:33 2019 +0000 Bug 29085: Minor unit test updates for refactoring. Deliver nonpadding events instead of calling token removal functions. --- src/test/test_circuitpadding.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index … [View More]db175fece..b7dbf022a 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -586,12 +586,12 @@ test_circuitpadding_token_removal_higher(void *arg) tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 2); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 1); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); /* Test that we cleaned out this bin. Don't do this in the case of the last bin since the tokens will get refilled */ @@ -610,7 +610,7 @@ test_circuitpadding_token_removal_higher(void *arg) CIRCPAD_STATE_BURST); circ_client_machine.states[CIRCPAD_STATE_BURST].histogram_edges[0] = 100; mi->padding_scheduled_at_usec = current_time; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[0], OP_EQ, 1); done: @@ -683,12 +683,12 @@ test_circuitpadding_token_removal_lower(void *arg) tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 2); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 1); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); /* Test that we cleaned out this bin. Don't do this in the case of the last bin since the tokens will get refilled */ @@ -708,7 +708,7 @@ test_circuitpadding_token_removal_lower(void *arg) circ_client_machine.states[CIRCPAD_STATE_BURST]. histogram_edges[BIG_HISTOGRAM_LEN-2] = 100; mi->padding_scheduled_at_usec = current_time - 29202; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[BIG_HISTOGRAM_LEN-2], OP_EQ, 1); done: @@ -780,12 +780,12 @@ test_circuitpadding_closest_token_removal(void *arg) tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 2); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 1); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); /* Test that we cleaned out this bin. Don't do this in the case of the last bin since the tokens will get refilled */ @@ -807,14 +807,14 @@ test_circuitpadding_closest_token_removal(void *arg) circ_client_machine.states[CIRCPAD_STATE_BURST].histogram_edges[2] = 120; mi->padding_scheduled_at_usec = current_time - 102; mi->histogram[0] = 0; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[1], OP_EQ, 1); /* Test above the highest bin, for coverage */ tt_int_op(client_side->padding_info[0]->current_state, OP_EQ, CIRCPAD_STATE_BURST); mi->padding_scheduled_at_usec = current_time - 29202; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[BIG_HISTOGRAM_LEN-2], OP_EQ, 1); done: @@ -889,12 +889,12 @@ test_circuitpadding_closest_token_removal_usec(void *arg) tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 2); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[bin_to_remove], OP_EQ, 1); mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); /* Test that we cleaned out this bin. Don't do this in the case of the last bin since the tokens will get refilled */ @@ -916,7 +916,7 @@ test_circuitpadding_closest_token_removal_usec(void *arg) circ_client_machine.states[CIRCPAD_STATE_BURST].histogram_edges[2] = 120; mi->padding_scheduled_at_usec = current_time - 102; mi->histogram[0] = 0; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[1], OP_EQ, 1); /* Test above the highest bin, for coverage */ @@ -925,7 +925,7 @@ test_circuitpadding_closest_token_removal_usec(void *arg) circ_client_machine.states[CIRCPAD_STATE_BURST]. histogram_edges[BIG_HISTOGRAM_LEN-2] = 100; mi->padding_scheduled_at_usec = current_time - 29202; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[BIG_HISTOGRAM_LEN-2], OP_EQ, 1); done: @@ -971,16 +971,16 @@ test_circuitpadding_token_removal_exact(void *arg) /* Ensure that we will clear out bin #4 with this usec */ mi->padding_scheduled_at_usec = current_time - 57; tt_int_op(mi->histogram[4], OP_EQ, 2); - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); mi->padding_scheduled_at_usec = current_time - 57; tt_int_op(mi->histogram[4], OP_EQ, 1); - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); tt_int_op(mi->histogram[4], OP_EQ, 0); /* Ensure that we will not remove any other tokens even tho we try to, since * this is what the exact strategy dictates */ mi->padding_scheduled_at_usec = current_time - 57; - circpad_machine_remove_token(mi); + circpad_cell_event_nonpadding_sent((circuit_t*)client_side); for (int i = 0; i < BIG_HISTOGRAM_LEN ; i++) { if (i != 4) { tt_int_op(mi->histogram[i], OP_EQ, 2); [View Less]

1 0

[tor/master] Bug 29085: Refactor padding sent accounting out of callback.
by asn＠torproject.org 15 May '19

15 May '19

commit 1c46790e0d3d6c722a0f3e74f24d60d03650e7d8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat May 11 03:26:53 2019 +0000 Bug 29085: Refactor padding sent accounting out of callback. This commit moves code that updates the state length and padding limit counts out from the callback to its own function, for clarity. It does not change functionality. --- src/core/or/circuitpadding.c | 73 +++++++++++++++++++++++++++----------------- 1 file … [View More]changed, 45 insertions(+), 28 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 1386bd22c..d6a79004f 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -831,6 +831,50 @@ check_machine_token_supply(circpad_machine_runtime_t *mi) } /** + * Count that a padding packet was sent. + * + * This updates our state length count, our machine rate limit counts, + * and if token removal is used, decrements the histogram. + */ +static inline void +circpad_machine_count_padding_sent(circpad_machine_runtime_t *mi) +{ + /* If we have a valid state length bound, consider it */ + if (mi->state_length != CIRCPAD_STATE_LENGTH_INFINITE && + !BUG(mi->state_length <= 0)) { + mi->state_length--; + } + + /* + * Update non-padding counts for rate limiting: We scale at UINT16_MAX + * because we only use this for a percentile limit of 2 sig figs, and + * space is scare in the machineinfo struct. + */ + mi->padding_sent++; + if (mi->padding_sent == UINT16_MAX) { + mi->padding_sent /= 2; + mi->nonpadding_sent /= 2; + } + + circpad_global_padding_sent++; + + /* If we have a mutable histogram, reduce the token count from + * the chosen padding bin (this assumes we always send padding + * when we intended to). */ + if (mi->histogram && mi->histogram_len) { + /* Ensure that we have a token removal strategy set */ + const circpad_state_t *state = circpad_machine_current_state(mi); + tor_assert_nonfatal(state->token_removal != CIRCPAD_TOKEN_REMOVAL_NONE); + + /* Basic sanity check on the histogram before removing anything */ + if (!BUG(mi->chosen_bin >= mi->histogram_len) && + !BUG(mi->histogram[mi->chosen_bin] == 0)) { + mi->histogram[mi->chosen_bin]--; + } + } +} + +/** * Count a nonpadding packet as being sent. * * This function updates our overhead accounting variables, as well @@ -1023,34 +1067,7 @@ circpad_send_padding_cell_for_callback(circpad_machine_runtime_t *mi) return CIRCPAD_STATE_CHANGED; } - /* If it's a histogram, reduce the token count */ - if (mi->histogram && mi->histogram_len) { - /* Basic sanity check on the histogram before removing anything */ - if (BUG(mi->chosen_bin >= mi->histogram_len) || - BUG(mi->histogram[mi->chosen_bin] == 0)) { - return CIRCPAD_STATE_CHANGED; - } - - mi->histogram[mi->chosen_bin]--; - } - - /* If we have a valid state length bound, consider it */ - if (mi->state_length != CIRCPAD_STATE_LENGTH_INFINITE && - !BUG(mi->state_length <= 0)) { - mi->state_length--; - } - - /* - * Update non-padding counts for rate limiting: We scale at UINT16_MAX - * because we only use this for a percentile limit of 2 sig figs, and - * space is scare in the machineinfo struct. - */ - mi->padding_sent++; - if (mi->padding_sent == UINT16_MAX) { - mi->padding_sent /= 2; - mi->nonpadding_sent /= 2; - } - circpad_global_padding_sent++; + circpad_machine_count_padding_sent(mi); if (CIRCUIT_IS_ORIGIN(mi->on_circ)) { circpad_send_command_to_hop(TO_ORIGIN_CIRCUIT(mi->on_circ), [View Less]

1 0