tor-commits June 2016

tor-commits@lists.torproject.org

20 participants
1204 discussions

[tor/master] Make sure that our tests expect the windows path separator as needed
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 64ee7bcd0c8e154269145b626a7cd56b9d6264a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 18:26:44 2016 -0400 Make sure that our tests expect the windows path separator as needed --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 9b6d5ff..a97ac7c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4948,7 +4948,7 @@ test_dir_populate_dump_desc_fifo(void *data) fname = "unparseable-desc." "DF0981323F3A70D02B55AB54B44B04F287D72F7B72F242E85C8CB0EDA8854A99"; - tor_asprintf(&expected_filename, "%s/%s", dirname, fname); + tor_asprintf(&expected_filename, "%s%s%s", dirname, PATH_SEPARATOR, fname); file_content = tor_strdup("hanc culpam maiorem an illam dicam?"); file_content_len = strlen(file_content); file_stat.st_mtime = 123456; @@ -4964,7 +4964,7 @@ test_dir_populate_dump_desc_fifo(void *data) fname = "unparseable-desc." "0786C7173447B7FB033FFCA2FC47C3CF71C30DD47CA8236D3FC7FF35853271C6"; - tor_asprintf(&expected_filename, "%s/%s", dirname, fname); + tor_asprintf(&expected_filename, "%s%s%s", dirname, PATH_SEPARATOR, fname); file_content = tor_strdup("hanc culpam maiorem an illam dicam?"); file_content_len = strlen(file_content); file_stat.st_mtime = 789012;

1 0

