nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug28612_squashed' into maint-0.3.5

Browse Source
This commit is contained in:
Nick Mathewson 2018-12-18 13:55:57 -05:00
commit 26bbeb298d
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug28612 Normal file
View File

@ -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.

2
src/app/main/main.c
View File

@ -1269,7 +1269,7 @@ sandbox_init_filter(void)
return cfg; return cfg;
} }
static int int
run_tor_main_loop(void) run_tor_main_loop(void)
{ {
handle_signals(); handle_signals();

2
src/app/main/main.h
View File

@ -26,4 +26,6 @@ void tor_free_all(int postfork);
int tor_init(int argc, char **argv); int tor_init(int argc, char **argv);
int run_tor_main_loop(void);
#endif /* !defined(TOR_MAIN_H) */ #endif /* !defined(TOR_MAIN_H) */

4
src/app/main/ntmain.c
View File

@ -298,7 +298,7 @@ nt_service_body(int argc, char **argv)
service_status.dwCurrentState = SERVICE_RUNNING; service_status.dwCurrentState = SERVICE_RUNNING;
service_fns.SetServiceStatus_fn(hStatus, &service_status); service_fns.SetServiceStatus_fn(hStatus, &service_status);
set_main_thread(); set_main_thread();
do_main_loop(); run_tor_main_loop();
tor_cleanup(); tor_cleanup();
} }
@ -326,7 +326,7 @@ nt_service_main(void)
return; return;
switch (get_options()->command) { switch (get_options()->command) {
case CMD_RUN_TOR: case CMD_RUN_TOR:
do_main_loop(); run_tor_main_loop();
break; break;
case CMD_LIST_FINGERPRINT: case CMD_LIST_FINGERPRINT:
case CMD_HASH_PASSWORD: case CMD_HASH_PASSWORD: