X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=bf3d6b74f36e38c1c3547ed257264dd7fcef5468;hp=013b24dfcfa76d23370f4863219f8bae0151d42e;hb=44e9d6a2872fac55f7eb701ba576ed9f39a22e08;hpb=67a4abda707b28b9c77cb35ff1e800e6a5b0991c diff --git a/src/process.c b/src/process.c index 013b24df..bf3d6b74 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.16 2000/11/26 22:42:34 zarq Exp $ + $Id: process.c,v 1.1.2.23 2001/07/24 20:03:40 guus Exp $ */ #include "config.h" @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -54,6 +53,8 @@ extern char *identname; extern char *pidfilename; extern char **g_argv; +sigset_t emptysigset; + void memory_full(int size) { syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size); @@ -157,11 +158,13 @@ cp /* If we succeeded in doing that, detach */ + closelog(); + if(do_detach) { if(daemon(0, 0) < 0) { - fprintf(stderr, _("Couldn't detach from terminal: %m")); + fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno)); return -1; } @@ -218,7 +221,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); } @@ -263,7 +266,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; } } @@ -285,7 +288,7 @@ cp */ RETSIGTYPE -sigterm_handler(int a, siginfo_t *info, void *) +sigterm_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got TERM signal")); @@ -294,7 +297,7 @@ sigterm_handler(int a, siginfo_t *info, void *) } RETSIGTYPE -sigquit_handler(int a, siginfo_t *info, void *) +sigquit_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got QUIT signal")); @@ -302,23 +305,29 @@ sigquit_handler(int a, siginfo_t *info, void *) } RETSIGTYPE -sigsegv_square(int a, siginfo_t *info, void *) +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, siginfo_t *info, void *) +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); @@ -332,7 +341,7 @@ sigsegv_handler(int a, siginfo_t *info, void *) } RETSIGTYPE -sighup_handler(int a, siginfo_t *info, void *) +sighup_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got HUP signal")); @@ -340,7 +349,7 @@ sighup_handler(int a, siginfo_t *info, void *) } RETSIGTYPE -sigint_handler(int a, siginfo_t *info, void *) +sigint_handler(int a, siginfo_t *info, void *b) { if(debug_lvl > DEBUG_NOTHING) syslog(LOG_NOTICE, _("Got INT signal, exiting")); @@ -348,24 +357,34 @@ sigint_handler(int a, siginfo_t *info, void *) } RETSIGTYPE -sigusr1_handler(int a, siginfo_t *info, void *) +sigusr1_handler(int a, siginfo_t *info, void *b) { dump_connection_list(); } RETSIGTYPE -sigusr2_handler(int a, siginfo_t *info, void *) +sigusr2_handler(int a, siginfo_t *info, void *b) { dump_subnet_list(); } RETSIGTYPE -sighuh(int a, siginfo_t *info, void *) +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 *); @@ -374,11 +393,12 @@ struct { { SIGTERM, sigterm_handler }, { SIGQUIT, sigquit_handler }, { SIGSEGV, sigsegv_handler }, - { SIGPIPE, NULL }, + { SIGPIPE, ignore_signal_handler }, { SIGINT, sigint_handler }, { SIGUSR1, sigusr1_handler }, { SIGUSR2, sigusr2_handler }, - { SIGCHLD, NULL }, + { SIGCHLD, ignore_signal_handler }, + { SIGALRM, ignore_signal_handler }, { 0, NULL } }; @@ -386,20 +406,19 @@ void setup_signals(void) { int i; - sigset_t a; struct sigaction act; - sigemptyset(&a); + sigemptyset(&emptysigset); act.sa_handler = NULL; - act.sa_mask = a; + 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 = sighuh_handler; - sigaction(sighandlers[i].signal, &act, NULL); + act.sa_sigaction = unexpected_signal_handler; + sigaction(i, &act, NULL); } /* Then, for each known signal that we want to catch, assign a @@ -408,7 +427,7 @@ setup_signals(void) { act.sa_sigaction = sighandlers[i].handler; if(sigaction(sighandlers[i].signal, &act, NULL) < 0) - fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %m\n"), - sighandlers[i].signal, strsignal(sighandlers[i].signal)); + fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"), + sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno)); } }