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

[tor/release-0.4.4] Resolve a compilation warning in test_connection.c
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 020e8e41c676370de66d3ddf459700867ed454cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 14 11:50:38 2020 -0400 Resolve a compilation warning in test_connection.c Instead of casting an enum to a void and back, use a string -- that's better C anyway. Fixes bug 40113; bugfix on 0.2.9.3-alpha. --- changes/bug40113 | 3 +++ src/test/test_connection.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug40113 b/changes/bug40113 new file mode 100644 index 0000000000..adf4634097 --- /dev/null +++ b/changes/bug40113 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Resolve a compilation warning that could occur in test_connection.c. + Fixes bug 40113; bugfix on 0.2.9.3-alpha. diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36f..6f716f5758 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -592,7 +592,8 @@ test_conn_download_status(void *arg) connection_t *ap_conn = NULL; const struct testcase_t *tc = arg; - consensus_flavor_t usable_flavor = (consensus_flavor_t)tc->setup_data; + consensus_flavor_t usable_flavor = + networkstatus_parse_flavor_name((const char*) tc->setup_data); /* The "other flavor" trick only works if there are two flavors */ tor_assert(N_CONSENSUS_FLAVORS == 2); @@ -893,9 +894,9 @@ struct testcase_t connection_tests[] = { 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), + test_conn_download_status_st, "microdesc"), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + test_conn_download_status_st, "ns"), //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 remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 149b7a2418b436bee1be8059e7ccac3d4e5a401a Merge: b6429430c6 f5ddc45647 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:29:00 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.4] Resolve a compilation warning in test_connection.c
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 020e8e41c676370de66d3ddf459700867ed454cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 14 11:50:38 2020 -0400 Resolve a compilation warning in test_connection.c Instead of casting an enum to a void and back, use a string -- that's better C anyway. Fixes bug 40113; bugfix on 0.2.9.3-alpha. --- changes/bug40113 | 3 +++ src/test/test_connection.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug40113 b/changes/bug40113 new file mode 100644 index 0000000000..adf4634097 --- /dev/null +++ b/changes/bug40113 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Resolve a compilation warning that could occur in test_connection.c. + Fixes bug 40113; bugfix on 0.2.9.3-alpha. diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36f..6f716f5758 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -592,7 +592,8 @@ test_conn_download_status(void *arg) connection_t *ap_conn = NULL; const struct testcase_t *tc = arg; - consensus_flavor_t usable_flavor = (consensus_flavor_t)tc->setup_data; + consensus_flavor_t usable_flavor = + networkstatus_parse_flavor_name((const char*) tc->setup_data); /* The "other flavor" trick only works if there are two flavors */ tor_assert(N_CONSENSUS_FLAVORS == 2); @@ -893,9 +894,9 @@ struct testcase_t connection_tests[] = { 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), + test_conn_download_status_st, "microdesc"), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + test_conn_download_status_st, "ns"), //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/maint-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/maint-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/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 149b7a2418b436bee1be8059e7ccac3d4e5a401a Merge: b6429430c6 f5ddc45647 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:29:00 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0

[tor/master] Resolve a compilation warning in test_connection.c
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 020e8e41c676370de66d3ddf459700867ed454cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 14 11:50:38 2020 -0400 Resolve a compilation warning in test_connection.c Instead of casting an enum to a void and back, use a string -- that's better C anyway. Fixes bug 40113; bugfix on 0.2.9.3-alpha. --- changes/bug40113 | 3 +++ src/test/test_connection.c | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changes/bug40113 b/changes/bug40113 new file mode 100644 index 0000000000..adf4634097 --- /dev/null +++ b/changes/bug40113 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Resolve a compilation warning that could occur in test_connection.c. + Fixes bug 40113; bugfix on 0.2.9.3-alpha. diff --git a/src/test/test_connection.c b/src/test/test_connection.c index ebe7c6d36f..6f716f5758 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -592,7 +592,8 @@ test_conn_download_status(void *arg) connection_t *ap_conn = NULL; const struct testcase_t *tc = arg; - consensus_flavor_t usable_flavor = (consensus_flavor_t)tc->setup_data; + consensus_flavor_t usable_flavor = + networkstatus_parse_flavor_name((const char*) tc->setup_data); /* The "other flavor" trick only works if there are two flavors */ tor_assert(N_CONSENSUS_FLAVORS == 2); @@ -893,9 +894,9 @@ struct testcase_t connection_tests[] = { 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), + test_conn_download_status_st, "microdesc"), CONNECTION_TESTCASE_ARG(download_status, TT_FORK, - test_conn_download_status_st, FLAV_NS), + test_conn_download_status_st, "ns"), //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/master] 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/master] 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/master] Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4
by asn＠torproject.org 07 Oct '20

07 Oct '20

commit 149b7a2418b436bee1be8059e7ccac3d4e5a401a Merge: b6429430c6 f5ddc45647 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Oct 7 13:29:00 2020 +0300 Merge remote-tracking branch 'tor-gitlab/mr/163' into maint-0.4.4 changes/bug40113 | 3 +++ src/test/test_connection.c | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)

1 0