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

[tor/master] Use SMARTLIST_FOREACH in connection_count_moribund() per code review
by nickm＠torproject.org 25 Aug '16

25 Aug '16

commit a403230fe38d396189a32bc525aa596444d88b61 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Aug 20 03:12:58 2016 +0000 Use SMARTLIST_FOREACH in connection_count_moribund() per code review --- src/or/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 18c0948..9741f15 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -655,20 +655,18 @@ close_closeable_connections(void) MOCK_IMPL(int, connection_count_moribund, (void)) { - int i, moribund = 0; - connection_t *conn; + int moribund = 0; /* * Count things we'll try to kill when close_closeable_connections() * runs next. */ - for (i = 0; i < smartlist_len(closeable_connection_lst); ++i) { - conn = smartlist_get(closeable_connection_lst, i); + SMARTLIST_FOREACH_BEGIN(closeable_connection_lst, connection_t *, conn) { if (conn->conn_array_index < 0 || conn->marked_for_close) { ++moribund; } - } + } SMARTLIST_FOREACH_END(conn); return moribund; }

1 0

[tor/master] s/connection_handle_oos/connection_check_oos/g per code review
by nickm＠torproject.org 25 Aug '16

25 Aug '16

commit dbdac1dc27b4ad1d98e8280e1f8b3a3aa2f60c15 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Aug 20 02:44:33 2016 +0000 s/connection_handle_oos/connection_check_oos/g per code review --- src/or/config.c | 2 +- src/or/connection.c | 22 +++++++++++----------- src/or/connection.h | 2 +- src/test/test_oos.c | 30 +++++++++++++++--------------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f7a7a53..4831bad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1360,7 +1360,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) options->ConnLimit_low_thresh); /* Give the OOS handler a chance with the new thresholds */ - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); } goto done; diff --git a/src/or/connection.c b/src/or/connection.c index 09b4733..f38dc59 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1359,7 +1359,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, * Normal exit; call the OOS handler since connection count just changed; * the exhaustion flag will always be zero here though. */ - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); return conn; @@ -1370,7 +1370,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, connection_free(conn); /* Call the OOS handler, indicate if we saw an exhaustion-related error */ - connection_handle_oos(get_n_open_sockets(), exhaustion); + connection_check_oos(get_n_open_sockets(), exhaustion); return NULL; } @@ -1467,12 +1467,12 @@ connection_handle_listener_read(connection_t *conn, int new_type) * * give the OOS handler a chance to run though */ - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); return 0; } else if (ERRNO_IS_RESOURCE_LIMIT(e)) { warn_too_many_conns(); /* Exhaustion; tell the OOS handler */ - connection_handle_oos(get_n_open_sockets(), 1); + connection_check_oos(get_n_open_sockets(), 1); return 0; } /* else there was a real error. */ @@ -1480,7 +1480,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) tor_socket_strerror(e)); connection_mark_for_close(conn); /* Tell the OOS handler about this too */ - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); return -1; } log_debug(LD_NET, @@ -1488,7 +1488,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) (int)news,(int)conn->s); /* We accepted a new conn; run OOS handler */ - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); if (make_socket_reuseable(news) < 0) { if (tor_socket_errno(news) == EINVAL) { @@ -1701,11 +1701,11 @@ connection_connect_sockaddr,(connection_t *conn, *socket_error = tor_socket_errno(s); if (ERRNO_IS_RESOURCE_LIMIT(*socket_error)) { warn_too_many_conns(); - connection_handle_oos(get_n_open_sockets(), 1); + connection_check_oos(get_n_open_sockets(), 1); } else { log_warn(LD_NET,"Error creating network socket: %s", tor_socket_strerror(*socket_error)); - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); } return -1; } @@ -1720,7 +1720,7 @@ connection_connect_sockaddr,(connection_t *conn, * against configuured maximum socket number, but tell it no exhaustion * failure. */ - connection_handle_oos(get_n_open_sockets(), 0); + connection_check_oos(get_n_open_sockets(), 0); if (bindaddr && bind(s, bindaddr, bindaddr_len) < 0) { *socket_error = tor_socket_errno(s); @@ -4664,7 +4664,7 @@ kill_conn_list_for_oos, (smartlist_t *conns)) * circuit-killing heuristics as needed. */ void -connection_handle_oos(int n_socks, int failed) +connection_check_oos(int n_socks, int failed) { int target_n_socks = 0, moribund_socks, socks_to_kill; smartlist_t *conns; @@ -4716,7 +4716,7 @@ connection_handle_oos(int n_socks, int failed) * Count moribund sockets; it's be important that anything we decide * to get rid of here but don't immediately close get counted as moribund * on subsequent invocations so we don't try to kill too many things if - * connection_handle_oos() gets called multiple times. + * connection_check_oos() gets called multiple times. */ moribund_socks = connection_count_moribund(); diff --git a/src/or/connection.h b/src/or/connection.h index e2f1764..9bf063f 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -247,7 +247,7 @@ void clock_skew_warning(const connection_t *conn, long apparent_skew, int trusted, log_domain_mask_t domain, const char *received, const char *source); -void connection_handle_oos(int n_socks, int failed); +void connection_check_oos(int n_socks, int failed); #ifdef CONNECTION_PRIVATE STATIC void connection_free_(connection_t *conn); diff --git a/src/test/test_oos.c b/src/test/test_oos.c index 69a6fef..9451c5c 100644 --- a/src/test/test_oos.c +++ b/src/test/test_oos.c @@ -76,7 +76,7 @@ pick_oos_victims_mock(int n) if (!pick_oos_mock_fail) { /* - * connection_handle_oos() just passes the list onto + * connection_check_oos() just passes the list onto * kill_conn_list_for_oos(); we don't need to simulate * its content for this mock, just its existence, but * we do need to check the parameter. @@ -93,14 +93,14 @@ pick_oos_victims_mock(int n) return l; } -/** Unit test for the logic in connection_handle_oos(), which is concerned +/** Unit test for the logic in connection_check_oos(), which is concerned * with comparing thresholds and connection counts to decide if an OOS has * occurred and if so, how many connections to try to kill, and then using * pick_oos_victims() and kill_conn_list_for_oos() to carry out its grim * duty. */ static void -test_oos_connection_handle_oos(void *arg) +test_oos_connection_check_oos(void *arg) { (void)arg; @@ -123,13 +123,13 @@ test_oos_connection_handle_oos(void *arg) MOCK(pick_oos_victims, pick_oos_victims_mock); /* No OOS case */ - connection_handle_oos(50, 0); + connection_check_oos(50, 0); tt_int_op(moribund_calls, OP_EQ, 0); tt_int_op(pick_oos_mock_calls, OP_EQ, 0); tt_int_op(kill_conn_list_calls, OP_EQ, 0); /* OOS from socket count, nothing moribund */ - connection_handle_oos(62, 0); + connection_check_oos(62, 0); tt_int_op(moribund_calls, OP_EQ, 1); tt_int_op(pick_oos_mock_calls, OP_EQ, 1); /* 12 == 62 - ConnLimit_low_thresh */ @@ -140,7 +140,7 @@ test_oos_connection_handle_oos(void *arg) /* OOS from socket count, some are moribund */ kill_conn_list_killed = 0; moribund_conns = 5; - connection_handle_oos(62, 0); + connection_check_oos(62, 0); tt_int_op(moribund_calls, OP_EQ, 2); tt_int_op(pick_oos_mock_calls, OP_EQ, 2); /* 7 == 62 - ConnLimit_low_thresh - moribund_conns */ @@ -152,7 +152,7 @@ test_oos_connection_handle_oos(void *arg) kill_conn_list_killed = 0; moribund_conns = 0; pick_oos_mock_fail = 1; - connection_handle_oos(62, 0); + connection_check_oos(62, 0); tt_int_op(moribund_calls, OP_EQ, 3); tt_int_op(pick_oos_mock_calls, OP_EQ, 3); tt_int_op(kill_conn_list_calls, OP_EQ, 2); @@ -165,7 +165,7 @@ test_oos_connection_handle_oos(void *arg) */ kill_conn_list_killed = 0; moribund_conns = 15; - connection_handle_oos(62, 0); + connection_check_oos(62, 0); tt_int_op(moribund_calls, OP_EQ, 4); tt_int_op(pick_oos_mock_calls, OP_EQ, 3); tt_int_op(kill_conn_list_calls, OP_EQ, 2); @@ -176,7 +176,7 @@ test_oos_connection_handle_oos(void *arg) */ kill_conn_list_killed = 0; moribund_conns = 0; - connection_handle_oos(50, 1); + connection_check_oos(50, 1); tt_int_op(moribund_calls, OP_EQ, 5); tt_int_op(pick_oos_mock_calls, OP_EQ, 4); tt_int_op(kill_conn_list_calls, OP_EQ, 3); @@ -185,7 +185,7 @@ test_oos_connection_handle_oos(void *arg) /* OOS from socket exhaustion with moribund conns */ kill_conn_list_killed = 0; moribund_conns = 2; - connection_handle_oos(50, 1); + connection_check_oos(50, 1); tt_int_op(moribund_calls, OP_EQ, 6); tt_int_op(pick_oos_mock_calls, OP_EQ, 5); tt_int_op(kill_conn_list_calls, OP_EQ, 4); @@ -194,7 +194,7 @@ test_oos_connection_handle_oos(void *arg) /* OOS from socket exhaustion with many moribund conns */ kill_conn_list_killed = 0; moribund_conns = 7; - connection_handle_oos(50, 1); + connection_check_oos(50, 1); tt_int_op(moribund_calls, OP_EQ, 7); tt_int_op(pick_oos_mock_calls, OP_EQ, 5); tt_int_op(kill_conn_list_calls, OP_EQ, 4); @@ -202,7 +202,7 @@ test_oos_connection_handle_oos(void *arg) /* OOS with both socket exhaustion and above-threshold */ kill_conn_list_killed = 0; moribund_conns = 0; - connection_handle_oos(62, 1); + connection_check_oos(62, 1); tt_int_op(moribund_calls, OP_EQ, 8); tt_int_op(pick_oos_mock_calls, OP_EQ, 6); tt_int_op(kill_conn_list_calls, OP_EQ, 5); @@ -214,7 +214,7 @@ test_oos_connection_handle_oos(void *arg) */ kill_conn_list_killed = 0; moribund_conns = 5; - connection_handle_oos(62, 1); + connection_check_oos(62, 1); tt_int_op(moribund_calls, OP_EQ, 9); tt_int_op(pick_oos_mock_calls, OP_EQ, 7); tt_int_op(kill_conn_list_calls, OP_EQ, 6); @@ -226,7 +226,7 @@ test_oos_connection_handle_oos(void *arg) */ kill_conn_list_killed = 0; moribund_conns = 15; - connection_handle_oos(62, 1); + connection_check_oos(62, 1); tt_int_op(moribund_calls, OP_EQ, 10); tt_int_op(pick_oos_mock_calls, OP_EQ, 7); tt_int_op(kill_conn_list_calls, OP_EQ, 6); @@ -445,7 +445,7 @@ test_oos_pick_oos_victims(void *arg) } struct testcase_t oos_tests[] = { - { "connection_handle_oos", test_oos_connection_handle_oos, + { "connection_check_oos", test_oos_connection_check_oos, TT_FORK, NULL, NULL }, { "kill_conn_list", test_oos_kill_conn_list, TT_FORK, NULL, NULL }, { "pick_oos_victims", test_oos_pick_oos_victims, TT_FORK, NULL, NULL },

1 0

[tor/master] Consider the case that a connection doesn't have a valid socket during OOS
by nickm＠torproject.org 25 Aug '16

25 Aug '16

commit 3efe92ba58137022dd6c61cff9823813218a1a14 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Aug 20 03:57:32 2016 +0000 Consider the case that a connection doesn't have a valid socket during OOS --- src/or/connection.c | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index 713a70c..6b85bfb 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4587,6 +4587,11 @@ pick_oos_victims, (int n)) tor_assert(c->type <= CONN_TYPE_MAX_); ++(conn_counts_by_type[c->type]); + /* Skip anything without a socket we can free */ + if (!(SOCKET_OK(c->s))) { + continue; + } + /* Skip anything we would count as moribund */ if (connection_is_moribund(c)) { continue; diff --git a/src/or/main.c b/src/or/main.c index 6ab94f5..a1b5954 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -662,7 +662,7 @@ connection_count_moribund, (void)) * runs next. */ SMARTLIST_FOREACH_BEGIN(closeable_connection_lst, connection_t *, conn) { - if (connection_is_moribund(conn)) ++moribund; + if (SOCKET_OK(conn->s) && connection_is_moribund(conn)) ++moribund; } SMARTLIST_FOREACH_END(conn); return moribund;

1 0

[tor/master] Use connection_mark_for_close() rather than connection_mark_on_flush() on OOS
by nickm＠torproject.org 25 Aug '16

25 Aug '16

commit 9a09513c0bd54abae3317be4136cf2578e11fbf3 Author: Andrea Shepard <andrea(a)torproject.org> Date: Sat Aug 20 04:43:01 2016 +0000 Use connection_mark_for_close() rather than connection_mark_on_flush() on OOS --- src/or/connection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index daa11ee..9b583f4 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4653,12 +4653,12 @@ kill_conn_list_for_oos, (smartlist_t *conns)) if (c->type == CONN_TYPE_OR) { connection_or_close_for_error(TO_OR_CONN(c), 1); } else { - connection_mark_and_flush(c); + connection_mark_for_close(c); } } SMARTLIST_FOREACH_END(c); log_notice(LD_NET, - "OOS handler marked and flushed %d connections", + "OOS handler marked %d connections", smartlist_len(conns)); }

1 0

[tor/master] Merge remote-tracking branch 'andrea/ticket18640_v3'
by nickm＠torproject.org 25 Aug '16

25 Aug '16

commit 1dfa2213a424c36d4aa70fdab60b27b6b5e1ced2 Merge: 20136a8 9a09513 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 14:29:06 2016 -0400 Merge remote-tracking branch 'andrea/ticket18640_v3' src/or/config.c | 30 ++++ src/or/connection.c | 304 ++++++++++++++++++++++++++++++++- src/or/connection.h | 23 ++- src/or/connection_or.c | 4 +- src/or/connection_or.h | 2 +- src/or/main.c | 21 ++- src/or/main.h | 4 +- src/or/or.h | 7 + src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_oos.c | 454 +++++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 840 insertions(+), 12 deletions(-)

1 0

[tor/master] changes file and docs for 18640.
by nickm＠torproject.org 25 Aug '16

25 Aug '16

commit 90bcfa2274a7b95bd4ff76b1c5c05e05cb8e571f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 25 14:32:10 2016 -0400 changes file and docs for 18640. --- changes/18640 | 6 ++++++ doc/tor.1.txt | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/changes/18640 b/changes/18640 new file mode 100644 index 0000000..de63da6 --- /dev/null +++ b/changes/18640 @@ -0,0 +1,6 @@ + o Major features (resource management): + - Tor now includes support for noticing when we are about to run out of + sockets, and preemptively closing connections of lower priority. + (This feature is off by default for now, since the current prioritizing + method is not mature enough yet. You can enable it by setting + "DisableOOSCheck 0".) Closes ticket 18640. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0550736..ebf16f3 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2041,6 +2041,12 @@ is non-zero): this. If this option is set to 0, Tor will try to pick a reasonable default based on your system's physical memory. (Default: 0) +[[DisableOOSCheck]] **DisableOOSCheck** **0**|**1**:: + This option disables the code that closes connections when Tor notices + that it is running low on sockets. Right now, it is on by default, + since the existing out-of-sockets mechanism tends to kill OR connections + more than it should. (Default: 1) + [[SigningKeyLifetime]] **SigningKeyLifetime** __N__ **days**|**weeks**|**months**:: For how long should each Ed25519 signing key be valid? Tor uses a permanent master identity key that can be kept offline, and periodically

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 25 Aug '16

