diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-30 21:21:49 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-30 21:21:49 +0000 |
commit | 77c03065a39f869a188b4e2e8cd6a88dc7a02fc8 (patch) | |
tree | cdce3e214df170eaa8106459a44fc2a82b70a629 /src/vpn/gnunet-helper-vpn.c | |
parent | 84dc557dc24e981d8c9a85b1bb087a4d803225a4 (diff) | |
download | gnunet-77c03065a39f869a188b4e2e8cd6a88dc7a02fc8.tar.gz gnunet-77c03065a39f869a188b4e2e8cd6a88dc7a02fc8.zip |
-also run if system does not support IPv4 or IPv6 at all - #2123
Diffstat (limited to 'src/vpn/gnunet-helper-vpn.c')
-rw-r--r-- | src/vpn/gnunet-helper-vpn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index 5a1b708e2..5903255f8 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c | |||
@@ -530,10 +530,10 @@ PROCESS_BUFFER: | |||
530 | * @param argc must be 6 | 530 | * @param argc must be 6 |
531 | * @param argv 0: binary name (gnunet-helper-vpn) | 531 | * @param argv 0: binary name (gnunet-helper-vpn) |
532 | * 1: tunnel interface name (gnunet-vpn) | 532 | * 1: tunnel interface name (gnunet-vpn) |
533 | * 2: IPv6 address (::1) | 533 | * 2: IPv6 address (::1), "-" to disable |
534 | * 3: IPv6 netmask length in bits (64) | 534 | * 3: IPv6 netmask length in bits (64), ignored if #2 is "-" |
535 | * 4: IPv4 address (1.2.3.4) | 535 | * 4: IPv4 address (1.2.3.4), "-" to disable |
536 | * 5: IPv4 netmask (255.255.0.0) | 536 | * 5: IPv4 netmask (255.255.0.0), ignored if #4 is "-" |
537 | */ | 537 | */ |
538 | int | 538 | int |
539 | main (int argc, char **argv) | 539 | main (int argc, char **argv) |
@@ -562,6 +562,7 @@ main (int argc, char **argv) | |||
562 | return 1; | 562 | return 1; |
563 | } | 563 | } |
564 | 564 | ||
565 | if (0 != strcmp (argv[2], "-")) | ||
565 | { | 566 | { |
566 | const char *address = argv[2]; | 567 | const char *address = argv[2]; |
567 | long prefix_len = atol (argv[3]); | 568 | long prefix_len = atol (argv[3]); |
@@ -575,6 +576,7 @@ main (int argc, char **argv) | |||
575 | set_address6 (dev, address, prefix_len); | 576 | set_address6 (dev, address, prefix_len); |
576 | } | 577 | } |
577 | 578 | ||
579 | if (0 != strcmp (argv[4], "-")) | ||
578 | { | 580 | { |
579 | const char *address = argv[4]; | 581 | const char *address = argv[4]; |
580 | const char *mask = argv[5]; | 582 | const char *mask = argv[5]; |