May 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Go back to tag 0.2.13 as FTE master is broken.
by gk＠torproject.org 08 May '14

08 May '14

commit 20f5b691785566fe6b227d7e716f26eaf7cac151 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 8 20:27:46 2014 +0000 Go back to tag 0.2.13 as FTE master is broken. --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 93ee6a7..8238aa6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master -FTEPROXY_TAG=master +FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2

1 0

[tor/master] One more 64->32
by nickm＠torproject.org 08 May '14

08 May '14

commit de2010e9c229cb130c30659aa62122529c125637 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 14:10:30 2014 -0400 One more 64->32 --- src/test/test_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 6f3b7e3..d66be32 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -189,7 +189,7 @@ test_util_write_chunks_to_file(void *arg) // assert the tempfile still contains the known string str = read_file_to_str(tempname, RFTS_BIN, &st); tt_assert(str != NULL); - tt_int_op((uint64_t)st.st_size, ==, temp_str_len); + tt_u64_op((uint64_t)st.st_size, ==, temp_str_len); test_mem_op(temp_str, ==, str, temp_str_len); done:

1 0

[tor/master] Fix numerous 64->32 errors in the unit tests
by nickm＠torproject.org 08 May '14

08 May '14

commit 28538069b2f1909a7600ec6d25f8efb78be496fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 14:01:17 2014 -0400 Fix numerous 64->32 errors in the unit tests Before the 11825 fix, these were all silently ignored. --- src/test/test.h | 23 ++++++++++++++++++++++ src/test/test_controller_events.c | 12 ++++++------ src/test/test_crypto.c | 3 ++- src/test/test_dir.c | 8 ++++---- src/test/test_extorport.c | 2 +- src/test/test_util.c | 38 ++++++++++++++++++------------------- 6 files changed, 55 insertions(+), 31 deletions(-) diff --git a/src/test/test.h b/src/test/test.h index 0ccf6c7..712183f 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -59,6 +59,29 @@ tt_assert_test_type(a,b,#a" "#op" "#b,double,(val1_ op val2_),"%f", \ TT_EXIT_TEST_FUNCTION) +#ifdef _MSC_VER +#define U64_PRINTF_TYPE uint64_t +#define U64_PRINTF_TYPE int64_t +#else +#define U64_PRINTF_TYPE unsigned long long +#define I64_PRINTF_TYPE long long +#endif + +#define tt_size_op(a,op,b) \ + tt_assert_test_fmt_type(a,b,#a" "#op" "#b,size_t,(val1_ op val2_), \ + U64_PRINTF_TYPE, U64_FORMAT, \ + {print_ = (U64_PRINTF_TYPE) value_;},{},TT_EXIT_TEST_FUNCTION) + +#define tt_u64_op(a,op,b) \ + tt_assert_test_fmt_type(a,b,#a" "#op" "#b,uint64_t,(val1_ op val2_), \ + U64_PRINTF_TYPE, U64_FORMAT, \ + {print_ = (U64_PRINTF_TYPE) value_;},{},TT_EXIT_TEST_FUNCTION) + +#define tt_i64_op(a,op,b) \ + tt_assert_test_fmt_type(a,b,#a" "#op" "#b,int64_t,(val1_ op val2_), \ + I64_PRINTF_TYPE, I64_FORMAT, \ + {print_ = (I64_PRINTF_TYPE) value_;},{},TT_EXIT_TEST_FUNCTION) + const char *get_fname(const char *name); crypto_pk_t *pk_generate(int idx); diff --git a/src/test/test_controller_events.c b/src/test/test_controller_events.c index ee35239..b45e97a 100644 --- a/src/test/test_controller_events.c +++ b/src/test/test_controller_events.c @@ -118,26 +118,26 @@ test_cntev_sum_up_cell_stats(void *arg) cell_stats = tor_malloc_zero(sizeof(cell_stats_t)); add_testing_cell_stats_entry(circ, CELL_RELAY, 0, 0, 0); sum_up_cell_stats_by_command(circ, cell_stats); - tt_int_op(1, ==, cell_stats->added_cells_appward[CELL_RELAY]); + tt_u64_op(1, ==, cell_stats->added_cells_appward[CELL_RELAY]); /* A single RELAY cell was added to the exitward queue. */ add_testing_cell_stats_entry(circ, CELL_RELAY, 0, 0, 1); sum_up_cell_stats_by_command(circ, cell_stats); - tt_int_op(1, ==, cell_stats->added_cells_exitward[CELL_RELAY]); + tt_u64_op(1, ==, cell_stats->added_cells_exitward[CELL_RELAY]); /* A single RELAY cell was removed from the appward queue where it spent * 20 msec. */ add_testing_cell_stats_entry(circ, CELL_RELAY, 2, 1, 0); sum_up_cell_stats_by_command(circ, cell_stats); - tt_int_op(20, ==, cell_stats->total_time_appward[CELL_RELAY]); - tt_int_op(1, ==, cell_stats->removed_cells_appward[CELL_RELAY]); + tt_u64_op(20, ==, cell_stats->total_time_appward[CELL_RELAY]); + tt_u64_op(1, ==, cell_stats->removed_cells_appward[CELL_RELAY]); /* A single RELAY cell was removed from the exitward queue where it * spent 30 msec. */ add_testing_cell_stats_entry(circ, CELL_RELAY, 3, 1, 1); sum_up_cell_stats_by_command(circ, cell_stats); - tt_int_op(30, ==, cell_stats->total_time_exitward[CELL_RELAY]); - tt_int_op(1, ==, cell_stats->removed_cells_exitward[CELL_RELAY]); + tt_u64_op(30, ==, cell_stats->total_time_exitward[CELL_RELAY]); + tt_u64_op(1, ==, cell_stats->removed_cells_exitward[CELL_RELAY]); done: tor_free(cell_stats); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 1fda334..5d8edb6 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1132,7 +1132,8 @@ test_crypto_curve25519_persist(void *arg) content = read_file_to_str(fname, RFTS_BIN, &st); tt_assert(content); taglen = strlen("== c25519v1: testing =="); - tt_int_op(st.st_size, ==, 32+CURVE25519_PUBKEY_LEN+CURVE25519_SECKEY_LEN); + tt_u64_op((uint64_t)st.st_size, ==, + 32+CURVE25519_PUBKEY_LEN+CURVE25519_SECKEY_LEN); tt_assert(fast_memeq(content, "== c25519v1: testing ==", taglen)); tt_assert(tor_mem_is_zero(content+taglen, 32-taglen)); cp = content + 32; diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 90667e9..c03b63b 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1066,7 +1066,7 @@ test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) test_eq(rs->or_port, 443); test_eq(rs->dir_port, 8000); /* no flags except "running" (16) and "v2dir" (64) */ - test_eq(vrs->flags, U64_LITERAL(80)); + tt_u64_op(vrs->flags, ==, U64_LITERAL(80)); } else if (tor_memeq(rs->identity_digest, "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5" "\x5\x5\x5\x5", @@ -1092,10 +1092,10 @@ test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) test_eq(rs->ipv6_orport, 4711); if (voter == 1) { /* all except "authority" (1) and "v2dir" (64) */ - test_eq(vrs->flags, U64_LITERAL(190)); + tt_u64_op(vrs->flags, ==, U64_LITERAL(190)); } else { /* 1023 - authority(1) - madeofcheese(16) - madeoftin(32) - v2dir(256) */ - test_eq(vrs->flags, U64_LITERAL(718)); + tt_u64_op(vrs->flags, ==, U64_LITERAL(718)); } } else if (tor_memeq(rs->identity_digest, "\x33\x33\x33\x33\x33\x33\x33\x33\x33\x33" @@ -1775,7 +1775,7 @@ test_dir_random_weighted(void *testdata) inp[i].u64 = vals[i]; total += vals[i]; } - tt_int_op(total, ==, 45); + tt_u64_op(total, ==, 45); for (i=0; i<n; ++i) { choice = choose_array_element_by_weight(inp, 10); tt_int_op(choice, >=, 0); diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index 64ed24e..93c8f77 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -202,7 +202,7 @@ test_ext_or_init_auth(void *arg) tt_int_op(ext_or_auth_cookie_is_set, ==, 1); cp = read_file_to_str(fn, RFTS_BIN, &st); tt_ptr_op(cp, !=, NULL); - tt_int_op(st.st_size, ==, 64); + tt_u64_op((uint64_t)st.st_size, ==, 64); test_memeq(cp, "! Extended ORPort Auth Cookie !\x0a", 32); test_memeq(cp+32, ext_or_auth_cookie, 32); memcpy(cookie0, ext_or_auth_cookie, 32); diff --git a/src/test/test_util.c b/src/test/test_util.c index 2c29429..6f3b7e3 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -151,7 +151,7 @@ test_util_write_chunks_to_file(void *arg) // assert the file has been written (expected size) str = read_file_to_str(fname, RFTS_BIN, &st); tt_assert(str != NULL); - tt_int_op(st.st_size, ==, data_str_len); + tt_u64_op((uint64_t)st.st_size, ==, data_str_len); test_mem_op(data_str, ==, str, data_str_len); tor_free(str); @@ -182,14 +182,14 @@ test_util_write_chunks_to_file(void *arg) // assert the file has been written (expected size) str = read_file_to_str(fname, RFTS_BIN, &st); tt_assert(str != NULL); - tt_int_op(st.st_size, ==, data_str_len); + tt_u64_op((uint64_t)st.st_size, ==, data_str_len); test_mem_op(data_str, ==, str, data_str_len); tor_free(str); // assert the tempfile still contains the known string str = read_file_to_str(tempname, RFTS_BIN, &st); tt_assert(str != NULL); - tt_int_op(st.st_size, ==, temp_str_len); + tt_int_op((uint64_t)st.st_size, ==, temp_str_len); test_mem_op(temp_str, ==, str, temp_str_len); done: @@ -1090,7 +1090,7 @@ test_util_strmisc(void) test_eq(i, 0); test_eq(0UL, tor_parse_ulong(TOOBIG, 10, 0, ULONG_MAX, &i, NULL)); test_eq(i, 0); - test_eq(U64_LITERAL(0), tor_parse_uint64(TOOBIG, 10, + tt_u64_op(U64_LITERAL(0), ==, tor_parse_uint64(TOOBIG, 10, 0, UINT64_MAX, &i, NULL)); test_eq(i, 0); } @@ -1288,21 +1288,21 @@ test_util_pow2(void) test_eq(tor_log2(UINT64_MAX), 63); /* Test round_to_power_of_2 */ - test_eq(round_to_power_of_2(120), 128); - test_eq(round_to_power_of_2(128), 128); - test_eq(round_to_power_of_2(130), 128); - test_assert(round_to_power_of_2(U64_LITERAL(40000000000000000)) == - U64_LITERAL(1)<<55); - test_assert(round_to_power_of_2(U64_LITERAL(0xffffffffffffffff)) == - U64_LITERAL(1)<<63); - test_eq(round_to_power_of_2(0), 1); - test_eq(round_to_power_of_2(1), 1); - test_eq(round_to_power_of_2(2), 2); - test_eq(round_to_power_of_2(3), 2); - test_eq(round_to_power_of_2(4), 4); - test_eq(round_to_power_of_2(5), 4); - test_eq(round_to_power_of_2(6), 4); - test_eq(round_to_power_of_2(7), 8); + tt_u64_op(round_to_power_of_2(120), ==, 128); + tt_u64_op(round_to_power_of_2(128), ==, 128); + tt_u64_op(round_to_power_of_2(130), ==, 128); + tt_u64_op(round_to_power_of_2(U64_LITERAL(40000000000000000)), ==, + U64_LITERAL(1)<<55); + tt_u64_op(round_to_power_of_2(U64_LITERAL(0xffffffffffffffff)), ==, + U64_LITERAL(1)<<63); + tt_u64_op(round_to_power_of_2(0), ==, 1); + tt_u64_op(round_to_power_of_2(1), ==, 1); + tt_u64_op(round_to_power_of_2(2), ==, 2); + tt_u64_op(round_to_power_of_2(3), ==, 2); + tt_u64_op(round_to_power_of_2(4), ==, 4); + tt_u64_op(round_to_power_of_2(5), ==, 4); + tt_u64_op(round_to_power_of_2(6), ==, 4); + tt_u64_op(round_to_power_of_2(7), ==, 8); done: ;

1 0

[tor/master] Fix unearthed problems in unit tests
by nickm＠torproject.org 08 May '14

08 May '14

commit df684789380a51c9de14120160adfb796d891436 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 13:16:08 2014 -0400 Fix unearthed problems in unit tests --- src/test/test_buffers.c | 3 +-- src/test/test_util.c | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 78b3aea..61ac5bc 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -663,8 +663,6 @@ test_buffers_zlib_fin_with_nil(void *arg) static void test_buffers_zlib_fin_at_chunk_end(void *arg) { - (void) arg; - char *msg = NULL; char *contents = NULL; char *expanded = NULL; @@ -672,6 +670,7 @@ test_buffers_zlib_fin_at_chunk_end(void *arg) tor_zlib_state_t *zlib_state = NULL; size_t out_len, in_len; size_t sz, headerjunk; + (void) arg; buf = buf_new_with_capacity(128); /* will round up */ sz = buf_get_default_chunk_size(buf); diff --git a/src/test/test_util.c b/src/test/test_util.c index e21f5aa..2c29429 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1291,10 +1291,10 @@ test_util_pow2(void) test_eq(round_to_power_of_2(120), 128); test_eq(round_to_power_of_2(128), 128); test_eq(round_to_power_of_2(130), 128); - test_eq(round_to_power_of_2(U64_LITERAL(40000000000000000)), - U64_LITERAL(1)<<55); - test_eq(round_to_power_of_2(U64_LITERAL(0xffffffffffffffff)), - U64_LITERAL(1)<<63); + test_assert(round_to_power_of_2(U64_LITERAL(40000000000000000)) == + U64_LITERAL(1)<<55); + test_assert(round_to_power_of_2(U64_LITERAL(0xffffffffffffffff)) == + U64_LITERAL(1)<<63); test_eq(round_to_power_of_2(0), 1); test_eq(round_to_power_of_2(1), 1); test_eq(round_to_power_of_2(2), 2);

1 0

[tor/master] Fix numerous type errors in the unit tests
by nickm＠torproject.org 08 May '14

08 May '14

commit 5bb617236704be189e68c713d95dac002912a219 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 13:08:13 2014 -0400 Fix numerous type errors in the unit tests Remove tinytest casts that were suppressing them. Fix for #11825. --- src/ext/tinytest_macros.h | 10 +++++----- src/test/test_buffers.c | 2 +- src/test/test_circuitlist.c | 2 +- src/test/test_extorport.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ext/tinytest_macros.h b/src/ext/tinytest_macros.h index db2dfcb..c3728d1 100644 --- a/src/ext/tinytest_macros.h +++ b/src/ext/tinytest_macros.h @@ -113,8 +113,8 @@ #define tt_assert_test_fmt_type(a,b,str_test,type,test,printf_type,printf_fmt, \ setup_block,cleanup_block,die_on_fail) \ TT_STMT_BEGIN \ - type val1_ = (type)(a); \ - type val2_ = (type)(b); \ + type val1_ = (a); \ + type val2_ = (b); \ int tt_status_ = (test); \ if (!tt_status_ || tinytest_get_verbosity_()>1) { \ printf_type print_; \ @@ -163,7 +163,7 @@ (val1_ op val2_),"%lu",TT_EXIT_TEST_FUNCTION) #define tt_ptr_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ + tt_assert_test_type(a,b,#a" "#op" "#b,const void*, \ (val1_ op val2_),"%p",TT_EXIT_TEST_FUNCTION) #define tt_str_op(a,op,b) \ @@ -173,7 +173,7 @@ #define tt_mem_op(expr1, op, expr2, len) \ tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \ - const char *, \ + const void *, \ (val1_ && val2_ && memcmp(val1_, val2_, len) op 0), \ char *, "%s", \ { print_ = tinytest_format_hex_(value_, (len)); }, \ @@ -189,7 +189,7 @@ (val1_ op val2_),"%lu",(void)0) #define tt_want_ptr_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,void*, \ + tt_assert_test_type(a,b,#a" "#op" "#b,const void*, \ (val1_ op val2_),"%p",(void)0) #define tt_want_str_op(a,op,b) \ diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index cb78a4b..78b3aea 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -222,7 +222,7 @@ test_buffer_pullup(void *arg) buf_pullup(buf, 16, 1); buf_get_first_chunk_data(buf, &cp, &sz); tt_ptr_op(cp, ==, NULL); - tt_ptr_op(sz, ==, 0); + tt_uint_op(sz, ==, 0); /* Let's make sure nothing got allocated */ tt_int_op(buf_get_total_allocation(), ==, 0); diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 7b7d415..b19edd1 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -53,7 +53,7 @@ circuitmux_detach_mock(circuitmux_t *cmux, circuit_t *circ) tt_int_op(cam.ncalls, ==, 1); \ tt_ptr_op(cam.cmux, ==, (mux_)); \ tt_ptr_op(cam.circ, ==, (circ_)); \ - tt_ptr_op(cam.dir, ==, (dir_)); \ + tt_int_op(cam.dir, ==, (dir_)); \ memset(&cam, 0, sizeof(cam)); \ } while (0) diff --git a/src/test/test_extorport.c b/src/test/test_extorport.c index d47792f..64ed24e 100644 --- a/src/test/test_extorport.c +++ b/src/test/test_extorport.c @@ -338,7 +338,7 @@ test_ext_or_cookie_auth_testvec(void *arg) handle_client_auth_nonce(client_nonce, 32, &client_hash, &reply, &reply_len)); tt_ptr_op(reply, !=, NULL ); - tt_ptr_op(reply_len, ==, 64); + tt_uint_op(reply_len, ==, 64); test_memeq(reply+32, "te road There is always another ", 32); /* HMACSHA256("Gliding wrapt in a brown mantle," * "ExtORPort authentication server-to-client hash"

1 0

[tor/master] Fix test_util_max_mem on 32-bit CPUs
by nickm＠torproject.org 08 May '14

08 May '14

commit 1f11be21700af2c9050ea79f2c8942786eda79ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 12:48:41 2014 -0400 Fix test_util_max_mem on 32-bit CPUs --- src/test/test_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index f2a0eaf..e21f5aa 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3627,17 +3627,17 @@ test_util_max_mem(void *arg) r = get_total_system_memory(&memory1); r2 = get_total_system_memory(&memory2); tt_int_op(r, ==, r2); - tt_int_op(memory2, ==, memory1); + tt_uint_op(memory2, ==, memory1); TT_BLATHER(("System memory: "U64_FORMAT, U64_PRINTF_ARG(memory1))); if (r==0) { /* You have at least a megabyte. */ - tt_int_op(memory1, >, (1<<20)); + tt_uint_op(memory1, >, (1<<20)); } else { /* You do not have a petabyte. */ #if SIZEOF_SIZE_T == SIZEOF_UINT64_T - tt_int_op(memory1, <, (U64_LITERAL(1)<<50)); + tt_uint_op(memory1, <, (U64_LITERAL(1)<<50)); #endif }

1 0

[tor/master] Move structures into (private) part of buffers.h so we can inspect them while testing
by nickm＠torproject.org 08 May '14

08 May '14

commit 4eb3018f940e1d41f8060837afd453f9a52a6fad Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 12:40:40 2014 -0400 Move structures into (private) part of buffers.h so we can inspect them while testing --- src/or/buffers.c | 31 +------------------------------ src/or/buffers.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/or/buffers.c b/src/or/buffers.c index e54751d..033f862 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -62,25 +62,8 @@ static int parse_socks_client(const uint8_t *data, size_t datalen, int state, char **reason, ssize_t *drain_out); -#define DEBUG_CHUNK_ALLOC - /* Chunk manipulation functions */ -/** A single chunk on a buffer or in a freelist. */ -typedef struct chunk_t { - struct chunk_t *next; /**< The next chunk on the buffer or freelist. */ - size_t datalen; /**< The number of bytes stored in this chunk */ - size_t memlen; /**< The number of usable bytes of storage in mem. */ -#ifdef DEBUG_CHUNK_ALLOC - size_t DBG_alloc; -#endif - char *data; /**< A pointer to the first byte of data stored in mem. */ - uint32_t inserted_time; /**< Timestamp in truncated ms since epoch - * when this chunk was inserted. */ - char mem[FLEXIBLE_ARRAY_MEMBER]; /**< The actual memory used for storage in - * this chunk. */ -} chunk_t; - #define CHUNK_HEADER_LEN STRUCT_OFFSET(chunk_t, mem[0]) /** Return the number of bytes needed to allocate a chunk to hold @@ -407,19 +390,6 @@ buf_dump_freelist_sizes(int severity) #endif } -/** Magic value for buf_t.magic, to catch pointer errors. */ -#define BUFFER_MAGIC 0xB0FFF312u -/** A resizeable buffer, optimized for reading and writing. */ -struct buf_t { - uint32_t magic; /**< Magic cookie for debugging: Must be set to - * BUFFER_MAGIC. */ - size_t datalen; /**< How many bytes is this buffer holding right now? */ - size_t default_chunk_size; /**< Don't allocate any chunks smaller than - * this for this buffer. */ - chunk_t *head; /**< First chunk in the list, or NULL for none. */ - chunk_t *tail; /**< Last chunk in the list, or NULL for none. */ -}; - /** Collapse data from the first N chunks from buf into buf->head, * growing it as necessary, until buf->head has the first bytes bytes * of data from the buffer, or until buf->head has all the data in buf. @@ -2507,6 +2477,7 @@ write_to_buf_zlib(buf_t *buf, tor_zlib_state_t *state, char *next; size_t old_avail, avail; int over = 0; + do { int need_new_chunk = 0; if (!buf->tail || ! CHUNK_REMAINING_CAPACITY(buf->tail)) { diff --git a/src/or/buffers.h b/src/or/buffers.h index a201282..c90e147 100644 --- a/src/or/buffers.h +++ b/src/or/buffers.h @@ -106,6 +106,35 @@ void assert_buf_ok(buf_t *buf); STATIC int buf_find_string_offset(const buf_t *buf, const char *s, size_t n); STATIC void buf_pullup(buf_t *buf, size_t bytes, int nulterminate); void buf_get_first_chunk_data(const buf_t *buf, const char **cp, size_t *sz); + +#define DEBUG_CHUNK_ALLOC +/** A single chunk on a buffer or in a freelist. */ +typedef struct chunk_t { + struct chunk_t *next; /**< The next chunk on the buffer or freelist. */ + size_t datalen; /**< The number of bytes stored in this chunk */ + size_t memlen; /**< The number of usable bytes of storage in mem. */ +#ifdef DEBUG_CHUNK_ALLOC + size_t DBG_alloc; +#endif + char *data; /**< A pointer to the first byte of data stored in mem. */ + uint32_t inserted_time; /**< Timestamp in truncated ms since epoch + * when this chunk was inserted. */ + char mem[FLEXIBLE_ARRAY_MEMBER]; /**< The actual memory used for storage in + * this chunk. */ +} chunk_t; + +/** Magic value for buf_t.magic, to catch pointer errors. */ +#define BUFFER_MAGIC 0xB0FFF312u +/** A resizeable buffer, optimized for reading and writing. */ +struct buf_t { + uint32_t magic; /**< Magic cookie for debugging: Must be set to + * BUFFER_MAGIC. */ + size_t datalen; /**< How many bytes is this buffer holding right now? */ + size_t default_chunk_size; /**< Don't allocate any chunks smaller than + * this for this buffer. */ + chunk_t *head; /**< First chunk in the list, or NULL for none. */ + chunk_t *tail; /**< Last chunk in the list, or NULL for none. */ +}; #endif #endif

1 0

[tor/master] More unit tests for #11648-related stuff
by nickm＠torproject.org 08 May '14

08 May '14

commit 891d239e012aadc907a0d98fb7a8268ff40bb62a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 12:41:01 2014 -0400 More unit tests for #11648-related stuff These are actually tests for #311. It appears to me that we didn't fix #311 properly when we thought we did in 475eb5d6; instead, the real fix was 05eff35ac6d64b, a few minutes earlier. --- src/test/test_buffers.c | 83 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index e86ec8e..cb78a4b 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -598,7 +598,7 @@ test_buffer_time_tracking(void *arg) } static void -test_buffers_zlib(void *arg) +test_buffers_zlib_impl(int finalize_with_nil) { char *msg = NULL; char *contents = NULL; @@ -606,8 +606,7 @@ test_buffers_zlib(void *arg) buf_t *buf = NULL; tor_zlib_state_t *zlib_state = NULL; size_t out_len, in_len; - - (void) arg; + int done; buf = buf_new_with_capacity(128); /* will round up */ zlib_state = tor_zlib_new(1, ZLIB_METHOD); @@ -617,7 +616,11 @@ test_buffers_zlib(void *arg) tt_int_op(write_to_buf_zlib(buf, zlib_state, msg, 128, 0), ==, 0); tt_int_op(write_to_buf_zlib(buf, zlib_state, msg+128, 128, 0), ==, 0); tt_int_op(write_to_buf_zlib(buf, zlib_state, msg+256, 256, 0), ==, 0); - tt_int_op(write_to_buf_zlib(buf, zlib_state, "all done", 9, 1), ==, 0); + done = !finalize_with_nil; + tt_int_op(write_to_buf_zlib(buf, zlib_state, "all done", 9, done), ==, 0); + if (finalize_with_nil) { + tt_int_op(write_to_buf_zlib(buf, zlib_state, "", 0, 1), ==, 0); + } in_len = buf_datalen(buf); contents = tor_malloc(in_len); @@ -644,6 +647,75 @@ test_buffers_zlib(void *arg) tor_free(msg); } +static void +test_buffers_zlib(void *arg) +{ + (void) arg; + test_buffers_zlib_impl(0); +} +static void +test_buffers_zlib_fin_with_nil(void *arg) +{ + (void) arg; + test_buffers_zlib_impl(1); +} + +static void +test_buffers_zlib_fin_at_chunk_end(void *arg) +{ + (void) arg; + + char *msg = NULL; + char *contents = NULL; + char *expanded = NULL; + buf_t *buf = NULL; + tor_zlib_state_t *zlib_state = NULL; + size_t out_len, in_len; + size_t sz, headerjunk; + + buf = buf_new_with_capacity(128); /* will round up */ + sz = buf_get_default_chunk_size(buf); + msg = tor_malloc_zero(sz); + + write_to_buf(msg, 1, buf); + tt_assert(buf->head); + + /* Fill up the chunk so the zlib stuff won't fit in one chunk. */ + tt_uint_op(buf->head->memlen, <, sz); + headerjunk = buf->head->memlen - 7; + write_to_buf(msg, headerjunk-1, buf); + tt_uint_op(buf->head->datalen, ==, headerjunk); + printf("<%u>\n", (unsigned)buf_datalen(buf)); + tt_uint_op(buf_datalen(buf), ==, headerjunk); + /* Write an empty string, with finalization on. */ + zlib_state = tor_zlib_new(1, ZLIB_METHOD); + tt_int_op(write_to_buf_zlib(buf, zlib_state, "", 0, 1), ==, 0); + + printf("<%u>\n", (unsigned)buf_datalen(buf)); + + in_len = buf_datalen(buf); + contents = tor_malloc(in_len); + + tt_int_op(fetch_from_buf(contents, in_len, buf), ==, 0); + + tt_uint_op(in_len, >, headerjunk); + + tt_int_op(0, ==, tor_gzip_uncompress(&expanded, &out_len, + contents + headerjunk, in_len - headerjunk, + ZLIB_METHOD, 1, + LOG_WARN)); + + tt_int_op(out_len, ==, 0); + tt_assert(expanded); + + done: + buf_free(buf); + tor_zlib_free(zlib_state); + tor_free(contents); + tor_free(expanded); + tor_free(msg); +} + struct testcase_t buffer_tests[] = { { "basic", test_buffers_basic, TT_FORK, NULL, NULL }, { "copy", test_buffer_copy, TT_FORK, NULL, NULL }, @@ -653,6 +725,9 @@ struct testcase_t buffer_tests[] = { NULL, NULL }, { "time_tracking", test_buffer_time_tracking, TT_FORK, NULL, NULL }, { "zlib", test_buffers_zlib, TT_FORK, NULL, NULL }, + { "zlib_fin_with_nil", test_buffers_zlib_fin_with_nil, TT_FORK, NULL, NULL }, + { "zlib_fin_at_chunk_end", test_buffers_zlib_fin_at_chunk_end, TT_FORK, + NULL, NULL}, END_OF_TESTCASES };

1 0

[obfsproxy/master] Don't set transport circuit to None when closing a circuit.
by asn＠torproject.org 08 May '14

08 May '14

commit 8fdb64a2edf9e354136085dc2ce38dbb60457716 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 8 17:42:14 2014 +0100 Don't set transport circuit to None when closing a circuit. --- ChangeLog | 2 ++ obfsproxy/network/network.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6e62a75..35fea5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Changes in version 0.2.10 - UNRELEASED: + - Don't set the transport's circuit to None if we are closing + a circuit; it was causing problems in obfs3. Fixes #11820. - Make sure that we don't try to do networking operations on a connection that should be closed. Fixes #11769. - Only print ScrambleSuit disclaimer on startup (instead of diff --git a/obfsproxy/network/network.py b/obfsproxy/network/network.py index aadbba5..f346618 100644 --- a/obfsproxy/network/network.py +++ b/obfsproxy/network/network.py @@ -185,7 +185,6 @@ class Circuit(Protocol): self.upstream.close() self.transport.circuitDestroyed(reason, side) - self.transport.circuit = None class GenericProtocol(Protocol, object): """

1 0

[obfsproxy/master] Don't do networking on connections that should be closed.
by asn＠torproject.org 08 May '14

08 May '14

commit 2ff160c0ad9258109d8c47eca162e7cd24e0f161 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu May 8 17:22:44 2014 +0100 Don't do networking on connections that should be closed. --- ChangeLog | 2 ++ obfsproxy/network/extended_orport.py | 3 +++ obfsproxy/network/network.py | 15 +++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 469988e..6e62a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ Changes in version 0.2.10 - UNRELEASED: + - Make sure that we don't try to do networking operations on a + connection that should be closed. Fixes #11769. - Only print ScrambleSuit disclaimer on startup (instead of printing it for every connection). Fixes #11768. diff --git a/obfsproxy/network/extended_orport.py b/obfsproxy/network/extended_orport.py index cb8ea4f..27220d4 100644 --- a/obfsproxy/network/extended_orport.py +++ b/obfsproxy/network/extended_orport.py @@ -121,6 +121,9 @@ class ExtORPortProtocol(network.GenericProtocol): """ We got some data, process it according to our current state. """ + if self.closed: + log.debug("%s: ExtORPort dataReceived called while closed. Ignoring.", self.name) + return self.buffer.write(data_rcvd) diff --git a/obfsproxy/network/network.py b/obfsproxy/network/network.py index fa4d1e6..aadbba5 100644 --- a/obfsproxy/network/network.py +++ b/obfsproxy/network/network.py @@ -120,6 +120,9 @@ class Circuit(Protocol): Circuit was just completed; that is, its endpoints are now connected. Do all the things we have to do now. """ + if self.closed: + log.debug("%s: Completed circuit while closed. Ignoring.", self.name) + return log.debug("%s: Circuit completed." % self.name) @@ -145,6 +148,10 @@ class Circuit(Protocol): Requires both downstream and upstream connections to be set. """ + if self.closed: + log.debug("%s: Calling circuit's dataReceived while closed. Ignoring.", self.name) + return + assert(self.downstream and self.upstream) assert((conn is self.downstream) or (conn is self.upstream)) @@ -208,6 +215,10 @@ class GenericProtocol(Protocol, object): """ Write 'buf' to the underlying transport. """ + if self.closed: + log.debug("%s: Calling write() while connection is closed. Ignoring.", self.name) + return + log.debug("%s: Writing %d bytes." % (self.name, len(buf))) self.transport.write(buf) @@ -291,6 +302,10 @@ class StaticDestinationProtocol(GenericProtocol): XXX: Can also be called with empty 'data' because of Circuit.setDownstreamConnection(). Document or split function. """ + if self.closed: + log.debug("%s: dataReceived called while closed. Ignoring.", self.name) + return + if (not self.buffer) and (not data): log.debug("%s: dataReceived called without a reason.", self.name) return

1 0