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

[tor/master] Test coverage for timers.
by nickm＠torproject.org 09 May '16

09 May '16

commit 11a09778d67cba7f118a7425bda313316ac7ecc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 15 09:31:18 2016 -0400 Test coverage for timers. --- src/common/timers.c | 6 ++++-- src/test/test-timers.c | 43 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/src/common/timers.c b/src/common/timers.c index 58981b9..5d8d1fe 100644 --- a/src/common/timers.c +++ b/src/common/timers.c @@ -186,14 +186,16 @@ libevent_timer_callback(evutil_socket_t fd, short what, void *arg) void timers_initialize(void) { - if (global_timeouts) - return; + if (BUG(global_timeouts)) + return; // LCOV_EXCL_LINE timeout_error_t err; global_timeouts = timeouts_open(0, &err); if (!global_timeouts) { + // LCOV_EXCL_START -- this can only fail on malloc failure. log_err(LD_BUG, "Unable to open timer backend: %s", strerror(err)); tor_assert(0); + // LCOV_EXCL_STOP } struct event *timer_event; diff --git a/src/test/test-timers.c b/src/test/test-timers.c index 83a5e1b..10db20f 100644 --- a/src/test/test-timers.c +++ b/src/test/test-timers.c @@ -21,12 +21,15 @@ #define N_TIMERS 1000 #define MAX_DURATION 30 +#define N_DISABLE 5 static struct timeval fire_at[N_TIMERS] = {{0,0}}; +static int is_disabled[N_TIMERS] = {0}; static int fired[N_TIMERS] = {0}; static struct timeval difference[N_TIMERS] = {{0,0}}; static tor_timer_t *timers[N_TIMERS] = {NULL}; +static int n_active_timers = 0; static int n_fired = 0; static void @@ -39,7 +42,7 @@ timer_cb(tor_timer_t *t, void *arg, const struct timeval *now) timersub(now, &fire_at[idx], &difference[idx]); ++n_fired; // printf("%d / %d\n",n_fired, N_TIMERS); - if (n_fired == N_TIMERS) { + if (n_fired == n_active_timers) { event_base_loopbreak(tor_libevent_get_base()); } } @@ -55,6 +58,7 @@ main(int argc, char **argv) timers_initialize(); int i; + int ret; struct timeval now; tor_gettimeofday(&now); for (i = 0; i < N_TIMERS; ++i) { @@ -62,26 +66,41 @@ main(int argc, char **argv) delay.tv_sec = crypto_rand_int_range(0,MAX_DURATION); delay.tv_usec = crypto_rand_int_range(0,1000000); timeradd(&now, &delay, &fire_at[i]); - timers[i] = timer_new(timer_cb, &timers[i], 0); + timers[i] = timer_new(timer_cb, &timers[i]); timer_schedule(timers[i], &delay); + ++n_active_timers; + } + + /* Disable some; we'll make sure they don't trigger. */ + for (i = 0; i < N_DISABLE; ++i) { + int idx = crypto_rand_int_range(0, N_TIMERS); + if (is_disabled[idx]) + continue; + is_disabled[idx] = 1; + timer_disable(timers[idx]); + --n_active_timers; } event_base_loop(tor_libevent_get_base(), 0); uint64_t total_difference = 0; uint64_t total_square_difference = 0; - tor_assert(n_fired == N_TIMERS); + tor_assert(n_fired == n_active_timers); for (i = 0; i < N_TIMERS; ++i) { + if (is_disabled[i]) { + tor_assert(fired[i] == 0); + continue; + } tor_assert(fired[i] == 1); uint64_t diff = difference[i].tv_usec + difference[i].tv_sec * 1000000; total_difference += diff; total_square_difference += diff*diff; } - const uint64_t mean_diff = total_difference / N_TIMERS; + const uint64_t mean_diff = total_difference / n_active_timers; printf("mean difference: "U64_FORMAT" usec\n", U64_PRINTF_ARG(mean_diff)); - const double mean_sq = ((double)total_square_difference) / N_TIMERS; + const double mean_sq = ((double)total_square_difference)/ n_active_timers; const double sq_mean = mean_diff * mean_diff; const double stddev = sqrt(mean_sq - sq_mean); printf("standard deviation: %lf usec\n", stddev); @@ -89,13 +108,21 @@ main(int argc, char **argv) if (mean_diff > 500*1000 || stddev > 500*1000) { printf("Either your system is under ridiculous load, or the " "timer backend is broken.\n"); - return 1; + ret = 1; } else if (mean_diff > 2000 || stddev > 2000) { printf("Either your system is a bit slow or the " "timer backend is odd.\n"); - return 0; + ret = 0; } else { printf("Looks good enough.\n"); + ret = 0; + } + + timer_free(NULL); + + for (i = 0; i < N_TIMERS; ++i) { + timer_free(timers[i]); } - return 0; + timers_shutdown(); + return ret; }

1 0

[tor/master] Merge branch 'timeouts_v2_squashed'
by nickm＠torproject.org 09 May '16

09 May '16

commit 69380033d644d39a7369e0cd2b2cb7fd5cd7c695 Merge: 641cdc3 af132fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 9 14:06:10 2016 -0400 Merge branch 'timeouts_v2_squashed' .gitignore | 2 + changes/timeouts | 7 + src/common/include.am | 5 +- src/common/timers.c | 297 +++++++++++++ src/common/timers.h | 22 + src/ext/README | 4 + src/ext/include.am | 24 +- src/ext/timeouts/Makefile | 68 +++ src/ext/timeouts/Rules.shrc | 40 ++ src/ext/timeouts/bench/Rules.mk | 49 +++ src/ext/timeouts/bench/bench-add.lua | 30 ++ src/ext/timeouts/bench/bench-aux.lua | 30 ++ src/ext/timeouts/bench/bench-del.lua | 25 ++ src/ext/timeouts/bench/bench-expire.lua | 29 ++ src/ext/timeouts/bench/bench-heap.c | 236 ++++++++++ src/ext/timeouts/bench/bench-llrb.c | 425 ++++++++++++++++++ src/ext/timeouts/bench/bench-wheel.c | 81 ++++ src/ext/timeouts/bench/bench.c | 293 +++++++++++++ src/ext/timeouts/bench/bench.h | 11 + src/ext/timeouts/bench/bench.plt | 19 + src/ext/timeouts/lua/Rules.mk | 20 + src/ext/timeouts/lua/timeout-lua.c | 396 +++++++++++++++++ src/ext/timeouts/test-timeout.c | 530 ++++++++++++++++++++++ src/ext/timeouts/timeout-bitops.c | 254 +++++++++++ src/ext/timeouts/timeout-debug.h | 77 ++++ src/ext/timeouts/timeout.c | 754 ++++++++++++++++++++++++++++++++ src/ext/timeouts/timeout.h | 256 +++++++++++ src/test/include.am | 16 +- src/test/test-timers.c | 133 ++++++ 29 files changed, 4130 insertions(+), 3 deletions(-)

1 0

[tor/master] timer tests: differences in timing accuracy can be negative.
by nickm＠torproject.org 09 May '16

09 May '16

commit af132fc299f837f8749278099e6257cea3795e8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 25 14:34:02 2016 -0400 timer tests: differences in timing accuracy can be negative. Also, use symbolic names for good-enough thresholds for timer accuracy. --- src/test/test-timers.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/test/test-timers.c b/src/test/test-timers.c index 10db20f..8f5ba7b 100644 --- a/src/test/test-timers.c +++ b/src/test/test-timers.c @@ -83,7 +83,7 @@ main(int argc, char **argv) event_base_loop(tor_libevent_get_base(), 0); - uint64_t total_difference = 0; + int64_t total_difference = 0; uint64_t total_square_difference = 0; tor_assert(n_fired == n_active_timers); for (i = 0; i < N_TIMERS; ++i) { @@ -92,11 +92,11 @@ main(int argc, char **argv) continue; } tor_assert(fired[i] == 1); - uint64_t diff = difference[i].tv_usec + difference[i].tv_sec * 1000000; + int64_t diff = difference[i].tv_usec + difference[i].tv_sec * 1000000; total_difference += diff; total_square_difference += diff*diff; } - const uint64_t mean_diff = total_difference / n_active_timers; + const int64_t mean_diff = total_difference / n_active_timers; printf("mean difference: "U64_FORMAT" usec\n", U64_PRINTF_ARG(mean_diff)); @@ -105,11 +105,16 @@ main(int argc, char **argv) const double stddev = sqrt(mean_sq - sq_mean); printf("standard deviation: %lf usec\n", stddev); - if (mean_diff > 500*1000 || stddev > 500*1000) { +#define MAX_DIFF_USEC (500*1000) +#define MAX_STDDEV_USEC (500*1000) +#define ODD_DIFF_USEC (2000) +#define ODD_STDDEV_USEC (2000) + + if (mean_diff < 0 || mean_diff > MAX_DIFF_USEC || stddev > MAX_STDDEV_USEC) { printf("Either your system is under ridiculous load, or the " "timer backend is broken.\n"); ret = 1; - } else if (mean_diff > 2000 || stddev > 2000) { + } else if (mean_diff > ODD_DIFF_USEC || stddev > ODD_STDDEV_USEC) { printf("Either your system is a bit slow or the " "timer backend is odd.\n"); ret = 0;

1 0

[spec/master] Merge pull request #46 from TheTorProject/fix/bridge-reachability-spec
by art＠torproject.org 09 May '16

09 May '16

commit b64482c4bb97ff9eac4398cb934acb0c9a804aaa Merge: c9be501 df399e9 Author: Joe Landers <joe(a)joelanders.net> Date: Mon Dec 21 20:40:38 2015 +0100 Merge pull request #46 from TheTorProject/fix/bridge-reachability-spec Add obfs4proxy documentation test-specs/ts-011-bridge-reachability.md | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[spec/master] Add obfs4proxy documentation
by art＠torproject.org 09 May '16

09 May '16

commit df399e98642a9d54fbb061fad14874361afb3868 Author: anadahz <kojgelo(a)inbox.com> Date: Sun Dec 20 22:01:47 2015 +0100 Add obfs4proxy documentation --- test-specs/ts-011-bridge-reachability.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test-specs/ts-011-bridge-reachability.md b/test-specs/ts-011-bridge-reachability.md index 194950a..e1f9caf 100644 --- a/test-specs/ts-011-bridge-reachability.md +++ b/test-specs/ts-011-bridge-reachability.md @@ -107,6 +107,8 @@ transport_name: obfs3: for [obfs3 obfsproxy](https://gitweb.torproject.org/pluggable-transports/obfsproxy.git…. + obfs4: for [obfs4 obfsproxy](https://gitweb.torproject.org/pluggable-transports/obfs4.git/tre…. + fte: for [fte-proxy](https://fteproxy.org/) scramblesuit: for [ScrambleSuit](http://www.cs.kau.se/philwint/scramblesuit/) @@ -135,6 +137,9 @@ bridge_address: obfsproxy_version (since 0.1.1): **string** indicating the version string of the obfsproxy client being used. +obfsproxy_log (since 0.1.2): + **string** info level log output of obfsproxy + ## Possible conclusions Which bridges are functioning from the given network vantage point and which

1 0

[spec/master] Update ts-008-tcpconnect.md
by art＠torproject.org 09 May '16

09 May '16

commit 744b8d58cf518ca9af20bd8be07b9a60b53af654 Author: Joe Landers <joe(a)joelanders.net> Date: Mon Apr 4 19:17:11 2016 +0200 Update ts-008-tcpconnect.md There are probably more of these formatting issues in this repo; I'm fixing a couple I just happened to see. --- test-specs/ts-008-tcpconnect.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test-specs/ts-008-tcpconnect.md b/test-specs/ts-008-tcpconnect.md index 4fa9d18..0736cc4 100644 --- a/test-specs/ts-008-tcpconnect.md +++ b/test-specs/ts-008-tcpconnect.md @@ -29,9 +29,11 @@ A list of URLs to be tested for censorship. The input document may contain an http or https URL, an IP:PORT, or a FQDN:PORT per line. e.g. - http://www.google.com - google.com:80 - 8.8.8.8:53 +``` + http://www.google.com + google.com:80 + 8.8.8.8:53 +``` are all valid entries @@ -59,7 +61,7 @@ The result of the connection attempt, 'success' or failure type. Ability to determine that a specific host:port is blocked. ## Example output sample - +``` ########################################### # OONI Probe Report for tcp_connect (0.1) # Wed Sep 18 20:41:49 2013 @@ -93,3 +95,4 @@ Ability to determine that a specific host:port is blocked. ... --- {connection: success, input: 'blogspot.com:80'} + ```

1 0

[spec/master] Merge pull request #44 from juga0/feature/psiphon-dev
by art＠torproject.org 09 May '16

09 May '16

commit c9be501c39e65bb98a3640be6c7a67ed9ec911a8 Merge: 93fbc7b 7e00a17 Author: Arturo Filastò <arturo(a)filasto.net> Date: Fri Nov 13 10:51:44 2015 +0100 Merge pull request #44 from juga0/feature/psiphon-dev add psiphon test specification data-formats/df-000-base.md | 2 + test-specs/ts-014-psiphon.md | 146 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+)

1 0

[spec/master] Merge pull request #47 from TheTorProject/fix/lantern-test-spec
by art＠torproject.org 09 May '16

09 May '16

commit 94c48754d59feb059f3510aa195a800ddf5f11a8 Merge: b64482c 0910934 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Mar 15 14:54:42 2016 +0100 Merge pull request #47 from TheTorProject/fix/lantern-test-spec Fix/lantern test spec test-specs/ts-012-lantern.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[spec/master] Merge pull request #49 from TheTorProject/feature/df-0.2
by art＠torproject.org 09 May '16

09 May '16

commit 3d3bd21cf45cb070296208bccd00e6e6b30fc90b Merge: 744b8d5 7c82e5d Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Apr 5 14:38:51 2016 +0200 Merge pull request #49 from TheTorProject/feature/df-0.2 Feature/df 0.2 Release-Procedure.md | 18 +- data-formats/df-000-base.md | 174 +- data-formats/df-001-httpt.md | 328 ++-- data-formats/df-002-dnst.md | 270 ++- data-formats/df-003-scapy.md | 663 ++++++- data-formats/df-004-tcpt.md | 63 + oonib.md | 78 +- test-specs/ts-001-bridget.md | 2 + test-specs/ts-002-dns-consistency.md | 247 +++ test-specs/ts-002-dnsconsistency.md | 178 -- test-specs/ts-003-http-requests.md | 321 ++-- test-specs/ts-004-http-host.md | 234 +++ test-specs/ts-004-httphost.md | 257 --- test-specs/ts-005-dns-spoof.md | 151 ++ test-specs/ts-005-dnsspoof.md | 149 -- test-specs/ts-006-header-field-manipulation.md | 186 +- test-specs/ts-007-http-invalid-request-line.md | 129 +- test-specs/ts-008-tcp-connect.md | 96 + test-specs/ts-008-tcpconnect.md | 98 - test-specs/ts-009-multi-port-traceroute.md | 2384 ------------------------ test-specs/ts-009-multi-protocol-traceroute.md | 619 ++++++ test-specs/ts-010-captive-portal.md | 125 +- test-specs/ts-011-bridge-reachability.md | 31 +- test-specs/ts-012-dns-injection.md | 2 +- 24 files changed, 3034 insertions(+), 3769 deletions(-)

1 0

[spec/master] Adjust oonib specification to the test_start_time field
by art＠torproject.org 09 May '16

09 May '16

commit 7c82e5d4ad86a19f828179dfe2048b5ac92f4272 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Mar 17 15:59:20 2016 +0100 Adjust oonib specification to the test_start_time field --- oonib.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oonib.md b/oonib.md index 90d7b99..036aa7d 100644 --- a/oonib.md +++ b/oonib.md @@ -103,9 +103,9 @@ The HTTP request it performs is: `string` that must be either "json" or "yaml" to identify the format of the content. - 'start_time': + 'test_start_time': NEW since oonibackend 1.3 - `float` seconds since epoch in UTC of when the measurement was started. + `string` timestamp in UTC of when the test was started using the format "%Y-%m-%d %H:%M:%S" 'input_hashes': (optional) `list` of hex encoded sha256sum of the contents

1 0