aboutsummaryrefslogtreecommitdiff
path: root/src/vpn/gnunet-vpn.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-09-22 14:37:41 +0000
committerChristian Grothoff <christian@grothoff.org>2013-09-22 14:37:41 +0000
commitf3658260ec94e9874e0c773c762b4b49fda29b8e (patch)
treec452b52f0d01316322fefabcb49f3d909666669d /src/vpn/gnunet-vpn.c
parentd80bcf63863d4f2203d76edb8934cbd808ed9e77 (diff)
downloadgnunet-f3658260ec94e9874e0c773c762b4b49fda29b8e.tar.gz
gnunet-f3658260ec94e9874e0c773c762b4b49fda29b8e.zip
remove 'nac' option from VPN, always return IP immediately, always build mesh tunnel asynchronously afterwards
Diffstat (limited to 'src/vpn/gnunet-vpn.c')
-rw-r--r--src/vpn/gnunet-vpn.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index 6402e1063..4c8dc43c0 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -80,11 +80,6 @@ static int udp;
80static int verbosity; 80static int verbosity;
81 81
82/** 82/**
83 * Option '-a': Notify only once the tunnel is connected?
84 */
85static int nac;
86
87/**
88 * Global return value. 83 * Global return value.
89 */ 84 */
90static int ret; 85static int ret;
@@ -246,7 +241,6 @@ run (void *cls, char *const *args, const char *cfgfile,
246 protocol, 241 protocol,
247 &peer, 242 &peer,
248 &sd, 243 &sd,
249 nac,
250 etime, 244 etime,
251 &allocation_cb, NULL); 245 &allocation_cb, NULL);
252 } 246 }
@@ -275,7 +269,6 @@ run (void *cls, char *const *args, const char *cfgfile,
275 req_af, 269 req_af,
276 dst_af, 270 dst_af,
277 addr, 271 addr,
278 nac,
279 etime, 272 etime,
280 &allocation_cb, NULL); 273 &allocation_cb, NULL);
281 } 274 }
@@ -297,9 +290,6 @@ main (int argc, char *const *argv)
297 {'6', "ipv6", NULL, 290 {'6', "ipv6", NULL,
298 gettext_noop ("request that result should be an IPv6 address"), 291 gettext_noop ("request that result should be an IPv6 address"),
299 0, &GNUNET_GETOPT_set_one, &ipv6}, 292 0, &GNUNET_GETOPT_set_one, &ipv6},
300 {'a', "after-connect", NULL,
301 gettext_noop ("print IP address only after mesh tunnel has been created"),
302 0, &GNUNET_GETOPT_set_one, &ipv6},
303 {'d', "duration", "TIME", 293 {'d', "duration", "TIME",
304 gettext_noop ("how long should the mapping be valid for new tunnels?"), 294 gettext_noop ("how long should the mapping be valid for new tunnels?"),
305 1, &GNUNET_GETOPT_set_relative_time, &duration}, 295 1, &GNUNET_GETOPT_set_relative_time, &duration},