January 2016 - tor-commits - lists.torproject.org

[tor/master] Fix some memory leaks
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit ee39869f67a1e9e829f7807cf8df783bbbbeccc3 Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 12 12:14:34 2016 -0500 Fix some memory leaks --- src/test/test_dir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index a350f1d..62aae03 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -21,6 +21,7 @@ #include "dirserv.h" #include "dirvote.h" #include "hibernate.h" +#include "memarea.h" #include "networkstatus.h" #include "router.h" #include "routerkeys.h" @@ -483,6 +484,7 @@ test_dir_routerinfo_parsing(void *arg) #undef CHECK_FAIL #undef CHECK_OK done: + memarea_clear_freelist(); routerinfo_free(ri); } @@ -585,6 +587,7 @@ test_dir_extrainfo_parsing(void *arg) #undef CHECK_FAIL done: + memarea_clear_freelist(); extrainfo_free(ei); routerinfo_free(ri); digestmap_free((digestmap_t*)map, routerinfo_free_wrapper_);

1 0

[tor/master] Make it compile with gcc-warnings turned on
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit b24a16e56e08c9b8ab4e4ab1d06e306cb474567c Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 12 11:53:07 2016 -0500 Make it compile with gcc-warnings turned on --- src/test/test_dir.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 9be7e0d..a350f1d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3761,6 +3761,14 @@ NS(directory_initiate_command_routerstatus)(const routerstatus_t *status, size_t payload_len, time_t if_modified_since) { + (void)status; + (void)dir_purpose; + (void)router_purpose; + (void)indirection; + (void)resource; + (void)payload; + (void)payload_len; + (void)if_modified_since; CALLED(directory_initiate_command_routerstatus)++; } @@ -3863,4 +3871,3 @@ struct testcase_t dir_tests[] = { DIR(find_dl_schedule_and_len, 0), END_OF_TESTCASES }; -

1 0

