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

[tor/master] Merge branch 'ticket28881_035' into maint-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 702fd6f0f21138c0864cdf0ce73c0319aceeccb7 Merge: bf71dce01 4894d44ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:52:36 2018 -0500 Merge branch 'ticket28881_035' into maint-0.3.5 changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/master] Merge branch 'bug28612_squashed' into maint-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 26bbeb298d1f5692bc18f38d61379087436461a2 Merge: 702fd6f0f 1c2abea30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:55:57 2018 -0500 Merge branch 'bug28612_squashed' into maint-0.3.5 changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 1c2abea30a36c2b9e0e7e220542d17210bdd0b5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 10:31:43 2018 -0500 Call run_tor_main_loop() in ntmain.c, rather than do_main_loop(). Fixes bug 28612; bugfix on 0.3.5.3-alpha. --- changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug28612 b/changes/bug28612 new file mode 100644 index 000000000..559f25423 --- /dev/null +++ b/changes/bug28612 @@ -0,0 +1,4 @@ + o Minor bugfixes (windows services): + - Make Tor start correctly as an NT service again: previously it + was broken by refactoring. Fixes bug 28612; bugfix on 0.3.5.3-alpha. + diff --git a/src/app/main/main.c b/src/app/main/main.c index ae87add67..a2b7c0845 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1269,7 +1269,7 @@ sandbox_init_filter(void) return cfg; } -static int +int run_tor_main_loop(void) { handle_signals(); diff --git a/src/app/main/main.h b/src/app/main/main.h index b64f2ef41..23a436703 100644 --- a/src/app/main/main.h +++ b/src/app/main/main.h @@ -26,4 +26,6 @@ void tor_free_all(int postfork); int tor_init(int argc, char **argv); +int run_tor_main_loop(void); + #endif /* !defined(TOR_MAIN_H) */ diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index 800720a0b..8d2135a58 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -298,7 +298,7 @@ nt_service_body(int argc, char **argv) service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); set_main_thread(); - do_main_loop(); + run_tor_main_loop(); tor_cleanup(); } @@ -326,7 +326,7 @@ nt_service_main(void) return; switch (get_options()->command) { case CMD_RUN_TOR: - do_main_loop(); + run_tor_main_loop(); break; case CMD_LIST_FINGERPRINT: case CMD_HASH_PASSWORD:

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 372df7a630afa4ffb0782287366b629916e0f728 Merge: 0af0f78df 26bbeb298 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:56:22 2018 -0500 Merge branch 'maint-0.3.5' changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Always initialize addr in parse_port_config()
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 4894d44ab8beee587c99a1765236813d445b392e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:38:42 2018 -0500 Always initialize addr in parse_port_config() It was always analyzed before use, but scan-build wasn't able to persuade itself of that. Closes ticket 28881. --- changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket28881 b/changes/ticket28881 new file mode 100644 index 000000000..1b015a6c3 --- /dev/null +++ b/changes/ticket28881 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - When parsing a port configuration, make it more + obvious to static analyzer tools that we will always initialize the + address. Closes ticket 28881. diff --git a/src/app/config/config.c b/src/app/config/config.c index 81cc3e378..4a8f94da0 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6913,6 +6913,8 @@ parse_port_config(smartlist_t *out, for (; ports; ports = ports->next) { tor_addr_t addr; + tor_addr_make_unspec(&addr); + int port; int sessiongroup = SESSION_GROUP_UNSET; unsigned isolation = ISO_DEFAULT;

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit a8fba6e1d0629cbb21f2627c1aaac36fa563f312 Merge: cc1f563df 702fd6f0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:52:39 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.5] Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 1c2abea30a36c2b9e0e7e220542d17210bdd0b5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 10:31:43 2018 -0500 Call run_tor_main_loop() in ntmain.c, rather than do_main_loop(). Fixes bug 28612; bugfix on 0.3.5.3-alpha. --- changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug28612 b/changes/bug28612 new file mode 100644 index 000000000..559f25423 --- /dev/null +++ b/changes/bug28612 @@ -0,0 +1,4 @@ + o Minor bugfixes (windows services): + - Make Tor start correctly as an NT service again: previously it + was broken by refactoring. Fixes bug 28612; bugfix on 0.3.5.3-alpha. + diff --git a/src/app/main/main.c b/src/app/main/main.c index ae87add67..a2b7c0845 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1269,7 +1269,7 @@ sandbox_init_filter(void) return cfg; } -static int +int run_tor_main_loop(void) { handle_signals(); diff --git a/src/app/main/main.h b/src/app/main/main.h index b64f2ef41..23a436703 100644 --- a/src/app/main/main.h +++ b/src/app/main/main.h @@ -26,4 +26,6 @@ void tor_free_all(int postfork); int tor_init(int argc, char **argv); +int run_tor_main_loop(void); + #endif /* !defined(TOR_MAIN_H) */ diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index 800720a0b..8d2135a58 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -298,7 +298,7 @@ nt_service_body(int argc, char **argv) service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); set_main_thread(); - do_main_loop(); + run_tor_main_loop(); tor_cleanup(); } @@ -326,7 +326,7 @@ nt_service_main(void) return; switch (get_options()->command) { case CMD_RUN_TOR: - do_main_loop(); + run_tor_main_loop(); break; case CMD_LIST_FINGERPRINT: case CMD_HASH_PASSWORD:

1 0

[tor/release-0.3.5] Merge branch 'bug28612_squashed' into maint-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 26bbeb298d1f5692bc18f38d61379087436461a2 Merge: 702fd6f0f 1c2abea30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:55:57 2018 -0500 Merge branch 'bug28612_squashed' into maint-0.3.5 changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'ticket28881_035' into maint-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 702fd6f0f21138c0864cdf0ce73c0319aceeccb7 Merge: bf71dce01 4894d44ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:52:36 2018 -0500 Merge branch 'ticket28881_035' into maint-0.3.5 changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 6d375e1cb7577e414b8e9412a7b53a63d1932596 Merge: a8fba6e1d 26bbeb298 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:56:22 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0