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

diff --git a/src/process.c b/src/process.c
index 6158fbab..8ca8733f 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.20 2001/01/07 17:09:02 guus Exp $
+    $Id: process.c,v 1.1.2.32 2001/11/03 22:53:02 guus Exp $
 */
 
 #include "config.h"
@@ -42,7 +42,9 @@
 #include "conf.h"
 #include "process.h"
 #include "subnet.h"
+#include "device.h"
 #include "connection.h"
+#include "device.h"
 
 #include "system.h"
 
@@ -55,6 +57,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);
@@ -85,8 +89,7 @@ cp
   close_network_connections();
 
   if(debug_lvl > DEBUG_NOTHING)
-    syslog(LOG_INFO, _("Total bytes written: tap %d, socket %d; bytes read: tap %d, socket %d"),
-	   total_tap_out, total_socket_out, total_tap_in, total_socket_in);
+    dump_device_stats();
 
   syslog(LOG_NOTICE, _("Terminating"));
 
@@ -121,7 +124,7 @@ cp
 /*
   kill older tincd for this net
 */
-int kill_other(void)
+int kill_other(int signal)
 {
   int pid;
 cp
@@ -136,7 +139,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 +167,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;
 	}
 
@@ -197,17 +200,29 @@ void _execute_script(const char *name)
   char *scriptname;
   char *s;
 cp
+#ifdef HAVE_UNSETENV
+  unsetenv("NETNAME");
+  unsetenv("DEVICE");
+  unsetenv("INTERFACE");
+#endif
+
   if(netname)
     {
       asprintf(&s, "NETNAME=%s", netname);
       putenv(s);	/* Don't free s! see man 3 putenv */
     }
-#ifdef HAVE_UNSETENV
-  else
+
+  if(device)
     {
-      unsetenv("NETNAME");
+      asprintf(&s, "DEVICE=%s", device);
+      putenv(s);	/* Don't free s! see man 3 putenv */
+    }
+
+  if(interface)
+    {
+      asprintf(&s, "INTERFACE=%s", interface);
+      putenv(s);	/* Don't free s! see man 3 putenv */
     }
-#endif
 
   chdir("/");
   
@@ -221,7 +236,7 @@ cp
   /* No return on success */
   
   if(errno != ENOENT)	/* Ignore if the file does not exist */
-    exit(-1);		/* Some error while trying execl(). */
+    exit(1);		/* Some error while trying execl(). */
   else
     exit(0);
 }
@@ -309,7 +324,7 @@ sigsegv_square(int a, siginfo_t *info, void *b)
 {
   syslog(LOG_ERR, _("Got another SEGV signal: not restarting"));
   cp_trace();
-  exit(0);
+  exit(1);
 }
 
 RETSIGTYPE
@@ -351,21 +366,35 @@ 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
 sigusr1_handler(int a, siginfo_t *info, void *b)
 {
-  dump_connection_list();
+  dump_connections();
 }
 
 RETSIGTYPE
 sigusr2_handler(int a, siginfo_t *info, void *b)
 {
-  dump_subnet_list();
+  dump_device_stats();
+  dump_nodes();
+  dump_edges();
+  dump_subnets();
 }
 
 RETSIGTYPE
@@ -375,6 +404,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_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
+    cp_trace();
+  }
+}
+
 struct {
   int signal;
   void (*handler)(int, siginfo_t *, void *);
@@ -383,11 +422,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 }
 };
 
@@ -406,17 +446,24 @@ setup_signals(void)
      ignored. */
   for(i = 0; i < NSIG; i++) 
     {
-      act.sa_sigaction = unexpected_signal_handler;
-      sigaction(sighandlers[i].signal, &act, NULL);
+      if(!do_detach)
+        act.sa_sigaction = SIG_DFL;
+      else
+        act.sa_sigaction = unexpected_signal_handler;
+      sigaction(i, &act, NULL);
     }
 
+  /* If we didn't detach, allow coredumps */
+  if(!do_detach)
+    sighandlers[3].handler = SIG_DFL;
+
   /* 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));
+	fprintf(stderr, _("Installing signal handler for signal %d (%s) failed: %s\n"),
+		sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno));
     }
 }