aboutsummaryrefslogtreecommitdiff
path: root/src/vpn/gnunet-vpn.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-01-24 10:16:44 +0000
committerChristian Grothoff <christian@grothoff.org>2013-01-24 10:16:44 +0000
commitf1649b1c350008f59a99051c5cfefe8ce998b2f3 (patch)
treef1465066b6fb5bd7080300f8a3eaf5ba129be391 /src/vpn/gnunet-vpn.c
parenteb7e0beb4eeb7897e25b1afbd9575e9111199e43 (diff)
-parse time nicely
Diffstat (limited to 'src/vpn/gnunet-vpn.c')
-rw-r--r--src/vpn/gnunet-vpn.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index 61d145c6e6..6402e1063a 100644
--- 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} ;
/**
@@ -180,8 +180,7 @@ run (void *cls, char *const *args, const char *cfgfile,
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);
@@ -301,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},