ip/tunnel: Unify setup and accept zero address for local/remote endpoints

It is fully legal to submit zero (INADDR_ANY/IN6ADDR_ANY_INIT)
value for local and/or remote endpoints for all tunnel drivers:
no need additionally check this in userspace.

Note that all tunnel specific code already can pass zero address
to the kernel.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>

diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index 208a1f06ab12f06c56bc2db8cd7a85b4f607b851..ce610f8494dae6318c7f28fe9b870398ba04d435 100644 (file)
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -127,16 +127,10 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                        p->iph.frag_off = htons(IP_DF);
                } else if (strcmp(*argv, "remote") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               p->iph.daddr = get_addr32(*argv);
-                       else
-                               p->iph.daddr = htonl(INADDR_ANY);
+                       p->iph.daddr = get_addr32(*argv);
                } else if (strcmp(*argv, "local") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               p->iph.saddr = get_addr32(*argv);
-                       else
-                               p->iph.saddr = htonl(INADDR_ANY);
+                       p->iph.saddr = get_addr32(*argv);
                } else if (strcmp(*argv, "dev") == 0) {
                        NEXT_ARG();
                        medium = *argv;

diff --git a/ip/link_gre.c b/ip/link_gre.c
index 43cb1af6196a1aa0b64cf3e7efd4ad115ae0347c..6f82fb4e6ac0156cfa4f3e7f3548e64ecae3f02e 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -251,12 +251,10 @@ get_failed:
                        pmtudisc = 1;
                } else if (!matches(*argv, "remote")) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               daddr = get_addr32(*argv);
+                       daddr = get_addr32(*argv);
                } else if (!matches(*argv, "local")) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               saddr = get_addr32(*argv);
+                       saddr = get_addr32(*argv);
                } else if (!matches(*argv, "dev")) {
                        NEXT_ARG();
                        link = if_nametoindex(*argv);

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 2804b8f4625914b6ebe1ab43a0e8f8b03a16da2f..5e4dffa60ef1d46c900eaa970c0d4eec493702f6 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -195,16 +195,10 @@ get_failed:
        while (argc > 0) {
                if (strcmp(*argv, "remote") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               raddr = get_addr32(*argv);
-                       else
-                               raddr = 0;
+                       raddr = get_addr32(*argv);
                } else if (strcmp(*argv, "local") == 0) {
                        NEXT_ARG();
-                       if (strcmp(*argv, "any"))
-                               laddr = get_addr32(*argv);
-                       else
-                               laddr = 0;
+                       laddr = get_addr32(*argv);
                } else if (matches(*argv, "dev") == 0) {
                        NEXT_ARG();
                        link = if_nametoindex(*argv);

diff --git a/ip/link_vti.c b/ip/link_vti.c
index 07ac94e7dc6669b95c9e2c8f99174c6f51b99467..05aefa32bdcbfc25f80e971cbac35a36759a8cde 100644 (file)
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -167,20 +167,10 @@ get_failed:
                        okey = uval;
                } else if (!matches(*argv, "remote")) {
                        NEXT_ARG();
-                       if (!strcmp(*argv, "any")) {
-                               fprintf(stderr, "invalid value for \"remote\": \"%s\"\n", *argv);
-                               exit(-1);
-                       } else {
-                               daddr = get_addr32(*argv);
-                       }
+                       daddr = get_addr32(*argv);
                } else if (!matches(*argv, "local")) {
                        NEXT_ARG();
-                       if (!strcmp(*argv, "any")) {
-                               fprintf(stderr, "invalid value for \"local\": \"%s\"\n", *argv);
-                               exit(-1);
-                       } else {
-                               saddr = get_addr32(*argv);
-                       }
+                       saddr = get_addr32(*argv);
                } else if (!matches(*argv, "dev")) {
                        NEXT_ARG();
                        link = if_nametoindex(*argv);

diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index 6d08bfe0f7990f74bb466770e3b38c152de60544..f665520f9f8de16d3feb06ab952cd2f0bd777d79 100644 (file)
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -161,27 +161,17 @@ get_failed:
                        }
                        okey = uval;
                } else if (!matches(*argv, "remote")) {
-                       NEXT_ARG();
-                       if (!strcmp(*argv, "any")) {
-                               fprintf(stderr, "invalid value for \"remote\": \"%s\"\n", *argv);
-                               exit(-1);
-                       } else {
-                               inet_prefix addr;
+                       inet_prefix addr;
 
-                               get_prefix(&addr, *argv, AF_INET6);
-                               memcpy(&daddr, addr.data, addr.bytelen);
-                       }
-               } else if (!matches(*argv, "local")) {
                        NEXT_ARG();
-                       if (!strcmp(*argv, "any")) {
-                               fprintf(stderr, "invalid value for \"local\": \"%s\"\n", *argv);
-                               exit(-1);
-                       } else {
-                               inet_prefix addr;
+                       get_prefix(&addr, *argv, AF_INET6);
+                       memcpy(&daddr, addr.data, addr.bytelen);
+               } else if (!matches(*argv, "local")) {
+                       inet_prefix addr;
 
-                               get_prefix(&addr, *argv, AF_INET6);
-                               memcpy(&saddr, addr.data, addr.bytelen);
-                       }
+                       NEXT_ARG();
+                       get_prefix(&addr, *argv, AF_INET6);
+                       memcpy(&saddr, addr.data, addr.bytelen);
                } else if (!matches(*argv, "dev")) {
                        NEXT_ARG();
                        link = if_nametoindex(*argv);