February 2015 - tor-commits - lists.torproject.org

[ooni-probe/master] Merge pull request #372 from TheTorProject/fix/14086
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 2ff381e5276fef1fdd203fc0662aebd6957a113d Merge: a609558 8330d9f Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Jan 15 14:58:30 2015 +0100 Merge pull request #372 from TheTorProject/fix/14086 Fix/14086 .gitignore | 2 + MANIFEST.in | 4 + data/ooniprobe.conf.sample | 2 - ooni/deckgen/cli.py | 4 +- ooni/deckgen/processors/citizenlab_test_lists.py | 16 ++-- ooni/deckgen/processors/namebench_dns_servers.py | 8 +- ooni/geoip.py | 14 ++-- ooni/resources/__init__.py | 24 ++++-- ooni/resources/update.py | 5 +- ooni/settings.py | 91 +++++++++++++++------- ooni/tests/test_oonicli.py | 2 +- requirements.txt | 4 + setup-dependencies.sh | 2 + setup.py | 25 +++++- 14 files changed, 133 insertions(+), 70 deletions(-)

1 0

[ooni-probe/master] Merge pull request #374 from anadahz/fix/setup_deps
by art＠torproject.org 04 Feb '15

04 Feb '15

commit df6a518728a4378b94a4c67780f86c3fe5b81619 Merge: 2ff381e 9ac1e77 Author: Arturo Filastò <arturo(a)filasto.net> Date: Thu Jan 15 14:58:51 2015 +0100 Merge pull request #374 from anadahz/fix/setup_deps Add install package libdumbnet-dev setup-dependencies.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[ooni-probe/master] Fix typo
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 9bc66e72853a473aa46639e2227e55bd6d5f9e67 Author: anadahz <kojgelo(a)inbox.com> Date: Wed Feb 4 01:35:32 2015 +0100 Fix typo --- setup-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-dependencies.sh b/setup-dependencies.sh index 28593db..d96f2cf 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -20,7 +20,7 @@ elif [ -r /lib/lsb/init-functions ]; then elif [ "$( lsb_release -is )" == "LinuxMint" ]; then source $MINT_RELEASE_VARS DISTRO="$ID" - DISTRO_VERSION="$( echo $VERSION | cut -d' ' -f2 | tr [:upper:] [:lower:] )" + DISTRO_VERSION="$( echo $VERSION | cut -d' ' -f3 | tr [:upper:] [:lower:] )" else DISTRO="debian" fi

1 0

[ooni-probe/master] Point the http header field manipulation test to a working backend
by art＠torproject.org 04 Feb '15

04 Feb '15

commit 8330d9fc5699242890cfb1cb2ceab7b544511993 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 15 14:13:42 2015 +0100 Point the http header field manipulation test to a working backend --- ooni/tests/test_oonicli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/tests/test_oonicli.py b/ooni/tests/test_oonicli.py index a01aade..2ca94e3 100644 --- a/ooni/tests/test_oonicli.py +++ b/ooni/tests/test_oonicli.py @@ -163,7 +163,7 @@ class TestRunDirector(ConfigTestCase): assert 'total' in entry['tampering'] yield self.run_helper('manipulation/http_header_field_manipulation', - ['-b', 'http://64.9.225.208'], + ['-b', 'http://4.15.35.157:80'], verify_function) @defer.inlineCallbacks

1 0

[tor/master] fix a unit tests memory leak (my fault)
by nickm＠torproject.org 03 Feb '15

03 Feb '15

commit ac8f235446ad1b26d9f85df10cca8ce250588b83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 3 15:58:48 2015 -0500 fix a unit tests memory leak (my fault) --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 84e80ea..849bbdb 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2994,7 +2994,6 @@ test_dir_packages(void *arg) BAD("sha512= sha256=" "3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7"); - votes = smartlist_new(); smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); smartlist_add(votes, tor_malloc_zero(sizeof(networkstatus_t))); @@ -3097,6 +3096,7 @@ test_dir_packages(void *arg) done: SMARTLIST_FOREACH(votes, networkstatus_t *, ns, { smartlist_free(ns->package_lines); tor_free(ns); }); + smartlist_free(votes); tor_free(res); }

1 0

[tor/master] Work around test_status.c weirdness
by nickm＠torproject.org 03 Feb '15

03 Feb '15

