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.20 2001/01/07 17:09:02 guus Exp $
+ $Id: process.c,v 1.1.2.25 2001/09/05 18:38:09 zarq Exp $
*/
#include "config.h"
sigset_t emptysigset;
+static int saved_debug_lvl = 0;
+
void memory_full(int size)
{
syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
/*
kill older tincd for this net
*/
-int kill_other(void)
+int kill_other(int signal)
{
int pid;
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, SIGTERM) && errno == ESRCH)
+ if(kill(pid, signal) && errno == ESRCH)
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
cp
{
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;
}
/* 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);
}
{
syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
cp_trace();
- exit(0);
+ exit(1);
}
RETSIGTYPE
RETSIGTYPE
sigint_handler(int a, siginfo_t *info, void *b)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got INT signal, exiting"));
- cleanup_and_exit(0);
+ if(saved_debug_lvl)
+ {
+ syslog(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+ saved_debug_lvl);
+ debug_lvl = saved_debug_lvl;
+ saved_debug_lvl = 0;
+ }
+ else
+ {
+ syslog(LOG_NOTICE, _("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."),
+ debug_lvl);
+ saved_debug_lvl = debug_lvl;
+ debug_lvl = 5;
+ }
}
RETSIGTYPE
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 *);
{ 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 }
};
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
{
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));
}
}