25 Aug '16

commit bb86549403261d9b3d3656f9665033f68a9cf0ce Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 25 13:49:02 2016 +0000 Update translations for tails-onioncircuits_completed --- hr_HR/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/onioncircuits.pot b/hr_HR/onioncircuits.pot index 8c8882c..22f6f59 100644 --- a/hr_HR/onioncircuits.pot +++ b/hr_HR/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-08-25 07:21+0000\n" +"PO-Revision-Date: 2016-08-25 13:20+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 25 Aug '16

25 Aug '16

commit 6b9dad25a33546a13cf9fab9149cac5b8107213a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 25 13:48:59 2016 +0000 Update translations for tails-onioncircuits --- hr_HR/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_HR/onioncircuits.pot b/hr_HR/onioncircuits.pot index 8c8882c..22f6f59 100644 --- a/hr_HR/onioncircuits.pot +++ b/hr_HR/onioncircuits.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-08-25 07:21+0000\n" +"PO-Revision-Date: 2016-08-25 13:20+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed
by translation＠torproject.org 25 Aug '16

25 Aug '16

commit aa3e0c3336df3689558f88165009aef1aa0c07fa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 25 13:48:51 2016 +0000 Update translations for tails-openpgp-applet_completed --- hr_HR/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/openpgp-applet.pot b/hr_HR/openpgp-applet.pot index 1c605e6..bb9ecba 100644 --- a/hr_HR/openpgp-applet.pot +++ b/hr_HR/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-08-25 07:21+0000\n" +"PO-Revision-Date: 2016-08-25 13:23+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr "Enkriptiraj Clipboard s _Lozinkom" #: bin/openpgp-applet:238 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Potpiši/Šifriraj Clipboard s Javnim_Ključevima" +msgstr "Potpiši/Šifriraj Clipboard s javnim _ključevima" #: bin/openpgp-applet:243 msgid "_Decrypt/Verify Clipboard"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 25 Aug '16

25 Aug '16

commit 0416c36193bd63ca80ab0d34a02a1cd8c5b48c40 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 25 13:48:47 2016 +0000 Update translations for tails-openpgp-applet --- hr_HR/openpgp-applet.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/openpgp-applet.pot b/hr_HR/openpgp-applet.pot index 1c605e6..bb9ecba 100644 --- a/hr_HR/openpgp-applet.pot +++ b/hr_HR/openpgp-applet.pot @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-08-25 07:21+0000\n" +"PO-Revision-Date: 2016-08-25 13:23+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr "Enkriptiraj Clipboard s _Lozinkom" #: bin/openpgp-applet:238 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "Potpiši/Šifriraj Clipboard s Javnim_Ključevima" +msgstr "Potpiši/Šifriraj Clipboard s javnim _ključevima" #: bin/openpgp-applet:243 msgid "_Decrypt/Verify Clipboard"

1 0