Cleanups, spelling fixes, allow symbol names for signals (-k option),

don't remove pidfile if other tincd is still running.

src/net.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: net.c,v 1.35.4.161 2002/03/01 14:25:10 guus Exp $
+    $Id: net.c,v 1.35.4.162 2002/03/11 11:23:04 guus Exp $
 */
 
 #include "config.h"
@@ -444,14 +444,14 @@ cp
           close_network_connections();
           exit_configuration(&config_tree);
 
-          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
+          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds..."));
           sleep(5);
 
           init_configuration(&config_tree);
 
           if(read_server_config())
             {
-              syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+              syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
               exit(1);
             }
 

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.35 2002/02/18 16:25:16 guus Exp $
+    $Id: process.c,v 1.1.2.36 2002/03/11 11:23:04 guus Exp $
 */
 
 #include "config.h"
@@ -65,7 +65,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);
 }
@@ -144,8 +144,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)
+    {
+      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;
 }
@@ -323,25 +330,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 +446,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 },

src/subnet.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: subnet.c,v 1.1.2.31 2002/02/20 17:16:15 guus Exp $
+    $Id: subnet.c,v 1.1.2.32 2002/03/11 11:23:04 guus Exp $
 */
 
 #include "config.h"

src/tincd.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: tincd.c,v 1.10.4.57 2002/02/10 21:57:54 guus Exp $
+    $Id: tincd.c,v 1.10.4.58 2002/03/11 11:23:04 guus Exp $
 */
 
 #include "config.h"
@@ -140,7 +140,36 @@ parse_options(int argc, char **argv, char **envp)
             debug_lvl++;
           break;
         case 'k': /* kill old tincds */
-	  kill_tincd = optarg?atoi(optarg):SIGTERM;
+          if(optarg)
+            {
+              if(!strcasecmp(optarg, "HUP"))
+                kill_tincd = SIGHUP;
+              else if(!strcasecmp(optarg, "TERM"))
+                kill_tincd = SIGTERM;
+              else if(!strcasecmp(optarg, "KILL"))
+                kill_tincd = SIGKILL;
+              else if(!strcasecmp(optarg, "USR1"))
+                kill_tincd = SIGUSR1;
+              else if(!strcasecmp(optarg, "USR2"))
+                kill_tincd = SIGUSR2;
+              else if(!strcasecmp(optarg, "WINCH"))
+                kill_tincd = SIGWINCH;
+              else if(!strcasecmp(optarg, "INT"))
+                kill_tincd = SIGINT;
+              else if(!strcasecmp(optarg, "ALRM"))
+                kill_tincd = SIGALRM;
+              else
+                {
+                  kill_tincd = atoi(optarg);
+                  if(!kill_tincd)
+                    {
+                      fprintf(stderr, _("Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n"), optarg);
+                      usage(1);
+                    }
+                }
+            }
+          else
+            kill_tincd = SIGTERM;
           break;
         case 'n': /* net name given */
           netname = xmalloc(strlen(optarg)+1);
@@ -309,12 +338,6 @@ main(int argc, char **argv, char **envp)
   if(show_help)
     usage(0);
 
-  if(geteuid())
-    {
-      fprintf(stderr, _("You must be root to run this program.\n"));
-      return 1;
-    }
-
 #ifdef HAVE_SOLARIS
   openlog("tinc", LOG_CONS, LOG_DAEMON);        /* Catch all syslog() calls issued before detaching */
 #else