X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=f395496fa2e53c18ff460a5647360d1bb9e10aa9;hp=35793a27e66cce6a613799d868bc5a584b2f27ed;hb=950c934e0bda28e5952d699d6008ee783d81982b;hpb=125c4978812cffa5154ce5378a276f43f78417d8

diff --git a/src/process.c b/src/process.c
index 35793a27..f395496f 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.25 2001/09/05 18:38:09 zarq Exp $
 */
 
 #include "config.h"
@@ -55,6 +55,8 @@ extern char **g_argv;
 
 sigset_t emptysigset;
 
+static int saved_debug_lvl = 0;
+
 void memory_full(int size)
 {
   syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
@@ -121,7 +123,7 @@ cp
 /*
   kill older tincd for this net
 */
-int kill_other(void)
+int kill_other(int signal)
 {
   int pid;
 cp
@@ -136,7 +138,7 @@ cp
 
   errno = 0;    /* No error, sometimes errno is only changed on error */
   /* ESRCH is returned when no process with that pid is found */
-  if(kill(pid, SIGTERM) && errno == ESRCH)
+  if(kill(pid, signal) && errno == ESRCH)
     fprintf(stderr, _("Removing stale lock file.\n"));
   remove_pid(pidfilename);
 cp
@@ -164,7 +166,7 @@ cp
     {
       if(daemon(0, 0) < 0)
 	{
-	  fprintf(stderr, _("Couldn't detach from terminal: %m"));
+	  fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno));
 	  return -1;
 	}
 
@@ -351,9 +353,20 @@ sighup_handler(int a, siginfo_t *info, void *b)
 RETSIGTYPE
 sigint_handler(int a, siginfo_t *info, void *b)
 {
-  if(debug_lvl > DEBUG_NOTHING)
-    syslog(LOG_NOTICE, _("Got INT signal, exiting"));
-  cleanup_and_exit(0);
+  if(saved_debug_lvl)
+    {
+      syslog(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+	     saved_debug_lvl);
+      debug_lvl = saved_debug_lvl;
+      saved_debug_lvl = 0;
+    }
+  else
+    {
+      syslog(LOG_NOTICE, _("Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d."),
+	     debug_lvl);
+      saved_debug_lvl = debug_lvl;
+      debug_lvl = 5;
+    }
 }
 
 RETSIGTYPE
@@ -375,6 +388,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 +406,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 +431,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
@@ -416,7 +440,7 @@ setup_signals(void)
     {
       act.sa_sigaction = sighandlers[i].handler;
       if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
-	fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %m\n"),
-		sighandlers[i].signal, strsignal(sighandlers[i].signal));
+	fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
+		sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno));
     }
 }