Some very small fixes

[tinc] / src / process.c

diff --git a/src/process.c b/src/process.c
index 37b3186..7c8d31f 100644 (file)
--- 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.24 2001/09/01 12:36:53 guus Exp $
+    $Id: process.c,v 1.1.2.31 2001/10/31 20:37:54 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"));
 
@@ -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("/");
   
@@ -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
@@ -380,7 +409,7 @@ 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));
+    syslog(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
     cp_trace();
   }
 }
@@ -421,6 +450,10 @@ setup_signals(void)
       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++)