--- gvpe/src/gvpe.C	2009/03/23 15:22:00	1.17
+++ gvpe/src/gvpe.C	2011/03/08 17:33:30	1.20
@@ -2,7 +2,7 @@
     gvpe.C -- the main file for gvpe
     Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
                   2000-2002 Guus Sliepen <guus@sliepen.eu.org>
-                  2003-2008 Marc Lehmann <gvpe@schmorp.de>
+                  2003-2011 Marc Lehmann <gvpe@schmorp.de>
  
     This file is part of GVPE.
 
@@ -77,15 +77,15 @@
 static int do_detach = 1;
 
 static struct option const long_options[] =
-    {
-      {"config", required_argument, NULL, 'c'},
-      {"help", no_argument, &show_help, 1},
-      {"version", no_argument, &show_version, 1},
-      {"no-detach", no_argument, &do_detach, 0},
-      {"log-level", required_argument, NULL, 'l'},
-      {"mlock", no_argument, &do_mlock, 1},
-      {NULL, 0, NULL, 0}
-    };
+{
+  {"config", required_argument, NULL, 'c'},
+  {"help", no_argument, &show_help, 1},
+  {"version", no_argument, &show_version, 1},
+  {"no-detach", no_argument, &do_detach, 0},
+  {"log-level", required_argument, NULL, 'l'},
+  {"mlock", no_argument, &do_mlock, 1},
+  {NULL, 0, NULL, 0}
+};
 
 static void
 usage (int status)
@@ -108,7 +108,7 @@
   exit (status);
 }
 
-void
+static void
 parse_options (int argc, char **argv, char **envp)
 {
   int r;
@@ -151,10 +151,9 @@
     }
 }
 
-/*
-  Close network connections, and terminate neatly
-*/
-void cleanup_and_exit(int c)
+// close network connections, and terminate neatly
+static void
+cleanup_and_exit (int c)
 {
   network.shutdown_all ();
 
@@ -166,35 +165,33 @@
   exit (c);
 }
 
-/*
-  Signal handlers.
-*/
-RETSIGTYPE
+// signal handlers
+static RETSIGTYPE
 sigterm_handler (int a)
 {
   network.events |= vpn::EVENT_SHUTDOWN;
   network.event.start ();
 }
 
-RETSIGTYPE
+static RETSIGTYPE
 sighup_handler (int a)
 {
   network.events |= vpn::EVENT_RECONNECT;
   network.event.start ();
 }
 
-RETSIGTYPE
+static RETSIGTYPE
 sigusr1_handler (int a)
 {
   network.dump_status ();
 }
 
-RETSIGTYPE
+static RETSIGTYPE
 sigusr2_handler (int a)
 {
 }
 
-void
+static void
 setup_signals (void)
 {
   struct sigaction act;
@@ -211,6 +208,17 @@
   act.sa_handler = sigterm_handler; sigaction (SIGTERM, &act, NULL);
 }
 
+struct Xob {//D
+  void wcbx ()
+  {
+    printf ("wcbx %p\n", pthread_self());
+  }
+  void dcbx ()
+  {
+    printf ("dcbx %p\n", pthread_self());
+  }
+};
+
 int
 main (int argc, char **argv, char **envp)
 {
@@ -291,7 +299,7 @@
 
   if (!network.setup ())
     {
-      ev_loop (EV_DEFAULT_ 0);
+      ev_run (EV_DEFAULT_ 0);
       cleanup_and_exit (EXIT_FAILURE);
     }