X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=0898e70e18aff4e967f0cea8856bf942278ad8b6;hp=d971a0f23b2eb9d6f2798f2c5e7f6e369f2c7f4e;hb=431fa10b37e78172a03c952e28a0364cc0e438f0;hpb=ac066bb057dcb187bf91670793ba5e6ca456e052 diff --git a/src/process.c b/src/process.c index d971a0f2..0898e70e 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.27 2001/10/27 13:13:35 guus Exp $ + $Id: process.c,v 1.1.2.44 2002/09/04 14:17:28 guus Exp $ */ #include "config.h" @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -44,6 +45,7 @@ #include "subnet.h" #include "device.h" #include "connection.h" +#include "device.h" #include "system.h" @@ -58,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); } @@ -76,6 +82,7 @@ int fcloseall(void) fclose(stdin); fclose(stdout); fclose(stderr); + return 0; } #endif @@ -139,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; } @@ -193,53 +207,48 @@ 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, char **envp) __attribute__ ((noreturn)); +void _execute_script(const char *scriptname, char **envp) { - char *scriptname; char *s; cp - if(netname) - { - asprintf(&s, "NETNAME=%s", netname); - putenv(s); /* Don't free s! see man 3 putenv */ - } -#ifdef HAVE_UNSETENV - else - { - unsetenv("NETNAME"); - } -#endif - + while(*envp) + putenv(*envp++); + 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); } /* Fork and execute the program pointed to by name. */ -int execute_script(const char *name) +int execute_script(const char *name, char **envp) { 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; } @@ -248,6 +257,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 */ @@ -274,14 +285,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, envp); } @@ -290,7 +301,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")); @@ -299,7 +310,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")); @@ -307,28 +318,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); @@ -338,12 +349,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")); @@ -351,7 +362,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) { @@ -370,51 +381,69 @@ 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(); - dump_vertices(); + dump_edges(); dump_subnets(); } 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) { - syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a)); + syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a)); cp_trace(); } } 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 } }; @@ -427,21 +456,28 @@ 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); } + /* If we didn't detach, allow coredumps */ + if(!do_detach) + sighandlers[3].handler = SIG_DFL; + /* 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; + 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));