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

[tor/master] Merge branch 'ticket26947'
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 159141a8c6e8ae6dc60110f897a931bf0a63e0b1 Merge: da4f4cb26 772106c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 18:07:32 2018 -0400 Merge branch 'ticket26947' changes/ticket26947 | 3 +++ src/feature/api/tor_api.c | 7 ++++++- src/feature/api/tor_api.h | 12 +++++++++++- src/tools/tor_runner.c | 7 ++++++- 4 files changed, 26 insertions(+), 3 deletions(-)

1 0

[tor/master] Add a new function, tor_api_get_provider_version()
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 772106c6bc37966f60be99a479240ced8abfea1b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 09:17:32 2018 -0400 Add a new function, tor_api_get_provider_version() Closes ticket 26947. --- changes/ticket26947 | 3 +++ src/feature/api/tor_api.c | 7 ++++++- src/feature/api/tor_api.h | 12 +++++++++++- src/tools/tor_runner.c | 7 ++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/changes/ticket26947 b/changes/ticket26947 new file mode 100644 index 000000000..620a3a559 --- /dev/null +++ b/changes/ticket26947 @@ -0,0 +1,3 @@ + o Minor features (in-process API): + - The tor_api now has a function that returns the name and version + of the backend implementing the API. Closes ticket 26947. diff --git a/src/feature/api/tor_api.c b/src/feature/api/tor_api.c index 2a4458bf6..a53ade1f3 100644 --- a/src/feature/api/tor_api.c +++ b/src/feature/api/tor_api.c @@ -61,6 +61,12 @@ tor_main_configuration_free(tor_main_configuration_t *cfg) raw_free(cfg); } +const char * +tor_api_get_provider_version(void) +{ + return "tor " VERSION; +} + /* Main entry point for the Tor process. Called from main(). * * This function is distinct from main() only so we can link main.c into @@ -85,4 +91,3 @@ tor_main(int argc, char *argv[]) tor_main_configuration_free(cfg); return rv; } - diff --git a/src/feature/api/tor_api.h b/src/feature/api/tor_api.h index ead9493c1..a08606ee3 100644 --- a/src/feature/api/tor_api.h +++ b/src/feature/api/tor_api.h @@ -58,6 +58,17 @@ int tor_main_configuration_set_command_line(tor_main_configuration_t *cfg, void tor_main_configuration_free(tor_main_configuration_t *cfg); /** + * Return the name and version of the software implementing the tor_api + * functionality. Current implementors are "tor" and "libtorrunner". + * + * Note that if you're using libtorrunner, you'll see the version of + * libtorrunner, not the version of Tor that it's invoking for you. + * + * Added in Tor 0.3.5.1-alpha. + **/ +const char *tor_api_get_provider_version(void); + +/** * Run the tor process, as if from the command line. * * The command line arguments from tor_main_configuration_set_command_line() @@ -98,4 +109,3 @@ int tor_run_main(const tor_main_configuration_t *); int tor_main(int argc, char **argv); #endif /* !defined(TOR_API_H) */ - diff --git a/src/tools/tor_runner.c b/src/tools/tor_runner.c index dd90af3df..f8805e650 100644 --- a/src/tools/tor_runner.c +++ b/src/tools/tor_runner.c @@ -46,6 +46,12 @@ static void child(const tor_main_configuration_t *cfg) __attribute__((noreturn)); +const char * +tor_api_get_provider_version(void) +{ + return "libtorrunner " VERSION; +} + int tor_run_main(const tor_main_configuration_t *cfg) { @@ -98,4 +104,3 @@ child(const tor_main_configuration_t *cfg) abort(); /* Unreachable */ } } -

1 0

[tor/master] Provide examples of tor_api_get_provider_version() output
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit df444e482bc083b4c4239b8fb4d532ebffaae5a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 18:10:28 2018 -0400 Provide examples of tor_api_get_provider_version() output At the same time, sternly warn any person thinking about relying on any particular format too strictly. If you do this, and your program breaks, it is your bug, not mine. --- src/feature/api/tor_api.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/feature/api/tor_api.h b/src/feature/api/tor_api.h index a08606ee3..ad2d3166c 100644 --- a/src/feature/api/tor_api.h +++ b/src/feature/api/tor_api.h @@ -65,6 +65,12 @@ void tor_main_configuration_free(tor_main_configuration_t *cfg); * libtorrunner, not the version of Tor that it's invoking for you. * * Added in Tor 0.3.5.1-alpha. + * + * Example return values include "tor 0.3.5.1-alpha" when linked directly + * against tor, and "libtorrunner 0.3.5.1-alpha" when linked against + * libtorrunner while it is invoking an arbitrary version of Tor. HOWEVER, + * the user MUST NOT depend on any particular format or contents of this + * string: there may be other things that implement Tor in the future. **/ const char *tor_api_get_provider_version(void);

1 0