commit 5be48c5d4c7339ab69b2becb6176c83d2f637f11 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 3 15:50:31 2015 -0500 Work around test_status.c weirdness Ordinarily, get_options() can never return NULL, but with test_status.c mocking, it can. So test for that case. The best fix here would be to pass the options value to a bridge_server_mode() function. --- src/or/status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/status.c b/src/or/status.c index 98db688..8057abe 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -132,7 +132,7 @@ log_heartbeat(time_t now) circuit_log_ancient_one_hop_circuits(1800); - if (options->BridgeRelay) { + if (options && options->BridgeRelay) { char *msg = NULL; msg = format_client_stats_heartbeat(now); if (msg)

1 0

[torspec/master] three typo fixes
by arma＠torproject.org 03 Feb '15

03 Feb '15

commit f547a82f219eabf5bcfbc965a29e1c5a1b52683a Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 3 13:50:33 2015 -0500 three typo fixes --- proposals/241-suspicious-guard-turnover.txt | 2 +- rend-spec.txt | 1 - tor-spec.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/proposals/241-suspicious-guard-turnover.txt b/proposals/241-suspicious-guard-turnover.txt index a0313b2..c75ae80 100644 --- a/proposals/241-suspicious-guard-turnover.txt +++ b/proposals/241-suspicious-guard-turnover.txt @@ -30,7 +30,7 @@ Status: Draft In the presence of these attacks, we can't continue to connect to the Tor network unconditionally. Doing so would eventually result - in the user chosing a hostile node as their guard, and losing + in the user choosing a hostile node as their guard, and losing anonymity. diff --git a/rend-spec.txt b/rend-spec.txt index 914ba89..540fca0 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -249,7 +249,6 @@ created by the service. "time-period" changes periodically as a function of time and - "permanent-id". The current value for "time-period" can be calculated using the following formula: diff --git a/tor-spec.txt b/tor-spec.txt index 43bb181..de5387e 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -514,7 +514,7 @@ see tor-design.pdf. Link protocols differences are: 1 -- The "certs up front" handshake. 2 -- Uses the renegotiation-based handshake. Introduces - varible-length cells. + variable-length cells. 3 -- Uses the in-protocol handshake. 4 -- Increases circuit ID width to 4 bytes.

1 0

[tor/master] Add unique client counter to the heartbeat message.
by nickm＠torproject.org 03 Feb '15

03 Feb '15

commit 05f8fd2878e1b85822c126c0206f8b8929556868 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Feb 26 12:43:53 2013 +0200 Add unique client counter to the heartbeat message. --- changes/bug6852 | 3 +++ src/or/geoip.c | 32 ++++++++++++++++++++++++++++++++ src/or/geoip.h | 1 + src/or/status.c | 10 +++++++++- 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/changes/bug6852 b/changes/bug6852 new file mode 100644 index 0000000..9bafef8 --- /dev/null +++ b/changes/bug6852 @@ -0,0 +1,3 @@ + o Minor features: + - Add a unique client counter to the heartbeat message. Resolves + ticket 6852. diff --git a/src/or/geoip.c b/src/or/geoip.c index e2e98e8..810070c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1292,6 +1292,38 @@ format_bridge_stats_controller(time_t now) return out; } +/** Return a newly allocated string holding our bridge usage stats by + * country in a format suitable for inclusion in our heartbeat + * message. Return NULL on failure. */ +char * +format_client_stats_heartbeat(time_t now) +{ + char *out = NULL; + int n_clients = 0; + clientmap_entry_t **ent; + double elapsed_time = 0; + + if (!start_of_bridge_stats_interval) + return NULL; /* Not initialized. */ + + /* count unique IPs */ + HT_FOREACH(ent, clientmap, &client_history) { + /* only count directly connecting clients */ + if ((*ent)->action != GEOIP_CLIENT_CONNECT) + continue; + n_clients++; + } + + elapsed_time = difftime(now, start_of_bridge_stats_interval); + + tor_asprintf(&out, "Heartbeat: " + "Since the last %ld hours, I have seen %d unique clients.", + tor_lround(elapsed_time / 3600), + n_clients); + + return out; +} + /** Write bridge statistics to $DATADIR/stats/bridge-stats and return * when we should next try to write statistics. */ time_t diff --git a/src/or/geoip.h b/src/or/geoip.h index ebefee5..bebce1e 100644 --- a/src/or/geoip.h +++ b/src/or/geoip.h @@ -60,6 +60,7 @@ time_t geoip_bridge_stats_write(time_t now); void geoip_bridge_stats_term(void); const char *geoip_get_bridge_stats_extrainfo(time_t); char *geoip_get_bridge_stats_controller(time_t); +char *format_client_stats_heartbeat(time_t now); #endif diff --git a/src/or/status.c b/src/or/status.c index 126167d..02d96aa 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -14,6 +14,7 @@ #include "router.h" #include "circuitlist.h" #include "main.h" +#include "geoip.h" /** Return the total number of circuits. */ static int @@ -87,7 +88,6 @@ log_heartbeat(time_t now) const routerinfo_t *me; const or_options_t *options = get_options(); - (void)now; if (public_server_mode(options)) { /* Let's check if we are in the current cached consensus. */ @@ -112,6 +112,14 @@ log_heartbeat(time_t now) 100*(U64_TO_DBL(stats_n_data_bytes_packaged) / U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) ); + if (options->BridgeRelay) { + char *msg = NULL; + msg = format_client_stats_heartbeat(now); + if (msg) + log_notice(LD_HEARTBEAT, "%s", msg); + tor_free(msg); + } + tor_free(uptime); tor_free(bw_sent); tor_free(bw_rcvd);

1 0

[tor/master] Choose a more deliberate cutoff for clients in heartbeat
by nickm＠torproject.org 03 Feb '15

03 Feb '15

commit 7f52dc4d03cc8b738b0c2a3896128ab38b030c52 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 3 13:02:22 2015 -0500 Choose a more deliberate cutoff for clients in heartbeat --- src/or/geoip.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index 810070c..25e8135 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -1298,10 +1298,11 @@ format_bridge_stats_controller(time_t now) char * format_client_stats_heartbeat(time_t now) { + const int n_hours = 6; char *out = NULL; int n_clients = 0; clientmap_entry_t **ent; - double elapsed_time = 0; + unsigned cutoff = (unsigned)( (now-n_hours*3600)/60 ); if (!start_of_bridge_stats_interval) return NULL; /* Not initialized. */ @@ -1311,14 +1312,14 @@ format_client_stats_heartbeat(time_t now) /* only count directly connecting clients */ if ((*ent)->action != GEOIP_CLIENT_CONNECT) continue; + if ((*ent)->last_seen_in_minutes < cutoff) + continue; n_clients++; } - elapsed_time = difftime(now, start_of_bridge_stats_interval); - tor_asprintf(&out, "Heartbeat: " - "Since the last %ld hours, I have seen %d unique clients.", - tor_lround(elapsed_time / 3600), + "In the last %d hours, I have seen %d unique clients.", + n_hours, n_clients); return out;

1 0

[tor/master] Merge branch 'bug6852'
by nickm＠torproject.org 03 Feb '15

03 Feb '15

commit cdc49629c7d26e9806b8aa3c5a7dc80fbec9d060 Merge: d03e1da 7f52dc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 3 13:06:58 2015 -0500 Merge branch 'bug6852' Conflicts: src/or/status.c changes/bug6852 | 3 +++ src/or/geoip.c | 33 +++++++++++++++++++++++++++++++++ src/or/geoip.h | 1 + src/or/status.c | 10 +++++++++- 4 files changed, 46 insertions(+), 1 deletion(-) diff --cc src/or/status.c index 0717070,02d96aa..98db688 --- a/src/or/status.c +++ b/src/or/status.c @@@ -17,18 -14,19 +17,19 @@@ #include "router.h" #include "circuitlist.h" #include "main.h" +#include "rephist.h" +#include "hibernate.h" +#include "rephist.h" +#include "statefile.h" + +static void log_accounting(const time_t now, const or_options_t *options); + #include "geoip.h" /** Return the total number of circuits. */ -static int +STATIC int count_circuits(void) { - circuit_t *circ; - int nr=0; - - for (circ = circuit_get_global_list_(); circ; circ = circ->next) - nr++; - - return nr; + return smartlist_len(circuit_get_global_list()); } /** Take seconds <b>secs</b> and return a newly allocated human-readable @@@ -88,13 -86,10 +89,12 @@@ log_heartbeat(time_t now char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; + double r = tls_get_write_overhead_ratio(); + const int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); - (void)now; - if (public_server_mode(options)) { + if (public_server_mode(options) && !hibernating) { /* Let's check if we are in the current cached consensus. */ if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */ @@@ -122,16 -112,14 +122,24 @@@ 100*(U64_TO_DBL(stats_n_data_bytes_packaged) / U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) ); + if (r > 1.0) { + double overhead = ( r - 1.0 ) * 100.0; + log_notice(LD_HEARTBEAT, "TLS write overhead: %.f%%", overhead); + } + + if (public_server_mode(options)) + rep_hist_log_circuit_handshake_stats(now); + + circuit_log_ancient_one_hop_circuits(1800); + + if (options->BridgeRelay) { + char *msg = NULL; + msg = format_client_stats_heartbeat(now); + if (msg) + log_notice(LD_HEARTBEAT, "%s", msg); + tor_free(msg); + } + tor_free(uptime); tor_free(bw_sent); tor_free(bw_rcvd);

1 0