- tor-commits - lists.torproject.org

[tor/master] Write missing function comments
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 7b30f8dc8c93ac215a1e7330fee1baa5f1437a98 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri Mar 22 13:04:06 2019 +0200 Write missing function comments --- src/test/test_ptr_slow.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_ptr_slow.c b/src/test/test_ptr_slow.c index 37560d435..2d4fc9d4d 100644 --- a/src/test/test_ptr_slow.c +++ b/src/test/test_ptr_slow.c @@ -36,6 +36,7 @@ assert_int_voidptr_roundtrip(int a) return; } +/** Test for possibility of casting `int` to `void *` and back. */ static void test_int_voidstar_interop(void *arg) { @@ -61,6 +62,7 @@ test_int_voidstar_interop(void *arg) } } +/** Assert that <b>a</b> can be cast to void * and back. */ static void assert_uint_voidptr_roundtrip(unsigned int a) { @@ -76,6 +78,7 @@ assert_uint_voidptr_roundtrip(unsigned int a) return; } +/** Test for possibility of casting `int` to `void *` and back. */ static void test_uint_voidstar_interop(void *arg) {

1 0

[tor/master] Move sizeof check to torint.h
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 68260e85b5fd4f5e0bb87a4c58b187a8309b0cb5 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Mar 25 10:17:30 2019 +0200 Move sizeof check to torint.h --- src/lib/cc/torint.h | 9 +++++++++ src/test/test_ptr_slow.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/cc/torint.h b/src/lib/cc/torint.h index c9b2d329f..9a66aada1 100644 --- a/src/lib/cc/torint.h +++ b/src/lib/cc/torint.h @@ -125,4 +125,13 @@ typedef int32_t ssize_t; /** Any size_t larger than this amount is likely to be an underflow. */ #define SIZE_T_CEILING ((size_t)(SSIZE_MAX-16)) +#if SIZEOF_INT > SIZEOF_VOID_P +#error "sizeof(int) > sizeof(void *) - Tor cannot be built on this platform!" +#endif + +#if SIZEOF_UNSIGNED_INT > SIZEOF_VOID_P +#error "sizeof(unsigned int) > sizeof(void *) - Tor cannot be built on this \ +platform!" +#endif + #endif /* !defined(TOR_TORINT_H) */ diff --git a/src/test/test_ptr_slow.c b/src/test/test_ptr_slow.c index 2d4fc9d4d..76bdbf189 100644 --- a/src/test/test_ptr_slow.c +++ b/src/test/test_ptr_slow.c @@ -11,15 +11,6 @@ #include <stdint.h> #include <limits.h> -#if SIZEOF_INT > SIZEOF_VOID_P -#error "sizeof(int) > sizeof(void *) - Tor cannot be built on this platform!" -#endif - -#if SIZEOF_UNSIGNED_INT > SIZEOF_VOID_P -#error "sizeof(unsigned int) > sizeof(void *) - Tor cannot be built on this \ -platform!" -#endif - /** Assert that <b>a</b> can be cast to void * and back. */ static void assert_int_voidptr_roundtrip(int a)

1 0

[tor/master] Tweak changes file
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 9529d99982eb64998e12db7704fa977bf02f541c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sun Mar 24 09:25:30 2019 +0200 Tweak changes file --- changes/ticket29537 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/ticket29537 b/changes/ticket29537 index 048e13c65..afe230820 100644 --- a/changes/ticket29537 +++ b/changes/ticket29537 @@ -1,3 +1,3 @@ o Testing: - - Check that all valid values of `int` and `unsigned int` can be - represented by `void *`. Resolves issue 29537. + - Check that representative subsets of values of `int` and `unsigned int` + can be represented by `void *`. Resolves issue 29537.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/724'
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 613c5ff3578bacde129701e370eca2afaaf914ff Merge: 064265086 4e6ba575a Author: teor <teor(a)torproject.org> Date: Tue Mar 26 19:31:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/724' changes/ticket29537 | 3 ++ configure.ac | 1 + src/lib/cc/torint.h | 9 ++++ src/test/include.am | 3 ++ src/test/ptr_helpers.c | 50 ++++++++++++++++++++++ src/test/ptr_helpers.h | 23 ++++++++++ src/test/test.h | 1 + src/test/test_ptr_slow.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ src/test/test_slow.c | 1 + 9 files changed, 197 insertions(+)

1 0

[tor/master] Add header guards to ptr_helpers.h
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 4e6ba575a66108f38a55cffdb197352757f77d78 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Mar 26 09:49:32 2019 +0200 Add header guards to ptr_helpers.h --- src/test/ptr_helpers.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/ptr_helpers.h b/src/test/ptr_helpers.h index fe2c8c970..67776b100 100644 --- a/src/test/ptr_helpers.h +++ b/src/test/ptr_helpers.h @@ -3,6 +3,9 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +#ifndef TOR_PTR_HELPERS_H +#define TOR_PTR_HELPERS_H + #include <stdint.h> void * @@ -16,3 +19,5 @@ cast_uintptr_to_voidstar(uintptr_t x); uintptr_t cast_voidstar_to_uintptr(void *x); + +#endif

1 0

[tor/master] changes: add file for #21377
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 6ecf9590eae8cac125705d2f99b284de998d5649 Author: juga0 <juga(a)riseup.net> Date: Fri Dec 21 17:10:19 2018 +0000 changes: add file for #21377 --- changes/ticket21377 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket21377 b/changes/ticket21377 new file mode 100644 index 000000000..2bf5149a0 --- /dev/null +++ b/changes/ticket21377 @@ -0,0 +1,4 @@ + o Minor features (dircache): + - When a directory authority is using a bandwidth file to obtain the + bandwidth values that will be included in the next vote, serve this + bandwidth file at /tor/status-vote/next/bandwidth. Closes ticket 21377. \ No newline at end of file

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 4258728d56cb02d36baa785200a0d04f5b4c8fa6 Merge: 828033001 6ecf9590e Author: teor <teor(a)torproject.org> Date: Tue Mar 26 19:15:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0 changes/ticket21377 | 4 ++ src/feature/dircache/dircache.c | 42 +++++++++++++++- src/test/test_dir_handle_get.c | 106 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] test: Check bw file cache lifetime
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit fb4a40c32c4a7e5b7175ea2c635687b6b24a29d0 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 12:38:45 2018 +0000 test: Check bw file cache lifetime --- src/test/test_dir_handle_get.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 8b2ee3eca..6d478f6b4 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2516,6 +2516,16 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) tt_assert(strstr(header, "Content-Encoding: identity\r\n")); tt_assert(strstr(header, "Content-Length: 167\r\n")); + /* Check cache lifetime */ + char expbuf[RFC1123_TIME_LEN+1]; + time_t now = time(NULL); + /* BANDWIDTH_CACHE_LIFETIME is defined in dircache.c. */ + format_rfc1123_time(expbuf, (time_t)(now + 30*60)); + char *expires = NULL; + /* Change to 'Cache-control: max-age=%d' if using http/1.1. */ + tor_asprintf(&expires, "Expires: %s\r\n", expbuf); + tt_assert(strstr(header, expires)); + tt_int_op(body_used, OP_EQ, strlen(body)); tt_str_op(content, OP_EQ, body); @@ -2525,6 +2535,7 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) connection_free_minimal(TO_CONN(conn)); tor_free(header); tor_free(body); + tor_free(expires); or_options_free(mock_options); mock_options = NULL; }

