tor-commits September 2013

tor-commits@lists.torproject.org

17 participants
1101 discussions

[tor/release-0.2.4] bump to 0.2.4.17-rc
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit b01028e87ef8d74763297462e89f480d28961ad2 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:50:14 2013 -0400 bump to 0.2.4.17-rc --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0e7b702..970be9c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2013, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.16-rc]) +AC_INIT([tor],[0.2.4.17-rc]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index b9f5aad..428f6a8 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.16-rc" +!define VERSION "0.2.4.17-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 8d0fcb6..706c42c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -241,7 +241,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.16-rc" +#define VERSION "0.2.4.17-rc"

1 0

[tor/release-0.2.4] fold in another changes item
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit cf744acae9feed93f41106dee7e0a6e44820139b Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:48:18 2013 -0400 fold in another changes item --- ChangeLog | 3 +++ changes/ticket9658 | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 427ded3..f237e27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,9 @@ Changes in version 0.2.4.17-rc - 2013-09-0x or we just won't work.) o Minor features: + - Track how many "TAP" and "NTor" circuit handshake requests we get, + and how many we complete, and log it every hour to help relay + operators follow trends in network load. Addresses ticket 9658. - Update to the August 7 2013 Maxmind GeoLite Country database. diff --git a/changes/ticket9658 b/changes/ticket9658 deleted file mode 100644 index a8db2ef..0000000 --- a/changes/ticket9658 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Track how many "TAP" and "NTor" circuit handshake requests we get, - and how many we complete, and log it every hour to help relay - operators follow trends in network load. Addresses ticket 9658.

1 0

[tor/release-0.2.4] don't let recently_chosen_ntors overflow
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit e443beffeb8c20dddeb198cf94667a82f4cb53c7 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:27:46 2013 -0400 don't let recently_chosen_ntors overflow with commit c6f1668d we let it grow arbitrarily large. it can still overflow, but the damage is very small now. --- src/or/onion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/onion.c b/src/or/onion.c index 41fe7b6..8e3e487 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -212,7 +212,7 @@ static uint16_t decide_next_handshake_type(void) { /* The number of times we've chosen ntor lately when both were available. */ - static int recently_chosen_ntors = 0; + static unsigned int recently_chosen_ntors = 0; if (!ol_entries[ONION_HANDSHAKE_TYPE_NTOR]) return ONION_HANDSHAKE_TYPE_TAP; /* no ntors? try tap */

1 0

[tor/release-0.2.4] Revert e443beff and solve it a different way
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit f51add6dbcef073d3ba57df13eee3c99d647fde9 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:41:07 2013 -0400 Revert e443beff and solve it a different way Now we explicitly check for overflow. This approach seemed smarter than a cascade of "change int to unsigned int and hope nothing breaks right before the release". Nick, feel free to fix in a better way, maybe in master. --- src/or/onion.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/onion.c b/src/or/onion.c index 8e3e487..1a0bcf1 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -212,7 +212,7 @@ static uint16_t decide_next_handshake_type(void) { /* The number of times we've chosen ntor lately when both were available. */ - static unsigned int recently_chosen_ntors = 0; + static int recently_chosen_ntors = 0; if (!ol_entries[ONION_HANDSHAKE_TYPE_NTOR]) return ONION_HANDSHAKE_TYPE_TAP; /* no ntors? try tap */ @@ -227,7 +227,8 @@ decide_next_handshake_type(void) * got here first. In any case this edge case will only become relevant * once tap is rare. We should reevaluate whether we like this decision * once tap gets more rare. */ - if (ol_entries[ONION_HANDSHAKE_TYPE_NTOR]) + if (ol_entries[ONION_HANDSHAKE_TYPE_NTOR] && + recently_chosen_ntors <= num_ntors_per_tap()) ++recently_chosen_ntors; return ONION_HANDSHAKE_TYPE_NTOR; /* no taps? try ntor */

1 0

[tor/release-0.2.4] collect and log statistics about onionskins received/processed
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 2c877d2da4a989639311de11e4ada8dd03bc8187 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 4 17:43:15 2013 -0400 collect and log statistics about onionskins received/processed we skip onionskins that came from non-relays, so we're less likely to run into privacy troubles. starts to implement ticket 9658. --- changes/ticket9658 | 4 ++++ src/or/command.c | 3 +++ src/or/cpuworker.c | 5 +++++ src/or/main.c | 5 +++++ src/or/rephist.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 8 ++++++-- 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/changes/ticket9658 b/changes/ticket9658 new file mode 100644 index 0000000..a8db2ef --- /dev/null +++ b/changes/ticket9658 @@ -0,0 +1,4 @@ + o Minor features: + - Track how many "TAP" and "NTor" circuit handshake requests we get, + and how many we complete, and log it every hour to help relay + operators follow trends in network load. Addresses ticket 9658. diff --git a/src/or/command.c b/src/or/command.c index 876ff52..699b02f 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -29,6 +29,7 @@ #include "hibernate.h" #include "nodelist.h" #include "onion.h" +#include "rephist.h" #include "relay.h" #include "router.h" #include "routerlist.h" @@ -277,6 +278,8 @@ command_process_create_cell(cell_t *cell, channel_t *chan) if (create_cell->handshake_type != ONION_HANDSHAKE_TYPE_FAST) { /* hand it off to the cpuworkers, and then return. */ + if (connection_or_digest_is_known_relay(chan->identity_digest)) + rep_hist_note_circuit_handshake_requested(create_cell->handshake_type); if (assign_onionskin_to_cpuworker(NULL, circ, create_cell) < 0) { log_debug(LD_GENERAL,"Failed to hand off onionskin. Closing."); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 61f9faa..ecf0d20 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -19,9 +19,11 @@ #include "circuitlist.h" #include "config.h" #include "connection.h" +#include "connection_or.h" #include "cpuworker.h" #include "main.h" #include "onion.h" +#include "rephist.h" #include "router.h" /** The maximum number of cpuworker processes we will keep around. */ @@ -683,6 +685,9 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker, return -1; } + if (connection_or_digest_is_known_relay(circ->p_chan->identity_digest)) + rep_hist_note_circuit_handshake_completed(onionskin->handshake_type); + should_time = should_time_request(onionskin->handshake_type); memset(&req, 0, sizeof(req)); req.magic = CPUWORKER_REQUEST_MAGIC; diff --git a/src/or/main.c b/src/or/main.c index bd23141..deed798 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1353,6 +1353,11 @@ run_scheduled_events(time_t now) next_time_to_write_stats_files = next_write; } time_to_write_stats_files = next_time_to_write_stats_files; + + /* Also commandeer this opportunity to log how our circuit handshake + * stats have been doing. */ + if (public_server_mode(options)) + rep_hist_log_circuit_handshake_stats(now); } /* 1h. Check whether we should write bridge statistics to disk. diff --git a/src/or/rephist.c b/src/or/rephist.c index 55f321d..131e531 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -3011,6 +3011,47 @@ rep_hist_conn_stats_write(time_t now) return start_of_conn_stats_interval + WRITE_STATS_INTERVAL; } +/** Internal statistics to track how many requests of each type of + * handshake we've received, and how many we've completed. Useful for + * seeing trends in cpu load. + * @{ */ +static int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; +static int onion_handshakes_completed[MAX_ONION_HANDSHAKE_TYPE+1] = {0}; +/**@}*/ + +/** A new onionskin (using the <b>type</b> handshake) has arrived. */ +void +rep_hist_note_circuit_handshake_requested(uint16_t type) +{ + if (type <= MAX_ONION_HANDSHAKE_TYPE) + onion_handshakes_requested[type]++; +} + +/** We've sent an onionskin (using the <b>type</b> handshake) to a + * cpuworker. */ +void +rep_hist_note_circuit_handshake_completed(uint16_t type) +{ + if (type <= MAX_ONION_HANDSHAKE_TYPE) + onion_handshakes_completed[type]++; +} + +/** Log our onionskin statistics since the last time we were called. */ +void +rep_hist_log_circuit_handshake_stats(time_t now) +{ + (void)now; + /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */ + log_notice(LD_HIST, "Circuit handshake stats since last time: " + "%d/%d TAP, %d/%d NTor.", + onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP], + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP], + onion_handshakes_completed[ONION_HANDSHAKE_TYPE_NTOR], + onion_handshakes_requested[ONION_HANDSHAKE_TYPE_NTOR]); + memset(onion_handshakes_completed, 0, sizeof(onion_handshakes_completed)); + memset(onion_handshakes_requested, 0, sizeof(onion_handshakes_requested)); +} + /** Free all storage held by the OR/link history caches, by the * bandwidth history arrays, by the port history, or by statistics . */ void diff --git a/src/or/rephist.h b/src/or/rephist.h index 811cd8d..de82474 100644 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@ -64,8 +64,6 @@ int rep_hist_circbuilding_dormant(time_t now); void note_crypto_pk_op(pk_op_t operation); void dump_pk_ops(int severity); -void rep_hist_free_all(void); - void rep_hist_exit_stats_init(time_t now); void rep_hist_reset_exit_stats(time_t now); void rep_hist_exit_stats_term(void); @@ -98,5 +96,11 @@ char *rep_hist_format_conn_stats(time_t now); time_t rep_hist_conn_stats_write(time_t now); void rep_hist_conn_stats_term(void); +void rep_hist_note_circuit_handshake_requested(uint16_t type); +void rep_hist_note_circuit_handshake_completed(uint16_t type); +void rep_hist_log_circuit_handshake_stats(time_t now); + +void rep_hist_free_all(void); + #endif

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 60f13485ebd70443a16ab083971073dbb6bdadcf Merge: 63b9118 2c877d2 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Sep 5 01:47:47 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/ticket9658 | 4 ++++ src/or/command.c | 3 +++ src/or/cpuworker.c | 5 +++++ src/or/main.c | 5 +++++ src/or/onion.c | 3 ++- src/or/rephist.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/or/rephist.h | 8 ++++++-- 7 files changed, 66 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.4] collect and log statistics about onionskins received/processed
by arma＠torproject.org 05 Sep '13

