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

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Sep '17

25 Sep '17

commit 48eab92676613112bcffb15416235e890beaaf5b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 25 16:17:12 2017 +0000 Update translations for tails-misc --- fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa.po b/fa.po index 736acdeb3..b91d9f11c 100644 --- a/fa.po +++ b/fa.po @@ -23,7 +23,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-19 18:35+0000\n" +"PO-Revision-Date: 2017-09-25 15:49+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 25 Sep '17

25 Sep '17

commit 7765fe250b914bb408016e2fe758c335ba74c8df Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 25 16:15:31 2017 +0000 Update translations for whisperback_completed --- fa/fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po b/fa/fa.po index 7e732853c..1804c3eee 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 12:00+0000\n" +"PO-Revision-Date: 2017-09-25 15:53+0000\n" "Last-Translator: Amir Moezzi <amirreza.mz(a)yahoo.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 25 Sep '17

25 Sep '17

commit 91cbe77e386ba252f797b8b9b3ea8ba110e42583 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 25 16:15:25 2017 +0000 Update translations for whisperback --- fa/fa.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/fa.po b/fa/fa.po index 7e732853c..1804c3eee 100644 --- a/fa/fa.po +++ b/fa/fa.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-19 12:00+0000\n" +"PO-Revision-Date: 2017-09-25 15:53+0000\n" "Last-Translator: Amir Moezzi <amirreza.mz(a)yahoo.com>\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] sched: Make KISTSchedRunInterval non negative
by nickm＠torproject.org 25 Sep '17

25 Sep '17

