August 2015 - tor-commits - lists.torproject.org

[tor/master] Fix some types on container fns
by nickm＠torproject.org 14 Aug '15

14 Aug '15

commit 216bde38e0cb281ca919a1429da0e542fad67612 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 22:14:14 2015 -0400 Fix some types on container fns --- src/common/container.c | 6 +++--- src/common/container.h | 6 +++--- src/or/dirvote.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index 082afb5..636dfb6 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -742,7 +742,7 @@ smartlist_sort_strings(smartlist_t *sl) } /** Return the most frequent string in the sorted list sl */ -char * +const char * smartlist_get_most_frequent_string(smartlist_t *sl) { return smartlist_get_most_frequent(sl, compare_string_ptrs_); @@ -752,7 +752,7 @@ smartlist_get_most_frequent_string(smartlist_t *sl) * If count_out is provided, set count_out to the * number of times that string appears. */ -char * +const char * smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out) { return smartlist_get_most_frequent_(sl, compare_string_ptrs_, count_out); @@ -1020,7 +1020,7 @@ smartlist_sort_digests256(smartlist_t *sl) /** Return the most frequent member of the sorted list of DIGEST256_LEN * digests in sl */ -char * +const uint8_t * smartlist_get_most_frequent_digest256(smartlist_t *sl) { return smartlist_get_most_frequent(sl, compare_digests256_); diff --git a/src/common/container.h b/src/common/container.h index 2a6ba01..5abd8b4 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -109,9 +109,9 @@ void smartlist_sort_digests(smartlist_t *sl); void smartlist_sort_digests256(smartlist_t *sl); void smartlist_sort_pointers(smartlist_t *sl); -char *smartlist_get_most_frequent_string(smartlist_t *sl); -char *smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out); -char *smartlist_get_most_frequent_digest256(smartlist_t *sl); +const char *smartlist_get_most_frequent_string(smartlist_t *sl); +const char *smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out); +const uint8_t *smartlist_get_most_frequent_digest256(smartlist_t *sl); void smartlist_uniq_strings(smartlist_t *sl); void smartlist_uniq_digests(smartlist_t *sl); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 0f3b77f..d8e6ee2 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -478,7 +478,7 @@ compute_routerstatus_consensus(smartlist_t *votes, int consensus_method, if (microdesc_digest256_out) { smartlist_t *digests = smartlist_new(); - const char *best_microdesc_digest; + const uint8_t *best_microdesc_digest; SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) { char d[DIGEST256_LEN]; if (compare_vote_rs(rs, most))

1 0

[tor/master] Increase unit test coverage on container.c
by nickm＠torproject.org 14 Aug '15

14 Aug '15

commit 810ef71fd5efd09e915bdfe7c4c46f2409970862 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 22:14:19 2015 -0400 Increase unit test coverage on container.c --- src/test/test_containers.c | 153 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 1 deletion(-) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 2ae81bf..eb98cc8 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -887,7 +887,7 @@ static void test_container_order_functions(void *arg) { int lst[25], n = 0; - unsigned int lst_2[25]; + uint32_t lst_2[25]; // int a=12,b=24,c=25,d=60,e=77; #define median() median_int(lst, n) @@ -933,6 +933,31 @@ test_container_order_functions(void *arg) #undef third_quartile + double dbls[] = { 1.0, 10.0, 100.0, 1e4, 1e5, 1e6 }; + tt_assert(1.0 == median_double(dbls, 1)); + tt_assert(1.0 == median_double(dbls, 2)); + tt_assert(10.0 == median_double(dbls, 3)); + tt_assert(10.0 == median_double(dbls, 4)); + tt_assert(100.0 == median_double(dbls, 5)); + tt_assert(100.0 == median_double(dbls, 6)); + + time_t times[] = { 5, 10, 20, 25, 15 }; + + tt_assert(5 == median_time(times, 1)); + tt_assert(5 == median_time(times, 2)); + tt_assert(10 == median_time(times, 3)); + tt_assert(10 == median_time(times, 4)); + tt_assert(15 == median_time(times, 5)); + + int32_t int32s[] = { -5, -10, -50, 100 }; + tt_int_op(-5, ==, median_int32(int32s, 1)); + tt_int_op(-10, ==, median_int32(int32s, 2)); + tt_int_op(-10, ==, median_int32(int32s, 3)); + tt_int_op(-10, ==, median_int32(int32s, 4)); + + long longs[] = { -30, 30, 100, -100, 7 }; + tt_int_op(7, ==, find_nth_long(longs, 5, 2)); + done: ; } @@ -1078,6 +1103,129 @@ test_container_fp_pair_map(void *arg) tor_free(v105); } +static void +test_container_smartlist_most_frequent(void *arg) +{ + (void) arg; + smartlist_t *sl = smartlist_new(); + + int count = -1; + const char *cp; + + cp = smartlist_get_most_frequent_string_(sl, &count); + tt_int_op(count, ==, 0); + tt_ptr_op(cp, ==, NULL); + + /* String must be sorted before we call get_most_frequent */ + smartlist_split_string(sl, "abc:def:ghi", ":", 0, 0); + + cp = smartlist_get_most_frequent_string_(sl, &count); + tt_int_op(count, ==, 1); + tt_str_op(cp, ==, "ghi"); /* Ties broken in favor of later element */ + + smartlist_split_string(sl, "def:ghi", ":", 0, 0); + smartlist_sort_strings(sl); + + cp = smartlist_get_most_frequent_string_(sl, &count); + tt_int_op(count, ==, 2); + tt_ptr_op(cp, !=, NULL); + tt_str_op(cp, ==, "ghi"); /* Ties broken in favor of later element */ + + smartlist_split_string(sl, "def:abc:qwop", ":", 0, 0); + smartlist_sort_strings(sl); + + cp = smartlist_get_most_frequent_string_(sl, &count); + tt_int_op(count, ==, 3); + tt_ptr_op(cp, !=, NULL); + tt_str_op(cp, ==, "def"); /* No tie */ + + done: + SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp)); + smartlist_free(sl); +} + +static void +test_container_smartlist_sort_ptrs(void *arg) +{ + (void)arg; + int array[10]; + int *arrayptrs[11]; + smartlist_t *sl = smartlist_new(); + unsigned i=0, j; + + for (j = 0; j < ARRAY_LENGTH(array); ++j) { + smartlist_add(sl, &array[j]); + arrayptrs[i++] = &array[j]; + if (j == 5) { + smartlist_add(sl, &array[j]); + arrayptrs[i++] = &array[j]; + } + } + + for (i = 0; i < 10; ++i) { + smartlist_shuffle(sl); + smartlist_sort_pointers(sl); + for (j = 0; j < ARRAY_LENGTH(arrayptrs); ++j) { + tt_ptr_op(smartlist_get(sl, j), ==, arrayptrs[j]); + } + } + + done: + smartlist_free(sl); +} + +static void +test_container_smartlist_strings_eq(void *arg) +{ + (void)arg; + smartlist_t *sl1 = smartlist_new(); + smartlist_t *sl2 = smartlist_new(); +#define EQ_SHOULD_SAY(s1,s2,val) \ + do { \ + SMARTLIST_FOREACH(sl1, char *, cp, tor_free(cp)); \ + SMARTLIST_FOREACH(sl2, char *, cp, tor_free(cp)); \ + smartlist_clear(sl1); \ + smartlist_clear(sl2); \ + smartlist_split_string(sl1, (s1), ":", 0, 0); \ + smartlist_split_string(sl2, (s2), ":", 0, 0); \ + tt_int_op((val), OP_EQ, smartlist_strings_eq(sl1, sl2)); \ + } while (0) + + /* Both NULL, so equal */ + tt_int_op(1, ==, smartlist_strings_eq(NULL, NULL)); + + /* One NULL, not equal. */ + tt_int_op(0, ==, smartlist_strings_eq(NULL, sl1)); + tt_int_op(0, ==, smartlist_strings_eq(sl1, NULL)); + + /* Both empty, both equal. */ + EQ_SHOULD_SAY("", "", 1); + + /* One empty, not equal */ + EQ_SHOULD_SAY("", "ab", 0); + EQ_SHOULD_SAY("", "xy:z", 0); + EQ_SHOULD_SAY("abc", "", 0); + EQ_SHOULD_SAY("abc:cd", "", 0); + + /* Different lengths, not equal. */ + EQ_SHOULD_SAY("hello:world", "hello", 0); + EQ_SHOULD_SAY("hello", "hello:friends", 0); + + /* Same lengths, not equal */ + EQ_SHOULD_SAY("Hello:world", "goodbye:world", 0); + EQ_SHOULD_SAY("Hello:world", "Hello:stars", 0); + + /* Actually equal */ + EQ_SHOULD_SAY("ABC", "ABC", 1); + EQ_SHOULD_SAY(" ab : cd : e", " ab : cd : e", 1); + + done: + SMARTLIST_FOREACH(sl1, char *, cp, tor_free(cp)); + SMARTLIST_FOREACH(sl2, char *, cp, tor_free(cp)); + smartlist_free(sl1); + smartlist_free(sl2); +} + #define CONTAINER_LEGACY(name) \ { #name, test_container_ ## name , 0, NULL, NULL } @@ -1099,6 +1247,9 @@ struct testcase_t container_tests[] = { CONTAINER_LEGACY(order_functions), CONTAINER(di_map, 0), CONTAINER_LEGACY(fp_pair_map), + CONTAINER(smartlist_most_frequent, 0), + CONTAINER(smartlist_sort_ptrs, 0), + CONTAINER(smartlist_strings_eq, 0), END_OF_TESTCASES };

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit 5ee1f77a78e518cefe157c01d6778b7d683185ab Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 01:45:20 2015 +0000 Update translations for https_everywhere_completed --- zh-CN/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index 9fb2af4..9e6e072 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -17,6 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "拦截所有 HTTP 请求"> <!ENTITY https-everywhere.menu.showCounter "显示计数器"> +<!ENTITY https-everywhere.menu.viewAllRules "查看所有规则"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 14 Aug '15

14 Aug '15

commit e7447796bb34df8a9b9bbac6909ef8df228ddc89 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 14 01:45:14 2015 +0000 Update translations for https_everywhere --- zh-CN/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-CN/https-everywhere.dtd b/zh-CN/https-everywhere.dtd index ae7fda8..9e6e072 100644 --- a/zh-CN/https-everywhere.dtd +++ b/zh-CN/https-everywhere.dtd @@ -17,7 +17,7 @@ <!ENTITY https-everywhere.menu.globalDisable "禁用 HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockHttpRequests "拦截所有 HTTP 请求"> <!ENTITY https-everywhere.menu.showCounter "显示计数器"> -<!ENTITY https-everywhere.menu.viewAllRules "View All Rules"> +<!ENTITY https-everywhere.menu.viewAllRules "查看所有规则"> <!ENTITY https-everywhere.prefs.title "HTTPS Everywhere 首选项"> <!ENTITY https-everywhere.prefs.enable_all "全部启用">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 13 Aug '15

13 Aug '15

commit f9133cb36b91ea9a838ff3b4ca4070e737d5a187 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 22:45:19 2015 +0000 Update translations for https_everywhere_completed --- es_CO/https-everywhere.properties | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/es_CO/https-everywhere.properties b/es_CO/https-everywhere.properties new file mode 100644 index 0000000..d89ecad --- /dev/null +++ b/es_CO/https-everywhere.properties @@ -0,0 +1,8 @@ +https-everywhere.menu.globalEnable = Habilitar HTTPS Everywhere +https-everywhere.menu.globalDisable = Desabilitar HTTPS Everywhere +https-everywhere.menu.enableDisable = Habilitar/Desabilitar Reglas +https-everywhere.menu.noRules = (No hai reglas para esta página) +https-everywhere.menu.unknownRules = (Las Reglas para esta pagina no existe) +https-everywhere.toolbar.hint = HTTPS Everywhere estai ativo ahora. Tu puedes aumentar uno site de otro site basico clicando o icone en la barra de direccion +https-everywhere.migration.notification0 = en ordem para implementar una arregla importante, isto recomeça la melhoria en tu regla preferencial del HTTPS Everywhere para su valores por defecto. +https-everywhere.menu.ruleset-tests = Começando HTTPS Everywhere testes del tu conjunto de reglas.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 13 Aug '15

13 Aug '15

commit 6689eb2a49a1a6c9986b6b52506fbe48c439677b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 22:45:15 2015 +0000 Update translations for https_everywhere --- es_CO/https-everywhere.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es_CO/https-everywhere.properties b/es_CO/https-everywhere.properties index 65b6f79..d89ecad 100644 --- a/es_CO/https-everywhere.properties +++ b/es_CO/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Habilitar HTTPS Everywhere https-everywhere.menu.globalDisable = Desabilitar HTTPS Everywhere -https-everywhere.menu.enableDisable = Habilitar/Desabilitar Regras -https-everywhere.menu.noRules = (No hai regras para esta página) -https-everywhere.menu.unknownRules = (Las Regras para esta pagina no existe) -https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. -https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. -https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.enableDisable = Habilitar/Desabilitar Reglas +https-everywhere.menu.noRules = (No hai reglas para esta página) +https-everywhere.menu.unknownRules = (Las Reglas para esta pagina no existe) +https-everywhere.toolbar.hint = HTTPS Everywhere estai ativo ahora. Tu puedes aumentar uno site de otro site basico clicando o icone en la barra de direccion +https-everywhere.migration.notification0 = en ordem para implementar una arregla importante, isto recomeça la melhoria en tu regla preferencial del HTTPS Everywhere para su valores por defecto. +https-everywhere.menu.ruleset-tests = Começando HTTPS Everywhere testes del tu conjunto de reglas.

1 0

[translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed
by translation＠torproject.org 13 Aug '15

13 Aug '15

commit b8b8b33fb949d2a21c4fa7390138ebaf15c800a4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 22:16:26 2015 +0000 Update translations for tor-messenger-authdtd_completed --- pt_BR/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/auth.dtd b/pt_BR/auth.dtd index 260f591..ae389e8 100644 --- a/pt_BR/auth.dtd +++ b/pt_BR/auth.dtd @@ -1,4 +1,4 @@ -<!ENTITY authDialog.title "Verificar a identidade dessa pessoa"> +<!ENTITY authDialog.title "Verificar a identidade da pessoa do seu contato"> <!ENTITY authDialog.authenticate "Verificar"> <!ENTITY authDialog.cancel "Cancelar"> <!ENTITY authDialog.help "Ajuda">

1 0

[translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd
by translation＠torproject.org 13 Aug '15

13 Aug '15

commit 47a96a562218b705094a433acb32b4551075af83 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 22:16:22 2015 +0000 Update translations for tor-messenger-authdtd --- pt_BR/auth.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/auth.dtd b/pt_BR/auth.dtd index 260f591..ae389e8 100644 --- a/pt_BR/auth.dtd +++ b/pt_BR/auth.dtd @@ -1,4 +1,4 @@ -<!ENTITY authDialog.title "Verificar a identidade dessa pessoa"> +<!ENTITY authDialog.title "Verificar a identidade da pessoa do seu contato"> <!ENTITY authDialog.authenticate "Verificar"> <!ENTITY authDialog.cancel "Cancelar"> <!ENTITY authDialog.help "Ajuda">

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 13 Aug '15

13 Aug '15

commit b0aca532e629062b30e3a39e54bc406a463f4a18 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 22:15:29 2015 +0000 Update translations for liveusb-creator_completed --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 52b8a2a..92dbf45 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -8,6 +8,7 @@ # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 # Carlos Villela, 2014 # Charles Fernando da Silva <eu.charles(a)hotmail.com>, 2015 +# CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01(a)yahoo.com.br>, 2015 # Daniel Messias dos Santos <danielms97(a)outlook.com>, 2013 # Daniel S. Koda <danielskoda(a)gmail.com>, 2008 # Eduardo Bonsi, 2013 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 16:01+0200\n" -"PO-Revision-Date: 2015-08-11 18:53+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2015-08-13 21:58+0000\n" +"Last-Translator: CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01(a)yahoo.com.br>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "" #: ../liveusb/gui.py:451 msgid "\"Clone & Install\"" -msgstr "\"Clonar & Instalar\"" +msgstr "\"Clonar e Instalar\"" #: ../liveusb/gui.py:453 msgid "\"Install from ISO\""

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 13 Aug '15

13 Aug '15

commit 7eac90484c7dc7a6ef908d4af28c44700cde5ea7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 22:15:25 2015 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 52b8a2a..92dbf45 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -8,6 +8,7 @@ # carlo giusepe tadei valente sasaki <carlo.gt.valente(a)gmail.com>, 2014 # Carlos Villela, 2014 # Charles Fernando da Silva <eu.charles(a)hotmail.com>, 2015 +# CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01(a)yahoo.com.br>, 2015 # Daniel Messias dos Santos <danielms97(a)outlook.com>, 2013 # Daniel S. Koda <danielskoda(a)gmail.com>, 2008 # Eduardo Bonsi, 2013 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-10 16:01+0200\n" -"PO-Revision-Date: 2015-08-11 18:53+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2015-08-13 21:58+0000\n" +"Last-Translator: CRISTIANO MARQUES DOS SANTOS <cristianomarquesadm01(a)yahoo.com.br>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,7 +37,7 @@ msgstr "" #: ../liveusb/gui.py:451 msgid "\"Clone & Install\"" -msgstr "\"Clonar & Instalar\"" +msgstr "\"Clonar e Instalar\"" #: ../liveusb/gui.py:453 msgid "\"Install from ISO\""

1 0