June 2011 - tor-commits - lists.torproject.org

[tor/master] Prefer tt_assert in unit tests, not tor_assert
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit b2e7c356dbbf746b263f56fbc7e808c71dd7264e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 20:33:53 2011 -0400 Prefer tt_assert in unit tests, not tor_assert --- changes/prefer_tt_assert | 4 ++++ src/test/test_crypto.c | 24 ++++++++++++------------ src/test/test_dir.c | 4 ++-- src/test/test_util.c | 22 +++++++++++----------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/changes/prefer_tt_assert b/changes/prefer_tt_assert new file mode 100644 index 0000000..4fdb636 --- /dev/null +++ b/changes/prefer_tt_assert @@ -0,0 +1,4 @@ + o Code simplifications and refactoring (tests): + - Use tt_assert, not tor_assert, for checking for test failures. + This makes the unit tests more able to go on in the event that + one of them fails. diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 121af27..dca0d3a 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -630,7 +630,7 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 4095); - tor_assert(encrypted_size > 0); /* This is obviously true, since 4111 is + tt_assert(encrypted_size > 0); /* This is obviously true, since 4111 is * greater than 0, but its truth is not * obvious to all analysis tools. */ cipher = crypto_create_init_cipher(key1, 0); @@ -639,7 +639,7 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 4095); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain, decrypted1, 4095); /* Encrypt a second time (with a new random initialization vector). */ cipher = crypto_create_init_cipher(key1, 1); @@ -648,14 +648,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 4095); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted2, 4095, encrypted2, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 4095); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain, decrypted2, 4095); test_memneq(encrypted1, encrypted2, encrypted_size); /* Decrypt with the wrong key. */ @@ -680,14 +680,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 1); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 1, encrypted1, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 1); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_1, decrypted1, 1); /* Special length case: 15. */ cipher = crypto_create_init_cipher(key1, 1); @@ -696,14 +696,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 15); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 15, encrypted1, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 15); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_15, decrypted1, 15); /* Special length case: 16. */ cipher = crypto_create_init_cipher(key1, 1); @@ -712,14 +712,14 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 16); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 16, encrypted1, encrypted_size); crypto_free_cipher_env(cipher); cipher = NULL; test_eq(decrypted_size, 16); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_16, decrypted1, 16); /* Special length case: 17. */ cipher = crypto_create_init_cipher(key1, 1); @@ -728,12 +728,12 @@ test_crypto_aes_iv(void) crypto_free_cipher_env(cipher); cipher = NULL; test_eq(encrypted_size, 16 + 17); - tor_assert(encrypted_size > 0); + tt_assert(encrypted_size > 0); cipher = crypto_create_init_cipher(key1, 0); decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 17, encrypted1, encrypted_size); test_eq(decrypted_size, 17); - tor_assert(decrypted_size > 0); + tt_assert(decrypted_size > 0); test_memeq(plain_17, decrypted1, 17); done: diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 4b86be4..4bbf768 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1169,10 +1169,10 @@ test_dir_v3_networkstatus(void) /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3); - tor_assert(detached_text1); + tt_assert(detached_text1); /* Try to parse it. */ dsig1 = networkstatus_parse_detached_signatures(detached_text1, NULL); - tor_assert(dsig1); + tt_assert(dsig1); /* Are parsed values as expected? */ test_eq(dsig1->valid_after, con3->valid_after); diff --git a/src/test/test_util.c b/src/test/test_util.c index afc4d5c..c4769e6 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -376,7 +376,7 @@ test_util_strmisc(void) /* Test memmem and memstr */ { const char *haystack = "abcde"; - tor_assert(!tor_memmem(haystack, 5, "ef", 2)); + tt_assert(!tor_memmem(haystack, 5, "ef", 2)); test_eq_ptr(tor_memmem(haystack, 5, "cd", 2), haystack + 2); test_eq_ptr(tor_memmem(haystack, 5, "cde", 3), haystack + 2); haystack = "ababcad"; @@ -640,26 +640,26 @@ test_util_gzip(void) tor_strdup("String with low redundancy that won't be compressed much."); test_assert(!tor_gzip_compress(&buf2, &len1, buf1, strlen(buf1)+1, ZLIB_METHOD)); - tor_assert(len1>16); + tt_assert(len1>16); /* when we allow an incomplete string, we should succeed.*/ - tor_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, + tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, ZLIB_METHOD, 0, LOG_INFO)); buf3[len2]='\0'; - tor_assert(len2 > 5); - tor_assert(!strcmpstart(buf1, buf3)); + tt_assert(len2 > 5); + tt_assert(!strcmpstart(buf1, buf3)); /* when we demand a complete string, this must fail. */ tor_free(buf3); - tor_assert(tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, + tt_assert(tor_gzip_uncompress(&buf3, &len2, buf2, len1-16, ZLIB_METHOD, 1, LOG_INFO)); - tor_assert(!buf3); + tt_assert(!buf3); /* Now, try streaming compression. */ tor_free(buf1); tor_free(buf2); tor_free(buf3); state = tor_zlib_new(1, ZLIB_METHOD); - tor_assert(state); + tt_assert(state); cp1 = buf1 = tor_malloc(1024); len1 = 1024; ccp2 = "ABCDEFGHIJABCDEFGHIJ"; @@ -676,7 +676,7 @@ test_util_gzip(void) test_eq(len2, 0); test_assert(cp1 > cp2); /* Make sure we really added something. */ - tor_assert(!tor_gzip_uncompress(&buf3, &len2, buf1, 1024-len1, + tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf1, 1024-len1, ZLIB_METHOD, 1, LOG_WARN)); test_streq(buf3, "ABCDEFGHIJABCDEFGHIJ"); /*Make sure it compressed right.*/ @@ -1397,7 +1397,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stdout */ pos = read_all(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, 0); - tor_assert(pos >= 0); + tt_assert(pos >= 0); stdout_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_out)); tt_str_op(stdout_buf, ==, expected_out); @@ -1412,7 +1412,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stderr */ pos = read_all(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1, 0); - tor_assert(pos >= 0); + tt_assert(pos >= 0); stderr_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_err)); tt_str_op(stderr_buf, ==, expected_err);

