-doxygen, following naming conventions

[oweals/gnunet.git] / src / vpn / gnunet-vpn.c

diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index 74c9956e2840606f8fe2fa327aec33fd56de60aa..6402e1063af46c93d965c8feecad7db2d690bde8 100644 (file)
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -92,7 +92,7 @@ static int ret;
 /**
  * Option '-d': duration of the mapping
  */
-static unsigned long long duration = 5 * 60;
+static struct GNUNET_TIME_Relative duration = { 5 * 60 * 1000} ;
 
 
 /**
@@ -137,12 +137,13 @@ allocation_cb (void *cls,
 {
   char buf[INET6_ADDRSTRLEN];
 
+  request = NULL;
   switch (af)
   {
   case AF_INET6:
   case AF_INET:
     FPRINTF (stdout,
-            "%s",
+            "%s\n",
             inet_ntop (af, address, buf, sizeof (buf)));
     break;
   case AF_UNSPEC:
@@ -172,15 +173,14 @@ run (void *cls, char *const *args, const char *cfgfile,
   int dst_af;
   int req_af;
   struct GNUNET_PeerIdentity peer; 
-  GNUNET_HashCode sd;
+  struct GNUNET_HashCode sd;
   const void *addr;
   struct in_addr v4;
   struct in6_addr v6;
   uint8_t protocol;
   struct GNUNET_TIME_Absolute etime;
 
-  etime = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
-                                                                          (unsigned int) duration));
+  etime = GNUNET_TIME_relative_to_absolute (duration);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                &do_disconnect, NULL);
   handle = GNUNET_VPN_connect (cfg);
@@ -300,9 +300,9 @@ main (int argc, char *const *argv)
     {'a', "after-connect", NULL,
      gettext_noop ("print IP address only after mesh tunnel has been created"),
      0, &GNUNET_GETOPT_set_one, &ipv6},
-    {'d', "duration", "SECONDS",
+    {'d', "duration", "TIME",
      gettext_noop ("how long should the mapping be valid for new tunnels?"),
-     1, &GNUNET_GETOPT_set_ulong, &duration},
+     1, &GNUNET_GETOPT_set_relative_time, &duration},
     {'i', "ip", "IP",
      gettext_noop ("destination IP for the tunnel"),
      1, &GNUNET_GETOPT_set_string, &target_ip},
@@ -311,7 +311,7 @@ main (int argc, char *const *argv)
      1, &GNUNET_GETOPT_set_string, &peer_id},
     {'s', "service", "NAME",
      gettext_noop ("name of the service we would like to access"),
-     1, &GNUNET_GETOPT_set_string, &peer_id},
+     1, &GNUNET_GETOPT_set_string, &service_name},
     {'t', "tcp", NULL,
      gettext_noop ("service is offered via TCP"),
      0, &GNUNET_GETOPT_set_one, &tcp},
@@ -322,11 +322,16 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_OPTION_VERBOSE (&verbosity),
     GNUNET_GETOPT_OPTION_END
   };
-  return (GNUNET_OK ==
-          GNUNET_PROGRAM_run (argc, argv, "gnunet-vpn",
-                              gettext_noop
-                              ("Setup tunnels via VPN."), options,
+  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+    return 2;
+
+  ret = (GNUNET_OK ==
+        GNUNET_PROGRAM_run (argc, argv, "gnunet-vpn",
+                            gettext_noop
+                            ("Setup tunnels via VPN."), options,
                               &run, NULL)) ? ret : 1;
+  GNUNET_free ((void *) argv);
+  return ret;
 }