X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=9d1c489ff88fbd1bbe2f583b40df802444a67649;hp=5cc32c665488856ec4fa13005be05163fec50173;hb=627f7c22b447bd464b536cd016278545674df93d;hpb=c2b9c06062d36bde859b630b99a08c7b7428e721

diff --git a/src/process.c b/src/process.c
index 5cc32c66..9d1c489f 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1999-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
 
     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.35 2002/02/18 16:25:16 guus Exp $
+    $Id: process.c,v 1.1.2.41 2002/06/21 10:11:13 guus Exp $
 */
 
 #include "config.h"
@@ -30,6 +30,7 @@
 #include <syslog.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -65,7 +66,7 @@ extern int do_purge;
 
 void memory_full(int size)
 {
-  syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exiting."), size);
+  syslog(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
   cp_trace();
   exit(1);
 }
@@ -81,6 +82,7 @@ int fcloseall(void)
   fclose(stdin);
   fclose(stdout);
   fclose(stderr);
+  return 0;
 }
 #endif
 
@@ -144,8 +146,15 @@ 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, signal) && errno == ESRCH)
-    fprintf(stderr, _("Removing stale lock file.\n"));
-  remove_pid(pidfilename);
+    {
+      if(netname)
+        fprintf(stderr, _("The tincd for net `%s' is no longer running. "), netname);
+      else
+        fprintf(stderr, _("The tincd is no longer running. "));
+
+      fprintf(stderr, _("Removing stale lock file.\n"));
+      remove_pid(pidfilename);
+    }
 cp
   return 0;
 }
@@ -198,10 +207,9 @@ cp
   Execute the program name, with sane environment.  All output will be
   redirected to syslog.
 */
-void _execute_script(const char *name)  __attribute__ ((noreturn));
-void _execute_script(const char *name)
+void _execute_script(const char *scriptname)  __attribute__ ((noreturn));
+void _execute_script(const char *scriptname)
 {
-  char *scriptname;
   char *s;
 cp
 #ifdef HAVE_UNSETENV
@@ -230,19 +238,16 @@ cp
 
   chdir("/");
   
-  asprintf(&scriptname, "%s/%s", confbase, name);
-
   /* Close all file descriptors */
   closelog();		/* <- this means we cannot use syslog() here anymore! */
   fcloseall();
 
   execl(scriptname, NULL);
   /* No return on success */
-  
-  if(errno != ENOENT)	/* Ignore if the file does not exist */
-    exit(1);		/* Some error while trying execl(). */
-  else
-    exit(0);
+
+  openlog("tinc", LOG_CONS | LOG_PID, LOG_DAEMON);
+  syslog(LOG_ERR, _("Could not execute `%s': %s"), scriptname, strerror(errno));
+  exit(errno);
 }
 
 /*
@@ -252,7 +257,16 @@ int execute_script(const char *name)
 {
   pid_t pid;
   int status;
+  struct stat s;
+  char *scriptname;
 cp
+  asprintf(&scriptname, "%s/%s", confbase, name);
+
+  /* First check if there is a script */
+
+  if(stat(scriptname, &s))
+    return 0;
+
   if((pid = fork()) < 0)
     {
       syslog(LOG_ERR, _("System call `%s' failed: %s"), "fork", strerror(errno));
@@ -264,6 +278,8 @@ cp
       if(debug_lvl >= DEBUG_STATUS)
         syslog(LOG_INFO, _("Executing script %s"), name);
 
+      free(scriptname);
+
       if(waitpid(pid, &status, 0) == pid)
         {
           if(WIFEXITED(status))		/* Child exited by itself */
@@ -297,7 +313,7 @@ cp
 cp
   /* Child here */
 
-  _execute_script(name);
+  _execute_script(scriptname);
 }
 
 
@@ -323,25 +339,25 @@ sigquit_handler(int a)
 }
 
 RETSIGTYPE
-sigsegv_square(int a)
+fatal_signal_square(int a)
 {
-  syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
+  syslog(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a, strsignal(a));
   cp_trace();
   exit(1);
 }
 
 RETSIGTYPE
-sigsegv_handler(int a)
+fatal_signal_handler(int a)
 {
   struct sigaction act;
-  syslog(LOG_ERR, _("Got SEGV signal"));
+  syslog(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
   cp_trace();
 
   if(do_detach)
     {
       syslog(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
 
-      act.sa_handler = sigsegv_square;
+      act.sa_handler = fatal_signal_square;
       act.sa_mask = emptysigset;
       act.sa_flags = 0;
       sigaction(SIGSEGV, &act, NULL);
@@ -439,7 +455,9 @@ struct {
   { SIGHUP, sighup_handler },
   { SIGTERM, sigterm_handler },
   { SIGQUIT, sigquit_handler },
-  { SIGSEGV, sigsegv_handler },
+  { SIGSEGV, fatal_signal_handler },
+  { SIGBUS, fatal_signal_handler },
+  { SIGILL, fatal_signal_handler },
   { SIGPIPE, ignore_signal_handler },
   { SIGINT, sigint_handler },
   { SIGUSR1, sigusr1_handler },