/*
process.c -- process management functions
- Copyright (C) 1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
+ 2000,2001 Guus Sliepen <guus@sliepen.warande.net>
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
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.15 2000/11/25 13:33:33 guus Exp $
+ $Id: process.c,v 1.1.2.22 2001/03/13 09:55:14 guus Exp $
*/
#include "config.h"
#include <unistd.h>
#include <termios.h>
-#include <list.h>
#include <pidfile.h>
#include <utils.h>
#include <xalloc.h>
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);
/* If we succeeded in doing that, detach */
+ closelog();
+
if(do_detach)
{
if(daemon(0, 0) < 0)
- return -1;
+ {
+ fprintf(stderr, _("Couldn't detach from terminal: %m"));
+ return -1;
+ }
/* Now UPDATE the pid in the pidfile, because we changed it... */
-
+
if(!write_pid(pidfilename))
- return 1;
+ return -1;
}
-
+
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
if(debug_lvl > DEBUG_NOTHING)
/* 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);
}
}
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;
}
}
_execute_script(name);
}
+
/*
Signal handlers.
*/
RETSIGTYPE
-sigterm_handler(int a)
+sigterm_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
}
RETSIGTYPE
-sigquit_handler(int a)
+sigquit_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got QUIT signal"));
}
RETSIGTYPE
-sigsegv_square(int a)
+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)
+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);
}
RETSIGTYPE
-sighup_handler(int a)
+sighup_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got HUP signal"));
}
RETSIGTYPE
-sigint_handler(int a)
+sigint_handler(int a, siginfo_t *info, void *b)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got INT signal, exiting"));
}
RETSIGTYPE
-sigusr1_handler(int a)
+sigusr1_handler(int a, siginfo_t *info, void *b)
{
dump_connection_list();
}
RETSIGTYPE
-sigusr2_handler(int a)
+sigusr2_handler(int a, siginfo_t *info, void *b)
{
dump_subnet_list();
}
RETSIGTYPE
-sighuh(int a)
+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 *);
+} sighandlers[] = {
+ { SIGHUP, sighup_handler },
+ { SIGTERM, sigterm_handler },
+ { SIGQUIT, sigquit_handler },
+ { SIGSEGV, sigsegv_handler },
+ { SIGPIPE, ignore_signal_handler },
+ { SIGINT, sigint_handler },
+ { SIGUSR1, sigusr1_handler },
+ { SIGUSR2, sigusr2_handler },
+ { SIGCHLD, ignore_signal_handler },
+ { SIGALRM, ignore_signal_handler },
+ { 0, NULL }
+};
+
void
setup_signals(void)
{
int i;
+ struct sigaction act;
+
+ sigemptyset(&emptysigset);
+ act.sa_handler = NULL;
+ act.sa_mask = emptysigset;
+ act.sa_flags = SA_SIGINFO;
- for(i=0;i<32;i++)
- signal(i,sighuh);
-
- if(signal(SIGTERM, SIG_IGN) != SIG_ERR)
- signal(SIGTERM, sigterm_handler);
- if(signal(SIGQUIT, SIG_IGN) != SIG_ERR)
- signal(SIGQUIT, sigquit_handler);
- if(signal(SIGSEGV, SIG_IGN) != SIG_ERR)
- signal(SIGSEGV, sigsegv_handler);
- if(signal(SIGHUP, SIG_IGN) != SIG_ERR)
- signal(SIGHUP, sighup_handler);
- signal(SIGPIPE, SIG_IGN);
- if(signal(SIGINT, SIG_IGN) != SIG_ERR)
- signal(SIGINT, sigint_handler);
- signal(SIGUSR1, sigusr1_handler);
- signal(SIGUSR2, sigusr2_handler);
- signal(SIGCHLD, SIG_IGN);
+ /* Set a default signal handler for every signal, errors will be
+ ignored. */
+ for(i = 0; i < NSIG; i++)
+ {
+ act.sa_sigaction = unexpected_signal_handler;
+ sigaction(i, &act, NULL);
+ }
+
+ /* 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;
+ 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));
+ }
}
projects / tinc / blobdiff