January 2018 - tor-commits - lists.torproject.org

[metrics-web/master] Document the relay version used by Onionoo for recommended_version
by karsten＠torproject.org 18 Jan '18

18 Jan '18

commit 9aaac03c3cd7a4982f47fae7949c7e9752195238 Author: teor <teor2345(a)gmail.com> Date: Thu Jan 18 23:25:20 2018 +1100 Document the relay version used by Onionoo for recommended_version Sometimes relay versions are different in the descriptor and in the consensus. Onionoo uses the consensus version. Documentation fix for #22488. --- src/main/resources/web/jsps/onionoo.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index b31b469..a416366 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/main/resources/web/jsps/onionoo.jsp @@ -602,6 +602,7 @@ Filtering by host name is case-insensitive. Return only relays and bridges running a Tor software version that is recommended (parameter value true) or not recommended by the directory authorities (parameter value false). +Uses the version in the consensus or bridge network status. Relays and bridges are not contained in either result, if the version they are running is not known. Parameter values are case-insensitive. @@ -1477,6 +1478,7 @@ implementation. Boolean field saying whether the Tor software version of this relay is recommended by the directory authorities or not. +Uses the relay version in the consensus. Omitted if either the directory authorities did not recommend versions, or the relay did not report which version it runs. @@ -1822,6 +1824,7 @@ implementation. Boolean field saying whether the Tor software version of this bridge is recommended by the directory authorities or not. +Uses the bridge version in the bridge network status. Omitted if either the directory authorities did not recommend versions, or the bridge did not report which version it runs. Added on November 28, 2017.

1 0

