X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=ae1985da0b0b8a155423a8b39651b82e050a5694;hp=7c8d31f6a236e999be33960288be2eabde7b2e25;hb=67a6d7bcc4891c627663c639c0e02315bd4cf437;hpb=8e74c5bee48f2ef363193044d5309a65e91c70d8 diff --git a/src/process.c b/src/process.c index 7c8d31f6..ae1985da 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.40 2002/04/27 11:40:45 guus Exp $ */ #include "config.h" @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -59,9 +60,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 +82,7 @@ int fcloseall(void) fclose(stdin); fclose(stdout); fclose(stderr); + return 0; } #endif @@ -140,8 +146,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; } @@ -194,10 +207,9 @@ cp Execute the program name, with sane environment. All output will be redirected to syslog. */ -void _execute_script(const char *name) __attribute__ ((noreturn)); -void _execute_script(const char *name) +void _execute_script(const char *scriptname) __attribute__ ((noreturn)); +void _execute_script(const char *scriptname) { - char *scriptname; char *s; cp #ifdef HAVE_UNSETENV @@ -226,19 +238,16 @@ cp chdir("/"); - asprintf(&scriptname, "%s/%s", confbase, name); - /* Close all file descriptors */ closelog(); /* <- this means we cannot use syslog() here anymore! */ fcloseall(); execl(scriptname, NULL); /* No return on success */ - - if(errno != ENOENT) /* Ignore if the file does not exist */ - exit(1); /* Some error while trying execl(). */ - else - exit(0); + + openlog("tinc", LOG_CONS | LOG_PID, LOG_DAEMON); + syslog(LOG_ERR, _("Could not execute `%s': %s"), scriptname, strerror(errno)); + exit(errno); } /* @@ -248,11 +257,19 @@ int execute_script(const char *name) { pid_t pid; int status; + struct stat s; + char *scriptname; cp + asprintf(&scriptname, "%s/%s", confbase, name); + + /* First check if there is a script */ + + if(stat(scriptname, &s)) + return 0; + 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; } @@ -261,6 +278,8 @@ cp if(debug_lvl >= DEBUG_STATUS) syslog(LOG_INFO, _("Executing script %s"), name); + free(scriptname); + if(waitpid(pid, &status, 0) == pid) { if(WIFEXITED(status)) /* Child exited by itself */ @@ -287,14 +306,14 @@ cp } else { - syslog(LOG_ERR, _("System call `%s' failed: %m"), "waitpid"); + syslog(LOG_ERR, _("System call `%s' failed: %s"), "waitpid", strerror(errno)); return -1; } } cp /* Child here */ - _execute_script(name); + _execute_script(scriptname); } @@ -303,7 +322,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 +331,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 +339,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 +370,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 +383,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 +402,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 +425,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 +450,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 +477,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 +498,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));