/*
process.c -- process management functions
- Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
+ 2000-2002 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.24 2001/09/01 12:36:53 guus Exp $
+ $Id: process.c,v 1.1.2.37 2002/03/19 00:07:09 guus Exp $
*/
#include "config.h"
#include "conf.h"
#include "process.h"
#include "subnet.h"
+#include "device.h"
#include "connection.h"
+#include "device.h"
#include "system.h"
sigset_t emptysigset;
+static int saved_debug_lvl = 0;
+
+extern int sighup;
+extern int sigalrm;
+extern int do_purge;
+
void memory_full(int size)
{
- syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
+ syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
cp_trace();
exit(1);
}
fclose(stdin);
fclose(stdout);
fclose(stderr);
+ return 0;
}
#endif
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"));
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, signal) && errno == ESRCH)
- fprintf(stderr, _("Removing stale lock file.\n"));
- remove_pid(pidfilename);
+ {
+ if(netname)
+ fprintf(stderr, _("The tincd for net `%s' is no longer running. "), netname);
+ else
+ fprintf(stderr, _("The tincd is no longer running. "));
+
+ fprintf(stderr, _("Removing stale lock file.\n"));
+ remove_pid(pidfilename);
+ }
cp
return 0;
}
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("/");
cp
if((pid = fork()) < 0)
{
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "fork");
+ syslog(LOG_ERR, _("System call `%s' failed: %s"), "fork", strerror(errno));
return -1;
}
}
else
{
- syslog(LOG_ERR, _("System call `%s' failed: %m"), "waitpid");
+ syslog(LOG_ERR, _("System call `%s' failed: %s"), "waitpid", strerror(errno));
return -1;
}
}
*/
RETSIGTYPE
-sigterm_handler(int a, siginfo_t *info, void *b)
+sigterm_handler(int a)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got TERM signal"));
}
RETSIGTYPE
-sigquit_handler(int a, siginfo_t *info, void *b)
+sigquit_handler(int a)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got QUIT signal"));
}
RETSIGTYPE
-sigsegv_square(int a, siginfo_t *info, void *b)
+fatal_signal_square(int a)
{
- syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
+ syslog(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a, strsignal(a));
cp_trace();
exit(1);
}
RETSIGTYPE
-sigsegv_handler(int a, siginfo_t *info, void *b)
+fatal_signal_handler(int a)
{
struct sigaction act;
- syslog(LOG_ERR, _("Got SEGV signal"));
+ syslog(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
cp_trace();
if(do_detach)
{
syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
- act.sa_handler = NULL;
+ act.sa_handler = fatal_signal_square;
act.sa_mask = emptysigset;
- act.sa_flags = SA_SIGINFO;
- act.sa_sigaction = sigsegv_square;
+ act.sa_flags = 0;
+ sigaction(SIGSEGV, &act, NULL);
close_network_connections();
sleep(5);
else
{
syslog(LOG_NOTICE, _("Not restarting."));
- exit(0);
+ exit(1);
}
}
RETSIGTYPE
-sighup_handler(int a, siginfo_t *info, void *b)
+sighup_handler(int a)
{
if(debug_lvl > DEBUG_NOTHING)
syslog(LOG_NOTICE, _("Got HUP signal"));
}
RETSIGTYPE
-sigint_handler(int a, siginfo_t *info, void *b)
+sigint_handler(int a)
+{
+ 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
+sigalrm_handler(int a)
{
if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got INT signal, exiting"));
- cleanup_and_exit(0);
+ syslog(LOG_NOTICE, _("Got ALRM signal"));
+ sigalrm = 1;
}
RETSIGTYPE
-sigusr1_handler(int a, siginfo_t *info, void *b)
+sigusr1_handler(int a)
{
- dump_connection_list();
+ dump_connections();
}
RETSIGTYPE
-sigusr2_handler(int a, siginfo_t *info, void *b)
+sigusr2_handler(int a)
{
- dump_subnet_list();
+ dump_device_stats();
+ dump_nodes();
+ dump_edges();
+ dump_subnets();
}
RETSIGTYPE
-unexpected_signal_handler(int a, siginfo_t *info, void *b)
+sigwinch_handler(int a)
+{
+ extern int do_purge;
+ do_purge = 1;
+}
+
+RETSIGTYPE
+unexpected_signal_handler(int a)
{
syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
}
RETSIGTYPE
-ignore_signal_handler(int a, siginfo_t *info, void *b)
+ignore_signal_handler(int a)
{
if(debug_lvl >= DEBUG_SCARY_THINGS)
{
- syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+ syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
cp_trace();
}
}
struct {
int signal;
- void (*handler)(int, siginfo_t *, void *);
+ void (*handler)(int);
} sighandlers[] = {
{ SIGHUP, sighup_handler },
{ SIGTERM, sigterm_handler },
{ SIGQUIT, sigquit_handler },
- { SIGSEGV, sigsegv_handler },
+ { SIGSEGV, fatal_signal_handler },
+ { SIGBUS, fatal_signal_handler },
+ { SIGILL, fatal_signal_handler },
{ SIGPIPE, ignore_signal_handler },
{ SIGINT, sigint_handler },
{ SIGUSR1, sigusr1_handler },
{ SIGUSR2, sigusr2_handler },
{ SIGCHLD, ignore_signal_handler },
- { SIGALRM, ignore_signal_handler },
+ { SIGALRM, sigalrm_handler },
+ { SIGWINCH, sigwinch_handler },
{ 0, NULL }
};
sigemptyset(&emptysigset);
act.sa_handler = NULL;
act.sa_mask = emptysigset;
- act.sa_flags = SA_SIGINFO;
+ act.sa_flags = 0;
/* Set a default signal handler for every signal, errors will be
ignored. */
for(i = 0; i < NSIG; i++)
{
- act.sa_sigaction = unexpected_signal_handler;
+ if(!do_detach)
+ act.sa_handler = SIG_DFL;
+ else
+ act.sa_handler = 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;
+ act.sa_handler = sighandlers[i].handler;
if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno));
projects / tinc / blobdiff