[tor/release-0.3.4] Always call tor_free_all() when exiting tor_run_main()
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a67d153cc7493f918f93d2ddb9aa62a27b434e5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:41:27 2018 -0400 Always call tor_free_all() when exiting tor_run_main() We would usually call it through tor_cleanup(), but in some code paths, we wouldn't. These paths would break restart-in-process, since leaving fields uncleared would cause assertion failures on restart. Fixes bug 26948; bugfix on 0.3.3.1-alpha --- changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug26948 b/changes/bug26948 new file mode 100644 index 000000000..0f0728843 --- /dev/null +++ b/changes/bug26948 @@ -0,0 +1,4 @@ + o Minor bugfixes (in-process restart): + - Always call tor_free_all() when leaving tor_run_main(). When we + did not, restarting tor in-process would cause an assertion failure. + Fixes bug 26948; bugfix on 0.3.3.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index 7f07b4404..9ecdc9555 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -4035,10 +4035,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif /* defined(NT_SERVICE) */ { int init_rv = tor_init(argc, argv); - if (init_rv < 0) - return -1; - else if (init_rv > 0) - return 0; + if (init_rv) { + tor_free_all(0); + return (init_rv < 0) ? -1 : 0; + } } if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) { @@ -4046,6 +4046,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) if (sandbox_init(cfg)) { log_err(LD_BUG,"Failed to create syscall sandbox filter"); + tor_free_all(0); return -1; }

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 0f0dac0bfcfc357a87c3d275e9846bdfca946877 Merge: aaa5ca366 c4d0d9bd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 18:06:15 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'bug26948_033' into maint-0.3.3
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit c4d0d9bd24c484893055d50999377f86fd9468c7 Merge: 00536254b a67d153cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 18:06:11 2018 -0400 Merge branch 'bug26948_033' into maint-0.3.3 changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit e1c878731ee0b8afe6d012697bf4e6e3d9c8c40d Merge: 1dd0548d8 0f0dac0bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 18:06:15 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit 0f0dac0bfcfc357a87c3d275e9846bdfca946877 Merge: aaa5ca366 c4d0d9bd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 8 18:06:15 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.3.3] Always call tor_free_all() when exiting tor_run_main()
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a67d153cc7493f918f93d2ddb9aa62a27b434e5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:41:27 2018 -0400 Always call tor_free_all() when exiting tor_run_main() We would usually call it through tor_cleanup(), but in some code paths, we wouldn't. These paths would break restart-in-process, since leaving fields uncleared would cause assertion failures on restart. Fixes bug 26948; bugfix on 0.3.3.1-alpha --- changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug26948 b/changes/bug26948 new file mode 100644 index 000000000..0f0728843 --- /dev/null +++ b/changes/bug26948 @@ -0,0 +1,4 @@ + o Minor bugfixes (in-process restart): + - Always call tor_free_all() when leaving tor_run_main(). When we + did not, restarting tor in-process would cause an assertion failure. + Fixes bug 26948; bugfix on 0.3.3.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index 7f07b4404..9ecdc9555 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -4035,10 +4035,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif /* defined(NT_SERVICE) */ { int init_rv = tor_init(argc, argv); - if (init_rv < 0) - return -1; - else if (init_rv > 0) - return 0; + if (init_rv) { + tor_free_all(0); + return (init_rv < 0) ? -1 : 0; + } } if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) { @@ -4046,6 +4046,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) if (sandbox_init(cfg)) { log_err(LD_BUG,"Failed to create syscall sandbox filter"); + tor_free_all(0); return -1; }

1 0

[tor/maint-0.3.4] Always call tor_free_all() when exiting tor_run_main()
by nickm＠torproject.org 08 Aug '18

08 Aug '18

commit a67d153cc7493f918f93d2ddb9aa62a27b434e5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 31 08:41:27 2018 -0400 Always call tor_free_all() when exiting tor_run_main() We would usually call it through tor_cleanup(), but in some code paths, we wouldn't. These paths would break restart-in-process, since leaving fields uncleared would cause assertion failures on restart. Fixes bug 26948; bugfix on 0.3.3.1-alpha --- changes/bug26948 | 4 ++++ src/or/main.c | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changes/bug26948 b/changes/bug26948 new file mode 100644 index 000000000..0f0728843 --- /dev/null +++ b/changes/bug26948 @@ -0,0 +1,4 @@ + o Minor bugfixes (in-process restart): + - Always call tor_free_all() when leaving tor_run_main(). When we + did not, restarting tor in-process would cause an assertion failure. + Fixes bug 26948; bugfix on 0.3.3.1-alpha. diff --git a/src/or/main.c b/src/or/main.c index 7f07b4404..9ecdc9555 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -4035,10 +4035,10 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) #endif /* defined(NT_SERVICE) */ { int init_rv = tor_init(argc, argv); - if (init_rv < 0) - return -1; - else if (init_rv > 0) - return 0; + if (init_rv) { + tor_free_all(0); + return (init_rv < 0) ? -1 : 0; + } } if (get_options()->Sandbox && get_options()->command == CMD_RUN_TOR) { @@ -4046,6 +4046,7 @@ tor_run_main(const tor_main_configuration_t *tor_cfg) if (sandbox_init(cfg)) { log_err(LD_BUG,"Failed to create syscall sandbox filter"); + tor_free_all(0); return -1; }

1 0