tor-commits November 2014

tor-commits@lists.torproject.org

24 participants
954 discussions

[tor/master] Define macros meaning <,>,==,!=,<=,>=
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 00f59098767766cc594c89837781c28a1ec67682 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 6 11:19:31 2014 -0500 Define macros meaning <,>,==,!=,<=,>= This lets us avoid putting operators directly in macro arguments, and thus will help us unconfuse coccinelle. For ticket 13172. --- changes/ticket13172 | 4 ++++ src/common/compat.h | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/changes/ticket13172 b/changes/… [View More]

1 0

[tor/master] Merge branch 'ticket13172'
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 2170171d84e30bc4b1b2565255bd978668c50e97 Merge: d85270e 00f5909 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 13:25:17 2014 -0500 Merge branch 'ticket13172' changes/ticket13172 | 4 ++++ src/common/compat.h | 9 +++++++++ 2 files changed, 13 insertions(+)

1 0

[tor/master] Fix wide lines (from 13172)
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 4ac5175109b14f8fafca3374ab5ca63968ab2cca Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 13:42:01 2014 -0500 Fix wide lines (from 13172) --- src/test/test.c | 2 +- src/test/test_addr.c | 16 +++++++----- src/test/test_buffers.c | 6 +++-- src/test/test_cell_formats.c | 3 ++- src/test/test_config.c | 3 ++- src/test/test_containers.c | 15 ++++++++---- src/test/test_crypto.c | 15 ++++++++---- src/… [View More]test/test_dir.c | 28 ++++++++++++--------- src/test/test_entrynodes.c | 8 +++--- src/test/test_extorport.c | 9 ++++--- src/test/test_socks.c | 4 +-- src/test/test_status.c | 7 +++--- src/test/test_util.c | 55 +++++++++++++++++++++++++++--------------- 13 files changed, 107 insertions(+), 64 deletions(-) diff --git a/src/test/test.c b/src/test/test.c index 8227176..07901ab 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -704,7 +704,7 @@ test_rend_fns(void *arg) smartlist_get(descs, 0))->desc_str) == 0); tt_assert(parsed); tt_mem_op(((rend_encoded_v2_service_descriptor_t *) - smartlist_get(descs, 0))->desc_id,OP_EQ, parsed_desc_id, DIGEST_LEN); + smartlist_get(descs, 0))->desc_id,OP_EQ, parsed_desc_id, DIGEST_LEN); tt_int_op(rend_parse_introduction_points(parsed, intro_points_encrypted, intro_points_size),OP_EQ, 3); tt_assert(!crypto_pk_cmp_keys(generated->pk, parsed->pk)); diff --git a/src/test/test_addr.c b/src/test/test_addr.c index b7fe2c4..a254a34 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -62,12 +62,13 @@ test_addr_basic(void *arg) struct in_addr in; /* good round trip */ - tt_int_op(tor_inet_pton(AF_INET, ip, &in),OP_EQ, 1); - tt_ptr_op(tor_inet_ntop(AF_INET, &in, tmpbuf, sizeof(tmpbuf)),OP_EQ, &tmpbuf); + tt_int_op(tor_inet_pton(AF_INET, ip, &in), OP_EQ, 1); + tt_ptr_op(tor_inet_ntop(AF_INET, &in, tmpbuf, sizeof(tmpbuf)), + OP_EQ, &tmpbuf); tt_str_op(tmpbuf,OP_EQ, ip); /* just enough buffer length */ - tt_str_op(tor_inet_ntop(AF_INET, &in, tmpbuf, strlen(ip) + 1),OP_EQ, ip); + tt_str_op(tor_inet_ntop(AF_INET, &in, tmpbuf, strlen(ip) + 1), OP_EQ, ip); /* too short buffer */ tt_ptr_op(tor_inet_ntop(AF_INET, &in, tmpbuf, strlen(ip)),OP_EQ, NULL); @@ -414,7 +415,8 @@ test_addr_ip6_helpers(void *arg) test_addr_compare("0::3:2:1", OP_LT, "0::ffff:0.3.2.1"); test_addr_compare("0::2:2:1", OP_LT, "0::ffff:0.3.2.1"); test_addr_compare("0::ffff:0.3.2.1", OP_GT, "0::0:0:0"); - test_addr_compare("0::ffff:5.2.2.1", OP_LT, "::ffff:6.0.0.0"); /* XXXX wrong. */ + test_addr_compare("0::ffff:5.2.2.1", OP_LT, + "::ffff:6.0.0.0"); /* XXXX wrong. */ tor_addr_parse_mask_ports("[::ffff:2.3.4.5]", 0, &t1, NULL, NULL, NULL); tor_addr_parse_mask_ports("2.3.4.5", 0, &t2, NULL, NULL, NULL); tt_assert(tor_addr_compare(&t1, &t2, CMP_SEMANTIC) == 0); @@ -461,7 +463,8 @@ test_addr_ip6_helpers(void *arg) tt_ptr_op(tor_addr_to_str(buf, &t1, 7, 0),OP_EQ, NULL); /* too short buf */ tt_str_op(tor_addr_to_str(buf, &t1, 8, 0),OP_EQ, "1.2.3.4"); - tt_int_op(AF_INET,OP_EQ, tor_addr_parse(&t1, "255.255.255.255")); /* 15 + \0 */ + tt_int_op(AF_INET, OP_EQ, + tor_addr_parse(&t1, "255.255.255.255")); /* 15 + \0 */ tt_ptr_op(tor_addr_to_str(buf, &t1, 15, 0),OP_EQ, NULL); /* too short buf */ tt_str_op(tor_addr_to_str(buf, &t1, 16, 0),OP_EQ, "255.255.255.255"); tt_ptr_op(tor_addr_to_str(buf, &t1, 15, 1),OP_EQ, NULL); /* too short buf */ @@ -1014,7 +1017,8 @@ test_addr_is_loopback(void *data) for (i=0; loopback_items[i].name; ++i) { tt_int_op(tor_addr_parse(&addr, loopback_items[i].name), OP_GE, 0); - tt_int_op(tor_addr_is_loopback(&addr), OP_EQ, loopback_items[i].is_loopback); + tt_int_op(tor_addr_is_loopback(&addr), OP_EQ, + loopback_items[i].is_loopback); } tor_addr_make_unspec(&addr); diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 7e42124..cb29ab0 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -499,7 +499,8 @@ test_buffer_allocation_tracking(void *arg) tt_int_op(buf_get_total_allocation(), OP_EQ, 16384); write_to_buf(junk, 4000, buf2); tt_int_op(buf_allocation(buf2), OP_EQ, 8192); /* another 4k chunk. */ - tt_int_op(buf_get_total_allocation(), OP_EQ, 5*4096); /* that chunk was new. */ + tt_int_op(buf_get_total_allocation(), + OP_EQ, 5*4096); /* that chunk was new. */ /* Make a really huge buffer */ for (i = 0; i < 1000; ++i) { @@ -554,7 +555,8 @@ test_buffer_time_tracking(void *arg) buf2 = buf_copy(buf); tt_assert(buf2); - tt_int_op(1234, OP_EQ, buf_get_oldest_chunk_timestamp(buf2, START_MSEC+1234)); + tt_int_op(1234, OP_EQ, + buf_get_oldest_chunk_timestamp(buf2, START_MSEC+1234)); /* Now add more bytes; enough to overflow the first chunk. */ tv0.tv_usec += 123 * 1000; diff --git a/src/test/test_cell_formats.c b/src/test/test_cell_formats.c index edc011f..e1f6bd7 100644 --- a/src/test/test_cell_formats.c +++ b/src/test/test_cell_formats.c @@ -841,7 +841,8 @@ test_cfmt_extended_cells(void *arg) crypto_rand((char*)b, 42); memcpy(p,"\x00\x2a",2); memcpy(p+2,b,42); - tt_int_op(0, OP_EQ, extended_cell_parse(&ec, RELAY_COMMAND_EXTENDED2, p, 2+42)); + tt_int_op(0, OP_EQ, + extended_cell_parse(&ec, RELAY_COMMAND_EXTENDED2, p, 2+42)); tt_int_op(RELAY_COMMAND_EXTENDED2, OP_EQ, ec.cell_type); tt_int_op(cc->cell_type, OP_EQ, CELL_CREATED2); tt_int_op(cc->handshake_len, OP_EQ, 42); diff --git a/src/test/test_config.c b/src/test/test_config.c index 1560c5c..dcb4e92 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -839,7 +839,8 @@ test_config_fix_my_family(void *arg) TT_FAIL(("options_validate failed: %s", err)); } - tt_str_op(options->MyFamily,OP_EQ, "$1111111111111111111111111111111111111111, " + tt_str_op(options->MyFamily,OP_EQ, + "$1111111111111111111111111111111111111111, " "$1111111111111111111111111111111111111112, " "$1111111111111111111111111111111111111113"); diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 89eb1a2..1eb8c15 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -241,11 +241,14 @@ test_container_smartlist_strings(void *arg) tt_int_op(f,OP_EQ, 1); tt_int_op(1,OP_EQ, smartlist_bsearch_idx(sl," arm",cmp_without_first_,&f)); tt_int_op(f,OP_EQ, 0); - tt_int_op(1,OP_EQ, smartlist_bsearch_idx(sl," arma",cmp_without_first_,&f)); + tt_int_op(1,OP_EQ, + smartlist_bsearch_idx(sl," arma",cmp_without_first_,&f)); tt_int_op(f,OP_EQ, 1); - tt_int_op(2,OP_EQ, smartlist_bsearch_idx(sl," armb",cmp_without_first_,&f)); + tt_int_op(2,OP_EQ, + smartlist_bsearch_idx(sl," armb",cmp_without_first_,&f)); tt_int_op(f,OP_EQ, 0); - tt_int_op(7,OP_EQ, smartlist_bsearch_idx(sl," zzzz",cmp_without_first_,&f)); + tt_int_op(7,OP_EQ, + smartlist_bsearch_idx(sl," zzzz",cmp_without_first_,&f)); tt_int_op(f,OP_EQ, 0); /* Test trivial cases for list of length 0 or 1 */ @@ -477,7 +480,8 @@ test_container_smartlist_join(void *arg) tt_str_op(joined,OP_EQ, "Anemias,Anemias,Crossbowmen,Work"); tor_free(joined); joined = smartlist_join_strings(sl4, ",", 0, NULL); - tt_str_op(joined,OP_EQ, "Ambush,Anchorman,Anchorman,Bacon,Inhumane,Insurance," + tt_str_op(joined,OP_EQ, + "Ambush,Anchorman,Anchorman,Bacon,Inhumane,Insurance," "Knish,Know,Manners,Manners,Maraschinos,Wombats,Wombats"); tor_free(joined); @@ -887,7 +891,8 @@ test_container_order_functions(void *arg) tt_int_op(7,OP_EQ, third_quartile()); /* 1, 2, 3, 4, 5, 6, ~7~, 8, 9 */ lst2[n++] = 10; lst2[n++] = 11; - tt_int_op(9,OP_EQ, third_quartile()); /* 1, 2, 3, 4, 5, 6, 7, 8, ~9~, 10, 11 */ + /* 1, 2, 3, 4, 5, 6, 7, 8, ~9~, 10, 11 */ + tt_int_op(9,OP_EQ, third_quartile()); #undef third_quartile diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index d3cd013..5352b9f 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -700,7 +700,8 @@ test_crypto_formats(void *arg) tt_int_op(strlen(data1),OP_EQ, 40); data2 = tor_malloc(FINGERPRINT_LEN+1); crypto_add_spaces_to_fp(data2, FINGERPRINT_LEN+1, data1); - tt_str_op(data2,OP_EQ, "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 0000"); + tt_str_op(data2, OP_EQ, + "ABCD 1234 ABCD 5678 0000 ABCD 1234 ABCD 5678 0000"); tor_free(data1); tor_free(data2); } @@ -1474,7 +1475,8 @@ test_crypto_curve25519_persist(void *arg) tt_int_op(0,OP_EQ,curve25519_keypair_generate(&keypair, 0)); - tt_int_op(0,OP_EQ,curve25519_keypair_write_to_file(&keypair, fname, "testing")); + tt_int_op(0,OP_EQ, + curve25519_keypair_write_to_file(&keypair, fname, "testing")); tt_int_op(0,OP_EQ,curve25519_keypair_read_from_file(&keypair2, &tag, fname)); tt_str_op(tag,OP_EQ,"testing"); tor_free(tag); @@ -1505,12 +1507,15 @@ test_crypto_curve25519_persist(void *arg) tor_free(fname); fname = tor_strdup(get_fname("bogus_keypair")); - tt_int_op(-1, OP_EQ, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); + tt_int_op(-1, OP_EQ, + curve25519_keypair_read_from_file(&keypair2, &tag, fname)); tor_free(tag); content[69] ^= 0xff; - tt_int_op(0, OP_EQ, write_bytes_to_file(fname, content, (size_t)st.st_size, 1)); - tt_int_op(-1, OP_EQ, curve25519_keypair_read_from_file(&keypair2, &tag, fname)); + tt_int_op(0, OP_EQ, + write_bytes_to_file(fname, content, (size_t)st.st_size, 1)); + tt_int_op(-1, OP_EQ, + curve25519_keypair_read_from_file(&keypair2, &tag, fname)); done: tor_free(fname); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cdf16ad..e5328fe 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -879,7 +879,8 @@ test_dir_versions(void *arg) /* Now try svn revisions. */ tt_int_op(1,OP_EQ, tor_version_as_new_as("Tor 0.2.1.0-dev (r100)", "Tor 0.2.1.0-dev (r99)")); - tt_int_op(1,OP_EQ, tor_version_as_new_as("Tor 0.2.1.0-dev (r100) on Banana Jr", + tt_int_op(1,OP_EQ, tor_version_as_new_as( + "Tor 0.2.1.0-dev (r100) on Banana Jr", "Tor 0.2.1.0-dev (r99) on Hal 9000")); tt_int_op(1,OP_EQ, tor_version_as_new_as("Tor 0.2.1.0-dev (r100)", "Tor 0.2.1.0-dev on Colossus")); @@ -929,7 +930,8 @@ test_dir_fp_pairs(void *arg) tt_mem_op(pair->first,OP_EQ, "Hexadecimal isn't so", DIGEST_LEN); tt_mem_op(pair->second,OP_EQ, "good for hiding your", DIGEST_LEN); pair = smartlist_get(sl, 1); - tt_mem_op(pair->first,OP_EQ, "secret data.\0\0\0\0\0\xff\xff\xff", DIGEST_LEN); + tt_mem_op(pair->first,OP_EQ, "secret data.\0\0\0\0\0\xff\xff\xff", + DIGEST_LEN); tt_mem_op(pair->second,OP_EQ, "Use AES-256 instead.", DIGEST_LEN); done: @@ -2067,8 +2069,8 @@ test_a_networkstatus( { digests_t *dsig_digests = strmap_get(dsig1->digests, "ns"); tt_assert(dsig_digests); - tt_mem_op(dsig_digests->d[DIGEST_SHA1],OP_EQ, con3->digests.d[DIGEST_SHA1], - DIGEST_LEN); + tt_mem_op(dsig_digests->d[DIGEST_SHA1], OP_EQ, + con3->digests.d[DIGEST_SHA1], DIGEST_LEN); dsig_digests = strmap_get(dsig1->digests, "microdesc"); tt_assert(dsig_digests); tt_mem_op(dsig_digests->d[DIGEST_SHA256],OP_EQ, @@ -2095,8 +2097,8 @@ test_a_networkstatus( /* Try adding it to con2. */ detached_text2 = get_detached_sigs(con2,con_md2); - tt_int_op(1,OP_EQ, networkstatus_add_detached_signatures(con2, dsig1, "test", - LOG_INFO, &msg)); + tt_int_op(1,OP_EQ, networkstatus_add_detached_signatures(con2, dsig1, + "test", LOG_INFO, &msg)); tor_free(detached_text2); tt_int_op(1,OP_EQ, networkstatus_add_detached_signatures(con_md2, dsig1, "test", @@ -2121,12 +2123,12 @@ test_a_networkstatus( "microdesc"))); /* Try adding to con2 twice; verify that nothing changes. */ - tt_int_op(0,OP_EQ, networkstatus_add_detached_signatures(con2, dsig1, "test", - LOG_INFO, &msg)); + tt_int_op(0,OP_EQ, networkstatus_add_detached_signatures(con2, dsig1, + "test", LOG_INFO, &msg)); /* Add to con. */ - tt_int_op(2,OP_EQ, networkstatus_add_detached_signatures(con, dsig2, "test", - LOG_INFO, &msg)); + tt_int_op(2,OP_EQ, networkstatus_add_detached_signatures(con, dsig2, + "test", LOG_INFO, &msg)); /* Check signatures */ voter = smartlist_get(con->voters, 1); sig = smartlist_get(voter->sigs, 0); @@ -2832,7 +2834,8 @@ test_dir_http_handling(void *args) tt_str_op(url,OP_EQ, "/tor/a/b/c.txt"); tor_free(url); - tt_int_op(parse_http_url("GET /tor/a/b/c.txt HTTP/1.600\r\n", &url),OP_EQ, 0); + tt_int_op(parse_http_url("GET /tor/a/b/c.txt HTTP/1.600\r\n", &url), + OP_EQ, 0); tt_str_op(url,OP_EQ, "/tor/a/b/c.txt"); tor_free(url); @@ -2867,7 +2870,8 @@ test_dir_http_handling(void *args) tt_int_op(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1", &url),OP_EQ, -1); tt_assert(!url); - tt_int_op(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1x\r\n", &url),OP_EQ, -1); + tt_int_op(parse_http_url("GET /tor/a/b/c.txt HTTP/1.1x\r\n", &url), + OP_EQ, -1); tt_assert(!url); tt_int_op(parse_http_url("GET /tor/a/b/c.txt HTTP/1.", &url),OP_EQ, -1); diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index eaf2e2d..5bf2985 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -75,7 +75,8 @@ setup_fake_routerlist(void) /* Sanity checking of routerlist and nodelist. */ our_routerlist = router_get_routerlist(); - tt_int_op(smartlist_len(our_routerlist->routers), OP_EQ, NUMBER_OF_DESCRIPTORS); + tt_int_op(smartlist_len(our_routerlist->routers), OP_EQ, + NUMBER_OF_DESCRIPTORS); routerlist_assert_ok(our_routerlist); our_nodelist = nodelist_get_list(); @@ -408,7 +409,7 @@ test_entry_guards_parse_state_simple(void *arg) tt_assert(e->is_dir_cache); /* Verify dirness */ - tt_str_op(e->chosen_by_version, OP_EQ, tor_version); /* Verify tor version */ + tt_str_op(e->chosen_by_version, OP_EQ, tor_version); /* Verify version */ tt_assert(e->made_contact); /* All saved guards have been contacted */ @@ -507,7 +508,8 @@ test_entry_guards_parse_state_pathbias(void *arg) /* XXX tt_double_op doesn't support equality. Cast to int for now. */ tt_int_op((int)e->circ_attempts, OP_EQ, (int)circ_attempts); tt_int_op((int)e->circ_successes, OP_EQ, (int)circ_successes); - tt_int_op((int)e->successful_circuits_closed, OP_EQ, (int)successful_closed); + tt_int_op((int)e->successful_circuits_closed, OP_EQ, + (int)successful_closed); tt_int_op((int)e->timeouts, OP_EQ, (int)timeouts); tt_int_op((int)e->collapsed_circuits, OP_EQ, (int)collapsed); tt_int_op((int)e->unusable_circuits, OP_EQ, (int)unusable); diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index c9d8527..d99961d 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -24,7 +24,8 @@ test_ext_or_id_map(void *arg) (void)arg; /* pre-initialization */ - tt_ptr_op(NULL, OP_EQ, connection_or_get_by_ext_or_id("xxxxxxxxxxxxxxxxxxxx")); + tt_ptr_op(NULL, OP_EQ, + connection_or_get_by_ext_or_id("xxxxxxxxxxxxxxxxxxxx")); c1 = or_connection_new(CONN_TYPE_EXT_OR, AF_INET); c2 = or_connection_new(CONN_TYPE_EXT_OR, AF_INET); @@ -36,7 +37,8 @@ test_ext_or_id_map(void *arg) tt_ptr_op(c1, OP_EQ, connection_or_get_by_ext_or_id(c1->ext_or_conn_id)); tt_ptr_op(c2, OP_EQ, connection_or_get_by_ext_or_id(c2->ext_or_conn_id)); - tt_ptr_op(NULL, OP_EQ, connection_or_get_by_ext_or_id("xxxxxxxxxxxxxxxxxxxx")); + tt_ptr_op(NULL, OP_EQ, + connection_or_get_by_ext_or_id("xxxxxxxxxxxxxxxxxxxx")); idp = tor_memdup(c2->ext_or_conn_id, EXT_OR_CONN_ID_LEN); @@ -423,7 +425,8 @@ do_ext_or_handshake(or_connection_t *conn) MOCK(crypto_rand, crypto_rand_return_tse_str); tt_int_op(0, OP_EQ, connection_ext_or_process_inbuf(conn)); UNMOCK(crypto_rand); - tt_int_op(TO_CONN(conn)->state, OP_EQ, EXT_OR_CONN_STATE_AUTH_WAIT_CLIENT_HASH); + tt_int_op(TO_CONN(conn)->state, OP_EQ, + EXT_OR_CONN_STATE_AUTH_WAIT_CLIENT_HASH); CONTAINS("\xec\x80\xed\x6e\x54\x6d\x3b\x36\xfd\xfc\x22\xfe\x13\x15\x41\x6b" "\x02\x9f\x1a\xde\x76\x10\xd9\x10\x87\x8b\x62\xee\xb7\x40\x38\x21" "te road There is always another ", 64); diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 98c5be0..fbb8b25 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -432,8 +432,8 @@ test_socks_5_malformed_commands(void *ptr) */ ADD_DATA(buf, "\x05\x01\x00"); ADD_DATA(buf, "\x05\x01\x00\x01\x02\x02\x02\x02\x11\x11"); - tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, 1),OP_EQ, - -1); + tt_int_op(fetch_from_buf_socks(buf, socks, get_options()->TestSocks, 1), + OP_EQ, -1); tt_int_op(5,OP_EQ,socks->socks_version); tt_int_op(10,OP_EQ,socks->replylen); diff --git a/src/test/test_status.c b/src/test/test_status.c index dd825f2..aa71aa6 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -435,8 +435,8 @@ NS(logv)(int severity, log_domain_mask_t domain, case 2: tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(domain, OP_EQ, LD_HEARTBEAT); - tt_ptr_op( - strstr(funcname, "rep_hist_log_circuit_handshake_stats"), OP_NE, NULL); + tt_ptr_op(strstr(funcname, "rep_hist_log_circuit_handshake_stats"), + OP_NE, NULL); tt_ptr_op(suffix, OP_EQ, NULL); tt_str_op(format, OP_EQ, "Circuit handshake stats since last time: %d/%d TAP, %d/%d NTor."); @@ -737,7 +737,8 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_rcvd */ tt_str_op(va_arg(ap, char *), OP_EQ, "0 kB"); /* acc_max */ /* format_local_iso_time uses local tz, just check mins and secs. */ - tt_ptr_op(strstr(va_arg(ap, char *), ":01:00"), OP_NE, NULL); /* end_buf */ + tt_ptr_op(strstr(va_arg(ap, char *), ":01:00"), + OP_NE, NULL); /* end_buf */ tt_str_op(va_arg(ap, char *), OP_EQ, "0:01 hours"); /* remaining */ break; default: diff --git a/src/test/test_util.c b/src/test/test_util.c index 5211701..b952bb2 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -544,7 +544,8 @@ test_util_time(void *arg) tt_int_op(t_res,OP_EQ, (time_t)1091580502UL); /* The timezone doesn't matter */ t_res = 0; - tt_int_op(0,OP_EQ, parse_rfc1123_time("Wed, 04 Aug 2004 00:48:22 ZUL", &t_res)); + tt_int_op(0,OP_EQ, + parse_rfc1123_time("Wed, 04 Aug 2004 00:48:22 ZUL", &t_res)); tt_int_op(t_res,OP_EQ, (time_t)1091580502UL); tt_int_op(-1,OP_EQ, parse_rfc1123_time("Wed, zz Aug 2004 99-99x99 GMT", &t_res)); @@ -680,10 +681,12 @@ test_util_parse_http_time(void *arg) parse_http_time("Wednesday, 04-Aug-94 00:48:22 GMT", &a_time)); tt_int_op((time_t)775961302UL,OP_EQ, tor_timegm(&a_time)); T("1994-08-04 00:48:22"); - tt_int_op(0,OP_EQ, parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time)); + tt_int_op(0,OP_EQ, + parse_http_time("Wednesday, 4-Aug-94 0:48:22 GMT", &a_time)); tt_int_op((time_t)775961302UL,OP_EQ, tor_timegm(&a_time)); T("1994-08-04 00:48:22"); - tt_int_op(0,OP_EQ, parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time)); + tt_int_op(0,OP_EQ, + parse_http_time("Miercoles, 4-Aug-94 0:48:22 GMT", &a_time)); tt_int_op((time_t)775961302UL,OP_EQ, tor_timegm(&a_time)); T("1994-08-04 00:48:22"); tt_int_op(0,OP_EQ, parse_http_time("Wed Aug 04 00:48:22 1994", &a_time)); @@ -695,10 +698,10 @@ test_util_parse_http_time(void *arg) tt_int_op(0,OP_EQ, parse_http_time("Mie Aug 4 0:48:22 1994", &a_time)); tt_int_op((time_t)775961302UL,OP_EQ, tor_timegm(&a_time)); T("1994-08-04 00:48:22"); - tt_int_op(0,OP_EQ, parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time)); + tt_int_op(0,OP_EQ,parse_http_time("Sun, 1 Jan 2012 00:00:00 GMT", &a_time)); tt_int_op((time_t)1325376000UL,OP_EQ, tor_timegm(&a_time)); T("2012-01-01 00:00:00"); - tt_int_op(0,OP_EQ, parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time)); + tt_int_op(0,OP_EQ,parse_http_time("Mon, 31 Dec 2012 00:00:00 GMT", &a_time)); tt_int_op((time_t)1356912000UL,OP_EQ, tor_timegm(&a_time)); T("2012-12-31 00:00:00"); tt_int_op(-1,OP_EQ, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time)); @@ -1373,7 +1376,8 @@ test_util_strmisc(void *arg) /* Test tor_parse_* where we overflow/underflow the underlying type. */ /* This string should overflow 64-bit ints. */ #define TOOBIG "100000000000000000000000000" - tt_int_op(0L,OP_EQ, tor_parse_long(TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); + tt_int_op(0L, OP_EQ, + tor_parse_long(TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); tt_int_op(i,OP_EQ, 0); tt_int_op(0L,OP_EQ, tor_parse_long("-"TOOBIG, 10, LONG_MIN, LONG_MAX, &i, NULL)); @@ -1551,10 +1555,10 @@ test_util_strmisc(void *arg) /* Test strcmp_len */ tt_int_op(strcmp_len("foo", "bar", 3), OP_GT, 0); - tt_int_op(strcmp_len("foo", "bar", 2), OP_LT, 0); /* First len, then lexical */ + tt_int_op(strcmp_len("foo", "bar", 2), OP_LT, 0); tt_int_op(strcmp_len("foo2", "foo1", 4), OP_GT, 0); tt_int_op(strcmp_len("foo2", "foo1", 3), OP_LT, 0); /* Really stop at len */ - tt_int_op(strcmp_len("foo2", "foo", 3), OP_EQ, 0); /* Really stop at len */ + tt_int_op(strcmp_len("foo2", "foo", 3), OP_EQ, 0); /* Really stop at len */ tt_int_op(strcmp_len("blah", "", 4), OP_GT, 0); tt_int_op(strcmp_len("blah", "", 0), OP_EQ, 0); @@ -1570,7 +1574,8 @@ test_util_pow2(void *arg) tt_int_op(tor_log2(64),OP_EQ, 6); tt_int_op(tor_log2(65),OP_EQ, 6); tt_int_op(tor_log2(63),OP_EQ, 5); - tt_int_op(tor_log2(0),OP_EQ, 0);/* incorrect mathematically, but as specified */ + /* incorrect mathematically, but as specified: */ + tt_int_op(tor_log2(0),OP_EQ, 0); tt_int_op(tor_log2(1),OP_EQ, 0); tt_int_op(tor_log2(2),OP_EQ, 1); tt_int_op(tor_log2(3),OP_EQ, 1); @@ -1835,7 +1840,8 @@ test_util_gzip(void *arg) tt_assert(!tor_gzip_uncompress(&buf3, &len2, buf1, 1024-len1, ZLIB_METHOD, 1, LOG_WARN)); - tt_str_op(buf3,OP_EQ,"ABCDEFGHIJABCDEFGHIJ"); /*Make sure it compressed right.*/ + /* Make sure it compressed right. */ + tt_str_op(buf3, OP_EQ, "ABCDEFGHIJABCDEFGHIJ"); tt_int_op(21,OP_EQ, len2); done: @@ -2043,7 +2049,8 @@ test_util_sscanf(void *arg) tt_int_op(99u,OP_EQ, u3); /* Hex (ie. %x) */ - tt_int_op(3,OP_EQ, tor_sscanf("1234 02aBcdEf ff", "%x %x %x", &u1, &u2, &u3)); + tt_int_op(3,OP_EQ, + tor_sscanf("1234 02aBcdEf ff", "%x %x %x", &u1, &u2, &u3)); tt_int_op(0x1234,OP_EQ, u1); tt_int_op(0x2ABCDEF,OP_EQ, u2); tt_int_op(0xFF,OP_EQ, u3); @@ -3067,12 +3074,14 @@ test_util_find_str_at_start_of_line(void *ptr) tt_ptr_op(line2,OP_EQ, find_str_at_start_of_line(long_string, "he")); tt_ptr_op(line2,OP_EQ, find_str_at_start_of_line(long_string, "hell")); tt_ptr_op(line2,OP_EQ, find_str_at_start_of_line(long_string, "hello k")); - tt_ptr_op(line2,OP_EQ, find_str_at_start_of_line(long_string, "hello kitty\n")); + tt_ptr_op(line2,OP_EQ, + find_str_at_start_of_line(long_string, "hello kitty\n")); tt_ptr_op(line2,OP_EQ, find_str_at_start_of_line(long_string, "hello kitty\nt")); tt_ptr_op(line3,OP_EQ, find_str_at_start_of_line(long_string, "third")); tt_ptr_op(line3,OP_EQ, find_str_at_start_of_line(long_string, "third line")); - tt_ptr_op(NULL,OP_EQ, find_str_at_start_of_line(long_string, "third line\n")); + tt_ptr_op(NULL, OP_EQ, + find_str_at_start_of_line(long_string, "third line\n")); tt_ptr_op(short_line2,OP_EQ, find_str_at_start_of_line(short_string, "second line\n")); done: @@ -3283,7 +3292,7 @@ test_util_ftruncate(void *ptr) tt_int_op(fd, OP_GE, 0); /* Make the file be there. */ - tt_int_op(strlen(message), OP_EQ, write_all(fd, message, strlen(message), 0)); + tt_int_op(strlen(message), OP_EQ, write_all(fd, message, strlen(message),0)); tt_int_op((int)tor_fd_getpos(fd), OP_EQ, strlen(message)); tt_int_op(0, OP_EQ, fstat(fd, &st)); tt_int_op((int)st.st_size, OP_EQ, strlen(message)); @@ -4145,8 +4154,10 @@ test_util_di_ops(void *arg) ii = (uint8_t)i; zz = (uint8_t)z; tt_int_op(tor_memeq(&zz, &ii, 1),OP_EQ, zz == ii); - tt_int_op(tor_memcmp(&zz, &ii, 1) > 0 ? GT : EQ,OP_EQ, zz > ii ? GT : EQ); - tt_int_op(tor_memcmp(&ii, &zz, 1) < 0 ? LT : EQ,OP_EQ, ii < zz ? LT : EQ); + tt_int_op(tor_memcmp(&zz, &ii, 1) > 0 ? GT : EQ,OP_EQ, + zz > ii ? GT : EQ); + tt_int_op(tor_memcmp(&ii, &zz, 1) < 0 ? LT : EQ,OP_EQ, + ii < zz ? LT : EQ); } } } @@ -4219,7 +4230,8 @@ test_util_eat_whitespace(void *ptr) /* Only ws */ strlcpy(str, " \t\r\n", sizeof(str)); tt_ptr_op(str + strlen(str),OP_EQ, eat_whitespace(str)); - tt_ptr_op(str + strlen(str),OP_EQ, eat_whitespace_eos(str, str + strlen(str))); + tt_ptr_op(str + strlen(str),OP_EQ, + eat_whitespace_eos(str, str + strlen(str))); tt_ptr_op(str + strlen(str) - 1,OP_EQ, eat_whitespace_no_nl(str)); tt_ptr_op(str + strlen(str) - 1,OP_EQ, @@ -4238,7 +4250,8 @@ test_util_eat_whitespace(void *ptr) for (i = 0; i < sizeof(ws); ++i) str[i] = ws[i]; tt_ptr_op(str + sizeof(ws),OP_EQ, eat_whitespace(str)); - tt_ptr_op(str + sizeof(ws),OP_EQ, eat_whitespace_eos(str, str + strlen(str))); + tt_ptr_op(str + sizeof(ws),OP_EQ, + eat_whitespace_eos(str, str + strlen(str))); tt_ptr_op(str + sizeof(ws),OP_EQ, eat_whitespace_no_nl(str)); tt_ptr_op(str + sizeof(ws),OP_EQ, eat_whitespace_eos_no_nl(str, str + strlen(str))); @@ -4260,14 +4273,16 @@ test_util_eat_whitespace(void *ptr) /* Eat entire comment */ strlcpy(str, "#Comment", sizeof(str)); tt_ptr_op(str + strlen(str),OP_EQ, eat_whitespace(str)); - tt_ptr_op(str + strlen(str),OP_EQ, eat_whitespace_eos(str, str + strlen(str))); + tt_ptr_op(str + strlen(str),OP_EQ, + eat_whitespace_eos(str, str + strlen(str))); tt_ptr_op(str,OP_EQ, eat_whitespace_no_nl(str)); tt_ptr_op(str,OP_EQ, eat_whitespace_eos_no_nl(str, str + strlen(str))); /* Blank line, then comment */ strlcpy(str, " \t\n # Comment", sizeof(str)); tt_ptr_op(str + strlen(str),OP_EQ, eat_whitespace(str)); - tt_ptr_op(str + strlen(str),OP_EQ, eat_whitespace_eos(str, str + strlen(str))); + tt_ptr_op(str + strlen(str),OP_EQ, + eat_whitespace_eos(str, str + strlen(str))); tt_ptr_op(str + 2,OP_EQ, eat_whitespace_no_nl(str)); tt_ptr_op(str + 2,OP_EQ, eat_whitespace_eos_no_nl(str, str + strlen(str))); [View Less]

1 0

[tor/master] Replace operators used as macro arguments with OP_XX macros
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit a3dafd3f58bb3122b9de919e931c02b5e12373b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 13:28:07 2014 -0500 Replace operators used as macro arguments with OP_XX macros Part of fix for 13172 --- src/common/compat_libevent.c | 2 +- src/ext/tinytest_demo.c | 16 +- src/or/circuituse.c | 10 +- src/test/test.c | 156 +-- src/test/test.h | 2 +- src/test/test_addr.c … [View More]

1 0

[tor/master] Reenhappy make check-spaces
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit d85270e13c74bbfb9d2a2f2f7f73736a07b57046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 13:15:10 2014 -0500 Reenhappy make check-spaces --- src/or/circuitlist.c | 7 ++++--- src/test/test_checkdir.c | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 1b4582a..c7287f9 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1740,10 +1740,11 @@ circuit_mark_for_close_, (… [View More]

1 0

[tor/master] Comment possible values of was_router_added_t.
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit f9d73eea9c2a17638ca55fc6fcc3a125c85c2619 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 11 20:37:39 2014 +0200 Comment possible values of was_router_added_t. --- src/or/or.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/or/or.h b/src/or/or.h index b95bfb1..371ca4f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4999,14 +4999,30 @@ typedef enum { /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */ typedef … [View More]

1 0

[tor/master] Renaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN.
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit a6520ed5379aa7cd29900eac11c483787f13d4df Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 11 20:56:40 2014 +0200 Renaming ROUTER_WAS_NOT_NEW to ROUTER_IS_ALREADY_KNOWN. --- src/or/dirserv.c | 6 +++--- src/or/or.h | 2 +- src/or/routerlist.c | 4 ++-- src/or/routerlist.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 730f005..d31bb72 100644 --- a/src/or/dirserv.c +++ b/src/or/… [View More]dirserv.c @@ -512,7 +512,7 @@ dirserv_add_multiple_descriptors(const char *desc, uint8_t purpose, if (!n_parsed) { *msg = "No descriptors found in your POST."; if (WRA_WAS_ADDED(r)) - r = ROUTER_WAS_NOT_NEW; + r = ROUTER_IS_ALREADY_KNOWN; } else { *msg = "(no message)"; } @@ -574,7 +574,7 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source) ri->cache_info.signed_descriptor_body, ri->cache_info.signed_descriptor_len, *msg); routerinfo_free(ri); - return ROUTER_WAS_NOT_NEW; + return ROUTER_IS_ALREADY_KNOWN; } /* Make a copy of desc, since router_add_to_routerlist might free @@ -646,7 +646,7 @@ dirserv_add_extrainfo(extrainfo_t *ei, const char **msg) if ((r = routerinfo_incompatible_with_extrainfo(ri, ei, NULL, msg))) { extrainfo_free(ei); - return r < 0 ? ROUTER_WAS_NOT_NEW : ROUTER_BAD_EI; + return r < 0 ? ROUTER_IS_ALREADY_KNOWN : ROUTER_BAD_EI; } router_add_extrainfo_to_routerlist(ei, msg, 0, 0); return ROUTER_ADDED_SUCCESSFULLY; diff --git a/src/or/or.h b/src/or/or.h index 371ca4f..a6c7f66 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5008,7 +5008,7 @@ typedef enum was_router_added_t { * it was incompatible with its extrainfo document. */ ROUTER_BAD_EI = -1, /* Router descriptor was rejected because it is already known. */ - ROUTER_WAS_NOT_NEW = -2, + ROUTER_IS_ALREADY_KNOWN = -2, /* General purpose router was rejected, because it was not listed * in consensus. */ ROUTER_NOT_IN_CONSENSUS = -3, diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d81dae4..81c3717 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3376,7 +3376,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, router_describe(router)); *msg = "Router descriptor was not new."; routerinfo_free(router); - return ROUTER_WAS_NOT_NEW; + return ROUTER_IS_ALREADY_KNOWN; } } @@ -3461,7 +3461,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, &routerlist->desc_store); routerlist_insert_old(routerlist, router); *msg = "Router descriptor was not new."; - return ROUTER_WAS_NOT_NEW; + return ROUTER_IS_ALREADY_KNOWN; } else { /* Same key, and either new, or listed in the consensus. */ log_debug(LD_DIR, "Replacing entry for router %s", diff --git a/src/or/routerlist.h b/src/or/routerlist.h index c6151de..e73e69b 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -118,7 +118,7 @@ WRA_WAS_ADDED(was_router_added_t s) { static INLINE int WRA_WAS_OUTDATED(was_router_added_t s) { return (s == ROUTER_WAS_TOO_OLD || - s == ROUTER_WAS_NOT_NEW || + s == ROUTER_IS_ALREADY_KNOWN || s == ROUTER_NOT_IN_CONSENSUS || s == ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS); } [View Less]

1 0

[tor/master] Adding changes file for 13644.
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 032560fc750811ba361143d99cb61ab4abb26b36 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Nov 11 21:01:30 2014 +0200 Adding changes file for 13644. --- changes/bug13644 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug13644 b/changes/bug13644 new file mode 100644 index 0000000..959ce65 --- /dev/null +++ b/changes/bug13644 @@ -0,0 +1,4 @@ + o Code simplifications and refactoring: + - Document all members of was_router_added_t enum and rename + … [View More]

1 0

[tor/master] Merge remote-tracking branch 'rl1987/bug13644'
by nickm＠torproject.org 12 Nov '14

12 Nov '14

commit 81433e74322bb6cab67458ff7ba524ee86ad7e1c Merge: ccc54d5 032560f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 13:12:14 2014 -0500 Merge remote-tracking branch 'rl1987/bug13644' changes/bug13644 | 4 ++++ src/or/dirserv.c | 6 +++--- src/or/or.h | 18 +++++++++++++++++- src/or/routerlist.c | 4 ++-- src/or/routerlist.h | 2 +- 5 files changed, 27 insertions(+), 7 deletions(-)

1 0

[doctor/master] Marking longclaw as a bwauth
by atagar＠torproject.org 12 Nov '14

12 Nov '14

commit 0d527c5fb20ffe50eb2ad1bf0ee998a93c8c8402 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 12 09:00:49 2014 -0800 Marking longclaw as a bwauth Our new authority is a bwauth, so including those checks for it. --- data/consensus_health.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index 8c36c73..3320129 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -36,6 +36,7 @… [View More]

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2014