- Second fixing-things pass: it even links now.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index e4549ec..b016e12 100644 (file)
--- a/src/tincd.c
+++ b/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.3 2000/06/28 14:34:40 guus Exp $
+    $Id: tincd.c,v 1.10.4.11 2000/10/14 17:04:16 guus Exp $
 */
 
 #include "config.h"
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <syslog.h>
 #include <unistd.h>
+#include <signal.h>
 
 #ifdef HAVE_SYS_IOCTL_H
 # include <sys/ioctl.h>
@@ -43,6 +44,7 @@
 #include "encr.h"
 #include "net.h"
 #include "netutl.h"
+#include "protocol.h"
 
 #include "system.h"
 
@@ -61,8 +63,6 @@ static int kill_tincd = 0;
 /* If zero, don't detach from the terminal. */
 static int do_detach = 1;
 
-char *confbase = NULL;           /* directory in which all config files are */
-char *configfilename = NULL;     /* configuration file name */
 char *identname;                 /* program name for syslog */
 char *netname = NULL;            /* name of the vpn network */
 char *pidfilename;               /* pid file location */
@@ -96,7 +96,7 @@ usage(int status)
   else
     {
       printf(_("Usage: %s [option]...\n\n"), program_name);
-      printf(_("  -c, --config=FILE     Read configuration options from FILE.\n"
+      printf(_("  -c, --config=DIR      Read configuration options from DIR.\n"
               "  -D, --no-detach       Don't fork and detach.\n"
               "  -d                    Increase debug level.\n"
               "  -k, --kill            Attempt to kill a running tincd and exit.\n"
@@ -123,8 +123,8 @@ parse_options(int argc, char **argv, char **envp)
         case 0: /* long option */
           break;
        case 'c': /* config file */
-         configfilename = xmalloc(strlen(optarg)+1);
-         strcpy(configfilename, optarg);
+         confbase = xmalloc(strlen(optarg)+1);
+         strcpy(confbase, optarg);
          break;
        case 'D': /* no detach */
          do_detach = 0;
@@ -291,35 +291,23 @@ int kill_other(void)
 */
 void make_names(void)
 {
-  if(!configfilename)
-    {
-      if(netname)
-       {
-         configfilename = xmalloc(strlen(netname)+18+strlen(CONFDIR));
-         sprintf(configfilename, "%s/tinc/%s/tinc.conf", CONFDIR, netname);
-       }
-      else
-       {
-         configfilename = xmalloc(17+strlen(CONFDIR));
-         sprintf(configfilename, "%s/tinc/tinc.conf", CONFDIR);
-       }
-    }
-  
   if(netname)
     {
-      pidfilename = xmalloc(strlen(netname)+20);
-      sprintf(pidfilename, "/var/run/tinc.%s.pid", netname);
-      confbase = xmalloc(strlen(netname)+8+strlen(CONFDIR));
-      sprintf(confbase, "%s/tinc/%s/", CONFDIR, netname);
-      identname = xmalloc(strlen(netname)+7);
-      sprintf(identname, "tinc.%s", netname);
+      if(!pidfilename)
+        asprintf(&pidfilename, "/var/run/tinc.%s.pid", netname);
+      if(!confbase)
+        asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
+      if(!identname)
+        asprintf(&identname, "tinc.%s", netname);
     }
   else
     {
-      pidfilename = "/var/run/tinc.pid";
-      confbase = xmalloc(7+strlen(CONFDIR));
-      sprintf(confbase, "%s/tinc/", CONFDIR);
-      identname = "tinc";
+      if(!pidfilename)
+        pidfilename = "/var/run/tinc.pid";
+      if(!confbase)
+        asprintf(&confbase, "%s/tinc", CONFDIR);
+      if(!identname)
+        identname = "tinc";
     }
 }
 
@@ -336,7 +324,7 @@ main(int argc, char **argv, char **envp)
 
   if(show_version)
     {
-      printf(_("%s version %s\n"), PACKAGE, VERSION);
+      printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE, VERSION, __DATE__, __TIME__, PROT_CURRENT);
       printf(_("Copyright (C) 1998,1999,2000 Ivo Timmermans and others,\n"
               "see the AUTHORS file for a complete list.\n\n"
               "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
@@ -363,7 +351,7 @@ main(int argc, char **argv, char **envp)
   if(kill_tincd)
     exit(kill_other());
 
-  if(read_config_file(configfilename))
+  if(read_server_config())
     return 1;
 
   setup_signals();
@@ -371,16 +359,21 @@ main(int argc, char **argv, char **envp)
   if(detach())
     exit(0);
 
+/* FIXME: wt* is this suppose to do?
   if(security_init())
     return 1;
+*/
+  for(;;)
+    {
+      setup_network_connections();
 
-  if(setup_network_connections())
-    cleanup_and_exit(1);
+      main_loop();
 
-  main_loop();
+      cleanup_and_exit(1);
 
-  cleanup_and_exit(1);
-  return 1;
+      syslog(LOG_ERR, _("Unrecoverable error, restarting in %d seconds!"), MAXTIMEOUT);
+      sleep(MAXTIMEOUT);
+    }
 }
 
 RETSIGTYPE
@@ -416,7 +409,6 @@ sigsegv_handler(int a)
     syslog(LOG_NOTICE, _("Got SEGV signal, trying to re-execute"));
 
   signal(SIGSEGV, sigsegv_square);
-
   close_network_connections();
   remove_pid(pidfilename);
   execvp(g_argv[0], g_argv);
@@ -426,17 +418,15 @@ RETSIGTYPE
 sighup_handler(int a)
 {
   if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Got HUP signal"));
-  close_network_connections();
-  setup_network_connections();
-  /* FIXME: read config-file and re-establish network connections */
+    syslog(LOG_NOTICE, _("Got HUP signal, rereading configuration and restarting"));
+  sighup = 1;
 }
 
 RETSIGTYPE
 sigint_handler(int a)
 {
   if(debug_lvl > 0)
-    syslog(LOG_NOTICE, _("Got INT signal"));
+    syslog(LOG_NOTICE, _("Got INT signal, exiting"));
   cleanup_and_exit(0);
 }
 
@@ -450,18 +440,20 @@ RETSIGTYPE
 sigusr2_handler(int a)
 {
   if(debug_lvl > 1)
-    syslog(LOG_NOTICE, _("Forcing new key generation"));
+    syslog(LOG_NOTICE, _("Got USR2 signal, forcing new key generation"));
+/* FIXME: reprogram this.
   regenerate_keys();
+*/
 }
 
 RETSIGTYPE
 sighuh(int a)
 {
   if(cp_file)
-    syslog(LOG_NOTICE, _("Got unexpected signal %d after %s line %d"),
-          a, cp_file, cp_line);
+    syslog(LOG_NOTICE, _("Got unexpected %s after %s line %d"),
+          strsignal(a), cp_file, cp_line);
   else
-    syslog(LOG_NOTICE, _("Got unexpected signal %d"), a);
+    syslog(LOG_NOTICE, _("Got unexpected %s"), strsignal(a));
 }
 
 void
@@ -485,11 +477,10 @@ setup_signals(void)
     signal(SIGINT, sigint_handler);
   signal(SIGUSR1, sigusr1_handler);
   signal(SIGUSR2, sigusr2_handler);
-  signal(SIGCHLD, parent_exit);
+//  signal(SIGCHLD, parent_exit);
 }
 
 RETSIGTYPE parent_exit(int a)
 {
-  syslog(LOG_NOTICE, _("Got SIGCHLD: exitting immediately"));
   exit(0);
 }