/*
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.16 2000/11/26 22:42:34 zarq Exp $
+ $Id: process.c,v 1.1.2.32 2001/11/03 22:53:02 guus Exp $
*/
#include "config.h"
#include <unistd.h>
#include <termios.h>
-#include <list.h>
#include <pidfile.h>
#include <utils.h>
#include <xalloc.h>
#include "conf.h"
#include "process.h"
#include "subnet.h"
+#include "device.h"
#include "connection.h"
+#include "device.h"
#include "system.h"
extern char *pidfilename;
extern char **g_argv;
+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);
close_network_connections();
if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_INFO, _("Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"),
- total_tap_out, total_socket_out, total_tap_in, total_socket_in);
+ dump_device_stats();
syslog(LOG_NOTICE, _("Terminating"));
/*
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 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;
}
char *scriptname;
char *s;
cp
+#ifdef HAVE_UNSETENV
+ unsetenv("NETNAME");
+ unsetenv("DEVICE");
+ unsetenv("INTERFACE");
+#endif
+
if(netname)
{
asprintf(&s, "NETNAME=%s", netname);
putenv(s); /* Don't free s! see man 3 putenv */
}
-#ifdef HAVE_UNSETENV
- else
+
+ if(device)
{
- unsetenv("NETNAME");
+ asprintf(&s, "DEVICE=%s", device);
+ putenv(s); /* Don't free s! see man 3 putenv */
+ }
+
+ if(interface)
+ {
+ asprintf(&s, "INTERFACE=%s", interface);
+ putenv(s); /* Don't free s! see man 3 putenv */
}
-#endif
chdir("/");
/* 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;
}
}
*/
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"));
}
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"));
}
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);
}
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"));
}
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"));
- 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
-sigusr1_handler(int a, siginfo_t *info, void *)
+sigusr1_handler(int a, siginfo_t *info, void *b)
{
- dump_connection_list();
+ dump_connections();
}
RETSIGTYPE
-sigusr2_handler(int a, siginfo_t *info, void *)
+sigusr2_handler(int a, siginfo_t *info, void *b)
{
- dump_subnet_list();
+ dump_device_stats();
+ dump_nodes();
+ dump_edges();
+ dump_subnets();
}
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_DEBUG, _("Ignored 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 }
};
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);
+ if(!do_detach)
+ act.sa_sigaction = SIG_DFL;
+ else
+ act.sa_sigaction = unexpected_signal_handler;
+ sigaction(i, &act, NULL);
}
+ /* If we didn't detach, allow coredumps */
+ if(!do_detach)
+ sighandlers[3].handler = SIG_DFL;
+
/* 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));
+ fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
+ sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno));
}
}
projects / tinc / blobdiff