iptnl/ip6tnl: Unify local/remote endpoint and 6rd address parsing

We are going to merge link_iptnl.c and link_ip6tnl.c and this is final
step to make their diffs clear and show what needs to be changed during
merge.

Note that it is safe to omit endpoint address(es) from netlink create
request as kernel is aware of such case and will use zero for that
endpoint(s).

Make sure we initialize ip6rdprefix and ip6rdrelayprefix bitlen in
link_iptnl.c only when configuring existing tunnel: if kernel does not
submit prefixlen in corresponding attributes preceeding get_addr_rta()
will set bitlen to -1 which is incorrect value.

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

diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 8a45d42b7b78332fa397931512bb8d93df06ce5f..77a909005f69b31ae286c8711492c45e54d96351 100644 (file)
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -93,8 +93,7 @@ static int ip6tunnel_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *linkinfo[IFLA_INFO_MAX+1];
        struct rtattr *iptuninfo[IFLA_IPTUN_MAX + 1];
        int len;
-       struct in6_addr laddr = IN6ADDR_ANY_INIT;
-       struct in6_addr raddr = IN6ADDR_ANY_INIT;
+       inet_prefix saddr, daddr;
        __u8 hop_limit = DEFAULT_TNL_HOP_LIMIT;
        __u8 encap_limit = IPV6_DEFAULT_TNL_ENCAP_LIMIT;
        __u32 flowinfo = 0;