commit ef2a449cceceb777126119d20c15cda707c17d61 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Sep 22 11:33:50 2017 -0400 sched: Make KISTSchedRunInterval non negative Fixes #23539. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23539 | 4 ++++ src/or/or.h | 2 +- src/or/scheduler.c | 9 ++------- src/or/scheduler.h | 2 +- src/or/scheduler_kist.c | 47 ++++++++++++++++++++++++----------------------- src/test/test_scheduler.c | 14 +++----------- 6 files changed, 35 insertions(+), 43 deletions(-) diff --git a/changes/bug23539 b/changes/bug23539 new file mode 100644 index 000000000..b3f6d3b45 --- /dev/null +++ b/changes/bug23539 @@ -0,0 +1,4 @@ + o Minor bugfixes (scheduler, KIST): + - Make the KISTSchedRunInterval option a non negative value. With this, + the way to disable KIST through the consensus is to set it to 0. + Fixes bug 23539; bugfix on 0.3.2.1-alpha. diff --git a/src/or/or.h b/src/or/or.h index 10a2b5741..9a9a70ccc 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4615,7 +4615,7 @@ typedef struct { * not use the KIST scheduler but use the old vanilla scheduler instead. If * zero, do what the consensus says and fall back to using KIST as if this is * set to "10 msec" if the consensus doesn't say anything. */ - int64_t KISTSchedRunInterval; + uint32_t KISTSchedRunInterval; /** A multiplier for the KIST per-socket limit calculation. */ double KISTSockBufSizeFactor; diff --git a/src/or/scheduler.c b/src/or/scheduler.c index cc0161122..4a3289030 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -249,13 +249,8 @@ select_scheduler(void) case SCHEDULER_KIST: if (!scheduler_can_use_kist()) { #ifdef HAVE_KIST_SUPPORT - if (get_options()->KISTSchedRunInterval == -1) { - log_info(LD_SCHED, "Scheduler type KIST can not be used. It is " - "disabled because KISTSchedRunInterval=-1"); - } else { - log_notice(LD_SCHED, "Scheduler type KIST has been disabled by " - "the consensus."); - } + log_notice(LD_SCHED, "Scheduler type KIST has been disabled by " + "the consensus or no kernel support."); #else /* !(defined(HAVE_KIST_SUPPORT)) */ log_info(LD_SCHED, "Scheduler type KIST not built in"); #endif /* defined(HAVE_KIST_SUPPORT) */ diff --git a/src/or/scheduler.h b/src/or/scheduler.h index f740230b1..e32a662c8 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -189,7 +189,7 @@ int scheduler_can_use_kist(void); void scheduler_kist_set_full_mode(void); void scheduler_kist_set_lite_mode(void); scheduler_t *get_kist_scheduler(void); -int32_t kist_scheduler_run_interval(const networkstatus_t *ns); +uint32_t kist_scheduler_run_interval(const networkstatus_t *ns); #ifdef TOR_UNIT_TESTS extern int32_t sched_run_interval; diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 5ba31bb87..8fe3ff556 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -208,8 +208,8 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * support. */ log_notice(LD_SCHED, "Looks like our kernel doesn't have the support " "for KIST anymore. We will fallback to the naive " - "approach. Set KISTSchedRunInterval=-1 to disable " - "KIST."); + "approach. Remove KIST from the Schedulers list " + "to disable."); kist_no_kernel_support = 1; } goto fallback; @@ -218,8 +218,8 @@ update_socket_info_impl, (socket_table_ent_t *ent)) if (errno == EINVAL) { log_notice(LD_SCHED, "Looks like our kernel doesn't have the support " "for KIST anymore. We will fallback to the naive " - "approach. Set KISTSchedRunInterval=-1 to disable " - "KIST."); + "approach. Remove KIST from the Schedulers list " + "to disable."); /* Same reason as the above. */ kist_no_kernel_support = 1; } @@ -491,7 +491,7 @@ static void kist_scheduler_init(void) { kist_scheduler_on_new_options(); - IF_BUG_ONCE(sched_run_interval <= 0) { + IF_BUG_ONCE(sched_run_interval == 0) { log_warn(LD_SCHED, "We are initing the KIST scheduler and noticed the " "KISTSchedRunInterval is telling us to not use KIST. That's " "weird! We'll continue using KIST, but at %dms.", @@ -705,33 +705,34 @@ get_kist_scheduler(void) return &kist_scheduler; } -/* Check the torrc for the configured KIST scheduler run interval. - * - If torrc < 0, then return the negative torrc value (shouldn't even be - * using KIST) +/* Check the torrc (and maybe consensus) for the configured KIST scheduler run + * interval. * - If torrc > 0, then return the positive torrc value (should use KIST, and * should use the set value) * - If torrc == 0, then look in the consensus for what the value should be. - * - If == 0, then return -1 (don't use KIST) + * - If == 0, then return 0 (don't use KIST) * - If > 0, then return the positive consensus value - * - If consensus doesn't say anything, return 10 milliseconds + * - If consensus doesn't say anything, return 10 milliseconds, default. */ -int32_t +uint32_t kist_scheduler_run_interval(const networkstatus_t *ns) { - int32_t run_interval = (int32_t)get_options()->KISTSchedRunInterval; + uint32_t run_interval = get_options()->KISTSchedRunInterval; + if (run_interval != 0) { - log_debug(LD_SCHED, "Found KISTSchedRunInterval in torrc. Using that."); + log_debug(LD_SCHED, "Found KISTSchedRunInterval=%" PRIu32 " in torrc. " + "Using that.", run_interval); return run_interval; } - log_debug(LD_SCHED, "Turning to the consensus for KISTSchedRunInterval"); - run_interval = networkstatus_get_param(ns, "KISTSchedRunInterval", - KIST_SCHED_RUN_INTERVAL_DEFAULT, - KIST_SCHED_RUN_INTERVAL_MIN, - KIST_SCHED_RUN_INTERVAL_MAX); - if (run_interval <= 0) - return -1; - return run_interval; + log_debug(LD_SCHED, "KISTSchedRunInterval=0, turning to the consensus."); + + /* Will either be the consensus value or the default. Note that 0 can be + * returned which means the consensus wants us to NOT use KIST. */ + return networkstatus_get_param(ns, "KISTSchedRunInterval", + KIST_SCHED_RUN_INTERVAL_DEFAULT, + KIST_SCHED_RUN_INTERVAL_MIN, + KIST_SCHED_RUN_INTERVAL_MAX); } /* Set KISTLite mode that is KIST without kernel support. */ @@ -767,9 +768,9 @@ scheduler_can_use_kist(void) /* We do have the support, time to check if we can get the interval that the * consensus can be disabling. */ - int64_t run_interval = kist_scheduler_run_interval(NULL); + uint32_t run_interval = kist_scheduler_run_interval(NULL); log_debug(LD_SCHED, "Determined KIST sched_run_interval should be " - "%" PRId64 ". Can%s use KIST.", + "%" PRIu32 ". Can%s use KIST.", run_interval, (run_interval > 0 ? "" : " not")); return run_interval > 0; } diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 51bedb3f9..d679d7cfe 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -84,7 +84,7 @@ mock_vanilla_networkstatus_get_param( (void)max_val; // only support KISTSchedRunInterval right now tor_assert(strcmp(param_name, "KISTSchedRunInterval")==0); - return -1; + return 0; } static int32_t @@ -628,7 +628,7 @@ test_scheduler_loop_vanilla(void *arg) MOCK(get_options, mock_get_options); clear_options(); set_scheduler_options(SCHEDULER_VANILLA); - mocked_options.KISTSchedRunInterval = -1; + mocked_options.KISTSchedRunInterval = 0; /* Set up libevent and scheduler */ @@ -932,14 +932,6 @@ test_scheduler_can_use_kist(void *arg) int res_should, res_freq; MOCK(get_options, mock_get_options); - /* Test force disabling of KIST */ - clear_options(); - mocked_options.KISTSchedRunInterval = -1; - res_should = scheduler_can_use_kist(); - res_freq = kist_scheduler_run_interval(NULL); - tt_int_op(res_should, ==, 0); - tt_int_op(res_freq, ==, -1); - /* Test force enabling of KIST */ clear_options(); mocked_options.KISTSchedRunInterval = 1234; @@ -985,7 +977,7 @@ test_scheduler_can_use_kist(void *arg) res_should = scheduler_can_use_kist(); res_freq = kist_scheduler_run_interval(NULL); tt_int_op(res_should, ==, 0); - tt_int_op(res_freq, ==, -1); + tt_int_op(res_freq, ==, 0); UNMOCK(networkstatus_get_param); done:

