June 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.4] Allow Rust to fail for now
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit e23ff6d4cccf4597a6e537450a2f5d55fa376b84 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jun 20 15:10:18 2018 -0500 Allow Rust to fail for now Multiple issues are preventing Travis CI from passing with Rust right now. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aab6f6b3d..f37f9a23f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,8 +87,9 @@ matrix: ## branches and build history pages. See ## https://github.com/travis-ci/travis-ci/issues/8716 allow_failures: - # - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - # - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" # - compiler: clang ## Create explicit matrix entries to work around a Travis CI

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4
by nickm＠torproject.org 21 Jun '18

21 Jun '18

commit 46dca273214147233808bcddb82c8bf76e8d6db5 Merge: f91ea506f e23ff6d4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 20:00:56 2018 -0400 Merge remote-tracking branch 'catalyst-github/allow_fail_rust' into maint-0.3.4 .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix clang warnings introduced by 9f2b887c5d251b93ee9def708
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit f91ea506f0a9af55a520dab4c88abf0c01bd2ce1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:49:06 2018 -0400 Fix clang warnings introduced by 9f2b887c5d251b93ee9def708 --- src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 53e4507f1..26b76c31f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4801,8 +4801,8 @@ process_environment_t * process_environment_make(struct smartlist_t *env_vars) { process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t)); - size_t n_env_vars = smartlist_len(env_vars); - size_t i; + int n_env_vars = smartlist_len(env_vars); + int i; size_t total_env_length; smartlist_t *env_vars_sorted; @@ -5375,4 +5375,3 @@ tor_ntohll(uint64_t a) { return tor_htonll(a); } - diff --git a/src/or/control.c b/src/or/control.c index 0d637dce7..ae54689c0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4597,7 +4597,7 @@ handle_control_add_onion(control_connection_t *conn, const char *body) { smartlist_t *args; - size_t arg_len; + int arg_len; (void) len; /* body is nul-terminated; it's safe to ignore the length */ args = getargs_helper("ADD_ONION", conn, body, 2, -1); if (!args) @@ -4618,7 +4618,7 @@ handle_control_add_onion(control_connection_t *conn, rend_auth_type_t auth_type = REND_NO_AUTH; /* Default to adding an anonymous hidden service if no flag is given */ int non_anonymous = 0; - for (size_t i = 1; i < arg_len; i++) { + for (int i = 1; i < arg_len; i++) { static const char *port_prefix = "Port="; static const char *flags_prefix = "Flags="; static const char *max_s_prefix = "MaxStreams="; @@ -7736,4 +7736,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ - diff --git a/src/or/geoip.c b/src/or/geoip.c index 2c917c564..c66bee0fa 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -150,7 +150,7 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, idx = ((uintptr_t)idxplus1_)-1; } { - geoip_country_t *c = smartlist_get(geoip_countries, idx); + geoip_country_t *c = smartlist_get(geoip_countries, (int)idx); tor_assert(!strcasecmp(c->countrycode, country)); } @@ -1884,4 +1884,3 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } -

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit f24797a5870b685af98728002a0b0da73f582fda Merge: 398f15bdf f91ea506f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:49:56 2018 -0400 Merge branch 'maint-0.3.4' src/common/util.c | 4 ++-- src/or/control.c | 5 ++--- src/or/geoip.c | 1 - 3 files changed, 4 insertions(+), 6 deletions(-)

1 0

[tor/release-0.3.4] Fix clang warnings introduced by 9f2b887c5d251b93ee9def708
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit f91ea506f0a9af55a520dab4c88abf0c01bd2ce1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:49:06 2018 -0400 Fix clang warnings introduced by 9f2b887c5d251b93ee9def708 --- src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 53e4507f1..26b76c31f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4801,8 +4801,8 @@ process_environment_t * process_environment_make(struct smartlist_t *env_vars) { process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t)); - size_t n_env_vars = smartlist_len(env_vars); - size_t i; + int n_env_vars = smartlist_len(env_vars); + int i; size_t total_env_length; smartlist_t *env_vars_sorted; @@ -5375,4 +5375,3 @@ tor_ntohll(uint64_t a) { return tor_htonll(a); } - diff --git a/src/or/control.c b/src/or/control.c index 0d637dce7..ae54689c0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4597,7 +4597,7 @@ handle_control_add_onion(control_connection_t *conn, const char *body) { smartlist_t *args; - size_t arg_len; + int arg_len; (void) len; /* body is nul-terminated; it's safe to ignore the length */ args = getargs_helper("ADD_ONION", conn, body, 2, -1); if (!args) @@ -4618,7 +4618,7 @@ handle_control_add_onion(control_connection_t *conn, rend_auth_type_t auth_type = REND_NO_AUTH; /* Default to adding an anonymous hidden service if no flag is given */ int non_anonymous = 0; - for (size_t i = 1; i < arg_len; i++) { + for (int i = 1; i < arg_len; i++) { static const char *port_prefix = "Port="; static const char *flags_prefix = "Flags="; static const char *max_s_prefix = "MaxStreams="; @@ -7736,4 +7736,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ - diff --git a/src/or/geoip.c b/src/or/geoip.c index 2c917c564..c66bee0fa 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -150,7 +150,7 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, idx = ((uintptr_t)idxplus1_)-1; } { - geoip_country_t *c = smartlist_get(geoip_countries, idx); + geoip_country_t *c = smartlist_get(geoip_countries, (int)idx); tor_assert(!strcasecmp(c->countrycode, country)); } @@ -1884,4 +1884,3 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } -

1 0

[tor/maint-0.3.4] Fix clang warnings introduced by 9f2b887c5d251b93ee9def708
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit f91ea506f0a9af55a520dab4c88abf0c01bd2ce1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 17:49:06 2018 -0400 Fix clang warnings introduced by 9f2b887c5d251b93ee9def708 --- src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 53e4507f1..26b76c31f 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -4801,8 +4801,8 @@ process_environment_t * process_environment_make(struct smartlist_t *env_vars) { process_environment_t *env = tor_malloc_zero(sizeof(process_environment_t)); - size_t n_env_vars = smartlist_len(env_vars); - size_t i; + int n_env_vars = smartlist_len(env_vars); + int i; size_t total_env_length; smartlist_t *env_vars_sorted; @@ -5375,4 +5375,3 @@ tor_ntohll(uint64_t a) { return tor_htonll(a); } - diff --git a/src/or/control.c b/src/or/control.c index 0d637dce7..ae54689c0 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4597,7 +4597,7 @@ handle_control_add_onion(control_connection_t *conn, const char *body) { smartlist_t *args; - size_t arg_len; + int arg_len; (void) len; /* body is nul-terminated; it's safe to ignore the length */ args = getargs_helper("ADD_ONION", conn, body, 2, -1); if (!args) @@ -4618,7 +4618,7 @@ handle_control_add_onion(control_connection_t *conn, rend_auth_type_t auth_type = REND_NO_AUTH; /* Default to adding an anonymous hidden service if no flag is given */ int non_anonymous = 0; - for (size_t i = 1; i < arg_len; i++) { + for (int i = 1; i < arg_len; i++) { static const char *port_prefix = "Port="; static const char *flags_prefix = "Flags="; static const char *max_s_prefix = "MaxStreams="; @@ -7736,4 +7736,3 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif /* defined(TOR_UNIT_TESTS) */ - diff --git a/src/or/geoip.c b/src/or/geoip.c index 2c917c564..c66bee0fa 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -150,7 +150,7 @@ geoip_add_entry(const tor_addr_t *low, const tor_addr_t *high, idx = ((uintptr_t)idxplus1_)-1; } { - geoip_country_t *c = smartlist_get(geoip_countries, idx); + geoip_country_t *c = smartlist_get(geoip_countries, (int)idx); tor_assert(!strcasecmp(c->countrycode, country)); } @@ -1884,4 +1884,3 @@ geoip_free_all(void) memset(geoip_digest, 0, sizeof(geoip_digest)); memset(geoip6_digest, 0, sizeof(geoip6_digest)); } -

1 0

[tor/maint-0.3.4] rust: Remove --all-features flag from `cargo test` call in test_rust.sh.
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 7589fd6d403ac2aecb991a07069d78c6dccae719 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 18 18:37:07 2018 +0000 rust: Remove --all-features flag from `cargo test` call in test_rust.sh. We'd like to feature gate code that calls C from Rust, as a workaround to several linker issues when running `cargo test` (#25386), and we can't feature gate anything out of test code if `cargo test` is called with `--all-features`. * FIXES #26400: https://bugs.torproject.org/26400 --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 95ffc2e65..4795258d0 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/master] rust: Remove --all-features flag from `cargo test` call in test_rust.sh.
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 7589fd6d403ac2aecb991a07069d78c6dccae719 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 18 18:37:07 2018 +0000 rust: Remove --all-features flag from `cargo test` call in test_rust.sh. We'd like to feature gate code that calls C from Rust, as a workaround to several linker issues when running `cargo test` (#25386), and we can't feature gate anything out of test code if `cargo test` is called with `--all-features`. * FIXES #26400: https://bugs.torproject.org/26400 --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 95ffc2e65..4795258d0 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 398f15bdf174c8b480b2d8984562f8360cbd2dda Merge: c86850c4c 7589fd6d4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 20 16:37:39 2018 -0400 Merge branch 'maint-0.3.4' src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.4] rust: Remove --all-features flag from `cargo test` call in test_rust.sh.
by nickm＠torproject.org 20 Jun '18

20 Jun '18

commit 7589fd6d403ac2aecb991a07069d78c6dccae719 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Jun 18 18:37:07 2018 +0000 rust: Remove --all-features flag from `cargo test` call in test_rust.sh. We'd like to feature gate code that calls C from Rust, as a workaround to several linker issues when running `cargo test` (#25386), and we can't feature gate anything out of test code if `cargo test` is called with `--all-features`. * FIXES #26400: https://bugs.torproject.org/26400 --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 95ffc2e65..4795258d0 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0