X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprocess.c;h=ee5fce97fcda59620f91fc468339c308378510c4;hb=33f241d97852d7a171f1aaf1bda7f66356ff889e;hp=3b147909b8067ddc5dd5e514b24e7cd93ffab43e;hpb=25b467638a23ad03524719329027225ae1da75bc;p=meshlink

diff --git a/src/process.c b/src/process.c
index 3b147909..ee5fce97 100644
--- a/src/process.c
+++ b/src/process.c
@@ -26,6 +26,7 @@
 #include "device.h"
 #include "edge.h"
 #include "logger.h"
+#include "net.h"
 #include "node.h"
 #include "process.h"
 #include "subnet.h"
@@ -40,11 +41,6 @@ extern char *identname;
 extern char **g_argv;
 extern bool use_logfile;
 
-static void memory_full(int size) {
-	logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
-	exit(1);
-}
-
 /* Some functions the less gifted operating systems might lack... */
 
 #ifdef HAVE_MINGW
@@ -227,9 +223,13 @@ bool init_service(void) {
   Detach from current terminal
 */
 bool detach(void) {
-	setup_signals();
-
 #ifndef HAVE_MINGW
+	signal(SIGALRM, SIG_IGN);
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGUSR1, SIG_IGN);
+	signal(SIGUSR2, SIG_IGN);
+	signal(SIGWINCH, SIG_IGN);
+
 	closelogger();
 #endif
 
@@ -329,40 +329,3 @@ bool execute_script(const char *name, char **envp) {
 #endif
 	return true;
 }
-
-
-/*
-  Signal handlers.
-*/
-
-#ifndef HAVE_MINGW
-static RETSIGTYPE ignore_signal_handler(int a) {
-	ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignored signal %d (%s)", a, strsignal(a));
-}
-
-static struct {
-	int signal;
-	void (*handler)(int);
-} sighandlers[] = {
-	{SIGPIPE, ignore_signal_handler},
-	{SIGCHLD, ignore_signal_handler},
-	{0, NULL}
-};
-#endif
-
-void setup_signals(void) {
-#ifndef HAVE_MINGW
-	int i;
-	struct sigaction act = {NULL};
-
-	sigemptyset(&act.sa_mask);
-
-	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
-}