tor-commits April 2019

tor-commits@lists.torproject.org

18 participants
3314 discussions

[tor/master] Merge branch 'maint-0.4.0'
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 0b6769a99e4493a0b69fcbedda3febc6028391fb Merge: 50341bb5b 42aae0e69 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 3 17:59:46 2019 +0300 Merge branch 'maint-0.4.0' changes/ticket29897 | 3 +++ src/feature/dircache/dircache.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/867' into maint-0.4.0
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 42aae0e693be6f96eef9d124867c7e0915b6ab78 Merge: 828f1829c 194b25f0c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 3 17:59:02 2019 +0300 Merge branch 'tor-github/pr/867' into maint-0.4.0 changes/ticket28816 | 4 ++++ changes/ticket29897 | 3 +++ src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ src/feature/dircache/dircache.c | 5 +---- 5 files changed, 27 insertions(+), 4 deletions(-)

1 0

[tor/master] dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 194b25f0c7043b2485bb90da6fb24c0e96957875 Author: teor <teor(a)torproject.org> Date: Tue Mar 26 18:12:16 2019 +1000 dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add() Implements ticket 29897. --- changes/ticket29897 | 3 +++ src/feature/dircache/dircache.c | 5 +---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changes/ticket29897 b/changes/ticket29897 new file mode 100644 index 000000000..232a79fbc --- /dev/null +++ b/changes/ticket29897 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Refactor handle_get_next_bandwidth() to use connection_dir_buf_add(). + Implements ticket 29897. diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index caa085dd6..62eb4c86c 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1486,13 +1486,10 @@ handle_get_next_bandwidth(dir_connection_t *conn, conn->compress_state = tor_compress_new(1, compress_method, choose_compression_level(len/2)); log_debug(LD_DIR, "Compressing bandwidth file."); - connection_buf_add_compress(bandwidth, len, conn, 0); - /* Flush the compression state. */ - connection_buf_add_compress("", 0, conn, 1); } else { log_debug(LD_DIR, "Not compressing bandwidth file."); - connection_buf_add(bandwidth, len, TO_CONN(conn)); } + connection_dir_buf_add((const char*)bandwidth, len, conn, 1); tor_free(bandwidth); return 0; }

1 0

[tor/release-0.4.0] Merge branch 'tor-github/pr/867' into maint-0.4.0
by asn＠torproject.org 03 Apr '19

03 Apr '19

1 0

[tor/release-0.4.0] Add connection_dir_buf_add() helper function
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 6ab1929f00e625a0056eb29c5308ae9f3155a049 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Feb 9 16:06:32 2019 +0200 Add connection_dir_buf_add() helper function --- src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index c8b19344b..7f2e96b4d 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -4341,6 +4341,23 @@ connection_write_to_buf_impl_,(const char *string, size_t len, connection_write_to_buf_commit(conn, written); } +/** + * Write a string (of size len to directory connection + * dir_conn. Apply compression if connection is configured to use + * it and finalize it if done is true. + */ +void +connection_dir_buf_add(const char *string, size_t len, + dir_connection_t *dir_conn, int done) +{ + if (dir_conn->compress_state != NULL) { + connection_buf_add_compress(string, len, dir_conn, done); + return; + } + + connection_buf_add(string, len, TO_CONN(dir_conn)); +} + void connection_buf_add_compress(const char *string, size_t len, dir_connection_t *conn, int done) diff --git a/src/core/mainloop/connection.h b/src/core/mainloop/connection.h index 411f13a8b..c93f1ef8e 100644 --- a/src/core/mainloop/connection.h +++ b/src/core/mainloop/connection.h @@ -226,6 +226,8 @@ MOCK_DECL(void, connection_write_to_buf_impl_, /* DOCDOC connection_write_to_buf */ static void connection_buf_add(const char *string, size_t len, connection_t *conn); +void connection_dir_buf_add(const char *string, size_t len, + dir_connection_t *dir_conn, int done); static inline void connection_buf_add(const char *string, size_t len, connection_t *conn) {

1 0

[tor/release-0.4.0] Add changes file
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit c2222ba169a059e1a6ce04cb9014fe8870674d87 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Feb 9 16:56:54 2019 +0200 Add changes file --- changes/ticket28816 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket28816 b/changes/ticket28816 new file mode 100644 index 000000000..02878ccfd --- /dev/null +++ b/changes/ticket28816 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Introduce a connection_dir_buf_add() helper function that checks for + compress_state of dir_connection_t and automatically writes a string to + directory connection with or without compression. Resolves issue 28816.

1 0

[tor/release-0.4.0] dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
by asn＠torproject.org 03 Apr '19

03 Apr '19

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit de0babab9b0917bdee45907d3ec6f0ea74f55cbc Merge: 33e0c0310 42aae0e69 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Apr 3 17:59:46 2019 +0300 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket28816 | 4 ++++ changes/ticket29897 | 3 +++ src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ src/feature/dircache/dircache.c | 5 +---- 5 files changed, 27 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.0] Changes file for bug 29527
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit cfcf6de1a83ebb192374836a8c35a317fc2894e1 Author: teor <teor(a)torproject.org> Date: Wed Mar 20 18:07:00 2019 +1000 Changes file for bug 29527 The previous commit introduces these changes: Stop warning about undefined behavior in the probability distribution tests. Float division by zero may technically be undefined behaviour in C, but it's well-defined in IEEE 754. Partial backport of 29298. Closes ticket 29527; bugfix on 0.4.0.1-alpha. --- changes/bug29527 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug29527 b/changes/bug29527 new file mode 100644 index 000000000..6f36a9e1a --- /dev/null +++ b/changes/bug29527 @@ -0,0 +1,5 @@ + o Minor features (circuit padding): + - Stop warning about undefined behavior in the probability distribution + tests. Float division by zero may technically be undefined behaviour in + C, but it's well-defined in IEEE 754. Partial backport of 29298. + Closes ticket 29527; bugfix on 0.4.0.1-alpha.

1 0

[tor/master] Silence unneeded clang warns that triggered in prob distr tests.
by asn＠torproject.org 03 Apr '19

03 Apr '19

commit 78a8827fd4d4c814e63a8670cf88453f1586f4c5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 25 15:29:41 2019 +0200 Silence unneeded clang warns that triggered in prob distr tests. See https://trac.torproject.org/projects/tor/ticket/29528#comment:3 and https://bugs.llvm.org/show_bug.cgi?id=19535 --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index 91a049844..0f7eb61f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1198,6 +1198,11 @@ if test "$fragile_hardening" = "yes"; then AC_MSG_ERROR([The compiler supports -fsanitize=undefined, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.*, and with Clang you need libclang_rt.ubsan*]) fi + TOR_TRY_COMPILE_WITH_CFLAGS([-fno-sanitize=float-divide-by-zero], also_link, CFLAGS_UBSAN="-fno-sanitize=float-divide-by-zero", true) + if test "$tor_cv_cflags__fno_sanitize_float_divide_by_zero" = "yes" && test "$tor_can_link__fno_sanitize_float_divide_by_zero" != "yes"; then + AC_MSG_ERROR([The compiler supports -fno-sanitize=float-divide-by-zero, but for some reason I was not able to link when using it. Are you missing run-time support? With GCC you need libasan.*, and with Clang you need libclang_rt.ubsan*]) + fi + TOR_CHECK_CFLAGS([-fno-omit-frame-pointer]) fi

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2019