From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 13 Mar 2001 09:55:14 +0000 (+0000)
Subject: Fixed bug in setup_signals() that would make tinc die when unexpected
X-Git-Tag: import-tinc-1.1~785^2~558
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=b413257e10ae0645da43583dd8f84a1f74df5bd7;p=meshlink

Fixed bug in setup_signals() that would make tinc die when unexpected
signals were caught.
---

diff --git a/src/process.c b/src/process.c
index 35793a27..d618427d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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.21 2001/03/01 21:32:04 guus Exp $
+    $Id: process.c,v 1.1.2.22 2001/03/13 09:55:14 guus Exp $
 */
 
 #include "config.h"
@@ -375,6 +375,16 @@ unexpected_signal_handler(int a, siginfo_t *info, void *b)
   cp_trace();
 }
 
+RETSIGTYPE
+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));
+    cp_trace();
+  }
+}
+
 struct {
   int signal;
   void (*handler)(int, siginfo_t *, void *);
@@ -383,11 +393,12 @@ struct {
   { SIGTERM, sigterm_handler },
   { SIGQUIT, sigquit_handler },
   { SIGSEGV, sigsegv_handler },
-  { SIGPIPE, NULL },
+  { SIGPIPE, ignore_signal_handler },
   { SIGINT, sigint_handler },
   { SIGUSR1, sigusr1_handler },
   { SIGUSR2, sigusr2_handler },
-  { SIGCHLD, NULL },
+  { SIGCHLD, ignore_signal_handler },
+  { SIGALRM, ignore_signal_handler },
   { 0, NULL }
 };
 
@@ -407,7 +418,7 @@ setup_signals(void)
   for(i = 0; i < NSIG; i++) 
     {
       act.sa_sigaction = unexpected_signal_handler;
-      sigaction(sighandlers[i].signal, &act, NULL);
+      sigaction(i, &act, NULL);
     }
 
   /* Then, for each known signal that we want to catch, assign a