Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / process.c

diff --git a/src/process.c b/src/process.c
index de9c71d6b8f68bb913ab003ae594c09800e6f0de..ee5fce97fcda59620f91fc468339c308378510c4 100644 (file)
--- 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
 
@@ -251,8 +251,6 @@ bool detach(void) {
        logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
                           VERSION, __DATE__, __TIME__, debug_level);
 
-       xalloc_fail_func = memory_full;
-
        return true;
 }
 
@@ -331,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
-}