/*
process.c -- process management functions
- Copyright (C) 1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1999-2005 Ivo Timmermans,
+ 2000-2006 Guus Sliepen <guus@tinc-vpn.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.18 2001/01/05 23:53:51 guus Exp $
+ $Id$
*/
-#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/wait.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <termios.h>
-
-#include <list.h>
-#include <pidfile.h>
-#include <utils.h>
-#include <xalloc.h>
+#include "system.h"
#include "conf.h"
+#include "connection.h"
+#include "device.h"
+#include "edge.h"
+#include "logger.h"
+#include "node.h"
+#include "pidfile.h"
#include "process.h"
#include "subnet.h"
-#include "connection.h"
-
-#include "system.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;
+extern volatile bool running;
sigset_t emptysigset;
-void memory_full(int size)
+static int saved_debug_level = -1;
+
+static void memory_full(int size)
{
- syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
- cp_trace();
- exit(1);
+ 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)
-{
- fflush(stdin);
- fflush(stdout);
- fflush(stderr);
- fclose(stdin);
- fclose(stdout);
- fclose(stderr);
+#ifdef HAVE_MINGW
+extern char *identname;
+extern char *program_name;
+extern char **g_argv;
+
+static SC_HANDLE manager = NULL;
+static SC_HANDLE service = NULL;
+static SERVICE_STATUS status = {0};
+static SERVICE_STATUS_HANDLE statushandle = 0;
+
+bool install_service(void) {
+ char command[4096] = "\"";
+ char **argp;
+ bool space;
+ SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
+
+ manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+ if(!manager) {
+ logger(LOG_ERR, _("Could not open service manager: %s"), winerror(GetLastError()));
+ return false;
+ }
+
+ if(!strchr(program_name, '\\')) {
+ GetCurrentDirectory(sizeof command - 1, command + 1);
+ strncat(command, "\\", sizeof command - strlen(command));
+ }
+
+ strncat(command, program_name, sizeof command - strlen(command));
+
+ strncat(command, "\"", sizeof command - strlen(command));
+
+ for(argp = g_argv + 1; *argp; argp++) {
+ space = strchr(*argp, ' ');
+ strncat(command, " ", sizeof command - strlen(command));
+
+ if(space)
+ strncat(command, "\"", sizeof command - strlen(command));
+
+ strncat(command, *argp, sizeof command - strlen(command));
+
+ if(space)
+ strncat(command, "\"", sizeof command - strlen(command));
+ }
+
+ service = CreateService(manager, identname, identname,
+ SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
+ command, NULL, NULL, NULL, NULL, NULL);
+
+ if(!service) {
+ logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
+ return false;
+ }
+
+ ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
+ logger(LOG_INFO, _("%s service installed"), identname);
+
+ if(!StartService(service, 0, NULL))
+ logger(LOG_WARNING, _("Could not start %s service: %s"), identname, winerror(GetLastError()));
+ else
+ logger(LOG_INFO, _("%s service started"), identname);
+
+ return true;
}
-#endif
-/*
- Close network connections, and terminate neatly
-*/
-void cleanup_and_exit(int c)
+bool remove_service(void) {
+ manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+ if(!manager) {
+ logger(LOG_ERR, _("Could not open service manager: %s"), winerror(GetLastError()));
+ return false;
+ }
+
+ service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
+
+ if(!service) {
+ logger(LOG_ERR, _("Could not open %s service: %s"), identname, winerror(GetLastError()));
+ return false;
+ }
+
+ if(!ControlService(service, SERVICE_CONTROL_STOP, &status))
+ logger(LOG_ERR, _("Could not stop %s service: %s"), identname, winerror(GetLastError()));
+ else
+ logger(LOG_INFO, _("%s service stopped"), identname);
+
+ if(!DeleteService(service)) {
+ logger(LOG_ERR, _("Could not remove %s service: %s"), identname, winerror(GetLastError()));
+ return false;
+ }
+
+ logger(LOG_INFO, _("%s service removed"), identname);
+
+ return true;
+}
+
+DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
+ switch(request) {
+ case SERVICE_CONTROL_STOP:
+ logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
+ break;
+ case SERVICE_CONTROL_SHUTDOWN:
+ logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
+ break;
+ default:
+ logger(LOG_WARNING, _("Got unexpected request %d"), request);
+ return ERROR_CALL_NOT_IMPLEMENTED;
+ }
+
+ if(running) {
+ running = false;
+ status.dwWaitHint = 30000;
+ status.dwCurrentState = SERVICE_STOP_PENDING;
+ SetServiceStatus(statushandle, &status);
+ return NO_ERROR;
+ } else {
+ status.dwWaitHint = 0;
+ status.dwCurrentState = SERVICE_STOPPED;
+ SetServiceStatus(statushandle, &status);
+ exit(1);
+ }
+
+}
+
+VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
{
-cp
- close_network_connections();
+ int err = 1;
+ extern int main2(int argc, char **argv);
- 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);
- syslog(LOG_NOTICE, _("Terminating"));
+ status.dwServiceType = SERVICE_WIN32;
+ status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+ status.dwWin32ExitCode = 0;
+ status.dwServiceSpecificExitCode = 0;
+ status.dwCheckPoint = 0;
- closelog();
- exit(c);
+ statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
+
+ if (!statushandle) {
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
+ err = 1;
+ } else {
+ status.dwWaitHint = 30000;
+ status.dwCurrentState = SERVICE_START_PENDING;
+ SetServiceStatus(statushandle, &status);
+
+ status.dwWaitHint = 0;
+ status.dwCurrentState = SERVICE_RUNNING;
+ SetServiceStatus(statushandle, &status);
+
+ err = main2(argc, argv);
+
+ status.dwWaitHint = 0;
+ status.dwCurrentState = SERVICE_STOPPED;
+ //status.dwWin32ExitCode = err;
+ SetServiceStatus(statushandle, &status);
+ }
+
+ return;
+}
+
+bool init_service(void) {
+ SERVICE_TABLE_ENTRY services[] = {
+ {identname, run_service},
+ {NULL, NULL}
+ };
+
+ if(!StartServiceCtrlDispatcher(services)) {
+ if(GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
+ return false;
+ }
+ else
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "StartServiceCtrlDispatcher", winerror(GetLastError()));
+ }
+
+ return true;
}
+#endif
+#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;
-cp
- if((pid = check_pid(pidfilename)))
- {
- if(netname)
- fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
- netname, pid);
- else
- fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
- return 1;
- }
-
- /* if it's locked, write-protected, or whatever */
- if(!write_pid(pidfilename))
- return 1;
-cp
- return 0;
+ pid_t pid;
+
+ cp();
+
+ pid = check_pid(pidfilename);
+
+ if(pid) {
+ if(netname)
+ fprintf(stderr, _("A tincd is already running for net `%s' with pid %ld.\n"),
+ netname, (long)pid);
+ else
+ fprintf(stderr, _("A tincd is already running with pid %ld.\n"), (long)pid);
+ return false;
+ }
+
+ /* if it's locked, write-protected, or whatever */
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
+ return false;
+ }
+
+ return true;
}
+#endif
/*
kill older tincd for this net
*/
-int kill_other(void)
+bool kill_other(int signal)
{
- int pid;
-cp
- if(!(pid = read_pid(pidfilename)))
- {
- if(netname)
- fprintf(stderr, _("No other tincd is running for net `%s'.\n"), netname);
- else
- fprintf(stderr, _("No other tincd is running.\n"));
- return 1;
- }
-
- 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)
- fprintf(stderr, _("Removing stale lock file.\n"));
- remove_pid(pidfilename);
-cp
- return 0;
+#ifndef HAVE_MINGW
+ pid_t pid;
+
+ cp();
+
+ pid = read_pid(pidfilename);
+
+ if(!pid) {
+ if(netname)
+ fprintf(stderr, _("No other tincd is running for net `%s'.\n"),
+ netname);
+ else
+ fprintf(stderr, _("No other tincd is running.\n"));
+ return false;
+ }
+
+ 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) {
+ 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);
+ }
+
+ return true;
+#else
+ return remove_service();
+#endif
}
/*
Detach from current terminal, write pidfile, kill parent
*/
-int detach(void)
+bool detach(void)
{
-cp
- setup_signals();
+ cp();
- /* First check if we can open a fresh new pidfile */
-
- if(write_pidfile())
- return -1;
+ setup_signals();
- /* If we succeeded in doing that, detach */
+ /* First check if we can open a fresh new pidfile */
- closelog();
+#ifndef HAVE_MINGW
+ if(!write_pidfile())
+ return false;
- if(do_detach)
- {
- if(daemon(0, 0) < 0)
- {
- fprintf(stderr, _("Couldn't detach from terminal: %m"));
- return -1;
+ /* If we succeeded in doing that, detach */
+
+ closelogger();
+#endif
+
+ if(do_detach) {
+#ifndef HAVE_MINGW
+ if(daemon(0, 0)) {
+ fprintf(stderr, _("Couldn't detach from terminal: %s"),
+ strerror(errno));
+ return false;
+ }
+
+ /* Now UPDATE the pid in the pidfile, because we changed it... */
+
+ if(!write_pid(pidfilename)) {
+ fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno));
+ return false;
+ }
+#else
+ if(!statushandle)
+ exit(install_service());
+#endif
}
- /* Now UPDATE the pid in the pidfile, because we changed it... */
-
- if(!write_pid(pidfilename))
- return -1;
- }
-
- openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
-
- 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);
-
- xalloc_fail_func = memory_full;
-cp
- return 0;
+ openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
+
+ logger(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
+ VERSION, __DATE__, __TIME__, debug_level);
+
+ xalloc_fail_func = memory_full;
+
+ return true;
}
-/*
- Execute the program name, with sane environment. All output will be
- redirected to syslog.
-*/
-void _execute_script(const char *name) __attribute__ ((noreturn));
-void _execute_script(const char *name)
+bool execute_script(const char *name, char **envp)
{
- char *scriptname;
- char *s;
-cp
- if(netname)
- {
- asprintf(&s, "NETNAME=%s", netname);
- putenv(s); /* Don't free s! see man 3 putenv */
- }
-#ifdef HAVE_UNSETENV
- else
- {
- unsetenv("NETNAME");
- }
+#ifdef HAVE_SYSTEM
+ int status, len;
+ struct stat s;
+ char *scriptname, *p;
+ int i;
+
+ cp();
+
+#ifndef HAVE_MINGW
+ len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+#else
+ len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
#endif
+ if(len < 0)
+ return false;
- chdir("/");
-
- asprintf(&scriptname, "%s/%s", confbase, name);
-
- /* Close all file descriptors */
- closelog(); /* <- this means we cannot use syslog() here anymore! */
- fcloseall();
-
- execl(scriptname, NULL);
- /* No return on success */
-
- if(errno != ENOENT) /* Ignore if the file does not exist */
- exit(-1); /* Some error while trying execl(). */
- else
- exit(0);
-}
+ scriptname[len - 1] = '\0';
-/*
- Fork and execute the program pointed to by name.
-*/
-int execute_script(const char *name)
-{
- pid_t pid;
- int status;
-cp
- if((pid = fork()) < 0)
- {
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "fork");
- return -1;
- }
-
- if(pid)
- {
- if(debug_lvl >= DEBUG_STATUS)
- syslog(LOG_INFO, _("Executing script %s"), name);
-
- 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"), 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, name, WTERMSIG(status), strsignal(WTERMSIG(status)));
- return -1;
- }
- else /* Something strange happened */
- {
- syslog(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid, name);
- return -1;
- }
- }
- else
- {
- syslog(LOG_ERR, _("System call `%s' failed: %m"), "waitpid");
- return -1;
- }
- }
-cp
- /* Child here */
-
- _execute_script(name);
+ /* First check if there is a script */
+
+ if(stat(scriptname + 1, &s)) {
+ free(scriptname);
+ return true;
+ }
+
+ ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+#ifdef HAVE_PUTENV
+ /* Set environment */
+
+ for(i = 0; envp[i]; i++)
+ putenv(envp[i]);
+#endif
+
+ scriptname[len - 1] = '\"';
+ status = system(scriptname);
+
+ free(scriptname);
+
+ /* Unset environment */
+
+ for(i = 0; envp[i]; i++) {
+ char *e = strchr(envp[i], '=');
+ if(e) {
+ p = alloca(e - envp[i] + 1);
+ strncpy(p, envp[i], e - envp[i]);
+ p[e - envp[i]] = '\0';
+ putenv(p);
+ }
+ }
+
+#ifdef WEXITSTATUS
+ if(status != -1) {
+ if(WIFEXITED(status)) { /* Child exited by itself */
+ if(WEXITSTATUS(status)) {
+ logger(LOG_ERR, _("Script %s exited with non-zero status %d"),
+ name, WEXITSTATUS(status));
+ return false;
+ }
+ } else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
+ logger(LOG_ERR, _("Script %s was killed by signal %d (%s)"),
+ name, WTERMSIG(status), strsignal(WTERMSIG(status)));
+ return false;
+ } else { /* Something strange happened */
+ logger(LOG_ERR, _("Script %s terminated abnormally"), name);
+ return false;
+ }
+ } else {
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
+ return false;
+ }
+#endif
+#endif
+ return true;
}
Signal handlers.
*/
-RETSIGTYPE
-sigterm_handler(int a, siginfo_t *info, void *b)
+#ifndef HAVE_MINGW
+static RETSIGTYPE sigterm_handler(int a)
+{
+ logger(LOG_NOTICE, _("Got %s signal"), "TERM");
+ if(running)
+ running = false;
+ else
+ exit(1);
+}
+
+static RETSIGTYPE sigquit_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got TERM signal"));
+ logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
+ if(running)
+ running = false;
+ else
+ exit(1);
+}
- cleanup_and_exit(0);
+static RETSIGTYPE fatal_signal_square(int 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(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
+ cp_trace();
+
+ if(do_detach) {
+ logger(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
+
+ act.sa_handler = fatal_signal_square;
+ act.sa_mask = emptysigset;
+ act.sa_flags = 0;
+ sigaction(SIGSEGV, &act, NULL);
+
+ close_network_connections();
+ sleep(5);
+ remove_pid(pidfilename);
+ execvp(g_argv[0], g_argv);
+ } else {
+ logger(LOG_NOTICE, _("Not restarting."));
+ exit(1);
+ }
}
-RETSIGTYPE
-sigquit_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE sighup_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got QUIT signal"));
- cleanup_and_exit(0);
+ logger(LOG_NOTICE, _("Got %s signal"), "HUP");
+ sighup = true;
}
-RETSIGTYPE
-sigsegv_square(int a, siginfo_t *info, void *b)
+static RETSIGTYPE sigint_handler(int a)
{
- syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
- cp_trace();
- exit(0);
+ logger(LOG_NOTICE, _("Got %s signal"), "INT");
+
+ 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 {
+ 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
-sigsegv_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE sigalrm_handler(int a)
{
- struct sigaction act;
- syslog(LOG_ERR, _("Got SEGV signal"));
- cp_trace();
-
- if(do_detach)
- {
- syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
-
- 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);
- execvp(g_argv[0], g_argv);
- }
- else
- {
- syslog(LOG_NOTICE, _("Not restarting."));
- exit(0);
- }
+ logger(LOG_NOTICE, _("Got %s signal"), "ALRM");
+ sigalrm = true;
}
-RETSIGTYPE
-sighup_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE sigusr1_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got HUP signal"));
- sighup = 1;
+ dump_connections();
}
-RETSIGTYPE
-sigint_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE sigusr2_handler(int a)
{
- if(debug_lvl > DEBUG_NOTHING)
- syslog(LOG_NOTICE, _("Got INT signal, exiting"));
- cleanup_and_exit(0);
+ dump_device_stats();
+ dump_nodes();
+ dump_edges();
+ dump_subnets();
}
-RETSIGTYPE
-sigusr1_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE sigwinch_handler(int a)
{
- dump_connection_list();
+ do_purge = true;
}
-RETSIGTYPE
-sigusr2_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE unexpected_signal_handler(int a)
{
- dump_subnet_list();
+ logger(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+ cp_trace();
}
-RETSIGTYPE
-unexpected_signal_handler(int a, siginfo_t *info, void *b)
+static RETSIGTYPE ignore_signal_handler(int a)
{
- syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
- cp_trace();
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
}
-struct {
- int signal;
- void (*handler)(int, siginfo_t *, void *);
+static struct {
+ int signal;
+ void (*handler)(int);
} sighandlers[] = {
- { SIGHUP, sighup_handler },
- { SIGTERM, sigterm_handler },
- { SIGQUIT, sigquit_handler },
- { SIGSEGV, sigsegv_handler },
- { SIGPIPE, NULL },
- { SIGINT, sigint_handler },
- { SIGUSR1, sigusr1_handler },
- { SIGUSR2, sigusr2_handler },
- { SIGCHLD, NULL },
- { 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)
+void setup_signals(void)
{
- int i;
- struct sigaction act;
-
- sigemptyset(&emptysigset);
- act.sa_handler = NULL;
- 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 = unexpected_signal_handler;
- sigaction(sighandlers[i].signal, &act, NULL);
- }
-
- /* 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));
- }
+#ifndef HAVE_MINGW
+ int i;
+ struct sigaction act;
+
+ sigemptyset(&emptysigset);
+ act.sa_handler = NULL;
+ act.sa_mask = emptysigset;
+ act.sa_flags = 0;
+
+ /* Set a default signal handler for every signal, errors will be
+ ignored. */
+ for(i = 0; i < NSIG; i++) {
+ 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_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));
+ }
+#endif
}