October 2020 - tor-commits - lists.torproject.org

[tor/maint-0.4.4] Fix warnings when using two unusual options together.
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 88d99fc1bd87b17517e49fd7ae82c0de6eaff992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:59:37 2020 -0400 Fix warnings when using two unusual options together. The option `--enable-all-bugs-are-fatal` when used with `--disable-module-relay` caused GCC to warn about functions that it thought should be labeled noreturn. I've tried a couple of approaches, but disabling the warning on these functions seems to be the best approach. Fixed #40129; bugfix on 0.4.4.1-alpha. --- changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug40129 b/changes/bug40129 new file mode 100644 index 0000000000..80de5ef355 --- /dev/null +++ b/changes/bug40129 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compiler warnings that would occur when building with + "--enable-all-bugs-are-fatal" and "--disable-module-relay" + at the same time. Fixes bug 40129; bugfix on 0.4.4.1-alpha. diff --git a/src/feature/dircache/dircache_stub.c b/src/feature/dircache/dircache_stub.c index 87811597d1..725c44bd4d 100644 --- a/src/feature/dircache/dircache_stub.c +++ b/src/feature/dircache/dircache_stub.c @@ -14,6 +14,7 @@ #include "feature/dircache/dirserv.h" #include "feature/dircommon/dir_connection_st.h" +DISABLE_GCC_WARNING("-Wmissing-noreturn") int directory_handle_command(dir_connection_t *conn) { @@ -29,6 +30,7 @@ connection_dirserv_flushed_some(dir_connection_t *conn) tor_assert_nonfatal_unreached_once(); return -1; } +ENABLE_GCC_WARNING("-Wmissing-noreturn") void dir_conn_clear_spool(dir_connection_t *conn) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 34d8163c36..75a3d2f35c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2488,6 +2488,10 @@ check_descriptor_bandwidth_changed(time_t now) } } +// This function can be "noreturn" if relay mode is disabled and +// ALL_BUGS_ARE_FATAL is set. +DISABLE_GCC_WARNING("-Wmissing-noreturn") + /** Note at log level severity that our best guess of address has changed from * prev to cur. */ void @@ -2517,6 +2521,7 @@ log_addr_has_changed(int severity, "Guessed our IP address as %s (source: %s).", addrbuf_cur, source); } +ENABLE_GCC_WARNING("-Wmissing-noreturn") /** Check whether our own address as defined by the Address configuration * has changed. This is for routers that get their address from a service

1 0

[tor/master] Merge branch 'maint-0.4.4' into master
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 438aba6c0b70c5becc8ba2c17fad98156901f64b Merge: 84e825598a a914ac5d7c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:42:57 2020 +0300 Merge branch 'maint-0.4.4' into master changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+) diff --cc src/feature/relay/router.c index 8233ebe47f,75a3d2f35c..5ca21964b6 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@@ -2636,12 -2521,11 +2640,13 @@@ log_addr_has_changed(int severity "Guessed our IP address as %s (source: %s).", addrbuf_cur, source); } + ENABLE_GCC_WARNING("-Wmissing-noreturn") -/** Check whether our own address as defined by the Address configuration - * has changed. This is for routers that get their address from a service - * like dyndns. If our address has changed, mark our descriptor dirty. */ +/** Check whether our own address has changed versus the one we have in our + * current descriptor. + * + * If our address has changed, call ip_address_changed() which takes + * appropriate actions. */ void check_descriptor_ipaddress_changed(time_t now) {

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit a914ac5d7c79170bfc766ffe2b2a30c9d99996bb Merge: 149b7a2418 88d99fc1bd Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:32:17 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4 changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+)

1 0

[tor/master] Fix warnings when using two unusual options together.
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 88d99fc1bd87b17517e49fd7ae82c0de6eaff992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:59:37 2020 -0400 Fix warnings when using two unusual options together. The option `--enable-all-bugs-are-fatal` when used with `--disable-module-relay` caused GCC to warn about functions that it thought should be labeled noreturn. I've tried a couple of approaches, but disabling the warning on these functions seems to be the best approach. Fixed #40129; bugfix on 0.4.4.1-alpha. --- changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug40129 b/changes/bug40129 new file mode 100644 index 0000000000..80de5ef355 --- /dev/null +++ b/changes/bug40129 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compiler warnings that would occur when building with + "--enable-all-bugs-are-fatal" and "--disable-module-relay" + at the same time. Fixes bug 40129; bugfix on 0.4.4.1-alpha. diff --git a/src/feature/dircache/dircache_stub.c b/src/feature/dircache/dircache_stub.c index 87811597d1..725c44bd4d 100644 --- a/src/feature/dircache/dircache_stub.c +++ b/src/feature/dircache/dircache_stub.c @@ -14,6 +14,7 @@ #include "feature/dircache/dirserv.h" #include "feature/dircommon/dir_connection_st.h" +DISABLE_GCC_WARNING("-Wmissing-noreturn") int directory_handle_command(dir_connection_t *conn) { @@ -29,6 +30,7 @@ connection_dirserv_flushed_some(dir_connection_t *conn) tor_assert_nonfatal_unreached_once(); return -1; } +ENABLE_GCC_WARNING("-Wmissing-noreturn") void dir_conn_clear_spool(dir_connection_t *conn) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 34d8163c36..75a3d2f35c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2488,6 +2488,10 @@ check_descriptor_bandwidth_changed(time_t now) } } +// This function can be "noreturn" if relay mode is disabled and +// ALL_BUGS_ARE_FATAL is set. +DISABLE_GCC_WARNING("-Wmissing-noreturn") + /** Note at log level severity that our best guess of address has changed from * prev to cur. */ void @@ -2517,6 +2521,7 @@ log_addr_has_changed(int severity, "Guessed our IP address as %s (source: %s).", addrbuf_cur, source); } +ENABLE_GCC_WARNING("-Wmissing-noreturn") /** Check whether our own address as defined by the Address configuration * has changed. This is for routers that get their address from a service

