/*
process.c -- process management functions
- Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
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.52 2003/07/06 23:16:28 guus Exp $
+ $Id: process.c,v 1.1.2.56 2003/07/21 14:47:43 guus Exp $
*/
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <termios.h>
-
-#include <pidfile.h>
-#include <utils.h>
-#include <xalloc.h>
+#include "system.h"
#include "conf.h"
-#include "process.h"
-#include "subnet.h"
-#include "device.h"
#include "connection.h"
#include "device.h"
+#include "edge.h"
#include "logger.h"
-
-#include "system.h"
+#include "node.h"
+#include "pidfile.h"
+#include "process.h"
+#include "subnet.h"
+#include "utils.h"
+#include "xalloc.h"
/* If zero, don't detach from the terminal. */
int do_detach = 1;
static void memory_full(int size)
{
- logger(DEBUG_ALWAYS, LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
+ logger(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
cp_trace();
exit(1);
}
close_network_connections();
- if(debug_level > DEBUG_NOTHING)
+ ifdebug(CONNECTIONS)
dump_device_stats();
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Terminating"));
+ logger(LOG_NOTICE, _("Terminating"));
- closelog();
+ closelogger();
exit(c);
}
/* If we succeeded in doing that, detach */
- closelog();
+ closelogger();
if(do_detach) {
if(daemon(0, 0) < 0) {
openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
+ logger(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
VERSION, __DATE__, __TIME__, debug_level);
xalloc_fail_func = memory_full;
__attribute__ ((noreturn));
static void _execute_script(const char *scriptname, char **envp)
{
+ int save_errno;
+
cp();
while(*envp)
execl(scriptname, NULL);
/* No return on success */
+ save_errno = errno;
+
openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
- logger(DEBUG_ALWAYS, LOG_ERR, _("Could not execute `%s': %s"), scriptname,
- strerror(errno));
- exit(errno);
+ logger(LOG_ERR, _("Could not execute `%s': %s"), scriptname,
+ strerror(save_errno));
+ exit(save_errno);
}
/*
pid = fork();
if(pid < 0) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "fork",
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "fork",
strerror(errno));
return -1;
}
if(pid) {
- logger(DEBUG_STATUS, LOG_INFO, _("Executing script %s"), name);
+ ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
free(scriptname);
if(waitpid(pid, &status, 0) == pid) {
if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Process %d (%s) exited with non-zero status %d"),
+ logger(LOG_ERR, _("Process %d (%s) exited with non-zero status %d"),
pid, name, WEXITSTATUS(status));
return -1;
} else
return 0;
} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
- logger(DEBUG_ALWAYS, LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
+ logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return -1;
} else { /* Something strange happened */
- logger(DEBUG_ALWAYS, LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
+ logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
name);
return -1;
}
- } else {
- logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
+ } else if (errno != EINTR) {
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
strerror(errno));
return -1;
}
+
+ /* Why do we get EINTR? */
+ return 0;
}
/* Child here */
static RETSIGTYPE sigterm_handler(int a)
{
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Got TERM signal"));
+ logger(LOG_NOTICE, _("Got TERM signal"));
cleanup_and_exit(0);
}
static RETSIGTYPE sigquit_handler(int a)
{
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Got QUIT signal"));
+ logger(LOG_NOTICE, _("Got QUIT signal"));
cleanup_and_exit(0);
}
static RETSIGTYPE fatal_signal_square(int a)
{
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a,
+ logger(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a,
strsignal(a));
cp_trace();
exit(1);
static RETSIGTYPE fatal_signal_handler(int a)
{
struct sigaction act;
- logger(DEBUG_ALWAYS, LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
+ logger(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
cp_trace();
if(do_detach) {
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
+ logger(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
act.sa_handler = fatal_signal_square;
act.sa_mask = emptysigset;
remove_pid(pidfilename);
execvp(g_argv[0], g_argv);
} else {
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Not restarting."));
+ logger(LOG_NOTICE, _("Not restarting."));
exit(1);
}
}
static RETSIGTYPE sighup_handler(int a)
{
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Got HUP signal"));
+ logger(LOG_NOTICE, _("Got HUP signal"));
sighup = 1;
}
static RETSIGTYPE sigint_handler(int a)
{
if(saved_debug_level != -1) {
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Reverting to old debug level (%d)"),
+ logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
saved_debug_level);
debug_level = saved_debug_level;
saved_debug_level = -1;
} else {
- logger(DEBUG_ALWAYS, LOG_NOTICE,
+ logger(LOG_NOTICE,
_("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."),
debug_level);
saved_debug_level = debug_level;
static RETSIGTYPE sigalrm_handler(int a)
{
- logger(DEBUG_ALWAYS, LOG_NOTICE, _("Got ALRM signal"));
+ logger(LOG_NOTICE, _("Got ALRM signal"));
sigalrm = 1;
}
static RETSIGTYPE unexpected_signal_handler(int a)
{
- logger(DEBUG_ALWAYS, LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+ logger(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
}
static RETSIGTYPE ignore_signal_handler(int a)
{
- logger(DEBUG_SCARY_THINGS, LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
}
static struct {
projects / tinc / blobdiff