February 2019 - tor-commits - lists.torproject.org

[tor/master] Add connection_dir_buf_add() helper function
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 09a3c949f8388c83d4b62e281474687a26596a59 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 37f35c8b8..b53552a53 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 f4f0e839a..de6473251 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/master] Add changes file
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 8d04dc416bd6aa3fefc0914add8708083dc99d52 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/master] Merge branch 'tor-github/pr/696'
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit a30f17f72fb4e016f1c0d7f8619fcb20fec29d16 Merge: c22446e30 8d04dc416 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Feb 20 11:29:55 2019 -0500 Merge branch 'tor-github/pr/696' changes/ticket28816 | 4 ++++ src/core/mainloop/connection.c | 17 +++++++++++++++++ src/core/mainloop/connection.h | 2 ++ src/feature/dircache/dircache.c | 28 ++++++++++------------------ src/feature/dircache/dirserv.c | 20 +++++++------------- 5 files changed, 40 insertions(+), 31 deletions(-)

1 0

[tor/master] Use compress_dir_buf_add() function in a few places
by dgoulet＠torproject.org 20 Feb '19

20 Feb '19

commit 4c102213326705079be60d3ce335b81c94b76499 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Feb 9 16:46:31 2019 +0200 Use compress_dir_buf_add() function in a few places --- src/feature/dircache/dircache.c | 28 ++++++++++------------------ src/feature/dircache/dirserv.c | 20 +++++++------------- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/feature/dircache/dircache.c b/src/feature/dircache/dircache.c index f6e57c506..ee6e4f7a8 100644 --- a/src/feature/dircache/dircache.c +++ b/src/feature/dircache/dircache.c @@ -1068,13 +1068,11 @@ handle_get_status_vote(dir_connection_t *conn, const get_handler_args_t *args) if (compress_method != NO_METHOD) { conn->compress_state = tor_compress_new(1, compress_method, choose_compression_level(estimated_len)); - SMARTLIST_FOREACH(items, const char *, c, - connection_buf_add_compress(c, strlen(c), conn, 0)); - connection_buf_add_compress("", 0, conn, 1); - } else { - SMARTLIST_FOREACH(items, const char *, c, - connection_buf_add(c, strlen(c), TO_CONN(conn))); } + + SMARTLIST_FOREACH(items, const char *, c, + connection_dir_buf_add(c, strlen(c), conn, + c_sl_idx == c_sl_len - 1)); } else { SMARTLIST_FOREACH(dir_items, cached_dir_t *, d, connection_buf_add(compress_method != NO_METHOD ? @@ -1325,19 +1323,13 @@ handle_get_keys(dir_connection_t *conn, const get_handler_args_t *args) if (compress_method != NO_METHOD) { conn->compress_state = tor_compress_new(1, compress_method, choose_compression_level(len)); - SMARTLIST_FOREACH(certs, authority_cert_t *, c, - connection_buf_add_compress( - c->cache_info.signed_descriptor_body, - c->cache_info.signed_descriptor_len, - conn, 0)); - connection_buf_add_compress("", 0, conn, 1); - } else { - SMARTLIST_FOREACH(certs, authority_cert_t *, c, - connection_buf_add(c->cache_info.signed_descriptor_body, - c->cache_info.signed_descriptor_len, - TO_CONN(conn))); } - keys_done: + + SMARTLIST_FOREACH(certs, authority_cert_t *, c, + connection_dir_buf_add(c->cache_info.signed_descriptor_body, + c->cache_info.signed_descriptor_len, + conn, c_sl_idx == c_sl_len - 1)); + keys_done: smartlist_free(certs); goto done; } diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 4be6836fe..79400bf15 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -583,11 +583,9 @@ spooled_resource_flush_some(spooled_resource_t *spooled, /* Absent objects count as "done". */ return SRFS_DONE; } - if (conn->compress_state) { - connection_buf_add_compress((const char*)body, bodylen, conn, 0); - } else { - connection_buf_add((const char*)body, bodylen, TO_CONN(conn)); - } + + connection_dir_buf_add((const char*)body, bodylen, conn, 0); + return SRFS_DONE; } else { cached_dir_t *cached = spooled->cached_dir_ref; @@ -622,14 +620,10 @@ spooled_resource_flush_some(spooled_resource_t *spooled, if (BUG(remaining < 0)) return SRFS_ERR; ssize_t bytes = (ssize_t) MIN(DIRSERV_CACHED_DIR_CHUNK_SIZE, remaining); - if (conn->compress_state) { - connection_buf_add_compress( - ptr + spooled->cached_dir_offset, - bytes, conn, 0); - } else { - connection_buf_add(ptr + spooled->cached_dir_offset, - bytes, TO_CONN(conn)); - } + + connection_dir_buf_add(ptr + spooled->cached_dir_offset, + bytes, conn, 0); + spooled->cached_dir_offset += bytes; if (spooled->cached_dir_offset >= (off_t)total_len) { return SRFS_DONE;

1 0

[tor/master] Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit 5ec65be8bff9862d31f612bdd28c0b0d78b1f5cf Merge: ccab4347e d32e40797 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:39:28 2019 -0500 Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0 src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Downgrade some LOG_ERR messages in the address/* tests to warnings
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit d32e4079761f0076cd9e704a7f9996aa5b599f60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 14:02:32 2019 -0500 Downgrade some LOG_ERR messages in the address/* tests to warnings Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Bug not in any released Tor. --- src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index d9304a0cf..bf9ca047d 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -746,7 +746,7 @@ test_address_get_if_addrs_list_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 1); + results = get_interface_address_list(LOG_WARN, 1); tt_ptr_op(results, OP_NE, NULL); /* When the network is down, a system might not have any non-local @@ -777,7 +777,7 @@ test_address_get_if_addrs_list_no_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 0); + results = get_interface_address_list(LOG_WARN, 0); tt_ptr_op(results, OP_NE, NULL); /* Work even on systems with only internal IPv4 addresses */ @@ -988,7 +988,7 @@ test_address_get_if_addrs(void *arg) (void)arg; - rv = get_interface_address(LOG_ERR, &addr_h); + rv = get_interface_address(LOG_WARN, &addr_h); /* When the network is down, a system might not have any non-local * non-multicast IPv4 addresses, not even internal ones.

1 0

[tor/master] Merge branch 'maint-0.4.0'
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit c22446e3055603cdbbea36e31ea49436d9ca3e11 Merge: 4d4eda89a 5ec65be8b Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:40:20 2019 -0500 Merge branch 'maint-0.4.0' src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Downgrade some LOG_ERR messages in the address/* tests to warnings
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit d32e4079761f0076cd9e704a7f9996aa5b599f60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 14:02:32 2019 -0500 Downgrade some LOG_ERR messages in the address/* tests to warnings Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Bug not in any released Tor. --- src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index d9304a0cf..bf9ca047d 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -746,7 +746,7 @@ test_address_get_if_addrs_list_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 1); + results = get_interface_address_list(LOG_WARN, 1); tt_ptr_op(results, OP_NE, NULL); /* When the network is down, a system might not have any non-local @@ -777,7 +777,7 @@ test_address_get_if_addrs_list_no_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 0); + results = get_interface_address_list(LOG_WARN, 0); tt_ptr_op(results, OP_NE, NULL); /* Work even on systems with only internal IPv4 addresses */ @@ -988,7 +988,7 @@ test_address_get_if_addrs(void *arg) (void)arg; - rv = get_interface_address(LOG_ERR, &addr_h); + rv = get_interface_address(LOG_WARN, &addr_h); /* When the network is down, a system might not have any non-local * non-multicast IPv4 addresses, not even internal ones.

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit 5ec65be8bff9862d31f612bdd28c0b0d78b1f5cf Merge: ccab4347e d32e40797 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Feb 20 10:39:28 2019 -0500 Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0 src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.0] Downgrade some LOG_ERR messages in the address/* tests to warnings
by arma＠torproject.org 20 Feb '19

20 Feb '19

commit d32e4079761f0076cd9e704a7f9996aa5b599f60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 14:02:32 2019 -0500 Downgrade some LOG_ERR messages in the address/* tests to warnings Fixes bug 29530, where the LOG_ERR messages were occurring when we had no configured network, and so we were failing the unit tests because of the recently-merged #28668. Bug not in any released Tor. --- src/test/test_address.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index d9304a0cf..bf9ca047d 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -746,7 +746,7 @@ test_address_get_if_addrs_list_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 1); + results = get_interface_address_list(LOG_WARN, 1); tt_ptr_op(results, OP_NE, NULL); /* When the network is down, a system might not have any non-local @@ -777,7 +777,7 @@ test_address_get_if_addrs_list_no_internal(void *arg) (void)arg; - results = get_interface_address_list(LOG_ERR, 0); + results = get_interface_address_list(LOG_WARN, 0); tt_ptr_op(results, OP_NE, NULL); /* Work even on systems with only internal IPv4 addresses */ @@ -988,7 +988,7 @@ test_address_get_if_addrs(void *arg) (void)arg; - rv = get_interface_address(LOG_ERR, &addr_h); + rv = get_interface_address(LOG_WARN, &addr_h); /* When the network is down, a system might not have any non-local * non-multicast IPv4 addresses, not even internal ones.

1 0