1 0

[tor/release-0.4.4] Fix warnings when using two unusual options together.
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 88d99fc1bd87b17517e49fd7ae82c0de6eaff992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 22 09:59:37 2020 -0400 Fix warnings when using two unusual options together. The option `--enable-all-bugs-are-fatal` when used with `--disable-module-relay` caused GCC to warn about functions that it thought should be labeled noreturn. I've tried a couple of approaches, but disabling the warning on these functions seems to be the best approach. Fixed #40129; bugfix on 0.4.4.1-alpha. --- changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/changes/bug40129 b/changes/bug40129 new file mode 100644 index 0000000000..80de5ef355 --- /dev/null +++ b/changes/bug40129 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Fix compiler warnings that would occur when building with + "--enable-all-bugs-are-fatal" and "--disable-module-relay" + at the same time. Fixes bug 40129; bugfix on 0.4.4.1-alpha. diff --git a/src/feature/dircache/dircache_stub.c b/src/feature/dircache/dircache_stub.c index 87811597d1..725c44bd4d 100644 --- a/src/feature/dircache/dircache_stub.c +++ b/src/feature/dircache/dircache_stub.c @@ -14,6 +14,7 @@ #include "feature/dircache/dirserv.h" #include "feature/dircommon/dir_connection_st.h" +DISABLE_GCC_WARNING("-Wmissing-noreturn") int directory_handle_command(dir_connection_t *conn) { @@ -29,6 +30,7 @@ connection_dirserv_flushed_some(dir_connection_t *conn) tor_assert_nonfatal_unreached_once(); return -1; } +ENABLE_GCC_WARNING("-Wmissing-noreturn") void dir_conn_clear_spool(dir_connection_t *conn) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 34d8163c36..75a3d2f35c 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2488,6 +2488,10 @@ check_descriptor_bandwidth_changed(time_t now) } } +// This function can be "noreturn" if relay mode is disabled and +// ALL_BUGS_ARE_FATAL is set. +DISABLE_GCC_WARNING("-Wmissing-noreturn") + /** Note at log level severity that our best guess of address has changed from * prev to cur. */ void @@ -2517,6 +2521,7 @@ log_addr_has_changed(int severity, "Guessed our IP address as %s (source: %s).", addrbuf_cur, source); } +ENABLE_GCC_WARNING("-Wmissing-noreturn") /** Check whether our own address as defined by the Address configuration * has changed. This is for routers that get their address from a service

1 0

[tor/release-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit a914ac5d7c79170bfc766ffe2b2a30c9d99996bb Merge: 149b7a2418 88d99fc1bd Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:32:17 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/154' into maint-0.4.4 changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 7d512cd8b3142b473e7d4169e76ef99301e98ada Merge: 9c31a8fde3 a914ac5d7c Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:42:57 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40129 | 4 ++++ src/feature/dircache/dircache_stub.c | 2 ++ src/feature/relay/router.c | 5 +++++ 3 files changed, 11 insertions(+)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.3.5' into bug40133_035
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 79d777396858d008bb99d0f411953a5152b921b0 Merge: 020e8e41c6 faf89ec6c2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 28 10:35:12 2020 -0400 Merge branch 'maint-0.3.5' into bug40133_035 .gitlab-ci.yml | 73 +++++++++++++++++++++++++++- changes/ticket40125 | 4 ++ changes/ticket40126 | 4 ++ changes/ticket40135 | 3 ++ scripts/ci/ci-driver.sh | 25 ++++++++++ src/feature/hs_common/shared_random_client.c | 4 -- src/test/test_rendcache.c | 3 ++ 7 files changed, 111 insertions(+), 5 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'bug40133_035' into bug40133_043
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit f5ddc456472ed9198cda186e59239b5f7558c799 Merge: beffad8529 79d7773968 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 28 10:37:14 2020 -0400 Merge branch 'bug40133_035' into bug40133_043 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --cc src/test/test_connection.c index 7ed831f7d8,6f716f5758..05f7009bf4 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@@ -979,18 -893,11 +980,18 @@@ struct testcase_t connection_tests[] = CONNECTION_TESTCASE(get_basic, TT_FORK, test_conn_get_basic_st), CONNECTION_TESTCASE(get_rend, TT_FORK, test_conn_get_rend_st), CONNECTION_TESTCASE(get_rsrc, TT_FORK, test_conn_get_rsrc_st), + - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_MICRODESC), - CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + test_conn_download_status_st, "microdesc"), + CONNECTION_TESTCASE_ARG(download_status, TT_FORK, + test_conn_download_status_st, "ns"), -//CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), + + CONNECTION_TESTCASE_ARG(https_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, &PROXY_CONNECT_ARG), + CONNECTION_TESTCASE_ARG(haproxy_proxy_connect, TT_FORK, + test_conn_proxy_connect_st, &PROXY_HAPROXY_ARG), + - //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), ++ //CONNECTION_TESTCASE(func_suffix, TT_FORK, setup_func_pair), { "failed_orconn_tracker", test_failed_orconn_tracker, TT_FORK, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 9c31a8fde348073b879489c4ca42c87bc66d357e Merge: 1ebea31036 149b7a2418 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:29:16 2020 +0300 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0