X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=system-linux.c;h=471efffcd2876d5da733c44981240e67cd8527d0;hp=b7297fd6a6d8cfc08a63321a3d2a4deb8b24ea56;hb=5fbd904e5b4ed87243c09c86adcfb17ae93aa4f5;hpb=7e3b89a4d4c0b55a9b2376b88cbe72a1edc5cd82

diff --git a/system-linux.c b/system-linux.c
index b7297fd..471efff 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -2462,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);
@@ -2488,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])) {
@@ -2535,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);