[tor/master] Add tests for src/or/directory.c
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit d5e860e3dca8cd9159e17555541262c828d05976 Author: Reinaldo de Souza Jr <juniorz(a)gmail.com> Date: Mon Sep 7 14:04:51 2015 -0500 Add tests for src/or/directory.c --- src/or/directory.c | 28 ++--- src/or/directory.h | 24 ++-- src/test/test_dir.c | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 372 insertions(+), 28 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 9461606..01ed694 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -143,7 +143,7 @@ purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose) /** Return a newly allocated string describing auth. Only describes * authority features. */ -static char * +STATIC char * authdir_type_to_string(dirinfo_type_t auth) { char *result; @@ -162,7 +162,7 @@ authdir_type_to_string(dirinfo_type_t auth) } /** Return a string describing a given directory connection purpose. */ -static const char * +STATIC const char * dir_conn_purpose_to_string(int purpose) { switch (purpose) @@ -370,7 +370,7 @@ directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose, /** Return true iff, according to the values in options, we should be * using directory guards for direct downloads of directory information. */ -static int +STATIC int should_use_directory_guards(const or_options_t *options) { /* Public (non-bridge) servers never use directory guards. */ @@ -666,15 +666,15 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status, * When fetching a rendezvous descriptor, resource is the service ID we * want to fetch. */ -void -directory_initiate_command_routerstatus(const routerstatus_t *status, - uint8_t dir_purpose, - uint8_t router_purpose, - dir_indirection_t indirection, - const char *resource, - const char *payload, - size_t payload_len, - time_t if_modified_since) +MOCK_IMPL(void, directory_initiate_command_routerstatus, + (const routerstatus_t *status, + uint8_t dir_purpose, + uint8_t router_purpose, + dir_indirection_t indirection, + const char *resource, + const char *payload, + size_t payload_len, + time_t if_modified_since)) { directory_initiate_command_routerstatus_rend(status, dir_purpose, router_purpose, @@ -2593,7 +2593,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) /** Return the compression level we should use for sending a compressed * response of size n_bytes. */ -static zlib_compression_level_t +STATIC zlib_compression_level_t choose_compression_level(ssize_t n_bytes) { if (! have_been_under_memory_pressure()) { @@ -3460,7 +3460,7 @@ connection_dir_finished_connecting(dir_connection_t *conn) * then return a list of int pointers defining download delays in seconds. * Helper function for download_status_increment_failure() and * download_status_reset(). */ -static const smartlist_t * +STATIC const smartlist_t * find_dl_schedule_and_len(download_status_t *dls, int server) { switch (dls->schedule) { diff --git a/src/or/directory.h b/src/or/directory.h index 4899eb5..d859df3 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -37,14 +37,16 @@ typedef enum { DIRIND_ANON_DIRPORT, } dir_indirection_t; -void directory_initiate_command_routerstatus(const routerstatus_t *status, - uint8_t dir_purpose, - uint8_t router_purpose, - dir_indirection_t indirection, - const char *resource, - const char *payload, - size_t payload_len, - time_t if_modified_since); +MOCK_DECL(void, directory_initiate_command_routerstatus, + (const routerstatus_t *status, + uint8_t dir_purpose, + uint8_t router_purpose, + dir_indirection_t indirection, + const char *resource, + const char *payload, + size_t payload_len, + time_t if_modified_since)); + void directory_initiate_command_routerstatus_rend(const routerstatus_t *status, uint8_t dir_purpose, uint8_t router_purpose, @@ -127,6 +129,12 @@ STATIC int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose); STATIC dirinfo_type_t dir_fetch_type(int dir_purpose, int router_purpose, const char *resource); +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_and_len(download_status_t *dls, + int server); #endif #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 855746e..9be7e0d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -12,6 +12,8 @@ #define ROUTERLIST_PRIVATE #define HIBERNATE_PRIVATE #define NETWORKSTATUS_PRIVATE +#define RELAY_PRIVATE + #include "or.h" #include "config.h" #include "crypto_ed25519.h" @@ -27,6 +29,9 @@ #include "routerset.h" #include "test.h" #include "torcert.h" +#include "relay.h" + +#define NS_MODULE dir static void test_dir_nicknames(void *arg) @@ -3340,12 +3345,33 @@ static void test_dir_fetch_type(void *arg) { (void)arg; - tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL, - NULL) == MICRODESC_DIRINFO); - tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, - NULL) == BRIDGE_DIRINFO); - tt_assert(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, - "microdesc") == (V3_DIRINFO | MICRODESC_DIRINFO)); + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_EXTRAINFO, ROUTER_PURPOSE_BRIDGE, + NULL), OP_EQ, EXTRAINFO_DIRINFO | BRIDGE_DIRINFO); + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_EXTRAINFO, ROUTER_PURPOSE_GENERAL, + NULL), OP_EQ, EXTRAINFO_DIRINFO | V3_DIRINFO); + + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, + NULL), OP_EQ, BRIDGE_DIRINFO); + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_SERVERDESC, + ROUTER_PURPOSE_GENERAL, NULL), OP_EQ, V3_DIRINFO); + + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_STATUS_VOTE, + ROUTER_PURPOSE_GENERAL, NULL), OP_EQ, V3_DIRINFO); + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES, + ROUTER_PURPOSE_GENERAL, NULL), OP_EQ, V3_DIRINFO); + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_CERTIFICATE, + ROUTER_PURPOSE_GENERAL, NULL), OP_EQ, V3_DIRINFO); + + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, + "microdesc"), OP_EQ, V3_DIRINFO|MICRODESC_DIRINFO); + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_CONSENSUS, ROUTER_PURPOSE_GENERAL, + NULL), OP_EQ, V3_DIRINFO); + + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_MICRODESC, ROUTER_PURPOSE_GENERAL, + NULL), OP_EQ, MICRODESC_DIRINFO); + + tt_int_op(dir_fetch_type(DIR_PURPOSE_FETCH_RENDDESC_V2, + ROUTER_PURPOSE_GENERAL, NULL), OP_EQ, NO_DIRINFO); done: ; } @@ -3494,6 +3520,308 @@ test_dir_packages(void *arg) tor_free(res); } +static void +test_dir_authdir_type_to_string(void *data) +{ + (void)data; + + tt_str_op(authdir_type_to_string(NO_DIRINFO), OP_EQ, + "[Not an authority]"); + tt_str_op(authdir_type_to_string(EXTRAINFO_DIRINFO), OP_EQ, + "[Not an authority]"); + tt_str_op(authdir_type_to_string(MICRODESC_DIRINFO), OP_EQ, + "[Not an authority]"); + + tt_str_op(authdir_type_to_string(V3_DIRINFO), OP_EQ, "V3"); + tt_str_op(authdir_type_to_string(BRIDGE_DIRINFO), OP_EQ, "Bridge"); + tt_str_op(authdir_type_to_string( + V3_DIRINFO | BRIDGE_DIRINFO | EXTRAINFO_DIRINFO), OP_EQ, + "V3, Bridge"); + done: ; +} + +static void +test_dir_conn_purpose_to_string(void *data) +{ + (void)data; + +#define EXPECT_CONN_PURPOSE(purpose, expected) \ + tt_str_op(dir_conn_purpose_to_string(purpose), OP_EQ, expected); + + EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_DIR, "server descriptor upload"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_VOTE, "server vote upload"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_SIGNATURES, + "consensus signature upload"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_SERVERDESC, "server descriptor fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_EXTRAINFO, "extra-info fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_CONSENSUS, + "consensus network-status fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_CERTIFICATE, "authority cert fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_STATUS_VOTE, "status vote fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES, + "consensus signature fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_RENDDESC_V2, + "hidden-service v2 descriptor fetch"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_UPLOAD_RENDDESC_V2, + "hidden-service v2 descriptor upload"); + EXPECT_CONN_PURPOSE(DIR_PURPOSE_FETCH_MICRODESC, "microdescriptor fetch"); + EXPECT_CONN_PURPOSE(1024, "(unknown)"); + + done: ; +} + +NS_DECL(int, +public_server_mode, (const or_options_t *options)); + +static int +NS(public_server_mode)(const or_options_t *options) +{ + (void)options; + + if (CALLED(public_server_mode)++ == 0) { + return 1; + } + + return 0; +} + +static void +test_dir_should_use_directory_guards(void *data) +{ + or_options_t *options; + char *errmsg = NULL; + (void)data; + + NS_MOCK(public_server_mode); + + options = options_new(); + options_init(options); + + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 1); + + options->UseEntryGuardsAsDirGuards = 1; + options->UseEntryGuards = 1; + options->DownloadExtraInfo = 0; + options->FetchDirInfoEarly = 0; + options->FetchDirInfoExtraEarly = 0; + options->FetchUselessDescriptors = 0; + tt_int_op(should_use_directory_guards(options), OP_EQ, 1); + tt_int_op(CALLED(public_server_mode), OP_EQ, 2); + + options->UseEntryGuards = 0; + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 3); + options->UseEntryGuards = 1; + + options->UseEntryGuardsAsDirGuards = 0; + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 4); + options->UseEntryGuardsAsDirGuards = 1; + + options->DownloadExtraInfo = 1; + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 5); + options->DownloadExtraInfo = 0; + + options->FetchDirInfoEarly = 1; + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 6); + options->FetchDirInfoEarly = 0; + + options->FetchDirInfoExtraEarly = 1; + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 7); + options->FetchDirInfoExtraEarly = 0; + + options->FetchUselessDescriptors = 1; + tt_int_op(should_use_directory_guards(options), OP_EQ, 0); + tt_int_op(CALLED(public_server_mode), OP_EQ, 8); + options->FetchUselessDescriptors = 0; + + done: + NS_UNMOCK(public_server_mode); + tor_free(options); + tor_free(errmsg); +} + +NS_DECL(void, +directory_initiate_command_routerstatus, (const routerstatus_t *status, + uint8_t dir_purpose, + uint8_t router_purpose, + dir_indirection_t indirection, + const char *resource, + const char *payload, + size_t payload_len, + time_t if_modified_since)); + +static void +test_dir_should_not_init_request_to_ourselves(void *data) +{ + char digest[DIGEST_LEN]; + dir_server_t *ourself = NULL; + crypto_pk_t *key = pk_generate(2); + (void) data; + + NS_MOCK(directory_initiate_command_routerstatus); + + clear_dir_servers(); + routerlist_free_all(); + + set_server_identity_key(key); + crypto_pk_get_digest(key, (char*) &digest); + ourself = trusted_dir_server_new("ourself", "127.0.0.1", 9059, 9060, digest, + NULL, V3_DIRINFO, 1.0); + + tt_assert(ourself); + dir_server_add(ourself); + + directory_get_from_all_authorities(DIR_PURPOSE_FETCH_STATUS_VOTE, 0, NULL); + tt_int_op(CALLED(directory_initiate_command_routerstatus), OP_EQ, 0); + + directory_get_from_all_authorities(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES, 0, + NULL); + + tt_int_op(CALLED(directory_initiate_command_routerstatus), OP_EQ, 0); + + done: + NS_UNMOCK(directory_initiate_command_routerstatus); + clear_dir_servers(); + routerlist_free_all(); + crypto_pk_free(key); +} + +static void +test_dir_should_not_init_request_to_dir_auths_without_v3_info(void *data) +{ + dir_server_t *ds = NULL; + dirinfo_type_t dirinfo_type = BRIDGE_DIRINFO | EXTRAINFO_DIRINFO \ + | MICRODESC_DIRINFO; + (void) data; + + NS_MOCK(directory_initiate_command_routerstatus); + + clear_dir_servers(); + routerlist_free_all(); + + ds = trusted_dir_server_new("ds", "10.0.0.1", 9059, 9060, + "12345678901234567890", NULL, dirinfo_type, 1.0); + tt_assert(ds); + dir_server_add(ds); + + directory_get_from_all_authorities(DIR_PURPOSE_FETCH_STATUS_VOTE, 0, NULL); + tt_int_op(CALLED(directory_initiate_command_routerstatus), OP_EQ, 0); + + directory_get_from_all_authorities(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES, 0, + NULL); + tt_int_op(CALLED(directory_initiate_command_routerstatus), OP_EQ, 0); + + done: + NS_UNMOCK(directory_initiate_command_routerstatus); + clear_dir_servers(); + routerlist_free_all(); +} + +static void +test_dir_should_init_request_to_dir_auths(void *data) +{ + dir_server_t *ds = NULL; + (void) data; + + NS_MOCK(directory_initiate_command_routerstatus); + + clear_dir_servers(); + routerlist_free_all(); + + ds = trusted_dir_server_new("ds", "10.0.0.1", 9059, 9060, + "12345678901234567890", NULL, V3_DIRINFO, 1.0); + tt_assert(ds); + dir_server_add(ds); + + directory_get_from_all_authorities(DIR_PURPOSE_FETCH_STATUS_VOTE, 0, NULL); + tt_int_op(CALLED(directory_initiate_command_routerstatus), OP_EQ, 1); + + directory_get_from_all_authorities(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES, 0, + NULL); + tt_int_op(CALLED(directory_initiate_command_routerstatus), OP_EQ, 2); + + done: + NS_UNMOCK(directory_initiate_command_routerstatus); + clear_dir_servers(); + routerlist_free_all(); +} + +void +NS(directory_initiate_command_routerstatus)(const routerstatus_t *status, + uint8_t dir_purpose, + uint8_t router_purpose, + dir_indirection_t indirection, + const char *resource, + const char *payload, + size_t payload_len, + time_t if_modified_since) +{ + CALLED(directory_initiate_command_routerstatus)++; +} + +static void +test_dir_choose_compression_level(void* data) +{ + (void)data; + + /* It starts under_memory_pressure */ + tt_int_op(have_been_under_memory_pressure(), OP_EQ, 1); + + tt_assert(HIGH_COMPRESSION == choose_compression_level(-1)); + tt_assert(LOW_COMPRESSION == choose_compression_level(1024-1)); + tt_assert(MEDIUM_COMPRESSION == choose_compression_level(2048-1)); + tt_assert(HIGH_COMPRESSION == choose_compression_level(2048)); + + /* Reset under_memory_pressure timer */ + cell_queues_check_size(); + tt_int_op(have_been_under_memory_pressure(), OP_EQ, 0); + + tt_assert(HIGH_COMPRESSION == choose_compression_level(-1)); + tt_assert(HIGH_COMPRESSION == choose_compression_level(1024-1)); + tt_assert(HIGH_COMPRESSION == choose_compression_level(2048-1)); + tt_assert(HIGH_COMPRESSION == choose_compression_level(2048)); + + done: ; +} + +static void +test_dir_find_dl_schedule_and_len(void* data) +{ + download_status_t dls; + smartlist_t server, client, server_cons, client_cons, bridge; + (void)data; + + mock_options = malloc(sizeof(or_options_t)); + reset_options(mock_options, &mock_get_options_calls); + MOCK(get_options, mock_get_options); + + mock_options->TestingServerDownloadSchedule = &server; + mock_options->TestingClientDownloadSchedule = &client; + mock_options->TestingServerConsensusDownloadSchedule = &server_cons; + mock_options->TestingClientConsensusDownloadSchedule = &client_cons; + mock_options->TestingBridgeDownloadSchedule = &bridge; + + dls.schedule = DL_SCHED_GENERIC; + tt_ptr_op(find_dl_schedule_and_len(&dls, 0), OP_EQ, &client); + tt_ptr_op(find_dl_schedule_and_len(&dls, 1), OP_EQ, &server); + + dls.schedule = DL_SCHED_CONSENSUS; + tt_ptr_op(find_dl_schedule_and_len(&dls, 0), OP_EQ, &client_cons); + tt_ptr_op(find_dl_schedule_and_len(&dls, 1), OP_EQ, &server_cons); + + dls.schedule = DL_SCHED_BRIDGE; + tt_ptr_op(find_dl_schedule_and_len(&dls, 0), OP_EQ, &bridge); + tt_ptr_op(find_dl_schedule_and_len(&dls, 1), OP_EQ, &bridge); + + done: + UNMOCK(get_options); +} + #define DIR_LEGACY(name) \ { #name, test_dir_ ## name , TT_FORK, NULL, NULL } @@ -3525,6 +3853,14 @@ struct testcase_t dir_tests[] = { DIR(purpose_needs_anonymity, 0), DIR(fetch_type, 0), DIR(packages, 0), + DIR(authdir_type_to_string, 0), + DIR(conn_purpose_to_string, 0), + DIR(should_use_directory_guards, 0), + DIR(should_not_init_request_to_ourselves, TT_FORK), + DIR(should_not_init_request_to_dir_auths_without_v3_info, 0), + DIR(should_init_request_to_dir_auths, 0), + DIR(choose_compression_level, 0), + DIR(find_dl_schedule_and_len, 0), END_OF_TESTCASES };

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Jan '16

15 Jan '16

commit 0801062220719bdf2e370dbefaa89093d3bdfc14 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 15 16:15:03 2016 +0000 Update translations for bridgedb --- mr/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po index 9494be5..a1110cf 100644 --- a/mr/LC_MESSAGES/bridgedb.po +++ b/mr/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-01-15 15:44+0000\n" +"PO-Revision-Date: 2016-01-15 15:47+0000\n" "Last-Translator: Vikrant Korde <vikrant.korde(a)gmail.com>\n" "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n" "MIME-Version: 1.0\n" @@ -187,7 +187,7 @@ msgstr "ब्रिज DB मध्ये आपले स्वागत आ #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "समर्थित वाहतूक प्रकार :" #: bridgedb/strings.py:56 #, python-format @@ -356,14 +356,14 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "हा संदेश दाखवतो." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "सध्या ब्रिजची विनंती." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges."

1 0

[tor/master] Changes file for feature 17076
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit d3e7803c1cd8f40d929729d771ed2565710291ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 15 10:59:28 2016 -0500 Changes file for feature 17076 --- changes/feature17076 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/feature17076 b/changes/feature17076 new file mode 100644 index 0000000..50ebc96 --- /dev/null +++ b/changes/feature17076 @@ -0,0 +1,3 @@ + o Testing: + - New tests for options_validate. Closes ticket 17076. Patch from + Ola Bini.

1 0

[tor/master] Revert my addition of callback cleaner and instead use existing functionality for temporary log files
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit 5c1c117b8ecae53ded15773ffa78da26757b7fe3 Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 12 15:39:49 2016 -0500 Revert my addition of callback cleaner and instead use existing functionality for temporary log files --- src/common/log.c | 25 +------------------------ src/common/torlog.h | 1 - src/test/test_options.c | 3 ++- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/common/log.c b/src/common/log.c index 02ad714..e0bfcf8 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -889,29 +889,6 @@ add_temp_log(int min_severity) UNLOCK_LOGS(); } -#define CALLBACK_FILENAME "<callback>" - -/** - * Removes the latest log handler added, if that log handler is a callback - * handler. - */ -void -remove_log_callback(void) -{ - if(logfiles && !strcmp(logfiles->filename, CALLBACK_FILENAME)) { - logfile_t *lf = logfiles; - - LOCK_LOGS(); - logfiles = lf->next; - log_global_min_severity_ = get_min_log_level(); - UNLOCK_LOGS(); - - tor_free(lf->filename); - tor_free(lf->severities); - tor_free(lf); - } -} - /** * Add a log handler to send messages in severity * to the function cb. @@ -923,7 +900,7 @@ add_callback_log(const log_severity_list_t *severity, log_callback cb) lf = tor_malloc_zero(sizeof(logfile_t)); lf->fd = -1; lf->severities = tor_memdup(severity, sizeof(log_severity_list_t)); - lf->filename = tor_strdup(CALLBACK_FILENAME); + lf->filename = tor_strdup("<callback>"); lf->callback = cb; lf->next = logfiles; diff --git a/src/common/torlog.h b/src/common/torlog.h index f72263c..53e3984 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -138,7 +138,6 @@ int add_file_log(const log_severity_list_t *severity, const char *filename, int add_syslog_log(const log_severity_list_t *severity, const char* syslog_identity_tag); #endif -void remove_log_callback(void); int add_callback_log(const log_severity_list_t *severity, log_callback cb); void logs_set_domain_logging(int enabled); int get_min_log_level(void); diff --git a/src/test/test_options.c b/src/test/test_options.c index 76e9bda..693b3da 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -50,6 +50,7 @@ setup_log_callback(void) lst.masks[LOG_WARN - LOG_ERR] = ~0; lst.masks[LOG_NOTICE - LOG_ERR] = ~0; add_callback_log(&lst, log_cback); + mark_logs_temp(); } static char * @@ -200,7 +201,7 @@ test_options_validate(void *arg) "We're a bridge but DirCache is disabled."); clear_log_messages(); - remove_log_callback(); + close_temp_logs(); return; }

1 0

[tor/master] Move clearing of log messages on advice from @cypherpunks, in order to minimize risk of race conditions leading to another memory leak
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit 6d5215fd19a2e6e28442a32311c8542358fa2c1d Author: Ola Bini <ola(a)olabini.se> Date: Tue Jan 12 16:32:54 2016 -0500 Move clearing of log messages on advice from @cypherpunks, in order to minimize risk of race conditions leading to another memory leak --- src/test/test_options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 693b3da..85b0983 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -200,8 +200,8 @@ test_options_validate(void *arg) WANT_ERR("BridgeRelay 1\nDirCache 0", "We're a bridge but DirCache is disabled."); - clear_log_messages(); close_temp_logs(); + clear_log_messages(); return; }

1 0

[tor/master] Update tests to match current changes to options_validate
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit 1722232d78c61238c72a3944b9d1baf5c7792462 Author: Ola Bini <ola(a)olabini.se> Date: Wed Jan 13 10:54:08 2016 -0500 Update tests to match current changes to options_validate --- src/test/test_options.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 85b0983..18e3e91 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -306,7 +306,10 @@ fixed_get_uname(void) } #define TEST_OPTIONS_OLD_VALUES "TestingV3AuthInitialVotingInterval 1800\n" \ - "TestingV3AuthInitialVoteDelay 300\n" \ + "TestingClientBootstrapConsensusMaxDownloadTries 7\n" \ + "TestingClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 4\n" \ + "TestingClientBootstrapConsensusMaxInProgressTries 3\n" \ + "TestingV3AuthInitialVoteDelay 300\n" \ "TestingV3AuthInitialDistDelay 300\n" \ "TestingClientMaxIntervalWithoutRequest 600\n" \ "TestingDirConnectionMaxStall 600\n" \ @@ -1997,7 +2000,8 @@ test_options_validate__publish_server_descriptor(void *ignored) char *msg; int previous_log = setup_capture_of_logs(LOG_WARN); options_test_data_t *tdata = get_options_test_data( - "PublishServerDescriptor bridge\n" TEST_OPTIONS_DEFAULT_VALUES); + "PublishServerDescriptor bridge\n" TEST_OPTIONS_DEFAULT_VALUES + ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); @@ -2652,7 +2656,7 @@ test_options_validate__accounting(void *ignored) ); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "AccountingRule must be 'sum' or 'max'"); + tt_str_op(msg, OP_EQ, "AccountingRule must be 'sum', 'max', 'in', or 'out'"); tor_free(msg); free_options_test_data(tdata); @@ -3332,6 +3336,7 @@ test_options_validate__families(void *ignored) "BandwidthRate 51300\n" "BandwidthBurst 51300\n" "MaxAdvertisedBandwidth 25700\n" + "DirCache 1\n" ); mock_clean_saved_logs(); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -3675,6 +3680,7 @@ test_options_validate__constrained_sockets(void *ignored) "ConstrainedSockets 1\n" "ConstrainedSockSize 2048\n" "DirPort 999\n" + "DirCache 1\n" ); mock_clean_saved_logs(); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -4048,8 +4054,9 @@ test_options_validate__testing_options(void *ignored) "is way too low."); TEST_TESTING_OPTION(TestingDirConnectionMaxStall, 1, 3601, "is way too low."); + // TODO: I think this points to a bug/regression in options_validate TEST_TESTING_OPTION(TestingConsensusMaxDownloadTries, 1, 801, - "must be greater than 1."); + "must be greater than 2."); TEST_TESTING_OPTION(TestingDescriptorMaxDownloadTries, 1, 801, "must be greater than 1."); TEST_TESTING_OPTION(TestingMicrodescMaxDownloadTries, 1, 801,

1 0

[tor/master] Whitespace cleanup
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit f47d4af04cdf5db86a298c25203f1600c23cb58d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 15 10:57:03 2016 -0500 Whitespace cleanup --- src/common/compat.h | 1 + src/common/log.c | 1 + src/common/torlog.h | 1 + src/test/log_test_helpers.c | 1 + src/test/log_test_helpers.h | 1 + src/test/test_crypto.c | 1 - src/test/test_options.c | 1 + 7 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/compat.h b/src/common/compat.h index 0717ed3..8f35dfd 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -708,3 +708,4 @@ ssize_t tor_getpass(const char *prompt, char *output, size_t buflen); #include "compat_threads.h" #endif + diff --git a/src/common/log.c b/src/common/log.c index e0bfcf8..4a8a7b1 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -1378,3 +1378,4 @@ truncate_logs(void) } } } + diff --git a/src/common/torlog.h b/src/common/torlog.h index 53e3984..3e86678 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -241,3 +241,4 @@ MOCK_DECL(STATIC void, logv, (int severity, log_domain_mask_t domain, # define TOR_TORLOG_H #endif + diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c index 7831ecc..51b5f9b 100644 --- a/src/test/log_test_helpers.c +++ b/src/test/log_test_helpers.c @@ -108,3 +108,4 @@ mock_saving_logv(int severity, log_domain_mask_t domain, saved_logs = smartlist_new(); smartlist_add(saved_logs, e); } + diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 4822ce5..af8e8a6 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -28,3 +28,4 @@ int mock_saved_severity_at(int ix); int mock_saved_log_number(void); #endif + diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index b3e0e1b..fb21f3a 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1734,7 +1734,6 @@ static const struct testcase_setup_t ed25519_test_setup = { ed25519_testcase_setup, ed25519_testcase_cleanup }; - static void test_crypto_ed25519_simple(void *arg) { diff --git a/src/test/test_options.c b/src/test/test_options.c index 18e3e91..a8b0ba9 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -4289,3 +4289,4 @@ struct testcase_t options_tests[] = { LOCAL_VALIDATE_TEST(accel), END_OF_TESTCASES /* */ }; +

1 0

[tor/master] Merge remote-tracking branch 'twstrike/options_test'
by nickm＠torproject.org 15 Jan '16

15 Jan '16

commit 00b13cb09170e5144516698429c29975abe2de10 Merge: d748c19 1722232 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 15 10:52:27 2016 -0500 Merge remote-tracking branch 'twstrike/options_test' src/common/compat.c | 3 +- src/common/compat.h | 3 +- src/common/log.c | 1 - src/common/torlog.h | 1 - src/test/log_test_helpers.c | 1 - src/test/log_test_helpers.h | 1 - src/test/test_options.c | 4026 ++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 4023 insertions(+), 13 deletions(-)

1 0