X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=a7f5d5ff87aeeb428175bd79c6f09a3cce570543;hp=7c8d31f6a236e999be33960288be2eabde7b2e25;hb=9d99a789c38e8a1694537e427e8d4313c948b02b;hpb=8e74c5bee48f2ef363193044d5309a65e91c70d8 diff --git a/src/process.c b/src/process.c index 7c8d31f6..a7f5d5ff 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999-2001 Ivo Timmermans , - 2000,2001 Guus Sliepen + Copyright (C) 1999-2002 Ivo Timmermans , + 2000-2002 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.31 2001/10/31 20:37:54 guus Exp $ + $Id: process.c,v 1.1.2.37 2002/03/19 00:07:09 guus Exp $ */ #include "config.h" @@ -59,9 +59,13 @@ sigset_t emptysigset; static int saved_debug_lvl = 0; +extern int sighup; +extern int sigalrm; +extern int do_purge; + void memory_full(int size) { - syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size); + syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size); cp_trace(); exit(1); } @@ -77,6 +81,7 @@ int fcloseall(void) fclose(stdin); fclose(stdout); fclose(stderr); + return 0; } #endif @@ -140,8 +145,15 @@ 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, signal) && errno == ESRCH) - fprintf(stderr, _("Removing stale lock file.\n")); - remove_pid(pidfilename); + { + if(netname) + fprintf(stderr, _("The tincd for net `%s' is no longer running. "), netname); + else + fprintf(stderr, _("The tincd is no longer running. ")); + + fprintf(stderr, _("Removing stale lock file.\n")); + remove_pid(pidfilename); + } cp return 0; } @@ -251,8 +263,7 @@ int execute_script(const char *name) cp if((pid = fork()) < 0) { - syslog(LOG_ERR, _("System call `%s' failed: %m"), - "fork"); + syslog(LOG_ERR, _("System call `%s' failed: %s"), "fork", strerror(errno)); return -1; } @@ -287,7 +298,7 @@ cp } else { - syslog(LOG_ERR, _("System call `%s' failed: %m"), "waitpid"); + syslog(LOG_ERR, _("System call `%s' failed: %s"), "waitpid", strerror(errno)); return -1; } } @@ -303,7 +314,7 @@ cp */ RETSIGTYPE -sigterm_handler(int a, siginfo_t *info, void *b) +sigterm_handler(int a) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got TERM signal")); @@ -312,7 +323,7 @@ sigterm_handler(int a, siginfo_t *info, void *b) } RETSIGTYPE -sigquit_handler(int a, siginfo_t *info, void *b) +sigquit_handler(int a) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got QUIT signal")); @@ -320,28 +331,28 @@ sigquit_handler(int a, siginfo_t *info, void *b) } RETSIGTYPE -sigsegv_square(int a, siginfo_t *info, void *b) +fatal_signal_square(int a) { - syslog(LOG_ERR, _("Got another SEGV signal: not restarting")); + syslog(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a, strsignal(a)); cp_trace(); exit(1); } RETSIGTYPE -sigsegv_handler(int a, siginfo_t *info, void *b) +fatal_signal_handler(int a) { struct sigaction act; - syslog(LOG_ERR, _("Got SEGV signal")); + syslog(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a)); cp_trace(); if(do_detach) { syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds...")); - act.sa_handler = NULL; + act.sa_handler = fatal_signal_square; act.sa_mask = emptysigset; - act.sa_flags = SA_SIGINFO; - act.sa_sigaction = sigsegv_square; + act.sa_flags = 0; + sigaction(SIGSEGV, &act, NULL); close_network_connections(); sleep(5); @@ -351,12 +362,12 @@ sigsegv_handler(int a, siginfo_t *info, void *b) else { syslog(LOG_NOTICE, _("Not restarting.")); - exit(0); + exit(1); } } RETSIGTYPE -sighup_handler(int a, siginfo_t *info, void *b) +sighup_handler(int a) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got HUP signal")); @@ -364,7 +375,7 @@ sighup_handler(int a, siginfo_t *info, void *b) } RETSIGTYPE -sigint_handler(int a, siginfo_t *info, void *b) +sigint_handler(int a) { if(saved_debug_lvl) { @@ -383,13 +394,21 @@ sigint_handler(int a, siginfo_t *info, void *b) } RETSIGTYPE -sigusr1_handler(int a, siginfo_t *info, void *b) +sigalrm_handler(int a) +{ + if(debug_lvl > DEBUG_NOTHING) + syslog(LOG_NOTICE, _("Got ALRM signal")); + sigalrm = 1; +} + +RETSIGTYPE +sigusr1_handler(int a) { dump_connections(); } RETSIGTYPE -sigusr2_handler(int a, siginfo_t *info, void *b) +sigusr2_handler(int a) { dump_device_stats(); dump_nodes(); @@ -398,14 +417,21 @@ sigusr2_handler(int a, siginfo_t *info, void *b) } RETSIGTYPE -unexpected_signal_handler(int a, siginfo_t *info, void *b) +sigwinch_handler(int a) +{ + extern int do_purge; + do_purge = 1; +} + +RETSIGTYPE +unexpected_signal_handler(int a) { syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a)); cp_trace(); } RETSIGTYPE -ignore_signal_handler(int a, siginfo_t *info, void *b) +ignore_signal_handler(int a) { if(debug_lvl >= DEBUG_SCARY_THINGS) { @@ -416,18 +442,21 @@ ignore_signal_handler(int a, siginfo_t *info, void *b) struct { int signal; - void (*handler)(int, siginfo_t *, void *); + void (*handler)(int); } sighandlers[] = { { SIGHUP, sighup_handler }, { SIGTERM, sigterm_handler }, { SIGQUIT, sigquit_handler }, - { SIGSEGV, sigsegv_handler }, + { SIGSEGV, fatal_signal_handler }, + { SIGBUS, fatal_signal_handler }, + { SIGILL, fatal_signal_handler }, { SIGPIPE, ignore_signal_handler }, { SIGINT, sigint_handler }, { SIGUSR1, sigusr1_handler }, { SIGUSR2, sigusr2_handler }, { SIGCHLD, ignore_signal_handler }, - { SIGALRM, ignore_signal_handler }, + { SIGALRM, sigalrm_handler }, + { SIGWINCH, sigwinch_handler }, { 0, NULL } }; @@ -440,13 +469,16 @@ setup_signals(void) sigemptyset(&emptysigset); act.sa_handler = NULL; act.sa_mask = emptysigset; - act.sa_flags = SA_SIGINFO; + act.sa_flags = 0; /* Set a default signal handler for every signal, errors will be ignored. */ for(i = 0; i < NSIG; i++) { - act.sa_sigaction = unexpected_signal_handler; + if(!do_detach) + act.sa_handler = SIG_DFL; + else + act.sa_handler = unexpected_signal_handler; sigaction(i, &act, NULL); } @@ -458,7 +490,7 @@ setup_signals(void) handler to the signal, with error checking this time. */ for(i = 0; sighandlers[i].signal; i++) { - act.sa_sigaction = sighandlers[i].handler; + act.sa_handler = 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));