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.49 2002/09/15 14:55:53 guus Exp $
+ $Id: process.c,v 1.1.2.52 2003/07/06 23:16:28 guus Exp $
*/
#include "config.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 "device.h"
#include "connection.h"
#include "device.h"
+#include "logger.h"
#include "system.h"
extern char *identname;
extern char *pidfilename;
extern char **g_argv;
+extern int use_logfile;
sigset_t emptysigset;
-static int saved_debug_lvl = 0;
+static int saved_debug_level = -1;
extern int sighup;
extern int sigalrm;
extern int do_purge;
-void memory_full(int size)
+static void memory_full(int size)
{
- syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
+ logger(DEBUG_ALWAYS, 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)
+ if(debug_level > DEBUG_NOTHING)
dump_device_stats();
- syslog(LOG_NOTICE, _("Terminating"));
+ logger(DEBUG_ALWAYS, LOG_NOTICE, _("Terminating"));
closelog();
exit(c);
/*
check for an existing tinc for this net, and write pid to pidfile
*/
-int write_pidfile(void)
+static int write_pidfile(void)
{
int pid;
return -1;
}
- 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(DEBUG_ALWAYS, LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
+ VERSION, __DATE__, __TIME__, debug_level);
xalloc_fail_func = memory_full;
}
/*
- 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)
+static 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)
{
cp();
chdir("/");
+ closelogger();
+
/* Close all file descriptors */
- closelog(); /* <- this means we cannot use syslog() here anymore! */
fcloseall();
execl(scriptname, NULL);
/* No return on success */
- openlog("tinc", LOG_CONS | LOG_PID, LOG_DAEMON);
- syslog(LOG_ERR, _("Could not execute `%s': %s"), scriptname,
+ 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);
}
pid = fork();
if(pid < 0) {
- syslog(LOG_ERR, _("System call `%s' failed: %s"), "fork",
+ logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "fork",
strerror(errno));
return -1;
}
if(pid) {
- if(debug_lvl >= DEBUG_STATUS)
- syslog(LOG_INFO, _("Executing script %s"), name);
+ logger(DEBUG_STATUS, 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(DEBUG_ALWAYS, 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 */
- syslog(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
+ logger(DEBUG_ALWAYS, LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return -1;
} else { /* Something strange happened */
-
- syslog(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
+ logger(DEBUG_ALWAYS, LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
name);
return -1;
}
} else {
- syslog(LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
+ logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
strerror(errno));
return -1;
}
Signal handlers.
*/
-RETSIGTYPE sigterm_handler(int a)
+static RETSIGTYPE sigterm_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got TERM signal"));
+ logger(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, 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"));
+ logger(DEBUG_ALWAYS, LOG_NOTICE, _("Got HUP signal"));
sighup = 1;
}
-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(DEBUG_ALWAYS, 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(DEBUG_ALWAYS, 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"));
+ logger(DEBUG_ALWAYS, LOG_NOTICE, _("Got ALRM signal"));
sigalrm = 1;
}
-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;
}
-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(DEBUG_ALWAYS, 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();
- }
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
}
-struct {
+static struct {
int signal;
void (*handler)(int);
} sighandlers[] = {
projects / tinc / blobdiff