X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=f395496fa2e53c18ff460a5647360d1bb9e10aa9;hp=1319c0c0b90881f0aa6188f64705efaa58f4667e;hb=950c934e0bda28e5952d699d6008ee783d81982b;hpb=cf49b2c0647554613874cce495e4a7937a9f7863 diff --git a/src/process.c b/src/process.c index 1319c0c0..f395496f 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999,2000 Ivo Timmermans , - 2000 Guus Sliepen + Copyright (C) 1999-2001 Ivo Timmermans , + 2000,2001 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: process.c,v 1.1.2.14 2000/11/24 23:13:05 guus Exp $ + $Id: process.c,v 1.1.2.25 2001/09/05 18:38:09 zarq Exp $ */ #include "config.h" @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -54,6 +53,10 @@ extern char *identname; extern char *pidfilename; extern char **g_argv; +sigset_t emptysigset; + +static int saved_debug_lvl = 0; + void memory_full(int size) { syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size); @@ -120,7 +123,7 @@ cp /* kill older tincd for this net */ -int kill_other(void) +int kill_other(int signal) { int pid; cp @@ -135,7 +138,7 @@ cp errno = 0; /* No error, sometimes errno is only changed on error */ /* ESRCH is returned when no process with that pid is found */ - if(kill(pid, SIGTERM) && errno == ESRCH) + if(kill(pid, signal) && errno == ESRCH) fprintf(stderr, _("Removing stale lock file.\n")); remove_pid(pidfilename); cp @@ -150,13 +153,29 @@ int detach(void) cp setup_signals(); + /* First check if we can open a fresh new pidfile */ + if(write_pidfile()) return -1; - if(do_detach) - if(daemon(0, 0) < 0) - return -1; + /* If we succeeded in doing that, detach */ + closelog(); + + if(do_detach) + { + if(daemon(0, 0) < 0) + { + fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno)); + return -1; + } + + /* Now UPDATE the pid in the pidfile, because we changed it... */ + + if(!write_pid(pidfilename)) + return -1; + } + openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON); if(debug_lvl > DEBUG_NOTHING) @@ -177,11 +196,8 @@ cp void _execute_script(const char *name) __attribute__ ((noreturn)); void _execute_script(const char *name) { - int error = 0; char *scriptname; char *s; - int fd; - cp if(netname) { @@ -207,7 +223,7 @@ cp /* No return on success */ if(errno != ENOENT) /* Ignore if the file does not exist */ - exit(-1); /* Some error while trying execl(). */ + exit(1); /* Some error while trying execl(). */ else exit(0); } @@ -252,7 +268,7 @@ cp } else /* Something strange happened */ { - syslog(LOG_ERR, _("Process %d (%s) terminated abnormaly"), pid, name); + syslog(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid, name); return -1; } } @@ -268,12 +284,13 @@ cp _execute_script(name); } + /* Signal handlers. */ RETSIGTYPE -sigterm_handler(int a) +sigterm_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got TERM signal")); @@ -282,7 +299,7 @@ sigterm_handler(int a) } RETSIGTYPE -sigquit_handler(int a) +sigquit_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got QUIT signal")); @@ -290,23 +307,29 @@ sigquit_handler(int a) } RETSIGTYPE -sigsegv_square(int a) +sigsegv_square(int a, siginfo_t *info, void *b) { syslog(LOG_ERR, _("Got another SEGV signal: not restarting")); cp_trace(); - exit(0); + exit(1); } RETSIGTYPE -sigsegv_handler(int a) +sigsegv_handler(int a, siginfo_t *info, void *b) { + struct sigaction act; syslog(LOG_ERR, _("Got SEGV signal")); cp_trace(); if(do_detach) { syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds...")); - signal(SIGSEGV, sigsegv_square); + + act.sa_handler = NULL; + act.sa_mask = emptysigset; + act.sa_flags = SA_SIGINFO; + act.sa_sigaction = sigsegv_square; + close_network_connections(); sleep(5); remove_pid(pidfilename); @@ -320,7 +343,7 @@ sigsegv_handler(int a) } RETSIGTYPE -sighup_handler(int a) +sighup_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got HUP signal")); @@ -328,52 +351,96 @@ sighup_handler(int a) } RETSIGTYPE -sigint_handler(int a) +sigint_handler(int a, siginfo_t *info, void *b) { - if(debug_lvl > DEBUG_NOTHING) - syslog(LOG_NOTICE, _("Got INT signal, exiting")); - cleanup_and_exit(0); + if(saved_debug_lvl) + { + syslog(LOG_NOTICE, _("Reverting to old debug level (%d)"), + saved_debug_lvl); + debug_lvl = saved_debug_lvl; + saved_debug_lvl = 0; + } + else + { + syslog(LOG_NOTICE, _("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."), + debug_lvl); + saved_debug_lvl = debug_lvl; + debug_lvl = 5; + } } RETSIGTYPE -sigusr1_handler(int a) +sigusr1_handler(int a, siginfo_t *info, void *b) { dump_connection_list(); } RETSIGTYPE -sigusr2_handler(int a) +sigusr2_handler(int a, siginfo_t *info, void *b) { dump_subnet_list(); } RETSIGTYPE -sighuh(int a) +unexpected_signal_handler(int a, siginfo_t *info, void *b) { syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a)); cp_trace(); } +RETSIGTYPE +ignore_signal_handler(int a, siginfo_t *info, void *b) +{ + if(debug_lvl >= DEBUG_SCARY_THINGS) + { + syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a)); + cp_trace(); + } +} + +struct { + int signal; + void (*handler)(int, siginfo_t *, void *); +} sighandlers[] = { + { SIGHUP, sighup_handler }, + { SIGTERM, sigterm_handler }, + { SIGQUIT, sigquit_handler }, + { SIGSEGV, sigsegv_handler }, + { SIGPIPE, ignore_signal_handler }, + { SIGINT, sigint_handler }, + { SIGUSR1, sigusr1_handler }, + { SIGUSR2, sigusr2_handler }, + { SIGCHLD, ignore_signal_handler }, + { SIGALRM, ignore_signal_handler }, + { 0, NULL } +}; + void setup_signals(void) { int i; + struct sigaction act; + + sigemptyset(&emptysigset); + act.sa_handler = NULL; + act.sa_mask = emptysigset; + act.sa_flags = SA_SIGINFO; + + /* Set a default signal handler for every signal, errors will be + ignored. */ + for(i = 0; i < NSIG; i++) + { + act.sa_sigaction = unexpected_signal_handler; + sigaction(i, &act, NULL); + } - for(i=0;i<32;i++) - signal(i,sighuh); - - if(signal(SIGTERM, SIG_IGN) != SIG_ERR) - signal(SIGTERM, sigterm_handler); - if(signal(SIGQUIT, SIG_IGN) != SIG_ERR) - signal(SIGQUIT, sigquit_handler); - if(signal(SIGSEGV, SIG_IGN) != SIG_ERR) - signal(SIGSEGV, sigsegv_handler); - if(signal(SIGHUP, SIG_IGN) != SIG_ERR) - signal(SIGHUP, sighup_handler); - signal(SIGPIPE, SIG_IGN); - if(signal(SIGINT, SIG_IGN) != SIG_ERR) - signal(SIGINT, sigint_handler); - signal(SIGUSR1, sigusr1_handler); - signal(SIGUSR2, sigusr2_handler); - signal(SIGCHLD, SIG_IGN); + /* Then, for each known signal that we want to catch, assign a + handler to the signal, with error checking this time. */ + for(i = 0; sighandlers[i].signal; i++) + { + act.sa_sigaction = sighandlers[i].handler; + if(sigaction(sighandlers[i].signal, &act, NULL) < 0) + fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"), + sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno)); + } }