1 0

[tor/master] sched: make interval a plain int; initialize with macro
by nickm＠torproject.org 25 Sep '17

25 Sep '17

commit 7bbc29b0f27581b77a16c97e5125d60150447591 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Sep 25 10:43:15 2017 -0400 sched: make interval a plain int; initialize with macro --- src/or/or.h | 2 +- src/or/scheduler.h | 2 +- src/or/scheduler_kist.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 9a9a70ccc..a90841fbc 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4615,7 +4615,7 @@ typedef struct { * not use the KIST scheduler but use the old vanilla scheduler instead. If * zero, do what the consensus says and fall back to using KIST as if this is * set to "10 msec" if the consensus doesn't say anything. */ - uint32_t KISTSchedRunInterval; + int KISTSchedRunInterval; /** A multiplier for the KIST per-socket limit calculation. */ double KISTSockBufSizeFactor; diff --git a/src/or/scheduler.h b/src/or/scheduler.h index e32a662c8..0ec24db93 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -189,7 +189,7 @@ int scheduler_can_use_kist(void); void scheduler_kist_set_full_mode(void); void scheduler_kist_set_lite_mode(void); scheduler_t *get_kist_scheduler(void); -uint32_t kist_scheduler_run_interval(const networkstatus_t *ns); +int kist_scheduler_run_interval(const networkstatus_t *ns); #ifdef TOR_UNIT_TESTS extern int32_t sched_run_interval; diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index 8fe3ff556..9e960cdef 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -91,7 +91,7 @@ static monotime_t scheduler_last_run; */ static double sock_buf_size_factor = 1.0; /* How often the scheduler runs. */ -STATIC int32_t sched_run_interval = 10; +STATIC int sched_run_interval = KIST_SCHED_RUN_INTERVAL_DEFAULT; #ifdef HAVE_KIST_SUPPORT /* Indicate if KIST lite mode is on or off. We can disable it at runtime. @@ -355,7 +355,7 @@ outbuf_table_remove(outbuf_table_t *table, channel_t *chan) static void set_scheduler_run_interval(const networkstatus_t *ns) { - int32_t old_sched_run_interval = sched_run_interval; + int old_sched_run_interval = sched_run_interval; sched_run_interval = kist_scheduler_run_interval(ns); if (old_sched_run_interval != sched_run_interval) { log_info(LD_SCHED, "Scheduler KIST changing its running interval " @@ -494,7 +494,7 @@ kist_scheduler_init(void) IF_BUG_ONCE(sched_run_interval == 0) { log_warn(LD_SCHED, "We are initing the KIST scheduler and noticed the " "KISTSchedRunInterval is telling us to not use KIST. That's " - "weird! We'll continue using KIST, but at %dms.", + "weird! We'll continue using KIST, but at %" PRId32 "ms.", KIST_SCHED_RUN_INTERVAL_DEFAULT); sched_run_interval = KIST_SCHED_RUN_INTERVAL_DEFAULT; } @@ -714,13 +714,13 @@ get_kist_scheduler(void) * - If > 0, then return the positive consensus value * - If consensus doesn't say anything, return 10 milliseconds, default. */ -uint32_t +int kist_scheduler_run_interval(const networkstatus_t *ns) { - uint32_t run_interval = get_options()->KISTSchedRunInterval; + int run_interval = get_options()->KISTSchedRunInterval; if (run_interval != 0) { - log_debug(LD_SCHED, "Found KISTSchedRunInterval=%" PRIu32 " in torrc. " + log_debug(LD_SCHED, "Found KISTSchedRunInterval=%" PRId32 " in torrc. " "Using that.", run_interval); return run_interval; } @@ -768,9 +768,9 @@ scheduler_can_use_kist(void) /* We do have the support, time to check if we can get the interval that the * consensus can be disabling. */ - uint32_t run_interval = kist_scheduler_run_interval(NULL); + int run_interval = kist_scheduler_run_interval(NULL); log_debug(LD_SCHED, "Determined KIST sched_run_interval should be " - "%" PRIu32 ". Can%s use KIST.", + "%" PRId32 ". Can%s use KIST.", run_interval, (run_interval > 0 ? "" : " not")); return run_interval > 0; }

1 0

[tor/master] Merge branch 'bug23539_032_01_squashed'
by nickm＠torproject.org 25 Sep '17

25 Sep '17

commit 90e8d1f58fb77eb15c59c1bd846aabe1555b64f2 Merge: f82f1f4b8 581e2c8b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 25 11:12:56 2017 -0400 Merge branch 'bug23539_032_01_squashed' changes/bug23539 | 4 ++++ src/or/or.h | 2 +- src/or/scheduler.c | 9 ++------ src/or/scheduler.h | 2 +- src/or/scheduler_kist.c | 53 ++++++++++++++++++++++++----------------------- src/test/test_scheduler.c | 14 +++---------- 6 files changed, 38 insertions(+), 46 deletions(-)

1 0

[tor/master] Whitespace fix.
by nickm＠torproject.org 25 Sep '17

25 Sep '17

commit 581e2c8b2c2976d3272d35957c1085514d446b44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 25 11:12:45 2017 -0400 Whitespace fix. --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 4a3289030..d98332530 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -178,7 +178,7 @@ STATIC struct event *run_sched_ev = NULL; static const char * get_scheduler_type_string(scheduler_types_t type) { - switch(type) { + switch (type) { case SCHEDULER_VANILLA: return "Vanilla"; case SCHEDULER_KIST:

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 25 Sep '17

25 Sep '17

commit 1e506174724be367d839c99b1612ecc8f4ebc07c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 25 14:47:10 2017 +0000 Update translations for tails-misc --- am.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/am.po b/am.po index cd58fe1ee..2a7737edf 100644 --- a/am.po +++ b/am.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-19 19:57+0000\n" +"PO-Revision-Date: 2017-09-25 14:26+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Amharic (http://www.transifex.com/otf/torproject/language/am/)\n" "MIME-Version: 1.0\n"

1 0

[translation/exoneratorproperties] Update translations for exoneratorproperties
by translation＠torproject.org 25 Sep '17

25 Sep '17

commit 80fe1ba02a49c4b4730c4f5e1c4eecd4d3f4d4d8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 25 14:20:40 2017 +0000 Update translations for exoneratorproperties --- bo/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bo/exonerator.properties b/bo/exonerator.properties index 848862390..422be2228 100644 --- a/bo/exonerator.properties +++ b/bo/exonerator.properties @@ -47,6 +47,6 @@ footer.abouttor.body.link2=learn more about Tor footer.abouttor.body.link3=contact The Tor Project, Inc. footer.aboutexonerator.heading=About ExoneraTor footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP addresses that have been part of the Tor network.  It answers the question whether there was a Tor relay running on a given IP address on a given date.  ExoneraTor may store more than one IP address per relay if relays use a different IP address for exiting to the Internet than for registering in the Tor network, and it stores whether a relay permitted transit of Tor traffic to the open Internet at that time. -footer.language.name=English +footer.language.name=དབྱིན་སྐད། footer.language.text=This page is also available in the following languages:

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 25 Sep '17

25 Sep '17

commit 4275e628df197bf5a73333b3d187750e40d41802 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 25 14:15:56 2017 +0000 Update translations for liveusb-creator --- pt/pt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 974b49ebc..660fa8eb7 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-25 14:02+0200\n" -"PO-Revision-Date: 2017-09-25 13:40+0000\n" +"PO-Revision-Date: 2017-09-25 13:57+0000\n" "Last-Translator: Henrique Rodrigues\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -347,7 +347,7 @@ msgstr "Nenhuma imagem ISO foi selecionada" #: ../tails_installer/gui.py:477 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Por favor selecione o ficheiro de imagem Tails ISO" #: ../tails_installer/gui.py:516 msgid "No device suitable to install Tails could be found"

1 0