diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-10-19 13:42:28 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-10-19 13:42:28 -0400 |
commit | 35746a9ee75608e7b2393e4519adca602bf2615f (patch) | |
tree | 3ed466046fe6cb7a0a6858c2b47765e2be459f3c /src/or/main.c | |
parent | 09562421589c055a6cb49c802a248f727390d158 (diff) | |
download | tor-35746a9ee75608e7b2393e4519adca602bf2615f.tar.gz tor-35746a9ee75608e7b2393e4519adca602bf2615f.zip |
Comment-only change: annotate exit() calls.
Sometimes when we call exit(), it's because the process is
completely hopeless: openssl has a broken AES-CTR implementation, or
the clock is in the 1960s, or something like that.
But sometimes, we should return cleanly from tor_main() instead, so
that embedders can keep embedding us and start another Tor process.
I've gone through all the exit() and _exit() calls to annotate them
with "exit ok" or "XXXX bad exit" -- the next step will be to fix
the bad exit()s.
First step towards 23848.
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c index 65b0b8f4df..be61628341 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1555,7 +1555,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options) generate_ed_link_cert(options, now, new_signing_key > 0)) { log_err(LD_OR, "Unable to update Ed25519 keys! Exiting."); tor_cleanup(); - exit(1); + exit(1); // XXXX bad exit } } return 30; @@ -2709,13 +2709,13 @@ process_signal(int sig) case SIGTERM: log_notice(LD_GENERAL,"Catching signal TERM, exiting cleanly."); tor_cleanup(); - exit(0); + exit(0); // XXXX bad exit break; case SIGINT: if (!server_mode(get_options())) { /* do it now */ log_notice(LD_GENERAL,"Interrupt: exiting cleanly."); tor_cleanup(); - exit(0); + exit(0); // XXXX bad exit } #ifdef HAVE_SYSTEMD sd_notify(0, "STOPPING=1"); @@ -2745,7 +2745,7 @@ process_signal(int sig) if (do_hup() < 0) { log_warn(LD_CONFIG,"Restart failed (config error?). Exiting."); tor_cleanup(); - exit(1); + exit(1); // XXXX bad exit } #ifdef HAVE_SYSTEMD sd_notify(0, "READY=1"); @@ -3198,7 +3198,7 @@ try_locking(const or_options_t *options, int err_if_locked) r = try_locking(options, 0); if (r<0) { log_err(LD_GENERAL, "No, it's still there. Exiting."); - exit(1); + exit(1); // XXXX bad exit } return r; } |