X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=695f1f7ed9a757d7239c522f51839b02a075aa8e;hp=1319c0c0b90881f0aa6188f64705efaa58f4667e;hb=4c502b005bfd24821e817c134e8a442a5f4606de;hpb=cf49b2c0647554613874cce495e4a7937a9f7863

diff --git a/src/process.c b/src/process.c
index 1319c0c0..695f1f7e 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.14 2000/11/24 23:13:05 guus Exp $
+    $Id: process.c,v 1.1.2.17 2000/11/28 08:59:27 zarq Exp $
 */
 
 #include "config.h"
@@ -54,6 +54,8 @@ extern char *identname;
 extern char *pidfilename;
 extern char **g_argv;
 
+sigset_t emptysigset;
+
 void memory_full(int size)
 {
   syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
@@ -150,13 +152,27 @@ int detach(void)
 cp
   setup_signals();
 
+  /* First check if we can open a fresh new pidfile */
+  
   if(write_pidfile())
     return -1;
 
-  if(do_detach)
-    if(daemon(0, 0) < 0)
-      return -1;
+  /* If we succeeded in doing that, detach */
 
+  if(do_detach)
+    {
+      if(daemon(0, 0) < 0)
+	{
+	  fprintf(stderr, _("Couldn't detach from terminal: %m"));
+	  return -1;
+	}
+
+      /* Now UPDATE the pid in the pidfile, because we changed it... */
+      
+      if(!write_pid(pidfilename))
+        return -1;
+    }
+  
   openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
 
   if(debug_lvl > DEBUG_NOTHING)
@@ -177,11 +193,8 @@ cp
 void _execute_script(const char *name)  __attribute__ ((noreturn));
 void _execute_script(const char *name)
 {
-  int error = 0;
   char *scriptname;
   char *s;
-  int fd;
-  
 cp
   if(netname)
     {
@@ -252,7 +265,7 @@ cp
 	    }
           else				/* Something strange happened */
             {
-	      syslog(LOG_ERR, _("Process %d (%s) terminated abnormaly"), pid, name);
+	      syslog(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid, name);
 	      return -1;
             }
         }
@@ -268,12 +281,13 @@ cp
   _execute_script(name);
 }
 
+
 /*
   Signal handlers.
 */
 
 RETSIGTYPE
-sigterm_handler(int a)
+sigterm_handler(int a, siginfo_t *info, void *b)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got TERM signal"));
@@ -282,7 +296,7 @@ sigterm_handler(int a)
 }
 
 RETSIGTYPE
-sigquit_handler(int a)
+sigquit_handler(int a, siginfo_t *info, void *b)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got QUIT signal"));
@@ -290,7 +304,7 @@ sigquit_handler(int a)
 }
 
 RETSIGTYPE
-sigsegv_square(int a)
+sigsegv_square(int a, siginfo_t *info, void *b)
 {
   syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
   cp_trace();
@@ -298,15 +312,21 @@ sigsegv_square(int a)
 }
 
 RETSIGTYPE
-sigsegv_handler(int a)
+sigsegv_handler(int a, siginfo_t *info, void *b)
 {
+  struct sigaction act;
   syslog(LOG_ERR, _("Got SEGV signal"));
   cp_trace();
 
   if(do_detach)
     {
       syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
-      signal(SIGSEGV, sigsegv_square);
+
+      act.sa_handler = NULL;
+      act.sa_mask = emptysigset;
+      act.sa_flags = SA_SIGINFO;
+      act.sa_sigaction = sigsegv_square;
+
       close_network_connections();
       sleep(5);
       remove_pid(pidfilename);
@@ -320,7 +340,7 @@ sigsegv_handler(int a)
 }
 
 RETSIGTYPE
-sighup_handler(int a)
+sighup_handler(int a, siginfo_t *info, void *b)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got HUP signal"));
@@ -328,7 +348,7 @@ sighup_handler(int a)
 }
 
 RETSIGTYPE
-sigint_handler(int a)
+sigint_handler(int a, siginfo_t *info, void *b)
 {
   if(debug_lvl > DEBUG_NOTHING)
     syslog(LOG_NOTICE, _("Got INT signal, exiting"));
@@ -336,44 +356,66 @@ sigint_handler(int a)
 }
 
 RETSIGTYPE
-sigusr1_handler(int a)
+sigusr1_handler(int a, siginfo_t *info, void *b)
 {
   dump_connection_list();
 }
 
 RETSIGTYPE
-sigusr2_handler(int a)
+sigusr2_handler(int a, siginfo_t *info, void *b)
 {
   dump_subnet_list();
 }
 
 RETSIGTYPE
-sighuh(int a)
+unexpected_signal_handler(int a, siginfo_t *info, void *b)
 {
   syslog(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
   cp_trace();
 }
 
+struct {
+  int signal;
+  void (*handler)(int, siginfo_t *, void *);
+} sighandlers[] = {
+  { SIGHUP, sighup_handler },
+  { SIGTERM, sigterm_handler },
+  { SIGQUIT, sigquit_handler },
+  { SIGSEGV, sigsegv_handler },
+  { SIGPIPE, NULL },
+  { SIGINT, sigint_handler },
+  { SIGUSR1, sigusr1_handler },
+  { SIGUSR2, sigusr2_handler },
+  { SIGCHLD, NULL },
+  { 0, NULL }
+};
+
 void
 setup_signals(void)
 {
   int i;
+  struct sigaction act;
 
-  for(i=0;i<32;i++)
-    signal(i,sighuh);
-
-  if(signal(SIGTERM, SIG_IGN) != SIG_ERR)
-    signal(SIGTERM, sigterm_handler);
-  if(signal(SIGQUIT, SIG_IGN) != SIG_ERR)
-    signal(SIGQUIT, sigquit_handler);
-  if(signal(SIGSEGV, SIG_IGN) != SIG_ERR)
-    signal(SIGSEGV, sigsegv_handler);
-  if(signal(SIGHUP, SIG_IGN) != SIG_ERR)
-    signal(SIGHUP, sighup_handler);
-  signal(SIGPIPE, SIG_IGN);
-  if(signal(SIGINT, SIG_IGN) != SIG_ERR)
-    signal(SIGINT, sigint_handler);
-  signal(SIGUSR1, sigusr1_handler);
-  signal(SIGUSR2, sigusr2_handler);
-  signal(SIGCHLD, SIG_IGN);
+  sigemptyset(&emptysigset);
+  act.sa_handler = NULL;
+  act.sa_mask = emptysigset;
+  act.sa_flags = SA_SIGINFO;
+
+  /* Set a default signal handler for every signal, errors will be
+     ignored. */
+  for(i = 0; i < NSIG; i++) 
+    {
+      act.sa_sigaction = unexpected_signal_handler;
+      sigaction(sighandlers[i].signal, &act, NULL);
+    }
+
+  /* Then, for each known signal that we want to catch, assign a
+     handler to the signal, with error checking this time. */
+  for(i = 0; sighandlers[i].signal; i++)
+    {
+      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));
+    }
 }