Fix changing tunnel remote and local address to any

If a tunnel is created with a local address, you can't change it to any.

 # ip tunnel add tunl1 mode ipip remote 10.16.42.37 local 10.16.42.214 ttl 64
 # ip tunnel show tunl1
 tunl1: ip/ip  remote 10.16.42.37  local 10.16.42.214  ttl 64
 # ip tunnel change tunl1 local any
 # echo $?
 0
 # ip tunnel show tunl1
 tunl1: ip/ip  remote 10.16.42.37  local 10.16.42.214  ttl 64

It happens that parse_args zeroes ip_tunnel_parm, and when creating the
tunnel, it is OK to leave it as is if the address is any. However, when
changing the tunnel, the current parameters will be read from
ip_tunnel_parm, and local and remote address won't be zeroes anymore, so
it needs to be explicitly set to any.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>

diff --git a/ip/iptunnel.c b/ip/iptunnel.c
index be84b83ec67331674f16b5da5db04ee6711ddc8f..78fa9885b3ed1b1ccd0bd2480a454911fce79667 100644 (file)
--- a/ip/iptunnel.c
+++ b/ip/iptunnel.c
@@ -167,10 +167,14 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
                        NEXT_ARG();
                        if (strcmp(*argv, "any"))
                                p->iph.daddr = get_addr32(*argv);
+                       else
+                               p->iph.daddr = htonl(INADDR_ANY);
                } 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);
                } else if (strcmp(*argv, "dev") == 0) {
                        NEXT_ARG();
                        strncpy(medium, *argv, IFNAMSIZ-1);