j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Fixed bug in setup_signals() that would make tinc die when unexpected

Browse source 
signals were caught.
This commit is contained in:
Guus Sliepen 2001-03-13 09:55:14 +00:00
parent f1a082823c
commit b413257e10
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/process.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: process.c,v 1.1.2.21 2001/03/01 21:32:04 guus Exp $ $Id: process.c,v 1.1.2.22 2001/03/13 09:55:14 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -375,6 +375,16 @@ unexpected_signal_handler(int a, siginfo_t *info, void *b)
cp_trace(); 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 { struct {
int signal; int signal;
void (*handler)(int, siginfo_t *, void *); void (*handler)(int, siginfo_t *, void *);
@ -383,11 +393,12 @@ struct {
{ SIGTERM, sigterm_handler }, { SIGTERM, sigterm_handler },
{ SIGQUIT, sigquit_handler }, { SIGQUIT, sigquit_handler },
{ SIGSEGV, sigsegv_handler }, { SIGSEGV, sigsegv_handler },
{ SIGPIPE, NULL }, { SIGPIPE, ignore_signal_handler },
{ SIGINT, sigint_handler }, { SIGINT, sigint_handler },
{ SIGUSR1, sigusr1_handler }, { SIGUSR1, sigusr1_handler },
{ SIGUSR2, sigusr2_handler }, { SIGUSR2, sigusr2_handler },
{ SIGCHLD, NULL }, { SIGCHLD, ignore_signal_handler },
{ SIGALRM, ignore_signal_handler },
{ 0, NULL } { 0, NULL }
}; };
@ -407,7 +418,7 @@ setup_signals(void)
for(i = 0; i < NSIG; i++) for(i = 0; i < NSIG; i++)
{ {
act.sa_sigaction = unexpected_signal_handler; 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 /* Then, for each known signal that we want to catch, assign a