1 0

[tor/master] Update the uptime string to include an hours indicator
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit da3256b5aefb4cad706d9f239c9743ca396564c4 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon May 16 21:58:01 2011 +0200 Update the uptime string to include an hours indicator Before, it wasn't really obvious if one meant hours:minutes or minutes:seconds etc. --- src/or/status.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/or/status.c b/src/or/status.c index 34a27b2..c8bc070 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -39,13 +39,15 @@ secs_to_uptime(long secs) switch (days) { case 0: - tor_asprintf(&uptime_string, "%d:%02d", hours, minutes); + tor_asprintf(&uptime_string, "%d:%02d hours", hours, minutes); break; case 1: - tor_asprintf(&uptime_string, "%ld day %d:%02d", days, hours, minutes); + tor_asprintf(&uptime_string, "%ld day %d:%02d hours", + days, hours, minutes); break; default: - tor_asprintf(&uptime_string, "%ld days %d:%02d", days, hours, minutes); + tor_asprintf(&uptime_string, "%ld days %d:%02d hours", + days, hours, minutes); break; }

1 0

[tor/master] Fix a minor coverity-found bug in tests
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 3bf808c3410a18508a70737329b0930f1693e262 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 19:58:27 2011 +0200 Fix a minor coverity-found bug in tests --- changes/coverity_master | 4 ++++ src/test/test_util.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master new file mode 100644 index 0000000..3b61087 --- /dev/null +++ b/changes/coverity_master @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Prevent using negative indices during unit test runs when read_all() + fails. Spotted by coverity. Bugfix on 0.2.3.1. + diff --git a/src/test/test_util.c b/src/test/test_util.c index d338bba..afc4d5c 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1397,6 +1397,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stdout */ pos = read_all(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, 0); + tor_assert(pos >= 0); stdout_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_out)); tt_str_op(stdout_buf, ==, expected_out); @@ -1411,6 +1412,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, /* Check stderr */ pos = read_all(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1, 0); + tor_assert(pos >= 0); stderr_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_err)); tt_str_op(stderr_buf, ==, expected_err);