[tor/maint-0.3.2] Merge branch 'bug24826_031' into maint-0.3.1
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit f406b9df0533c9730b4537b39f3a7f8d232f3558 Merge: af8cadf3a 4bb831e08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:45 2018 -0500 Merge branch 'bug24826_031' into maint-0.3.1 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 44388757c44834d63614c4e13cf88931992afc2a Merge: 4e653ac2c f406b9df0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:48 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'bug24826_031' into maint-0.3.1
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit f406b9df0533c9730b4537b39f3a7f8d232f3558 Merge: af8cadf3a 4bb831e08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 18 08:13:45 2018 -0500 Merge branch 'bug24826_031' into maint-0.3.1 changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Improve fragile-hardening performance of consensus_split_lines.
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 12:42:40 2018 -0500 Improve fragile-hardening performance of consensus_split_lines. For whatever reason, in my testing, using memchr() here improves performance over strchr() by a great deal. Fixes bug 24826; bugfix on 0.3.1.1-alpha. --- changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24826_031 b/changes/bug24826_031 new file mode 100644 index 000000000..3d4a66184 --- /dev/null +++ b/changes/bug24826_031 @@ -0,0 +1,4 @@ + o Minor bugfixes (performance, fragile-hardening): + - Improve the performance of our consensus-diff application code when Tor + is built with the --enable-fragile-hardening option set. Fixes bug + 24826; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 1baa11897..deaf465fe 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1, STATIC int consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area) { + const char *end_of_str = s + strlen(s); + tor_assert(*end_of_str == '\0'); + while (*s) { - const char *eol = strchr(s, '\n'); + const char *eol = memchr(s, '\n', end_of_str - s); if (!eol) { /* File doesn't end with newline. */ return -1;

1 0

[tor/maint-0.3.1] Improve fragile-hardening performance of consensus_split_lines.
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 12:42:40 2018 -0500 Improve fragile-hardening performance of consensus_split_lines. For whatever reason, in my testing, using memchr() here improves performance over strchr() by a great deal. Fixes bug 24826; bugfix on 0.3.1.1-alpha. --- changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24826_031 b/changes/bug24826_031 new file mode 100644 index 000000000..3d4a66184 --- /dev/null +++ b/changes/bug24826_031 @@ -0,0 +1,4 @@ + o Minor bugfixes (performance, fragile-hardening): + - Improve the performance of our consensus-diff application code when Tor + is built with the --enable-fragile-hardening option set. Fixes bug + 24826; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 1baa11897..deaf465fe 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1, STATIC int consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area) { + const char *end_of_str = s + strlen(s); + tor_assert(*end_of_str == '\0'); + while (*s) { - const char *eol = strchr(s, '\n'); + const char *eol = memchr(s, '\n', end_of_str - s); if (!eol) { /* File doesn't end with newline. */ return -1;

1 0

[tor/master] Improve fragile-hardening performance of consensus_split_lines.
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 4bb831e0873e7e4468a44dbf9e253bcd5df18421 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 12:42:40 2018 -0500 Improve fragile-hardening performance of consensus_split_lines. For whatever reason, in my testing, using memchr() here improves performance over strchr() by a great deal. Fixes bug 24826; bugfix on 0.3.1.1-alpha. --- changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug24826_031 b/changes/bug24826_031 new file mode 100644 index 000000000..3d4a66184 --- /dev/null +++ b/changes/bug24826_031 @@ -0,0 +1,4 @@ + o Minor bugfixes (performance, fragile-hardening): + - Improve the performance of our consensus-diff application code when Tor + is built with the --enable-fragile-hardening option set. Fixes bug + 24826; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 1baa11897..deaf465fe 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -1285,8 +1285,11 @@ consdiff_apply_diff(const smartlist_t *cons1, STATIC int consensus_split_lines(smartlist_t *out, const char *s, memarea_t *area) { + const char *end_of_str = s + strlen(s); + tor_assert(*end_of_str == '\0'); + while (*s) { - const char *eol = strchr(s, '\n'); + const char *eol = memchr(s, '\n', end_of_str - s); if (!eol) { /* File doesn't end with newline. */ return -1;

1 0

[tor/master] Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY.
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 1efb84215e827e4fe887ea633eb39f06db285786 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 14:23:56 2018 -0500 Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY. Patch written by "Vort" on trac. Addresses ticket 22798. --- changes/bug22798 | 4 ++++ src/common/compat.h | 3 +++ src/or/connection.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/changes/bug22798 b/changes/bug22798 new file mode 100644 index 000000000..86af6c934 --- /dev/null +++ b/changes/bug22798 @@ -0,0 +1,4 @@ + o Minor features (windows, performance): + - Improve performance on Windows Vista and Windows 7 by adjusting TCP send + window size according to the recommendation from + SIO_IDEAL_SEND_BACKLOG_QUERY. Closes ticket 22798. Patch from Vort. diff --git a/src/common/compat.h b/src/common/compat.h index ee1c9454d..fe2d0da08 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -10,6 +10,9 @@ #ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> +#ifndef SIO_IDEAL_SEND_BACKLOG_QUERY +#define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b +#endif #endif #include "torint.h" #include "testsupport.h" diff --git a/src/or/connection.c b/src/or/connection.c index 8b00d637f..5d9d16d37 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3694,6 +3694,36 @@ connection_outbuf_too_full(connection_t *conn) return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); } +/** Fix slow upload for Windows Vista and Windows 7 systems (bug #22798). + * This achieved by tuning socket send buffer size according to hint, + * returned by SIO_IDEAL_SEND_BACKLOG_QUERY ioctl command. + */ +static void +update_send_buffer_size(tor_socket_t sock) +{ +#ifdef _WIN32 + static int isVistaOr7 = -1; + if (isVistaOr7 == -1) { + isVistaOr7 = 0; + OSVERSIONINFO osvi = { 0 }; + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion < 2) + isVistaOr7 = 1; + } + if (!isVistaOr7) + return; + if (get_options()->ConstrainedSockets) + return; + ULONG isb = 0; + DWORD bytesReturned = 0; + if (!WSAIoctl(sock, SIO_IDEAL_SEND_BACKLOG_QUERY, NULL, 0, + &isb, sizeof(isb), &bytesReturned, NULL, NULL)) { + setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (const char*)&isb, sizeof(isb)); + } +#endif +} + /** Try to flush more bytes onto conn-\>s. * * This function gets called either from conn_write_callback() in main.c @@ -3812,6 +3842,9 @@ connection_handle_write_impl(connection_t *conn, int force) result = flush_buf_tls(or_conn->tls, conn->outbuf, max_to_write, &conn->outbuf_flushlen); + if (result >= 0) + update_send_buffer_size(conn->s); + /* If we just flushed the last bytes, tell the channel on the * or_conn to check if it needs to geoip_change_dirreq_state() */ /* XXXX move this to flushed_some or finished_flushing -NM */ @@ -3886,6 +3919,7 @@ connection_handle_write_impl(connection_t *conn, int force) connection_mark_for_close(conn); return -1; } + update_send_buffer_size(conn->s); n_written = (size_t) result; }

1 0

[tor/master] update comment; ignore argument on non-win
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 57eab23ea57620b6d4139f684a74cb85188c12fb Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 16 14:35:49 2018 -0500 update comment; ignore argument on non-win --- src/or/connection.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 5d9d16d37..dfb6d5bf1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3694,14 +3694,20 @@ connection_outbuf_too_full(connection_t *conn) return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); } -/** Fix slow upload for Windows Vista and Windows 7 systems (bug #22798). - * This achieved by tuning socket send buffer size according to hint, - * returned by SIO_IDEAL_SEND_BACKLOG_QUERY ioctl command. +/** + * On Windows Vista and Windows 7, tune the send buffer size according to a + * hint from the OS. + * + * This should help fix slow upload rates. */ static void + update_send_buffer_size(tor_socket_t sock) { #ifdef _WIN32 + /* We only do this on Vista and 7, because earlier versions of Windows + * don't have the SIO_IDEAL_SEND_BACKLOG_QUERY functionality, and on + * later versions it isn't necessary. */ static int isVistaOr7 = -1; if (isVistaOr7 == -1) { isVistaOr7 = 0; @@ -3721,6 +3727,8 @@ update_send_buffer_size(tor_socket_t sock) &isb, sizeof(isb), &bytesReturned, NULL, NULL)) { setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (const char*)&isb, sizeof(isb)); } +#else + (void) sock; #endif }

1 0

[tor/master] Merge branch 'bug22798_029_squashed'
by nickm＠torproject.org 18 Jan '18

18 Jan '18

commit 77026f8a87064efc926f0be1e65c922f5e4ea238 Merge: 959af2024 57eab23ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 17 13:26:41 2018 -0500 Merge branch 'bug22798_029_squashed' changes/bug22798 | 4 ++++ src/common/compat.h | 3 +++ src/or/connection.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --cc src/or/connection.c index 3c37c59b4,dfb6d5bf1..a020bef77 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -3876,9 -3847,12 +3914,12 @@@ connection_handle_write_impl(connection /* else open, or closing */ initial_size = buf_datalen(conn->outbuf); - result = flush_buf_tls(or_conn->tls, conn->outbuf, + result = buf_flush_to_tls(conn->outbuf, or_conn->tls, max_to_write, &conn->outbuf_flushlen); + if (result >= 0) + update_send_buffer_size(conn->s); + /* If we just flushed the last bytes, tell the channel on the * or_conn to check if it needs to geoip_change_dirreq_state() */ /* XXXX move this to flushed_some or finished_flushing -NM */

1 0