1 0

[tor/release-0.4.0] bwauth: use flag to do not warn when file is missing
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit ee09e5d7eacdfde0cd5e1bc4a18c72fd7e47c1a7 Author: juga0 <juga(a)riseup.net> Date: Wed Nov 7 08:49:51 2018 +0000 bwauth: use flag to do not warn when file is missing Use flag to do not warn when the bandwidth file is missing trying to serve it by http. Also remove double space in the assignement. --- src/feature/dircache/dircache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index f373b74c8..2aaaf7be1 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1451,7 +1451,8 @@ handle_get_next_bandwidth(dir_connection_t *conn, const or_options_t *options = get_options(); if (options->V3BandwidthsFile) { int lifetime = 60; - char *bandwidth = read_file_to_str(options->V3BandwidthsFile, 0, NULL); + char *bandwidth = read_file_to_str(options->V3BandwidthsFile, + RFTS_IGNORE_MISSING, NULL); size_t len = strlen(bandwidth); write_http_response_header(conn, len, NO_METHOD, lifetime); connection_buf_add(bandwidth, len, TO_CONN(conn));

1 0

[tor/master] dircache: fix identation and remove unneded goto
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit da7a8d7624b76053210bad6f830df7842a4b30f1 Author: juga0 <juga(a)riseup.net> Date: Mon Nov 19 17:27:41 2018 +0000 dircache: fix identation and remove unneded goto --- src/test/test_dir_handle_get.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 0cd7e1050..22f5a9b3d 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2548,14 +2548,14 @@ test_dir_handle_get_status_vote_next_bandwidth(void* data) * If it would, the size and content would be different than the original. */ - done: - UNMOCK(get_options); - UNMOCK(connection_write_to_buf_impl_); - connection_free_minimal(TO_CONN(conn)); - tor_free(header); - tor_free(body); - tor_free(expires); - or_options_free(mock_options); mock_options = NULL; + done: + UNMOCK(get_options); + UNMOCK(connection_write_to_buf_impl_); + connection_free_minimal(TO_CONN(conn)); + tor_free(header); + tor_free(body); + tor_free(expires); + or_options_free(mock_options); } static void

1 0