1 0

[tor/master] tweak coverity_master changes file
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 2fd56030574730549c7546bd54d1ec94ee308ed0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 8 20:29:10 2011 -0400 tweak coverity_master changes file --- changes/coverity_master | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 784dec3..43ce1fd 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,8 +1,8 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() - fails. Spotted by coverity. Bugfix on 0.2.3.1. + fails. Spotted by coverity. Bugfix on 0.2.3.1-alppa. - Fix a rare memory leak when checking the nodelist without it being - present. Found by coverity. Bugfix on 0.2.3.1. + present. Found by coverity. Bugfix on 0.2.3.1-alpha. o Code simplifications and refactoring: - Remove a dead variable in the heartbeat log code. Spotted by coverity.

1 0

[tor/master] Fix a memleak in nodelist_assert_ok()
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 82837673655151609462d529986a310e04f1ba50 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:38:42 2011 +0200 Fix a memleak in nodelist_assert_ok() --- changes/coverity_master | 2 ++ src/or/nodelist.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index ab174bc..784dec3 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,6 +1,8 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() fails. Spotted by coverity. Bugfix on 0.2.3.1. + - Fix a rare memory leak when checking the nodelist without it being + present. Found by coverity. Bugfix on 0.2.3.1. o Code simplifications and refactoring: - Remove a dead variable in the heartbeat log code. Spotted by coverity. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 0856b31..8cded8f 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -342,11 +342,13 @@ nodelist_assert_ok(void) { routerlist_t *rl = router_get_routerlist(); networkstatus_t *ns = networkstatus_get_latest_consensus(); - digestmap_t *dm = digestmap_new(); + digestmap_t *dm; if (!the_nodelist) return; + dm = digestmap_new(); + /* every routerinfo in rl->routers should be in the nodelist. */ if (rl) { SMARTLIST_FOREACH_BEGIN(rl->routers, routerinfo_t *, ri) {

1 0

[tor/master] Remove a dead variable in the heartbeat code
by nickm＠torproject.org 09 Jun '11

09 Jun '11

commit 3033f8459b332c934b3098ee15c3aa04e3545484 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:10:43 2011 +0200 Remove a dead variable in the heartbeat code --- changes/coverity_master | 2 ++ src/or/status.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changes/coverity_master b/changes/coverity_master index 3b61087..ab174bc 100644 --- a/changes/coverity_master +++ b/changes/coverity_master @@ -1,4 +1,6 @@ o Minor bugfixes: - Prevent using negative indices during unit test runs when read_all() fails. Spotted by coverity. Bugfix on 0.2.3.1. + o Code simplifications and refactoring: + - Remove a dead variable in the heartbeat log code. Spotted by coverity. diff --git a/src/or/status.c b/src/or/status.c index c8bc070..64e3022 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -84,7 +84,6 @@ log_heartbeat(time_t now) char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; - const node_t *myself; or_options_t *options = get_options(); (void)now; @@ -94,7 +93,7 @@ log_heartbeat(time_t now) if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */ else - if (!(myself = node_get_by_id(me->cache_info.identity_digest))) + if (!node_get_by_id(me->cache_info.identity_digest)) log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: It seems like we are not " "in the cached consensus."); }

1 0

[flashproxy/master] Fix further syntax error in f23dc0aa, thanks rransom.
by dcf＠torproject.org 08 Jun '11

08 Jun '11

commit f1f8f33074f2d03dced8676dcfb213fb5b9262af Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jun 8 13:53:33 2011 -0700 Fix further syntax error in f23dc0aa, thanks rransom. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index c2c648e..27fff61 100755 --- a/connector.py +++ b/connector.py @@ -386,7 +386,7 @@ while True: remotes.remove(fd) fd.close() else: - log(u"Data from unconnected remote %s (%d bytes)." % format_addr(fd.getpeername()), len(data)) + log(u"Data from unconnected remote %s (%d bytes)." % (format_addr(fd.getpeername()), len(data))) fd.buf += data if len(fd.buf) >= UNCONNECTED_BUFFER_LIMIT: log(u"Refusing to buffer more than %d bytes from local %s." % (UNCONNECTED_BUFFER_LIMIT, format_addr(fd.getpeername())))

1 0

[tor/maint-0.2.2] remove some dead code, found by coverity
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit db7dd3ee7a07d9bc121d1c8f353e206327bb72c5 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 20:02:16 2011 +0200 remove some dead code, found by coverity --- changes/coverity_maint | 3 +++ src/or/rephist.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint new file mode 100644 index 0000000..ec25d09 --- /dev/null +++ b/changes/coverity_maint @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Remove some dead code as indicated by coverity. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 6be8484..242fe81 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2401,8 +2401,7 @@ rep_hist_buffer_stats_add_circ(circuit_t *circ, time_t end_of_interval) stat = tor_malloc_zero(sizeof(circ_buffer_stats_t)); stat->processed_cells = orcirc->processed_cells; /* 1000.0 for s -> ms; 2.0 because of app-ward and exit-ward queues */ - stat->mean_num_cells_in_queue = interval_length == 0 ? 0.0 : - (double) orcirc->total_cell_waiting_time / + stat->mean_num_cells_in_queue = (double) orcirc->total_cell_waiting_time / (double) interval_length / 1000.0 / 2.0; stat->mean_time_cells_in_queue = (double) orcirc->total_cell_waiting_time /

1 0

[tor/maint-0.2.2] Fix a rare memleak during stats writing
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit f30327449009a7f00b0f5c2bd09a7eff615df3dd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:35:26 2011 +0200 Fix a rare memleak during stats writing If rep_hist_buffer_stats_write() was called unitinitalized, we'd leak memory. --- changes/coverity_maint | 1 + src/or/rephist.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/coverity_maint b/changes/coverity_maint index 6d60355..e7be90a 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -5,4 +5,5 @@ - Add some forgotten return value checks during unit tests. Found by coverity. - Don't use 1-bit wide signed bit fields. Found by coverity. + - Fix a rare memory leak during stats writing. Found by coverity. diff --git a/src/or/rephist.c b/src/or/rephist.c index 242fe81..54593a0 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2451,8 +2451,8 @@ rep_hist_buffer_stats_write(time_t now) int processed_cells[SHARES], circs_in_share[SHARES], number_of_circuits, i; double queued_cells[SHARES], time_in_queue[SHARES]; - smartlist_t *str_build = smartlist_create(); - char *str = NULL, *buf=NULL; + smartlist_t *str_build = NULL; + char *str = NULL, *buf = NULL; circuit_t *circ; if (!start_of_buffer_stats_interval) @@ -2460,6 +2460,8 @@ rep_hist_buffer_stats_write(time_t now) if (start_of_buffer_stats_interval + WRITE_STATS_INTERVAL > now) goto done; /* Not ready to write */ + str_build = smartlist_create(); + /* add current circuits to stats */ for (circ = _circuit_get_global_list(); circ; circ = circ->next) rep_hist_buffer_stats_add_circ(circ, now);

1 0

[tor/maint-0.2.2] Comment out some obviously dead code.
by nickm＠torproject.org 08 Jun '11

08 Jun '11

commit 9e56ac27da80969fadaad7eaf64a8384e68a778e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Jun 8 21:23:05 2011 +0200 Comment out some obviously dead code. Coverity warned about it, it's harmless to comment out. --- src/or/circuitlist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 4ad244d..8534c38 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -775,8 +775,8 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn) return found->circuit; return NULL; - /* The rest of this checks for bugs. Disabled by default. */ + /* We comment it out because coverity complains otherwise. { circuit_t *circ; for (circ=global_circuitlist;circ;circ = circ->next) { @@ -795,7 +795,7 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn) } } return NULL; - } + } */ } /** Return a circ such that:

1 0