From patchwork Tue Mar 14 20:36:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 738925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vjRPg5MK5z9s06 for ; Wed, 15 Mar 2017 07:37:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="J0/sBbGL"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dM1SiB2X"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Wfe6nHyzGaBuh7AGuShPjol+DUok8uw5Hp/+t+MbJps=; b=J0/sBbGLwD8hOJ 0kdvtcvo09y/dbp+akKQ4JDVP5M9OuYPoavmp6QgS6fJzNwGJK9W5m8Nmiwh+l+kShvN9A5RyIbLP KyWeuUluRvMbdNVCREAbaQLbyOOiRq6nvCCmcMhQq9OpM4HuJkJSWJM2zLdwY5zJ3QUEI3kzyEDXl ZsdYrc8rTP519YLp93Vn+batHMeW2nEUllCsIUxkNlO8aqz1SEDIyLnHe15hcnlixeeGvKpT/+p+U ekKvi322RCv8V5l1ge9Kz71u9iZN9W/QRZTZ6PzHZdk6Nx0ZZM+AGzYxvOXrK1N+PBTL0aq9sc12f jhH3eIIGybuY9VSZMv5Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cntC5-00071P-4C; Tue, 14 Mar 2017 20:37:21 +0000 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cntBy-0006s6-NE for lede-dev@lists.infradead.org; Tue, 14 Mar 2017 20:37:18 +0000 Received: by mail-wr0-x241.google.com with SMTP id l37so25252112wrc.3 for ; Tue, 14 Mar 2017 13:36:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Uk9BSeywAMMSYr9Qv7sn73JCrz/ItyxfpRuq+bl1We8=; b=dM1SiB2XXAaMffQ4R+36dehCT27iW2FGZ/PYOroK+2/S0nhO0tyKFjz2L9jWMXI5ov 9s5/4Qj1Tl+YBcOTZ0ZhWFSHQEA0hpMPaiWRyXkbRTFHYd+6P4XRNOX97vQq0BVZunv6 +Gzo7V8bMWjHWwqjIXcIjTZekhd8rJyrUv+GeHLXbk6s6omSSZnzpQcLoE0qOcfZusar V5CazqHvrxXCwEhHe7MbO8BbFmdDcxm5KZDQiXp3RQoDwXge6NU6RxrLpn3Urf8lea5c afVqZBO/EZ7C4eILyhkHA6h4HH4KVG3E9lmbqZP+Z6GdKNAg54QpF8hVsMYgKzkJjX+W zI3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Uk9BSeywAMMSYr9Qv7sn73JCrz/ItyxfpRuq+bl1We8=; b=lOqE0m5SV2etXcz5bxOKlKzUqnRISZsnfxqg2VK5curqW3WPjLXwlhvYTclojZI150 RzcT8/LgKvOblcEbcRl7ioVLmCAE94CLWn4+CgvkswHTnzMdIhIrmtQYurxT99/046Q0 pGckZXt97KLgKpA8ke+scsIiIgje/rovnqkP50t1/i65i4xWNKfQN0Caqqk9JiskdJ9T 5ESElIOQio4POOhNhOOyse6KHNU5u2Lqyzv122O+rxfieuzuY68mGnbZkUaHFJC0794G a4mWJ15ETUq9OrSe9wl7+KsMwdnNRhmkjxRwTSnnEPP/lZpB0E345F20E1uZ3oVDPqjI povg== X-Gm-Message-State: AMke39nlgGbKGNO008SaYVUacMMq/twVqwjNLLfbsAk9HVpSMaa4zFiIAf7eUWtMdWWUYw== X-Received: by 10.223.170.73 with SMTP id q9mr34271103wrd.13.1489523813164; Tue, 14 Mar 2017 13:36:53 -0700 (PDT) Received: from linux-5g1g.lan (ptr-fvflmy8bncogcgbxomy.18120a2.ip6.access.telenet.be. [2a02:1812:1103:ff00:76df:bfff:feac:e5fa]) by smtp.gmail.com with ESMTPSA id u184sm1126898wmb.29.2017.03.14.13.36.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Mar 2017 13:36:52 -0700 (PDT) From: Hans Dedecker To: lede-dev@lists.infradead.org, nbd@nbd.name Date: Tue, 14 Mar 2017 21:36:39 +0100 Message-Id: <20170314203639.4236-2-dedeckeh@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170314203639.4236-1-dedeckeh@gmail.com> References: <20170314203639.4236-1-dedeckeh@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170314_133715_013367_4E77A409 X-CRM114-Status: GOOD ( 12.81 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:241 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dedeckeh[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [LEDE-DEV] [PATCH netifd 2/2] system-linux: parse vti specific settings as nested json data object X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Dedecker MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Parse vti specific settings ikey and okey as nested json data object. At the same time remove the now obsolete TUNNEL_ATTR_INFO attribute. Signed-off-by: Hans Dedecker --- system-linux.c | 29 ++++++++++++++++------------- system.c | 11 ++++++++++- system.h | 8 +++++++- 3 files changed, 33 insertions(+), 15 deletions(-) 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); diff --git a/system.c b/system.c index f899c7b..3d4a979 100644 --- a/system.c +++ b/system.c @@ -27,7 +27,6 @@ static const struct blobmsg_policy tunnel_attrs[__TUNNEL_ATTR_MAX] = { [TUNNEL_ATTR_6RD_RELAY_PREFIX] = { .name = "6rd-relay-prefix", .type = BLOBMSG_TYPE_STRING }, [TUNNEL_ATTR_LINK] = { .name = "link", .type = BLOBMSG_TYPE_STRING }, [TUNNEL_ATTR_FMRS] = { .name = "fmrs", .type = BLOBMSG_TYPE_ARRAY }, - [TUNNEL_ATTR_INFO] = { .name = "info", .type = BLOBMSG_TYPE_STRING }, [TUNNEL_ATTR_DATA] = { .name = "data", .type = BLOBMSG_TYPE_TABLE }, }; @@ -61,6 +60,16 @@ const struct uci_blob_param_list gre_data_attr_list = { .params = gre_data_attrs, }; +static const struct blobmsg_policy vti_data_attrs[__VTI_DATA_ATTR_MAX] = { + [VTI_DATA_IKEY] = { .name = "ikey", .type = BLOBMSG_TYPE_INT32 }, + [VTI_DATA_OKEY] = { .name = "okey", .type = BLOBMSG_TYPE_INT32 }, +}; + +const struct uci_blob_param_list vti_data_attr_list = { + .n_params = __VTI_DATA_ATTR_MAX, + .params = vti_data_attrs, +}; + void system_fd_set_cloexec(int fd) { #ifdef FD_CLOEXEC diff --git a/system.h b/system.h index 14b1e53..9995fa9 100644 --- a/system.h +++ b/system.h @@ -34,7 +34,6 @@ enum tunnel_param { TUNNEL_ATTR_6RD_RELAY_PREFIX, TUNNEL_ATTR_LINK, TUNNEL_ATTR_FMRS, - TUNNEL_ATTR_INFO, TUNNEL_ATTR_DATA, __TUNNEL_ATTR_MAX }; @@ -58,8 +57,15 @@ enum gre_data { __GRE_DATA_ATTR_MAX }; +enum vti_data { + VTI_DATA_IKEY, + VTI_DATA_OKEY, + __VTI_DATA_ATTR_MAX +}; + extern const struct uci_blob_param_list vxlan_data_attr_list; extern const struct uci_blob_param_list gre_data_attr_list; +extern const struct uci_blob_param_list vti_data_attr_list; enum bridge_opt { /* stp and forward delay always set */