X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=b790d7a14075fee88e28f8ae1105bfc3356ec667;hp=f9cd82ffee8c08716e6feeeda3b4b1a96a241672;hb=82e383710980534d38bb9a8ef22f20677cd85861;hpb=5dc4ade0b9c127a3c144d9c59894bf13527fe060

diff --git a/src/tincd.c b/src/tincd.c
index f9cd82ff..b790d7a1 100644
--- 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.49 2001/07/04 08:43:32 guus Exp $
+    $Id: tincd.c,v 1.10.4.53 2001/10/27 12:13:17 guus Exp $
 */
 
 #include "config.h"
@@ -78,12 +78,13 @@ char **environment;              /* A pointer to the environment on
 static struct option const long_options[] =
 {
   { "config", required_argument, NULL, 'c' },
-  { "kill", no_argument, NULL, 'k' },
+  { "kill", optional_argument, NULL, 'k' },
   { "net", required_argument, NULL, 'n' },
   { "help", no_argument, &show_help, 1 },
   { "version", no_argument, &show_version, 1 },
   { "no-detach", no_argument, &do_detach, 0 },
   { "generate-keys", optional_argument, NULL, 'K'},
+  { "debug", optional_argument, NULL, 'd'},
   { NULL, 0, NULL, 0 }
 };
 
@@ -97,8 +98,8 @@ usage(int status)
       printf(_("Usage: %s [option]...\n\n"), program_name);
       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"
+	       "  -d, --debug[=LEVEL]        Increase debug level or set it to LEVEL.\n"
+	       "  -k, --kill[=SIGNAL]        Attempt to kill a running tincd and exit.\n"
 	       "  -n, --net=NETNAME          Connect to net NETNAME.\n"));
       printf(_("  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
                "      --help                 Display this help and exit.\n"
@@ -114,7 +115,7 @@ parse_options(int argc, char **argv, char **envp)
   int r;
   int option_index = 0;
   
-  while((r = getopt_long(argc, argv, "c:Ddkn:K::", long_options, &option_index)) != EOF)
+  while((r = getopt_long(argc, argv, "c:Dd::k::n:K::", long_options, &option_index)) != EOF)
     {
       switch(r)
         {
@@ -134,7 +135,7 @@ parse_options(int argc, char **argv, char **envp)
 	    debug_lvl++;
 	  break;
 	case 'k': /* kill old tincds */
-	  kill_tincd = 1;
+	  kill_tincd = optarg?atoi(optarg):SIGTERM;
 	  break;
 	case 'n': /* net name given */
 	  netname = xmalloc(strlen(optarg)+1);
@@ -204,7 +205,7 @@ int keygen(int bits)
 {
   RSA *rsa_key;
   FILE *f;
-  config_t const *cfg;
+  char *name = NULL;
   char *filename;
 
   fprintf(stderr, _("Generating %d bits keys:\n"), bits);
@@ -212,16 +213,18 @@ int keygen(int bits)
 
   if(!rsa_key)
     {
-      fprintf(stderr, _("Error during key generation!"));
+      fprintf(stderr, _("Error during key generation!\n"));
       return -1;
-     }
+    }
   else
     fprintf(stderr, _("Done.\n"));
 
-  if(config && (cfg = get_config_val(config, config_name)))
-    asprintf(&filename, "%s/hosts/%s", confbase, cfg->data.ptr);
+  get_config_string(lookup_config(config_tree, "Name"), &name);
+
+  if(name)
+    asprintf(&filename, "%s/hosts/%s", confbase, name);
   else
-    asprintf(&filename, "%s/rsa_key.priv", confbase);
+    asprintf(&filename, "%s/rsa_key.pub", confbase);
 
   if((f = ask_and_safe_open(filename, _("public RSA key"), "a")) == NULL)
     return -1;
@@ -328,7 +331,7 @@ cp
     }
     
   if(kill_tincd)
-    exit(kill_other());
+    exit(kill_other(kill_tincd));
 
   if(read_server_config())
     exit(1);
@@ -349,8 +352,8 @@ cp
 
       if(do_detach)
         {
-          syslog(LOG_NOTICE, _("Restarting in %d seconds!"), MAXTIMEOUT);
-          sleep(MAXTIMEOUT);
+          syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
+          sleep(maxtimeout);
         }
       else
         {