05 Sep '13

1 0

[tor/maint-0.2.4] Revert e443beff and solve it a different way
by arma＠torproject.org 05 Sep '13

05 Sep '13

1 0

[tor/maint-0.2.4] don't let recently_chosen_ntors overflow
by arma＠torproject.org 05 Sep '13

05 Sep '13

1 0

[tor/release-0.2.4] fold in recent changes entries
by arma＠torproject.org 05 Sep '13

05 Sep '13

commit 63b91189e0c3c278735f9ec9662739929138e228 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Sep 4 23:57:35 2013 -0400 fold in recent changes entries --- ChangeLog | 18 ++++++++++++++++++ changes/bug9400 | 7 ------- changes/bug9671_023 | 5 ----- changes/feature9574 | 7 ------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95ce519..427ded3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,17 @@ Changes in version 0.2.4.17-rc - 2013-09-0x + + o Major features: + - Relays now process the new "NTor" circuit-level handshake requests + with higher priority than the old "TAP" circuit-level handshake + requests. We still process some TAP requests to not totally starve + 0.2.3 clients when NTor becomes popular. A new consensus parameter + "NumNTorsPerTAP" lets us tune the balance later if we need to. + Implements ticket 9574. + o Major bugfixes: + - If the circuit build timeout logic is disabled (via the consensus, + or because we are an authority), then don't build testing circuits. + Fixes bug 9657; bugfix on 0.2.2.14-alpha. - Bridges now send AUTH_CHALLENGE cells during their v3 handshakes; previously they did not, which prevented them from receiving successful connections from relays for self-test or bandwidth @@ -12,6 +24,12 @@ Changes in version 0.2.4.17-rc - 2013-09-0x next microdescriptor networkstatus. Fixes bug 9564; bugfix on 0.2.3.14-alpha. + o Minor bugfixes: + - Avoid double-closing the listener socket in our socketpair + replacement (used on Windows) in the case where the addresses on + our opened sockets don't match what we expected. Fixes bug 9400; + bugfix on every released Tor version. Found by Coverity. + o Minor fixes (config options): - Avoid overflows when the user sets MaxCircuitDirtiness to a ridiculously high value, by imposing a (ridiculously high) 30-day diff --git a/changes/bug9400 b/changes/bug9400 deleted file mode 100644 index 9742240..0000000 --- a/changes/bug9400 +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes: - - - Avoid double-closing the listener socket in our socketpair replacement - (used on Windows) in the case where the addresses on our opened - sockets don't match what we expected. Fixes bug 9400; bugfix on - every released Tor version. Found by Coverity. - diff --git a/changes/bug9671_023 b/changes/bug9671_023 deleted file mode 100644 index 035ca5c..0000000 --- a/changes/bug9671_023 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - If the circuit build timeout logic is disabled (via the consensus, - or because we are an authority), then don't build testing circuits. - Fixes bug 9657; bugfix on 0.2.2.14-alpha. - diff --git a/changes/feature9574 b/changes/feature9574 deleted file mode 100644 index 723606e..0000000 --- a/changes/feature9574 +++ /dev/null @@ -1,7 +0,0 @@ - o Major features: - - Relays now process the new "NTor" circuit-level handshake requests - with higher priority than the old "TAP" circuit-level handshake - requests. We still process some TAP requests to not totally starve - 0.2.3 clients when NTor becomes popular. A new consensus parameter - "NumNTorsPerTAP" lets us tune the balance later if we need to. - Implements ticket 9574.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2013