--- gvpe/src/vped.C	2003/10/14 19:57:55	1.10
+++ gvpe/src/vped.C	2004/06/11 15:56:36	1.19
@@ -1,8 +1,8 @@
 /*
-    vped.C -- the main file for vped
+    vped.C -- the main file for gvpe
     Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
                   2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-                  2003      Marc Lehmannn <pcg@goof.com>
+                  2003-2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
 
 #include <cstdio>
 #include <cstring>
+#include <cstdlib>
+#include <clocale>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -49,8 +51,6 @@
 #include "vpn.h"
 #include "iom.h"
 
-vpn network;
-
 static loglevel llevel = L_NONE;
 
 /* If nonzero, display usage information and exit. */
@@ -151,8 +151,8 @@
 {
   network.shutdown_all ();
 
-  if (pidfilename)
-    remove_pid (pidfilename);
+  if (conf.pidfilename)
+    remove_pid (conf.pidfilename);
 
   slog (L_INFO, _("terminating with exit code %d"), c);
 
@@ -224,6 +224,7 @@
     {
       printf (_("%s version %s (built %s %s, protocol %d.%d)\n"), get_identity (),
               VERSION, __DATE__, __TIME__, PROTOCOL_MAJOR, PROTOCOL_MINOR);
+      printf (_("Built with kernel interface %s/%s.\n"), IFTYPE, IFSUBTYPE);
       printf (_
               ("Copyright (C) 2003 Marc Lehmann <vpe@plan9.de> and others.\n"
                "See the AUTHORS file for a complete list.\n\n"
@@ -247,7 +248,6 @@
       slog (L_ERR, _("system call `%s' failed: %s"), "mlockall", strerror (errno));
 #endif
 
-  make_names ();
   conf.read_config (true);
 
   set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
@@ -256,23 +256,23 @@
 
   if (!THISNODE)
     {
-      slog (L_ERR, _("current node not set, or node '%s' not found in configfile, use the -n switch when starting vped."),
+      slog (L_ERR, _("current node not set, or node '%s' not found in configfile, specify the nodename when starting vped."),
             thisnode ? thisnode : "<unset>");
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 
   if (detach (do_detach))
-    exit (0);
+    exit (EXIT_SUCCESS);
 
   setup_signals ();
 
   if (!network.setup ())
     {
       iom.loop ();
-      cleanup_and_exit (1);
+      cleanup_and_exit (EXIT_FAILURE);
     }
 
   slog (L_ERR, _("unable to setup network, unrecoverable error, exiting."));
-  cleanup_and_exit (1);
+  cleanup_and_exit (EXIT_FAILURE);
 }