@@ -108,7 +107,12 @@ static int ip6tunnel_parse_opt(struct link_util *lu, int argc, char **argv,
        __u8 metadata = 0;
        __u32 fwmark = 0;
 
+       inet_prefix_reset(&saddr);
+       inet_prefix_reset(&daddr);
+
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
+               const struct rtattr *rta;
+
                if (rtnl_talk(&rth, &req.n, &answer) < 0) {
 get_failed:
                        fprintf(stderr,
@@ -134,13 +138,13 @@ get_failed:
                parse_rtattr_nested(iptuninfo, IFLA_IPTUN_MAX,
                                    linkinfo[IFLA_INFO_DATA]);
 
-               if (iptuninfo[IFLA_IPTUN_LOCAL])
-                       memcpy(&laddr, RTA_DATA(iptuninfo[IFLA_IPTUN_LOCAL]),
-                              sizeof(laddr));
+               rta = iptuninfo[IFLA_IPTUN_LOCAL];
+               if (rta && get_addr_rta(&saddr, rta, AF_INET6))
+                       goto get_failed;
 
-               if (iptuninfo[IFLA_IPTUN_REMOTE])
-                       memcpy(&raddr, RTA_DATA(iptuninfo[IFLA_IPTUN_REMOTE]),
-                              sizeof(raddr));
+               rta = iptuninfo[IFLA_IPTUN_REMOTE];
+               if (rta && get_addr_rta(&daddr, rta, AF_INET6))
+                       goto get_failed;
 
                if (iptuninfo[IFLA_IPTUN_TTL])
                        hop_limit = rta_getattr_u8(iptuninfo[IFLA_IPTUN_TTL]);
@@ -185,17 +189,11 @@ get_failed:
                        else
                                invarg("Cannot guess tunnel mode.", *argv);
                } else if (strcmp(*argv, "remote") == 0) {
-                       inet_prefix addr;
-
                        NEXT_ARG();
-                       get_addr(&addr, *argv, AF_INET6);
-                       memcpy(&raddr, addr.data, sizeof(raddr));
+                       get_addr(&daddr, *argv, AF_INET6);
                } else if (strcmp(*argv, "local") == 0) {
-                       inet_prefix addr;
-
                        NEXT_ARG();
-                       get_addr(&addr, *argv, AF_INET6);
-                       memcpy(&laddr, addr.data, sizeof(laddr));
+                       get_addr(&saddr, *argv, AF_INET6);
                } else if (matches(*argv, "dev") == 0) {
                        NEXT_ARG();
                        link = ll_name_to_index(*argv);
@@ -322,8 +320,14 @@ get_failed:
                return 0;
        }
 
-       addattr_l(n, 1024, IFLA_IPTUN_LOCAL, &laddr, sizeof(laddr));
-       addattr_l(n, 1024, IFLA_IPTUN_REMOTE, &raddr, sizeof(raddr));
+       if (is_addrtype_inet(&saddr)) {
+               addattr_l(n, 1024, IFLA_IPTUN_LOCAL,
+                         saddr.data, saddr.bytelen);
+       }
+       if (is_addrtype_inet(&daddr)) {
+               addattr_l(n, 1024, IFLA_IPTUN_REMOTE,
+                         daddr.data, daddr.bytelen);
+       }
        addattr8(n, 1024, IFLA_IPTUN_TTL, hop_limit);
        addattr8(n, 1024, IFLA_IPTUN_ENCAP_LIMIT, encap_limit);
        addattr32(n, 1024, IFLA_IPTUN_FLOWINFO, flowinfo);

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index bc1074e940be20e3500ea2f868918b9623f981ac..acd9f45b40b4163129418695effc2519cd453b19 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -90,16 +90,11 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
        struct rtattr *linkinfo[IFLA_INFO_MAX+1];
        struct rtattr *iptuninfo[IFLA_IPTUN_MAX + 1];
        int len;
-       __u32 laddr = 0;
-       __u32 raddr = 0;
+       inet_prefix saddr, daddr, ip6rdprefix, ip6rdrelayprefix;
        __u8 pmtudisc = 1;
        __u8 tos = 0;
        __u16 iflags = 0;
        __u8 ttl = 0;
-       struct in6_addr ip6rdprefix = {};
-       __u16 ip6rdprefixlen = 0;
-       __u32 ip6rdrelayprefix = 0;
-       __u16 ip6rdrelayprefixlen = 0;
        __u8 proto = 0;
        __u32 link = 0;
        __u16 encaptype = 0;
@@ -109,7 +104,15 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
        __u8 metadata = 0;
        __u32 fwmark = 0;
 
+       inet_prefix_reset(&saddr);
+       inet_prefix_reset(&daddr);
+
+       inet_prefix_reset(&ip6rdprefix);
+       inet_prefix_reset(&ip6rdrelayprefix);
+
        if (!(n->nlmsg_flags & NLM_F_CREATE)) {
+               const struct rtattr *rta;
+
                if (rtnl_talk(&rth, &req.n, &answer) < 0) {
 get_failed:
                        fprintf(stderr,
@@ -135,11 +138,27 @@ get_failed:
                parse_rtattr_nested(iptuninfo, IFLA_IPTUN_MAX,
                                    linkinfo[IFLA_INFO_DATA]);
 
-               if (iptuninfo[IFLA_IPTUN_LOCAL])
-                       laddr = rta_getattr_u32(iptuninfo[IFLA_IPTUN_LOCAL]);
+               rta = iptuninfo[IFLA_IPTUN_LOCAL];
+               if (rta && get_addr_rta(&saddr, rta, AF_INET))
+                       goto get_failed;
+
+               rta = iptuninfo[IFLA_IPTUN_REMOTE];
+               if (rta && get_addr_rta(&daddr, rta, AF_INET))
+                       goto get_failed;
+
+               rta = iptuninfo[IFLA_IPTUN_6RD_PREFIX];
+               if (rta && get_addr_rta(&ip6rdprefix, rta, AF_INET6))
+                       goto get_failed;
+
+               rta = iptuninfo[IFLA_IPTUN_6RD_RELAY_PREFIX];
+               if (rta && get_addr_rta(&ip6rdrelayprefix, rta, AF_INET))
+                       goto get_failed;
+
+               rta = iptuninfo[IFLA_IPTUN_6RD_PREFIXLEN];
+               ip6rdprefix.bitlen = rta ? rta_getattr_u16(rta) : 0;
 
-               if (iptuninfo[IFLA_IPTUN_REMOTE])
-                       raddr = rta_getattr_u32(iptuninfo[IFLA_IPTUN_REMOTE]);
+               rta = iptuninfo[IFLA_IPTUN_6RD_RELAY_PREFIXLEN];
+               ip6rdrelayprefix.bitlen = rta ? rta_getattr_u16(rta) : 0;
 
                if (iptuninfo[IFLA_IPTUN_TTL])
                        ttl = rta_getattr_u8(iptuninfo[IFLA_IPTUN_TTL]);
@@ -168,22 +187,7 @@ get_failed:
                        encapsport = rta_getattr_u16(iptuninfo[IFLA_IPTUN_ENCAP_SPORT]);
                if (iptuninfo[IFLA_IPTUN_ENCAP_DPORT])
                        encapdport = rta_getattr_u16(iptuninfo[IFLA_IPTUN_ENCAP_DPORT]);
-               if (iptuninfo[IFLA_IPTUN_6RD_PREFIX])
-                       memcpy(&ip6rdprefix,
-                              RTA_DATA(iptuninfo[IFLA_IPTUN_6RD_PREFIX]),
-                              sizeof(laddr));
-
-               if (iptuninfo[IFLA_IPTUN_6RD_PREFIXLEN])
-                       ip6rdprefixlen =
-                               rta_getattr_u16(iptuninfo[IFLA_IPTUN_6RD_PREFIXLEN]);
-
-               if (iptuninfo[IFLA_IPTUN_6RD_RELAY_PREFIX])
-                       ip6rdrelayprefix =
-                               rta_getattr_u32(iptuninfo[IFLA_IPTUN_6RD_RELAY_PREFIX]);
-
-               if (iptuninfo[IFLA_IPTUN_6RD_RELAY_PREFIXLEN])
-                       ip6rdrelayprefixlen =
-                               rta_getattr_u16(iptuninfo[IFLA_IPTUN_6RD_RELAY_PREFIXLEN]);
+
                if (iptuninfo[IFLA_IPTUN_COLLECT_METADATA])
                        metadata = 1;
 
@@ -214,10 +218,10 @@ get_failed:
                                invarg("Cannot guess tunnel mode.", *argv);
                } else if (strcmp(*argv, "remote") == 0) {
                        NEXT_ARG();
-                       raddr = get_addr32(*argv);
+                       get_addr(&daddr, *argv, AF_INET);
                } else if (strcmp(*argv, "local") == 0) {
                        NEXT_ARG();
-                       laddr = get_addr32(*argv);
+                       get_addr(&saddr, *argv, AF_INET);
                } else if (matches(*argv, "dev") == 0) {
                        NEXT_ARG();
                        link = ll_name_to_index(*argv);
@@ -289,29 +293,16 @@ get_failed:
                } else if (strcmp(*argv, "external") == 0) {
                        metadata = 1;
                } else if (strcmp(*argv, "6rd-prefix") == 0) {
-                       inet_prefix prefix;
-
                        NEXT_ARG();
-                       if (get_prefix(&prefix, *argv, AF_INET6))
+                       if (get_prefix(&ip6rdprefix, *argv, AF_INET6))
                                invarg("invalid 6rd_prefix\n", *argv);
-                       memcpy(&ip6rdprefix, prefix.data, 16);
-                       ip6rdprefixlen = prefix.bitlen;
                } else if (strcmp(*argv, "6rd-relay_prefix") == 0) {
-                       inet_prefix prefix;
-
                        NEXT_ARG();
-                       if (get_prefix(&prefix, *argv, AF_INET))
+                       if (get_prefix(&ip6rdrelayprefix, *argv, AF_INET))
                                invarg("invalid 6rd-relay_prefix\n", *argv);
-                       memcpy(&ip6rdrelayprefix, prefix.data, 4);
-                       ip6rdrelayprefixlen = prefix.bitlen;
                } else if (strcmp(*argv, "6rd-reset") == 0) {
-                       inet_prefix prefix;
-
-                       get_prefix(&prefix, "2002::", AF_INET6);
-                       memcpy(&ip6rdprefix, prefix.data, 16);
-                       ip6rdprefixlen = 16;
-                       ip6rdrelayprefix = 0;
-                       ip6rdrelayprefixlen = 0;
+                       get_prefix(&ip6rdprefix, "2002::/16", AF_INET6);
+                       inet_prefix_reset(&ip6rdrelayprefix);
                } else if (strcmp(*argv, "fwmark") == 0) {
                        NEXT_ARG();
                        if (get_u32(&fwmark, *argv, 0))
@@ -334,8 +325,14 @@ get_failed:
                return 0;
        }
 
-       addattr32(n, 1024, IFLA_IPTUN_LOCAL, laddr);
-       addattr32(n, 1024, IFLA_IPTUN_REMOTE, raddr);
+       if (is_addrtype_inet(&saddr)) {
+               addattr_l(n, 1024, IFLA_IPTUN_LOCAL,
+                         saddr.data, saddr.bytelen);
+       }
+       if (is_addrtype_inet(&daddr)) {
+               addattr_l(n, 1024, IFLA_IPTUN_REMOTE,
+                         daddr.data, daddr.bytelen);
+       }
        addattr8(n, 1024, IFLA_IPTUN_PMTUDISC, pmtudisc);
        addattr8(n, 1024, IFLA_IPTUN_TOS, tos);
        addattr8(n, 1024, IFLA_IPTUN_TTL, ttl);
@@ -349,15 +346,17 @@ get_failed:
 
        if (strcmp(lu->id, "sit") == 0) {
                addattr16(n, 1024, IFLA_IPTUN_FLAGS, iflags);
-               if (ip6rdprefixlen) {
+               if (is_addrtype_inet(&ip6rdprefix)) {
                        addattr_l(n, 1024, IFLA_IPTUN_6RD_PREFIX,
-                                 &ip6rdprefix, sizeof(ip6rdprefix));
+                                 ip6rdprefix.data, ip6rdprefix.bytelen);
                        addattr16(n, 1024, IFLA_IPTUN_6RD_PREFIXLEN,
-                                 ip6rdprefixlen);
+                                 ip6rdprefix.bitlen);
+               }
+               if (is_addrtype_inet(&ip6rdrelayprefix)) {
                        addattr32(n, 1024, IFLA_IPTUN_6RD_RELAY_PREFIX,
-                                 ip6rdrelayprefix);
+                                 ip6rdrelayprefix.data[0]);
                        addattr16(n, 1024, IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
-                                 ip6rdrelayprefixlen);
+                                 ip6rdrelayprefix.bitlen);
                }
        }