[tor/master] Set binary mode when checking malformed descriptor.
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 69e22e294ba903be420888db92440d2ae2ec48c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 18:23:58 2016 -0400 Set binary mode when checking malformed descriptor. --- src/or/routerparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 63397b5..106110e 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -875,7 +875,7 @@ dump_desc_populate_one_file, (const char *dirname, const char *f)) * file contains a '\0', read_file_to_str() will allocate space for and * read the entire file and return the correct size in st. */ - desc = read_file_to_str(path, RFTS_IGNORE_MISSING, &st); + desc = read_file_to_str(path, RFTS_IGNORE_MISSING|RFTS_BIN, &st); if (!desc) { /* We couldn't read it */ log_notice(LD_DIR,

1 0

[tor/master] One more tt_u64_op
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 889cfac676599f02ad2bd1abe0c9fd6ab08821b4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 16:46:53 2016 -0400 One more tt_u64_op --- 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 fe8dbdd..9b6d5ff 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4353,7 +4353,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /*

1 0

[tor/master] fix naked memcmps
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit b750a77e3fc16cc670d89be1d1ed4d278d4ca989 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 15:34:16 2016 -0400 fix naked memcmps --- src/or/dirserv.c | 4 ++-- src/or/entrynodes.c | 2 +- src/or/routerparse.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e616373..64ebde6 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2062,8 +2062,8 @@ routers_make_ed_keys_unique(smartlist_t *routers) const time_t ri2_pub = ri2->cache_info.published_on; if (ri2_pub < ri_pub || (ri2_pub == ri_pub && - memcmp(ri->cache_info.signed_descriptor_digest, - ri2->cache_info.signed_descriptor_digest,DIGEST_LEN)<0)) { + fast_memcmp(ri->cache_info.signed_descriptor_digest, + ri2->cache_info.signed_descriptor_digest,DIGEST_LEN)<0)) { digest256map_set(by_ed_key, pk, ri); ri2->omit_from_vote = 1; } else { diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 17507fe..6990bcd 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2452,7 +2452,7 @@ get_bridge_dl_status_by_id, (const char *digest)) if (digest && get_options()->UseBridges && bridge_list) { SMARTLIST_FOREACH_BEGIN(bridge_list, bridge_info_t *, b) { - if (memcmp(digest, b->identity, DIGEST_LEN) == 0) { + if (tor_memeq(digest, b->identity, DIGEST_LEN)) { dl = &(b->fetch_status); break; } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 13ffaf9..63397b5 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -773,7 +773,7 @@ dump_desc_fifo_bump_hash(const uint8_t *digest_sha256) /* Find a match if one exists */ SMARTLIST_FOREACH_BEGIN(descs_dumped, dumped_desc_t *, ent) { if (ent && - memcmp(ent->digest_sha256, digest_sha256, DIGEST256_LEN) == 0) { + tor_memeq(ent->digest_sha256, digest_sha256, DIGEST256_LEN)) { /* * Save a pointer to the match and remove it from its current * position. @@ -919,7 +919,7 @@ dump_desc_populate_one_file, (const char *dirname, const char *f)) } /* Compare the digests */ - if (memcmp(digest, content_digest, DIGEST256_LEN) != 0) { + if (tor_memneq(digest, content_digest, DIGEST256_LEN)) { /* No match */ log_info(LD_DIR, "Hash of %s from unparseable descriptors directory didn't "

1 0

[tor/master] use tt_u64_op for comparing len_descs_dumped
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 591078c76df4c7bdcfabba0a76c311f5f0b33950 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 15:34:36 2016 -0400 use tt_u64_op for comparing len_descs_dumped --- src/test/test_dir.c | 56 ++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 98823c7..fe8dbdd 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4326,7 +4326,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -4339,7 +4339,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_1)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_1)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4374,7 +4374,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_2)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_2)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4390,7 +4390,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_3)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_3)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4404,7 +4404,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -4425,7 +4425,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_4)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_4)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4441,7 +4441,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_4) + strlen(test_desc_1)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_4) + strlen(test_desc_1)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4457,7 +4457,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_1) + strlen(test_desc_2)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_1) + strlen(test_desc_2)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4471,7 +4471,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -4492,7 +4492,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_3)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_3)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4508,7 +4508,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4524,7 +4524,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4538,7 +4538,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -4559,7 +4559,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_1)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_1)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4575,7 +4575,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_1) + strlen(test_desc_2)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_1) + strlen(test_desc_2)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4591,7 +4591,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_1) + strlen(test_desc_2)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_1) + strlen(test_desc_2)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4605,7 +4605,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -4626,7 +4626,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_3)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_3)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4642,7 +4642,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4658,7 +4658,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_3) + strlen(test_desc_4)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4674,7 +4674,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_4) + strlen(test_desc_1)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_4) + strlen(test_desc_1)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4688,7 +4688,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -4709,7 +4709,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_2)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_2)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 1); /* @@ -4725,7 +4725,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_3)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_3)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4741,7 +4741,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_3)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_3)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4757,7 +4757,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* * Assert things about the FIFO state */ - tt_int_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_4)); + tt_u64_op(len_descs_dumped, ==, strlen(test_desc_2) + strlen(test_desc_4)); tt_assert(descs_dumped != NULL && smartlist_len(descs_dumped) == 2); /* @@ -4771,7 +4771,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Reset the FIFO and check its state */ dump_desc_fifo_cleanup(); - tt_int_op(len_descs_dumped, ==, 0); + tt_u64_op(len_descs_dumped, ==, 0); tt_assert(descs_dumped == NULL || smartlist_len(descs_dumped) == 0); /* @@ -5068,7 +5068,7 @@ test_dir_populate_dump_desc_fifo_2(void *data) dump_desc_populate_fifo_from_directory("d"); tt_assert(descs_dumped != NULL); tt_int_op(smartlist_len(descs_dumped), OP_EQ, 3); - tt_int_op(len_descs_dumped, OP_EQ, 1368); + tt_u64_op(len_descs_dumped, OP_EQ, 1368); ent = smartlist_get(descs_dumped, 0); tt_str_op(ent->filename, OP_EQ, "d/bar"); tt_int_op(ent->len, OP_EQ, 456);

1 0

[meek/master] Make project ID consistent in appengine README.
by dcf＠torproject.org 30 Jun '16

30 Jun '16

commit b186d19929b478e426213cf020b5df56a5512b08 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 30 11:48:06 2016 -0700 Make project ID consistent in appengine README. --- appengine/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/README b/appengine/README index 895b542..f819d24 100644 --- a/appengine/README +++ b/appengine/README @@ -21,5 +21,5 @@ to deploy it you run To configure meek-client to talk to the App Engine app, give the app's name as the url and "www.google.com" as the front domain. UseBridges 1 - Bridge meek 0.0.2.0:1 url=https://yourapphere.appspot.com/ front=www.google.com + Bridge meek 0.0.2.0:1 url=https://example.appspot.com/ front=www.google.com ClientTransportPlugin meek exec ./meek-client --log meek-client.log

1 0

[atlas/master] Fix Trac 'Report a bug' link
by phw＠torproject.org 30 Jun '16

30 Jun '16

commit 6c11ce4e37c00c6ec920281363e42681d5c234ac Author: Ivan Markin <twim(a)riseup.net> Date: Thu Jun 30 18:33:15 2016 +0000 Fix Trac 'Report a bug' link --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 5588c23..ad18030 100644 --- a/index.html +++ b/index.html @@ -63,7 +63,7 @@ The Tor Project - <div style="display: inline" id="year"></div><br/> <a href="#about">About</a> - <a href="https://gitweb.torproject.org/atlas.git">Source code</a> - - <a href="https://trac.torproject.org/projects/tor/newticket?component=Atlas">Report a bug</a> + <a href="https://trac.torproject.org/projects/tor/newticket?component=Metrics/Atlas">Report a bug</a> - <a href="mailto:art@torproject.org">Contact</a> </footer>

1 0

[meek/master] Remove "application: meek-reflect" from app.yaml.
by dcf＠torproject.org 30 Jun '16

30 Jun '16

commit 72ad7acb085ac253579f315214462a93fdf109c2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 30 11:33:09 2016 -0700 Remove "application: meek-reflect" from app.yaml. A better way to do this is with the -application flag to goapp. --- appengine/README | 6 +++--- appengine/app.yaml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/appengine/README b/appengine/README index 61e4907..895b542 100644 --- a/appengine/README +++ b/appengine/README @@ -15,9 +15,9 @@ meek-client to talk to the locally running app, put this in torrc: ClientTransportPlugin meek exec ./meek-client --log meek-client.log To deploy to App Engine, create a Google Account and use it to create a -new app with a unique name. Edit the "application:" line of app.yaml to -refer to your app's name. Run - go_appengine/goapp deploy +new app with a unique name. Let's say your app is called "example". Then +to deploy it you run + go_appengine/goapp deploy -application example To configure meek-client to talk to the App Engine app, give the app's name as the url and "www.google.com" as the front domain. UseBridges 1 diff --git a/appengine/app.yaml b/appengine/app.yaml index 82e0631..184eb35 100644 --- a/appengine/app.yaml +++ b/appengine/app.yaml @@ -1,4 +1,3 @@ -application: meek-reflect version: 1 runtime: go api_version: go1

1 0

[tor/master] Fix more naked strdup/malloc/free instances
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 2713de2a47f652f1d0637df7b9b02b6ec039a8f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 14:36:31 2016 -0400 Fix more naked strdup/malloc/free instances --- src/or/config.c | 8 ++++---- src/test/test_dir.c | 20 ++++++++++---------- src/test/test_dir_handle_get.c | 2 +- src/test/test_policy.c | 2 +- src/test/test_rendcache.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 18ee979..45acd39 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2075,7 +2075,7 @@ config_parse_commandline(int argc, char **argv, int ignore_errors, if (want_arg == ARGUMENT_NECESSARY && is_last) { if (ignore_errors) { - arg = strdup(""); + arg = tor_strdup(""); } else { log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.", argv[i]); @@ -4125,11 +4125,11 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem, if (options->DirCache) { if (total_mem < DIRCACHE_MIN_BANDWIDTH) { if (options->BridgeRelay) { - *msg = strdup("Running a Bridge with less than " + *msg = tor_strdup("Running a Bridge with less than " STRINGIFY(DIRCACHE_MIN_MB_BANDWIDTH) " MB of memory is " "not recommended."); } else { - *msg = strdup("Being a directory cache (default) with less than " + *msg = tor_strdup("Being a directory cache (default) with less than " STRINGIFY(DIRCACHE_MIN_MB_BANDWIDTH) " MB of memory is " "not recommended and may consume most of the available " "resources, consider disabling this functionality by " @@ -4138,7 +4138,7 @@ have_enough_mem_for_dircache(const or_options_t *options, size_t total_mem, } } else { if (total_mem >= DIRCACHE_MIN_BANDWIDTH) { - *msg = strdup("DirCache is disabled and we are configured as a " + *msg = tor_strdup("DirCache is disabled and we are configured as a " "relay. This may disqualify us from becoming a guard in the " "future."); } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 576b4e4..98823c7 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2849,7 +2849,7 @@ test_dir_dirserv_set_routerstatus_testing(void *arg) (void)arg; /* Init options */ - mock_options = malloc(sizeof(or_options_t)); + mock_options = tor_malloc(sizeof(or_options_t)); reset_options(mock_options, &mock_get_options_calls); MOCK(get_options, mock_get_options); @@ -2867,10 +2867,10 @@ test_dir_dirserv_set_routerstatus_testing(void *arg) routerset_parse(routerset_none, ROUTERSET_NONE_STR, "No routers"); /* Init routerstatuses */ - routerstatus_t *rs_a = malloc(sizeof(routerstatus_t)); + routerstatus_t *rs_a = tor_malloc(sizeof(routerstatus_t)); reset_routerstatus(rs_a, ROUTER_A_ID_STR, ROUTER_A_IPV4); - routerstatus_t *rs_b = malloc(sizeof(routerstatus_t)); + routerstatus_t *rs_b = tor_malloc(sizeof(routerstatus_t)); reset_routerstatus(rs_b, ROUTER_B_ID_STR, ROUTER_B_IPV4); /* Sanity check that routersets correspond to routerstatuses. @@ -3055,7 +3055,7 @@ test_dir_dirserv_set_routerstatus_testing(void *arg) tt_assert(rs_b->is_hs_dir == 1); done: - free(mock_options); + tor_free(mock_options); mock_options = NULL; UNMOCK(get_options); @@ -3064,8 +3064,8 @@ test_dir_dirserv_set_routerstatus_testing(void *arg) routerset_free(routerset_a); routerset_free(routerset_none); - free(rs_a); - free(rs_b); + tor_free(rs_a); + tor_free(rs_b); } static void @@ -4282,7 +4282,7 @@ test_dir_dump_unparseable_descriptors(void *data) * Set up options mock so we can force a tiny FIFO size and generate * cleanups. */ - mock_options = malloc(sizeof(or_options_t)); + mock_options = tor_malloc(sizeof(or_options_t)); reset_options(mock_options, &mock_get_options_calls); mock_options->MaxUnparseableDescSizeToLog = 1536; MOCK(get_options, mock_get_options); @@ -4795,7 +4795,7 @@ test_dir_dump_unparseable_descriptors(void *data) UNMOCK(options_get_datadir_fname2_suffix); UNMOCK(check_private_dir); UNMOCK(get_options); - free(mock_options); + tor_free(mock_options); mock_options = NULL; return; @@ -5142,7 +5142,7 @@ test_dir_find_dl_schedule(void* data) smartlist_t client_boot_auth_only_cons, client_boot_auth_cons; smartlist_t client_boot_fallback_cons, bridge; - mock_options = malloc(sizeof(or_options_t)); + mock_options = tor_malloc(sizeof(or_options_t)); reset_options(mock_options, &mock_get_options_calls); MOCK(get_options, mock_get_options); @@ -5251,7 +5251,7 @@ test_dir_find_dl_schedule(void* data) UNMOCK(networkstatus_consensus_is_bootstrapping); UNMOCK(networkstatus_consensus_can_use_extra_fallbacks); UNMOCK(get_options); - free(mock_options); + tor_free(mock_options); mock_options = NULL; } diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 927fa8b..3282037 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -467,7 +467,7 @@ static or_options_t *mock_options = NULL; static void init_mock_options(void) { - mock_options = malloc(sizeof(or_options_t)); + mock_options = tor_malloc(sizeof(or_options_t)); memset(mock_options, 0, sizeof(or_options_t)); mock_options->TestingTorNetwork = 1; } diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 913a2f3..14182af 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -804,7 +804,7 @@ mock_get_interface_address6_list(int severity, tt_assert(template_list); SMARTLIST_FOREACH_BEGIN(template_list, tor_addr_t *, src_addr) { - tor_addr_t *dest_addr = malloc(sizeof(tor_addr_t)); + tor_addr_t *dest_addr = tor_malloc(sizeof(tor_addr_t)); memset(dest_addr, 0, sizeof(*dest_addr)); tor_addr_copy_tight(dest_addr, src_addr); smartlist_add(clone_list, dest_addr); diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index c8279fc..e210e05 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -971,7 +971,7 @@ test_rend_cache_entry_free(void *data) // Handles non-NULL descriptor correctly e = tor_malloc_zero(sizeof(rend_cache_entry_t)); - e->desc = (char *)malloc(10); + e->desc = tor_malloc(10); rend_cache_entry_free(e); /* done: */

1 0

[tor/master] Avoid naked strdups in test_dir.c
by nickm＠torproject.org 30 Jun '16

30 Jun '16

commit 9a92f582191e76039b639ef29167a05563623d0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 30 14:30:28 2016 -0400 Avoid naked strdups in test_dir.c --- src/test/test_dir.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 8c708f0..576b4e4 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4148,9 +4148,9 @@ mock_get_datadir_fname(const or_options_t *options, /* Just duplicate the basename and return it for this mock */ if (sub2) { /* If we have sub2, it's the basename, otherwise sub1 */ - rv = strdup(sub2); + rv = tor_strdup(sub2); } else { - rv = strdup(sub1); + rv = tor_strdup(sub1); } done: @@ -5024,13 +5024,13 @@ pop_one_mock(const char *dirname, const char *f) if (dirname != NULL && strcmp(dirname, "d") == 0) { if (f != NULL && strcmp(f, "foo") == 0) { ent = tor_malloc_zero(sizeof(*ent)); - ent->filename = strdup("d/foo"); + ent->filename = tor_strdup("d/foo"); ent->len = 123; ent->digest_sha256[0] = 1; ent->when = 1024; } else if (f != NULL && strcmp(f, "bar") == 0) { ent = tor_malloc_zero(sizeof(*ent)); - ent->filename = strdup("d/bar"); + ent->filename = tor_strdup("d/bar"); ent->len = 456; ent->digest_sha256[0] = 2; /* @@ -5040,7 +5040,7 @@ pop_one_mock(const char *dirname, const char *f) ent->when = 512; } else if (f != NULL && strcmp(f, "baz") == 0) { ent = tor_malloc_zero(sizeof(*ent)); - ent->filename = strdup("d/baz"); + ent->filename = tor_strdup("d/baz"); ent->len = 789; ent->digest_sha256[0] = 3; ent->when = 768;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2016