diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-18 13:55:57 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-18 13:55:57 -0500 |
| commit | 26bbeb298d1f5692bc18f38d61379087436461a2 (patch) | |
| tree | 8b650f54518cf28b660232aa9da8cbbbe749c4c5 /src/app | |
| parent | 702fd6f0f21138c0864cdf0ce73c0319aceeccb7 (diff) | |
| parent | 1c2abea30a36c2b9e0e7e220542d17210bdd0b5e (diff) | |
| download | tor-26bbeb298d1f5692bc18f38d61379087436461a2.tar.gz tor-26bbeb298d1f5692bc18f38d61379087436461a2.zip | |
Merge branch 'bug28612_squashed' into maint-0.3.5
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main/main.c | 2 | ||||
| -rw-r--r-- | src/app/main/main.h | 2 | ||||
| -rw-r--r-- | src/app/main/ntmain.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c index ae87add67d..a2b7c08456 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 b64f2ef417..23a436703e 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 800720a0b4..8d2135a587 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: |