/*
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.46 2002/09/09 21:24:41 guus Exp $
+ $Id: process.c,v 1.1.2.60 2003/07/31 14:24:19 guus Exp $
*/
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.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 "system.h"
+#include "edge.h"
+#include "logger.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;
+bool do_detach = true;
+bool sighup = false;
+bool sigalrm = false;
extern char *identname;
extern char *pidfilename;
extern char **g_argv;
+extern bool use_logfile;
sigset_t emptysigset;
-static int saved_debug_lvl = 0;
-
-extern int sighup;
-extern int sigalrm;
-extern int do_purge;
+static int saved_debug_level = -1;
-void memory_full(int size)
+static void memory_full(int size)
{
- syslog(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);
}
/* Some functions the less gifted operating systems might lack... */
#ifndef HAVE_FCLOSEALL
-int fcloseall(void)
+static int fcloseall(void)
{
fflush(stdin);
fflush(stdout);
close_network_connections();
- if(debug_lvl > DEBUG_NOTHING)
+ ifdebug(CONNECTIONS)
dump_device_stats();
- syslog(LOG_NOTICE, _("Terminating"));
+ logger(LOG_NOTICE, _("Terminating"));
- closelog();
+ closelogger();
exit(c);
}
+#ifndef HAVE_MINGW
/*
check for an existing tinc for this net, and write pid to pidfile
*/
-int write_pidfile(void)
+static bool write_pidfile(void)
{
int pid;
netname, pid);
else
fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
- return 1;
+ return false;
}
/* if it's locked, write-protected, or whatever */
if(!write_pid(pidfilename))
- return 1;
+ return false;
- return 0;
+ return true;
}
+#endif
/*
kill older tincd for this net
*/
-int kill_other(int signal)
+bool kill_other(int signal)
{
+#ifndef HAVE_MINGW
int pid;
cp();
netname);
else
fprintf(stderr, _("No other tincd is running.\n"));
- return 1;
+ return false;
}
errno = 0; /* No error, sometimes errno is only changed on error */
fprintf(stderr, _("Removing stale lock file.\n"));
remove_pid(pidfilename);
}
+#endif
- return 0;
+ return true;
}
/*
Detach from current terminal, write pidfile, kill parent
*/
-int detach(void)
+bool detach(void)
{
cp();
/* First check if we can open a fresh new pidfile */
- if(write_pidfile())
- return -1;
+#ifndef HAVE_MINGW
+ if(!write_pidfile())
+ return false;
+#endif
/* If we succeeded in doing that, detach */
- closelog();
+ closelogger();
+#ifdef HAVE_FORK
if(do_detach) {
- if(daemon(0, 0) < 0) {
+ if(daemon(0, 0)) {
fprintf(stderr, _("Couldn't detach from terminal: %s"),
strerror(errno));
- return -1;
+ return false;
}
/* Now UPDATE the pid in the pidfile, because we changed it... */
if(!write_pid(pidfilename))
- return -1;
+ return false;
}
+#endif
- openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
+ openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
- VERSION, __DATE__, __TIME__, debug_lvl);
- else
- syslog(LOG_NOTICE, _("tincd %s starting"), VERSION);
+ logger(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
+ VERSION, __DATE__, __TIME__, debug_level);
xalloc_fail_func = memory_full;
- return 0;
+ return true;
}
+#ifdef HAVE_FORK
/*
- Execute the program name, with sane environment. All output will be
- redirected to syslog.
+ Execute the program name, with sane environment.
*/
-void _execute_script(const char *scriptname, char **envp)
- __attribute__ ((noreturn));
-void _execute_script(const char *scriptname, char **envp)
+static void _execute_script(const char *scriptname, char **envp)
+ __attribute__ ((__noreturn__));
+static void _execute_script(const char *scriptname, char **envp)
{
- char *s;
+ int save_errno;
cp();
chdir("/");
+ closelogger();
+
/* Close all file descriptors */
- closelog(); /* <- this means we cannot use syslog() here anymore! */
fcloseall();
- execl(scriptname, NULL);
+ execl(scriptname, scriptname, NULL);
/* No return on success */
- openlog("tinc", LOG_CONS | LOG_PID, LOG_DAEMON);
- syslog(LOG_ERR, _("Could not execute `%s': %s"), scriptname,
- strerror(errno));
- exit(errno);
+ save_errno = errno;
+
+ openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
+ logger(LOG_ERR, _("Could not execute `%s': %s"), scriptname,
+ strerror(save_errno));
+ exit(save_errno);
}
+#endif
/*
Fork and execute the program pointed to by name.
*/
-int execute_script(const char *name, char **envp)
+bool execute_script(const char *name, char **envp)
{
+#ifdef HAVE_FORK
pid_t pid;
int status;
struct stat s;
/* First check if there is a script */
if(stat(scriptname, &s))
- return 0;
+ return true;
pid = fork();
if(pid < 0) {
- syslog(LOG_ERR, _("System call `%s' failed: %s"), "fork",
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "fork",
strerror(errno));
- return -1;
+ return false;
}
if(pid) {
- if(debug_lvl >= DEBUG_STATUS)
- syslog(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)) {
- syslog(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;
+ return false;
} else
- return 0;
+ return true;
} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
- syslog(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;
+ return false;
} else { /* Something strange happened */
-
- syslog(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
+ logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
name);
- return -1;
+ return false;
}
- } else {
- syslog(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;
+ return false;
}
+
+ /* Why do we get EINTR? */
+ return true;
}
/* Child here */
_execute_script(scriptname, envp);
+#else
+ return true;
+#endif
}
Signal handlers.
*/
-RETSIGTYPE sigterm_handler(int a)
+#ifndef HAVE_MINGW
+static RETSIGTYPE sigterm_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got TERM signal"));
+ logger(LOG_NOTICE, _("Got TERM signal"));
cleanup_and_exit(0);
}
-RETSIGTYPE sigquit_handler(int a)
+static RETSIGTYPE sigquit_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got QUIT signal"));
+ logger(LOG_NOTICE, _("Got QUIT signal"));
cleanup_and_exit(0);
}
-RETSIGTYPE fatal_signal_square(int a)
+static RETSIGTYPE fatal_signal_square(int a)
{
- syslog(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);
}
-RETSIGTYPE fatal_signal_handler(int a)
+static RETSIGTYPE fatal_signal_handler(int a)
{
struct sigaction act;
- syslog(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) {
- syslog(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 {
- syslog(LOG_NOTICE, _("Not restarting."));
+ logger(LOG_NOTICE, _("Not restarting."));
exit(1);
}
}
-RETSIGTYPE sighup_handler(int a)
+static RETSIGTYPE sighup_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got HUP signal"));
- sighup = 1;
+ logger(LOG_NOTICE, _("Got HUP signal"));
+ sighup = true;
}
-RETSIGTYPE sigint_handler(int a)
+static RETSIGTYPE 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;
+ if(saved_debug_level != -1) {
+ logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+ saved_debug_level);
+ debug_level = saved_debug_level;
+ saved_debug_level = -1;
} 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;
+ 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;
+ debug_level = 5;
}
}
-RETSIGTYPE sigalrm_handler(int a)
+static RETSIGTYPE sigalrm_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got ALRM signal"));
- sigalrm = 1;
+ logger(LOG_NOTICE, _("Got ALRM signal"));
+ sigalrm = true;
}
-RETSIGTYPE sigusr1_handler(int a)
+static RETSIGTYPE sigusr1_handler(int a)
{
dump_connections();
}
-RETSIGTYPE sigusr2_handler(int a)
+static RETSIGTYPE sigusr2_handler(int a)
{
dump_device_stats();
dump_nodes();
dump_subnets();
}
-RETSIGTYPE sigwinch_handler(int a)
+static RETSIGTYPE sigwinch_handler(int a)
{
- extern int do_purge;
- do_purge = 1;
+ do_purge = true;
}
-RETSIGTYPE unexpected_signal_handler(int a)
+static RETSIGTYPE unexpected_signal_handler(int a)
{
- syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+ logger(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
cp_trace();
}
-RETSIGTYPE ignore_signal_handler(int a)
+static RETSIGTYPE ignore_signal_handler(int a)
{
- if(debug_lvl >= DEBUG_SCARY_THINGS) {
- syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
- cp_trace();
- }
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
}
-struct {
+static struct {
int signal;
- void (*handler) (int);
+ void (*handler)(int);
} sighandlers[] = {
- {
- SIGHUP, sighup_handler}, {
- SIGTERM, sigterm_handler}, {
- SIGQUIT, sigquit_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, sigalrm_handler}, {
- SIGWINCH, sigwinch_handler}, {
- 0, NULL}
+ {SIGHUP, sighup_handler},
+ {SIGTERM, sigterm_handler},
+ {SIGQUIT, sigquit_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, sigalrm_handler},
+ {SIGWINCH, sigwinch_handler},
+ {0, NULL}
};
+#endif
void setup_signals(void)
{
+#ifndef HAVE_MINGW
int i;
struct sigaction act;
for(i = 0; sighandlers[i].signal; i++) {
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"),
+ fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
sighandlers[i].signal, strsignal(sighandlers[i].signal),
strerror(errno));
}
+#endif
}
projects / oweals / tinc.git / blobdiff