X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=cd1b96e69a75e83c6fde274acb04038d26e2d3c5;hp=7373a70c2ab0118e4ccd96362fb303aa91178843;hb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36;hpb=c0a3f67a5d66088aaf526f1461986f9e86d5dd1f

diff --git a/src/process.c b/src/process.c
index 7373a70c..cd1b96e6 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
 
     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
@@ -17,7 +17,7 @@
     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.30 2001/10/31 12:50:24 guus Exp $
+    $Id: process.c,v 1.1.2.33 2002/02/10 21:57:54 guus Exp $
 */
 
 #include "config.h"
@@ -59,6 +59,10 @@ sigset_t emptysigset;
 
 static int saved_debug_lvl = 0;
 
+extern int sighup;
+extern int sigalrm;
+extern int do_purge;
+
 void memory_full(int size)
 {
   syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
@@ -342,6 +346,7 @@ sigsegv_handler(int a, siginfo_t *info, void *b)
       act.sa_mask = emptysigset;
       act.sa_flags = SA_SIGINFO;
       act.sa_sigaction = sigsegv_square;
+      sigaction(SIGSEGV, &act, NULL);
 
       close_network_connections();
       sleep(5);
@@ -351,7 +356,7 @@ sigsegv_handler(int a, siginfo_t *info, void *b)
   else
     {
       syslog(LOG_NOTICE, _("Not restarting."));
-      exit(0);
+      exit(1);
     }
 }
 
@@ -382,6 +387,14 @@ sigint_handler(int a, siginfo_t *info, void *b)
     }
 }
 
+RETSIGTYPE
+sigalrm_handler(int a, siginfo_t *info, void *b)
+{
+  if(debug_lvl > DEBUG_NOTHING)
+    syslog(LOG_NOTICE, _("Got ALRM signal"));
+  sigalrm = 1;
+}
+
 RETSIGTYPE
 sigusr1_handler(int a, siginfo_t *info, void *b)
 {
@@ -397,6 +410,13 @@ sigusr2_handler(int a, siginfo_t *info, void *b)
   dump_subnets();
 }
 
+RETSIGTYPE
+sigwinch_handler(int a, siginfo_t *info, void *b)
+{
+  extern int do_purge;
+  do_purge = 1;
+}
+
 RETSIGTYPE
 unexpected_signal_handler(int a, siginfo_t *info, void *b)
 {
@@ -409,7 +429,7 @@ ignore_signal_handler(int a, siginfo_t *info, void *b)
 {
   if(debug_lvl >= DEBUG_SCARY_THINGS)
   {
-    syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
+    syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
     cp_trace();
   }
 }
@@ -427,7 +447,8 @@ struct {
   { SIGUSR1, sigusr1_handler },
   { SIGUSR2, sigusr2_handler },
   { SIGCHLD, ignore_signal_handler },
-  { SIGALRM, ignore_signal_handler },
+  { SIGALRM, sigalrm_handler },
+  { SIGWINCH, sigwinch_handler },
   { 0, NULL }
 };
 
@@ -446,12 +467,16 @@ setup_signals(void)
      ignored. */
   for(i = 0; i < NSIG; i++) 
     {
-      act.sa_sigaction = unexpected_signal_handler;
+      if(!do_detach)
+        act.sa_sigaction = (void(*)(int, siginfo_t *, void *))SIG_DFL;
+      else
+        act.sa_sigaction = unexpected_signal_handler;
       sigaction(i, &act, NULL);
     }
 
+  /* If we didn't detach, allow coredumps */
   if(!do_detach)
-    sighandlers[3].handler = SIG_DFL;
+    sighandlers[3].handler = (void(*)(int, siginfo_t *, void *))SIG_DFL;
 
   /* Then, for each known signal that we want to catch, assign a
      handler to the signal, with error checking this time. */