--- gvpe/src/vped.C	2003/03/01 15:53:03	1.1
+++ gvpe/src/vped.C	2003/03/21 23:17:01	1.3
@@ -44,9 +44,12 @@
 #include "slog.h"
 #include "util.h"
 #include "protocol.h"
+#include "iom.h"
 
 vpn network;
 
+static loglevel llevel = L_NONE;
+
 /* If nonzero, display usage information and exit. */
 static int show_help;
 
@@ -128,11 +131,9 @@
 
         case 'l':		/* inc debug level */
           {
-            loglevel l = string_to_loglevel (optarg);
+            llevel = string_to_loglevel (optarg);
 
-            if (l != L_NONE)
-              set_loglevel (l);
-            else
+            if (llevel == L_NONE)
               slog (L_WARN, "'%s': %s", optarg, UNKNOWN_LOGLEVEL);
           }
           break;
@@ -168,12 +169,14 @@
 sigterm_handler (int a)
 {
   network.events |= vpn::EVENT_SHUTDOWN;
+  network.event.start (0);
 }
 
 RETSIGTYPE
 sighup_handler (int a)
 {
   network.events |= vpn::EVENT_RECONNECT;
+  network.event.start (0);
 }
 
 RETSIGTYPE
@@ -246,9 +249,9 @@
   make_names ();
   conf.read_config (true);
 
-  RAND_load_file ("/dev/urandom", 1024);
+  set_loglevel (llevel != L_NONE ? llevel : conf.llevel);
 
-  //OpenSSL_add_all_algorithms ();
+  RAND_load_file ("/dev/urandom", 1024);
 
   if (!THISNODE)
     {
@@ -264,7 +267,7 @@
 
   if (!network.setup ())
     {
-      network.main_loop ();
+      iom.loop ();
       cleanup_and_exit (1);
     }