X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=4455b65f63a57dfcfbfb4901a4dc18189165f5c5;hp=8ca8733f72c74f8c619b1c9906c5801d83e029fd;hb=dd611fb4f91b9b17c20c458694d2765b22814c5f;hpb=cf0e133e191cb40954bf5b6ee0a579442fe4b60b

diff --git a/src/process.c b/src/process.c
index 8ca8733f..4455b65f 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.32 2001/11/03 22:53:02 guus Exp $
+    $Id: process.c,v 1.1.2.34 2002/02/12 14:29:00 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);
@@ -303,7 +307,7 @@ cp
 */
 
 RETSIGTYPE
-sigterm_handler(int a, siginfo_t *info, void *b)
+sigterm_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got TERM signal"));
@@ -312,7 +316,7 @@ sigterm_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigquit_handler(int a, siginfo_t *info, void *b)
+sigquit_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got QUIT signal"));
@@ -320,7 +324,7 @@ sigquit_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigsegv_square(int a, siginfo_t *info, void *b)
+sigsegv_square(int a)
 {
   syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
   cp_trace();
@@ -328,7 +332,7 @@ sigsegv_square(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigsegv_handler(int a, siginfo_t *info, void *b)
+sigsegv_handler(int a)
 {
   struct sigaction act;
   syslog(LOG_ERR, _("Got SEGV signal"));
@@ -338,10 +342,10 @@ sigsegv_handler(int a, siginfo_t *info, void *b)
     {
       syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
 
-      act.sa_handler = NULL;
+      act.sa_handler = sigsegv_square;
       act.sa_mask = emptysigset;
-      act.sa_flags = SA_SIGINFO;
-      act.sa_sigaction = sigsegv_square;
+      act.sa_flags = 0;
+      sigaction(SIGSEGV, &act, NULL);
 
       close_network_connections();
       sleep(5);
@@ -351,12 +355,12 @@ sigsegv_handler(int a, siginfo_t *info, void *b)
   else
     {
       syslog(LOG_NOTICE, _("Not restarting."));
-      exit(0);
+      exit(1);
     }
 }
 
 RETSIGTYPE
-sighup_handler(int a, siginfo_t *info, void *b)
+sighup_handler(int a)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got HUP signal"));
@@ -364,7 +368,7 @@ sighup_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigint_handler(int a, siginfo_t *info, void *b)
+sigint_handler(int a)
 {
   if(saved_debug_lvl)
     {
@@ -383,13 +387,21 @@ sigint_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-sigusr1_handler(int a, siginfo_t *info, void *b)
+sigalrm_handler(int a)
+{
+  if(debug_lvl > DEBUG_NOTHING)
+    syslog(LOG_NOTICE, _("Got ALRM signal"));
+  sigalrm = 1;
+}
+
+RETSIGTYPE
+sigusr1_handler(int a)
 {
   dump_connections();
 }
 
 RETSIGTYPE
-sigusr2_handler(int a, siginfo_t *info, void *b)
+sigusr2_handler(int a)
 {
   dump_device_stats();
   dump_nodes();
@@ -398,14 +410,21 @@ sigusr2_handler(int a, siginfo_t *info, void *b)
 }
 
 RETSIGTYPE
-unexpected_signal_handler(int a, siginfo_t *info, void *b)
+sigwinch_handler(int a)
+{
+  extern int do_purge;
+  do_purge = 1;
+}
+
+RETSIGTYPE
+unexpected_signal_handler(int a)
 {
   syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
   cp_trace();
 }
 
 RETSIGTYPE
-ignore_signal_handler(int a, siginfo_t *info, void *b)
+ignore_signal_handler(int a)
 {
   if(debug_lvl >= DEBUG_SCARY_THINGS)
   {
@@ -416,7 +435,7 @@ ignore_signal_handler(int a, siginfo_t *info, void *b)
 
 struct {
   int signal;
-  void (*handler)(int, siginfo_t *, void *);
+  void (*handler)(int);
 } sighandlers[] = {
   { SIGHUP, sighup_handler },
   { SIGTERM, sigterm_handler },
@@ -427,7 +446,8 @@ struct {
   { SIGUSR1, sigusr1_handler },
   { SIGUSR2, sigusr2_handler },
   { SIGCHLD, ignore_signal_handler },
-  { SIGALRM, ignore_signal_handler },
+  { SIGALRM, sigalrm_handler },
+  { SIGWINCH, sigwinch_handler },
   { 0, NULL }
 };
 
@@ -440,16 +460,16 @@ setup_signals(void)
   sigemptyset(&emptysigset);
   act.sa_handler = NULL;
   act.sa_mask = emptysigset;
-  act.sa_flags = SA_SIGINFO;
+  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_sigaction = SIG_DFL;
+        act.sa_handler = SIG_DFL;
       else
-        act.sa_sigaction = unexpected_signal_handler;
+        act.sa_handler = unexpected_signal_handler;
       sigaction(i, &act, NULL);
     }
 
@@ -461,7 +481,7 @@ setup_signals(void)
      handler to the signal, with error checking this time. */
   for(i = 0; sighandlers[i].signal; i++)
     {
-      act.sa_sigaction = sighandlers[i].handler;
+      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));