X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=d618427d5357c3f89ea13e23809851d8d5043e29;hp=01ca31e1525f3a1cc3caac50ee2f68b7f2dbf8ef;hb=b413257e10ae0645da43583dd8f84a1f74df5bd7;hpb=e924096f62655d711cd2d114a8d1ef0fecbb593b diff --git a/src/process.c b/src/process.c index 01ca31e1..d618427d 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.18 2001/01/05 23:53:51 guus Exp $ + $Id: process.c,v 1.1.2.22 2001/03/13 09:55:14 guus Exp $ */ #include "config.h" @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -222,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); } @@ -310,7 +309,7 @@ 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 @@ -376,6 +375,16 @@ unexpected_signal_handler(int a, siginfo_t *info, void *b) 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 *); @@ -384,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 } }; @@ -408,7 +418,7 @@ setup_signals(void) for(i = 0; i < NSIG; i++) { act.sa_sigaction = unexpected_signal_handler; - sigaction(sighandlers[i].signal, &act, NULL); + sigaction(i, &act, NULL); } /* Then, for each known signal that we want to catch, assign a