interface-ip: set prefix indicator flag when IPv6 prefix lifetime changes

[project/netifd.git] / system-linux.c

diff --git a/system-linux.c b/system-linux.c
index 8888047..471efff 100644 (file)
--- a/system-linux.c
+++ b/system-linux.c
@@ -2316,31 +2316,41 @@ static int system_add_gre_tunnel(const char *name, const char *kind,
                }
        }
 
-       if ((cur = tb[TUNNEL_ATTR_INFO]) && (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)) {
-               uint8_t icsum, ocsum, iseqno, oseqno;
-               if (sscanf(blobmsg_get_string(cur), "%u,%u,%hhu,%hhu,%hhu,%hhu",
-                       &ikey, &okey, &icsum, &ocsum, &iseqno, &oseqno) < 6) {
-                       ret = -EINVAL;
-                       goto failure;
-               }
+       if ((cur = tb[TUNNEL_ATTR_DATA])) {
+               struct blob_attr *tb_data[__GRE_DATA_ATTR_MAX];
 
-               if (ikey)
-                       iflags |= GRE_KEY;
+               blobmsg_parse(gre_data_attr_list.params, __GRE_DATA_ATTR_MAX, tb_data,
+                       blobmsg_data(cur), blobmsg_len(cur));
+
+               if ((cur = tb_data[GRE_DATA_IKEY])) {
+                       if ((ikey = blobmsg_get_u32(cur)))
+                               iflags |= GRE_KEY;
+               }
 
-               if (okey)
-                       oflags |= GRE_KEY;
+               if ((cur = tb_data[GRE_DATA_OKEY])) {
+                       if ((okey = blobmsg_get_u32(cur)))
+                               oflags |= GRE_KEY;
+               }
 
-               if (icsum)
-                       iflags |= GRE_CSUM;
+               if ((cur = tb_data[GRE_DATA_ICSUM])) {
+                       if (blobmsg_get_bool(cur))
+                               iflags |= GRE_CSUM;
+               }
 
-               if (ocsum)
-                       oflags |= GRE_CSUM;
+               if ((cur = tb_data[GRE_DATA_OCSUM])) {
+                       if (blobmsg_get_bool(cur))
+                               oflags |= GRE_CSUM;
+               }
 
-               if (iseqno)
-                       iflags |= GRE_SEQ;
+               if ((cur = tb_data[GRE_DATA_ISEQNO])) {
+                       if (blobmsg_get_bool(cur))
+                               iflags |= GRE_SEQ;
+               }
 
-               if (oseqno)
-                       oflags |= GRE_SEQ;
+               if ((cur = tb[GRE_DATA_OSEQNO])) {
+                       if (blobmsg_get_bool(cur))
+                               oflags |= GRE_SEQ;
+               }
        }
 
        if (v6) {
@@ -2452,7 +2462,6 @@ static int system_add_vti_tunnel(const char *name, const char *kind,
        struct nl_msg *nlm;
        struct ifinfomsg ifi = { .ifi_family = AF_UNSPEC, };
        struct blob_attr *cur;
-       uint32_t ikey = 0, okey = 0;
        int ret = 0;
 
        nlm = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST | NLM_F_REPLACE | NLM_F_CREATE);
@@ -2478,14 +2487,6 @@ static int system_add_vti_tunnel(const char *name, const char *kind,
        if (link)
                nla_put_u32(nlm, IFLA_VTI_LINK, link);
 
-       if ((cur = tb[TUNNEL_ATTR_INFO]) && (blobmsg_type(cur) == BLOBMSG_TYPE_STRING)) {
-               if (sscanf(blobmsg_get_string(cur), "%u,%u",
-                       &ikey, &okey) < 2) {
-                       ret = -EINVAL;
-                       goto failure;
-               }
-       }
-
        if (v6) {
                struct in6_addr in6buf;
                if ((cur = tb[TUNNEL_ATTR_LOCAL])) {
@@ -2525,11 +2526,23 @@ static int system_add_vti_tunnel(const char *name, const char *kind,
 
        }
 
-       if (okey)
-               nla_put_u32(nlm, IFLA_VTI_OKEY, htonl(okey));
+       if ((cur = tb[TUNNEL_ATTR_DATA])) {
+               struct blob_attr *tb_data[__VTI_DATA_ATTR_MAX];
+               uint32_t ikey = 0, okey = 0;
 
-       if (ikey)
-               nla_put_u32(nlm, IFLA_VTI_IKEY, htonl(ikey));
+               blobmsg_parse(vti_data_attr_list.params, __VTI_DATA_ATTR_MAX, tb_data,
+                       blobmsg_data(cur), blobmsg_len(cur));
+
+               if ((cur = tb_data[VTI_DATA_IKEY])) {
+                       if ((ikey = blobmsg_get_u32(cur)))
+                               nla_put_u32(nlm, IFLA_VTI_IKEY, htonl(ikey));
+               }
+
+               if ((cur = tb_data[VTI_DATA_OKEY])) {
+                       if ((okey = blobmsg_get_u32(cur)))
+                               nla_put_u32(nlm, IFLA_VTI_OKEY, htonl(okey));
+               }
+       }
 
        nla_nest_end(nlm, infodata);
        nla_nest_end(nlm, linkinfo);