From patchwork Mon Feb 12 20:17:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 872363 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ya84lMpm"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgH6X4zWWz9t32 for ; Tue, 13 Feb 2018 07:18:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753008AbeBLUSK (ORCPT ); Mon, 12 Feb 2018 15:18:10 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:41157 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752400AbeBLUSI (ORCPT ); Mon, 12 Feb 2018 15:18:08 -0500 Received: by mail-lf0-f66.google.com with SMTP id f136so22103834lff.8 for ; Mon, 12 Feb 2018 12:18:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=+kEqbMF1D1r2iXOYUqMj8QvVMDCoMpjWOTxBTh2i14Y=; b=Ya84lMpmdzT7Hd8C56JVxGxMIvXl8LXzO56uhGbYMS5TnAuFZYrQCKn2G7go2Q5VfS 7h7csiiJdJ5tERyVrfU/MqZGqTi1DNjOSy7fH01cZZ2nSp5SF40J06f1mScffGgL/N3B CYQwBFjgn1Fjgu1kg/G8S7ZRPeZp4kUvVC0cfRQp3+/rh8gG8poCDkiuqIFz0vYslFS0 F/N9H8rfPhLBg2ZReE8We8rtZSmvfeO6620pC0Z1WwglylHQVrTgASBT9oWzJ7c1U74U XcIFa1y6iasMlIjRuIdNSrV5kxXm39jZPRHLQievCTzeXw+n3/BOBFXysZ0FkYp3vHRX WnTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=+kEqbMF1D1r2iXOYUqMj8QvVMDCoMpjWOTxBTh2i14Y=; b=I2cy6ow1TFasJ16bezhr4dCAOK8znuVtuYOw9oStTmXlpsqR+J/b30tdHtZKPmu4Xf Bj6cU4KOF71o8J6PU6YYBlKUY/FlzqvLVV+9BL8Hnwx/4ovlhz/Q7yqVRGT30UEIMir1 cIBiCSFM/8FJVdQOibUIEJNqCPGxqE6PlZMmpIHaEAcVpKfngNKPjroU4PP7GTRzY6Rd rgy/k2Lh6gGdDaVnHlxF/WG/73JmVeGLOs7QTJHM2jDwQhLAhqt/mMTOaOmr5dQw23N9 kEfrvaog7XM1+b9DvujVfnrojKmfWhrCuBr7nf0jn8Gsh1vTlcGJDojckY6vTy5R0nR7 BqOA== X-Gm-Message-State: APf1xPDUL8D0WDOjrHMd7K0rRRWXKgwx6UiXEhB57yIQCEjVxoJVYjMF CispejW4uZt6sCYB/j+ZTxlikw== X-Google-Smtp-Source: AH8x226Ac92rwWPI6zPaBEjP1u0x4zRPunGFlToYc3XYyBsle8DDjuAX3x3NDv7UoivbxjzfcxaENA== X-Received: by 10.25.17.73 with SMTP id g70mr7889180lfi.0.1518466686699; Mon, 12 Feb 2018 12:18:06 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id f199sm230269lfg.44.2018.02.12.12.18.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 12:18:05 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next v3 1/4] utils: Introduce and use inet_prefix_reset() Date: Mon, 12 Feb 2018 22:17:56 +0200 Message-Id: <1518466679-3605-2-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> References: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Initializing @inet_prefix using C initializers or memset() seems inefficient and unnecessary: only small part of ->data[] field will be used to store address corresponding to ->family. Instead initialize ->flags with zero and assume no other fields accessed before checking corresponding bits in ->flags. For example special helpers (e.g. is_addrtype_*()) can be used to ensure that @inet_prefix contains valid ip or ipv6 address. Signed-off-by: Serhey Popovych --- include/utils.h | 5 +++++ ip/iplink_geneve.c | 2 +- ip/iplink_vxlan.c | 7 ++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/utils.h b/include/utils.h index 4dc514d..867e540 100644 --- a/include/utils.h +++ b/include/utils.h @@ -65,6 +65,11 @@ enum { ADDRTYPE_INET_MULTI = ADDRTYPE_INET | ADDRTYPE_MULTI }; +static inline void inet_prefix_reset(inet_prefix *p) +{ + p->flags = 0; +} + static inline bool is_addrtype_inet(const inet_prefix *p) { return p->flags & ADDRTYPE_INET; diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c index c666072..1fcdd83 100644 --- a/ip/iplink_geneve.c +++ b/ip/iplink_geneve.c @@ -71,7 +71,7 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv, bool set_op = (n->nlmsg_type == RTM_NEWLINK && !(n->nlmsg_flags & NLM_F_CREATE)); - daddr.flags = 0; + inet_prefix_reset(&daddr); while (argc > 0) { if (!matches(*argv, "id") || diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c index 00875ba..d768c07 100644 --- a/ip/iplink_vxlan.c +++ b/ip/iplink_vxlan.c @@ -74,8 +74,7 @@ static void check_duparg(__u64 *attrs, int type, const char *key, static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, struct nlmsghdr *n) { - inet_prefix saddr; - inet_prefix daddr; + inet_prefix saddr, daddr; __u32 vni = 0; __u8 learning = 1; __u16 dstport = 0; @@ -85,7 +84,9 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv, !(n->nlmsg_flags & NLM_F_CREATE)); saddr.family = daddr.family = AF_UNSPEC; - saddr.flags = daddr.flags = 0; + + inet_prefix_reset(&saddr); + inet_prefix_reset(&daddr); while (argc > 0) { if (!matches(*argv, "id") || From patchwork Mon Feb 12 20:17:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 872366 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AYx0cyHB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgH6t085Kz9sRm for ; Tue, 13 Feb 2018 07:18:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752400AbeBLUS2 (ORCPT ); Mon, 12 Feb 2018 15:18:28 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:39124 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752228AbeBLUSJ (ORCPT ); Mon, 12 Feb 2018 15:18:09 -0500 Received: by mail-lf0-f67.google.com with SMTP id h78so14924059lfg.6 for ; Mon, 12 Feb 2018 12:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=G8ZOufCabtfPW6OE3rQ9R852tKjgVLzAnO92Alcj0mU=; b=AYx0cyHBS+4Jj0crKYvSM5Op8wM6QNqJAxSb0VZf3elAt//k1mPfPluo/9BNXj5OOA ySLn3RehgO6R/mPbPM8qIM6s20T7jt4Z5EiVaAiepK62OAw0yqqsbWi+tLnECk5KitQm kbs1FfvaS+ORBzJtmRSf4kidht34QjrCBbq9lIeC1g0s6v/aMb9HfZ2WXadaFeBxhsBG CoTPREjjmdeIb0uh8lEiLeptenS1X3IaQ9t03sA9r3ibrOXTWbttk5E51ZCOIUaBE6xN HYyiRduagw2+KQ504tqqczmn2lh9lEg+JchKh//D3FECfq0HWwpNQDQMDI3FH9l+J22v Iguw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=G8ZOufCabtfPW6OE3rQ9R852tKjgVLzAnO92Alcj0mU=; b=pmdlsvqfpX9x3c/Z/KnDe+i9bTPooaAdaJY4n37QVqa12cPZF/bTp/s7BJ91VRzda8 7oyBInZhhvYKLh3j7ZhQqthIcYRbuNVR6kDu/ucl8K0AOL8V+Rd5xgw1uG81CjJ8qDW4 zVdSrHJH/BcDMFeBGWOw1q+A98LBlEOZChDpXl4Gvjr5EGdb/jLlzjToXIVJmJs/1F7R j3+vPik8UacSDUV3zkp41Z9yJPy7koLCOjs8hSdb4MqHV9u8N+0GR4q3NH0Fr2Tt0K7D 4EzcqhKwI9TdRGxznX2xt9/W8rkFAv1RdickVFUSZheWbpKX/LZQ6BOA3I/oR1o4g64l 0BvA== X-Gm-Message-State: APf1xPB6ZmpcNC7FAc1J1PA6Z+Yg6lhQk3jsv56KViFSmXGhoCoGejAu g4Pypx1m1LlOqm/1w/udUVMn2w== X-Google-Smtp-Source: AH8x227oyB9rZCo4uNQmuupIr2dPEjKf8VzX5BzQOslNyzKWugwh8qoLY5SCGqvjfc8/CbPjwF7cwA== X-Received: by 10.25.156.20 with SMTP id f20mr7887561lfe.12.1518466688044; Mon, 12 Feb 2018 12:18:08 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id f199sm230269lfg.44.2018.02.12.12.18.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 12:18:06 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next v3 2/4] vti/vti6: Unify local/remote endpoint address parsing Date: Mon, 12 Feb 2018 22:17:57 +0200 Message-Id: <1518466679-3605-3-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> References: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We are going to merge link_vti.c and link_vti6.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). Signed-off-by: Serhey Popovych --- ip/link_vti.c | 32 ++++++++++++++++++++------------ ip/link_vti6.c | 38 ++++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 30 deletions(-) diff --git a/ip/link_vti.c b/ip/link_vti.c index edd17fe..99e10e8 100644 --- a/ip/link_vti.c +++ b/ip/link_vti.c @@ -64,13 +64,17 @@ static int vti_parse_opt(struct link_util *lu, int argc, char **argv, struct rtattr *vtiinfo[IFLA_VTI_MAX + 1]; __be32 ikey = 0; __be32 okey = 0; - unsigned int saddr = 0; - unsigned int daddr = 0; + inet_prefix saddr, daddr; unsigned int link = 0; __u32 fwmark = 0; int len; + 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, @@ -96,18 +100,20 @@ get_failed: parse_rtattr_nested(vtiinfo, IFLA_VTI_MAX, linkinfo[IFLA_INFO_DATA]); + rta = vtiinfo[IFLA_VTI_LOCAL]; + if (rta && get_addr_rta(&saddr, rta, AF_INET)) + goto get_failed; + + rta = vtiinfo[IFLA_VTI_REMOTE]; + if (rta && get_addr_rta(&daddr, rta, AF_INET)) + goto get_failed; + if (vtiinfo[IFLA_VTI_IKEY]) ikey = rta_getattr_u32(vtiinfo[IFLA_VTI_IKEY]); if (vtiinfo[IFLA_VTI_OKEY]) okey = rta_getattr_u32(vtiinfo[IFLA_VTI_OKEY]); - if (vtiinfo[IFLA_VTI_LOCAL]) - saddr = rta_getattr_u32(vtiinfo[IFLA_VTI_LOCAL]); - - if (vtiinfo[IFLA_VTI_REMOTE]) - daddr = rta_getattr_u32(vtiinfo[IFLA_VTI_REMOTE]); - if (vtiinfo[IFLA_VTI_LINK]) link = rta_getattr_u8(vtiinfo[IFLA_VTI_LINK]); @@ -129,10 +135,10 @@ get_failed: okey = tnl_parse_key("okey", *argv); } else if (!matches(*argv, "remote")) { NEXT_ARG(); - daddr = get_addr32(*argv); + get_addr(&daddr, *argv, AF_INET); } else if (!matches(*argv, "local")) { NEXT_ARG(); - saddr = get_addr32(*argv); + get_addr(&saddr, *argv, AF_INET); } else if (!matches(*argv, "dev")) { NEXT_ARG(); link = ll_name_to_index(*argv); @@ -154,8 +160,10 @@ get_failed: addattr32(n, 1024, IFLA_VTI_IKEY, ikey); addattr32(n, 1024, IFLA_VTI_OKEY, okey); - addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, 4); - addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, 4); + if (is_addrtype_inet(&saddr)) + addattr_l(n, 1024, IFLA_VTI_LOCAL, saddr.data, saddr.bytelen); + if (is_addrtype_inet(&daddr)) + addattr_l(n, 1024, IFLA_VTI_REMOTE, daddr.data, daddr.bytelen); addattr32(n, 1024, IFLA_VTI_FWMARK, fwmark); if (link) addattr32(n, 1024, IFLA_VTI_LINK, link); diff --git a/ip/link_vti6.c b/ip/link_vti6.c index 1276ebd..1df6579 100644 --- a/ip/link_vti6.c +++ b/ip/link_vti6.c @@ -64,15 +64,19 @@ static int vti6_parse_opt(struct link_util *lu, int argc, char **argv, struct rtattr *tb[IFLA_MAX + 1]; struct rtattr *linkinfo[IFLA_INFO_MAX+1]; struct rtattr *vtiinfo[IFLA_VTI_MAX + 1]; - struct in6_addr saddr = IN6ADDR_ANY_INIT; - struct in6_addr daddr = IN6ADDR_ANY_INIT; __be32 ikey = 0; __be32 okey = 0; + inet_prefix saddr, daddr; unsigned int link = 0; __u32 fwmark = 0; int len; + 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, @@ -98,18 +102,20 @@ get_failed: parse_rtattr_nested(vtiinfo, IFLA_VTI_MAX, linkinfo[IFLA_INFO_DATA]); + rta = vtiinfo[IFLA_VTI_LOCAL]; + if (rta && get_addr_rta(&saddr, rta, AF_INET6)) + goto get_failed; + + rta = vtiinfo[IFLA_VTI_REMOTE]; + if (rta && get_addr_rta(&daddr, rta, AF_INET6)) + goto get_failed; + if (vtiinfo[IFLA_VTI_IKEY]) ikey = rta_getattr_u32(vtiinfo[IFLA_VTI_IKEY]); if (vtiinfo[IFLA_VTI_OKEY]) okey = rta_getattr_u32(vtiinfo[IFLA_VTI_OKEY]); - if (vtiinfo[IFLA_VTI_LOCAL]) - memcpy(&saddr, RTA_DATA(vtiinfo[IFLA_VTI_LOCAL]), sizeof(saddr)); - - if (vtiinfo[IFLA_VTI_REMOTE]) - memcpy(&daddr, RTA_DATA(vtiinfo[IFLA_VTI_REMOTE]), sizeof(daddr)); - if (vtiinfo[IFLA_VTI_LINK]) link = rta_getattr_u8(vtiinfo[IFLA_VTI_LINK]); @@ -130,17 +136,11 @@ get_failed: NEXT_ARG(); okey = tnl_parse_key("okey", *argv); } else if (!matches(*argv, "remote")) { - inet_prefix addr; - NEXT_ARG(); - get_addr(&addr, *argv, AF_INET6); - memcpy(&daddr, addr.data, sizeof(daddr)); + get_addr(&daddr, *argv, AF_INET6); } else if (!matches(*argv, "local")) { - inet_prefix addr; - NEXT_ARG(); - get_addr(&addr, *argv, AF_INET6); - memcpy(&saddr, addr.data, sizeof(saddr)); + get_addr(&saddr, *argv, AF_INET6); } else if (!matches(*argv, "dev")) { NEXT_ARG(); link = ll_name_to_index(*argv); @@ -162,8 +162,10 @@ get_failed: addattr32(n, 1024, IFLA_VTI_IKEY, ikey); addattr32(n, 1024, IFLA_VTI_OKEY, okey); - addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, sizeof(saddr)); - addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, sizeof(daddr)); + if (is_addrtype_inet(&saddr)) + addattr_l(n, 1024, IFLA_VTI_LOCAL, saddr.data, saddr.bytelen); + if (is_addrtype_inet(&daddr)) + addattr_l(n, 1024, IFLA_VTI_REMOTE, daddr.data, daddr.bytelen); addattr32(n, 1024, IFLA_VTI_FWMARK, fwmark); if (link) addattr32(n, 1024, IFLA_VTI_LINK, link); From patchwork Mon Feb 12 20:17:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 872364 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tfR9fOUz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgH6b5x2Yz9sRm for ; Tue, 13 Feb 2018 07:18:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752319AbeBLUSN (ORCPT ); Mon, 12 Feb 2018 15:18:13 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:37399 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752972AbeBLUSL (ORCPT ); Mon, 12 Feb 2018 15:18:11 -0500 Received: by mail-lf0-f66.google.com with SMTP id f137so22113013lfe.4 for ; Mon, 12 Feb 2018 12:18:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=JaRLeDLD3b9JRyL7EeDUKN69L0AplSbUvqddaZk/fWY=; b=tfR9fOUzxoqIV1CNSwAACG3g8ADtUiKSnN2XltWJWCtPNDzeBO3Wj3v5faMveFERif HGxnS078bg24DIRuH6kN2Me15LbkAKZtYBmNejQuCrOcWbyDrjRtfBcfLD57np79CGPu 3i3/f/unjWqiKH8NYrCIqYtaRa7/EBOpMwSYTeJWNkWmejHxbK2JzyXqAhGMt2u4YB6K TEBdzLPHtMdMx7+9/fIztBrzT+jkBJWmXYXhPl1RGCtNeOf6z5meRKQhS9KaAFoLQdvx uNt3zp/3v/fjW9yXitQNePoKpnYayTjI3y21gzal5MC/6GJjlDd+1/SvqqqOtelZllI2 8F8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=JaRLeDLD3b9JRyL7EeDUKN69L0AplSbUvqddaZk/fWY=; b=assNkOMghxB3j52CoHZxCkmz8pjFEWi7vs5z5uxZ7kB3BA4cXaT9KzovHnIoDgn2DC EhRwd65N/m3/kd7RLURzhjjeWiE/4X18omnSfINv4C0aknuWfKhzrFbwlllQED28SqLJ 0AzWCu9VlbdvQxdvBKQ94QaRUWszam2/6OLkxufUAM5+Xq2Sa+dcVw9H8y8iGNu6bKni 01N8YK9B2Rh+P2ViO09X/zT2nG3YG7LMzges/LU4zsniWLLZN9yvsH1GKYxur+IHZpZu x3aH9MNo4DSm0mOcicDRJ6S19EALEiA9B/rll+UGNTgFvj2J4jiT+lFT1uWqVx6j+hvu LqZA== X-Gm-Message-State: APf1xPBtnwTY8enugqkc3rCW1OTS61uIXo2kjbQbhVZhajGThP4q4FgC 09m35xVBHF4jfFv9kyl4GoPntA== X-Google-Smtp-Source: AH8x224B1dtbTCIg3HyJumAvYfHKobPL5TuhylUlBgfvEUaZ8G9mo5KrDpfrgXLj2yBxRntwWOL5cw== X-Received: by 10.25.211.206 with SMTP id k197mr7724004lfg.93.1518466689250; Mon, 12 Feb 2018 12:18:09 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id f199sm230269lfg.44.2018.02.12.12.18.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 12:18:08 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next v3 3/4] gre/gre6: Unify local/remote endpoint address parsing Date: Mon, 12 Feb 2018 22:17:58 +0200 Message-Id: <1518466679-3605-4-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> References: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We are going to merge link_gre.c and link_gre6.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). Signed-off-by: Serhey Popovych --- ip/link_gre.c | 57 +++++++++++++++++++++++++++++++++----------------------- ip/link_gre6.c | 38 +++++++++++++++++++------------------ 2 files changed, 54 insertions(+), 41 deletions(-) diff --git a/ip/link_gre.c b/ip/link_gre.c index e3e5323..64588d7 100644 --- a/ip/link_gre.c +++ b/ip/link_gre.c @@ -86,8 +86,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u16 oflags = 0; __be32 ikey = 0; __be32 okey = 0; - unsigned int saddr = 0; - unsigned int daddr = 0; + inet_prefix saddr, daddr; __u8 pmtudisc = 1; __u8 ignore_df = 0; __u8 tos = 0; @@ -104,7 +103,12 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u8 erspan_dir = 0; __u16 erspan_hwid = 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, @@ -130,6 +134,14 @@ get_failed: parse_rtattr_nested(greinfo, IFLA_GRE_MAX, linkinfo[IFLA_INFO_DATA]); + rta = greinfo[IFLA_GRE_LOCAL]; + if (rta && get_addr_rta(&saddr, rta, AF_INET)) + goto get_failed; + + rta = greinfo[IFLA_GRE_REMOTE]; + if (rta && get_addr_rta(&daddr, rta, AF_INET)) + goto get_failed; + if (greinfo[IFLA_GRE_IKEY]) ikey = rta_getattr_u32(greinfo[IFLA_GRE_IKEY]); @@ -142,12 +154,6 @@ get_failed: if (greinfo[IFLA_GRE_OFLAGS]) oflags = rta_getattr_u16(greinfo[IFLA_GRE_OFLAGS]); - if (greinfo[IFLA_GRE_LOCAL]) - saddr = rta_getattr_u32(greinfo[IFLA_GRE_LOCAL]); - - if (greinfo[IFLA_GRE_REMOTE]) - daddr = rta_getattr_u32(greinfo[IFLA_GRE_REMOTE]); - if (greinfo[IFLA_GRE_PMTUDISC]) pmtudisc = rta_getattr_u8( greinfo[IFLA_GRE_PMTUDISC]); @@ -232,10 +238,10 @@ get_failed: pmtudisc = 1; } else if (!matches(*argv, "remote")) { NEXT_ARG(); - daddr = get_addr32(*argv); + get_addr(&daddr, *argv, AF_INET); } else if (!matches(*argv, "local")) { NEXT_ARG(); - saddr = get_addr32(*argv); + get_addr(&saddr, *argv, AF_INET); } else if (!matches(*argv, "dev")) { NEXT_ARG(); link = ll_name_to_index(*argv); @@ -343,17 +349,20 @@ get_failed: argc--; argv++; } - if (!ikey && IN_MULTICAST(ntohl(daddr))) { - ikey = daddr; - iflags |= GRE_KEY; - } - if (!okey && IN_MULTICAST(ntohl(daddr))) { - okey = daddr; - oflags |= GRE_KEY; - } - if (IN_MULTICAST(ntohl(daddr)) && !saddr) { - fprintf(stderr, "A broadcast tunnel requires a source address.\n"); - return -1; + if (is_addrtype_inet_multi(&daddr)) { + if (!ikey) { + ikey = daddr.data[0]; + iflags |= GRE_KEY; + } + if (!okey) { + okey = daddr.data[0]; + oflags |= GRE_KEY; + } + if (!is_addrtype_inet_not_unspec(&saddr)) { + fprintf(stderr, + "A broadcast tunnel requires a source address.\n"); + return -1; + } } if (metadata) { @@ -365,8 +374,10 @@ get_failed: addattr32(n, 1024, IFLA_GRE_OKEY, okey); addattr_l(n, 1024, IFLA_GRE_IFLAGS, &iflags, 2); addattr_l(n, 1024, IFLA_GRE_OFLAGS, &oflags, 2); - addattr_l(n, 1024, IFLA_GRE_LOCAL, &saddr, 4); - addattr_l(n, 1024, IFLA_GRE_REMOTE, &daddr, 4); + if (is_addrtype_inet(&saddr)) + addattr_l(n, 1024, IFLA_GRE_LOCAL, saddr.data, saddr.bytelen); + if (is_addrtype_inet(&daddr)) + addattr_l(n, 1024, IFLA_GRE_REMOTE, daddr.data, daddr.bytelen); addattr_l(n, 1024, IFLA_GRE_PMTUDISC, &pmtudisc, 1); if (ignore_df) addattr8(n, 1024, IFLA_GRE_IGNORE_DF, ignore_df & 1); diff --git a/ip/link_gre6.c b/ip/link_gre6.c index 251ae0e..6c77038 100644 --- a/ip/link_gre6.c +++ b/ip/link_gre6.c @@ -97,8 +97,7 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u16 oflags = 0; __be32 ikey = 0; __be32 okey = 0; - struct in6_addr raddr = IN6ADDR_ANY_INIT; - struct in6_addr laddr = 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; @@ -115,7 +114,12 @@ static int gre_parse_opt(struct link_util *lu, int argc, char **argv, __u8 erspan_dir = 0; __u16 erspan_hwid = 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, @@ -141,6 +145,14 @@ get_failed: parse_rtattr_nested(greinfo, IFLA_GRE_MAX, linkinfo[IFLA_INFO_DATA]); + rta = greinfo[IFLA_GRE_LOCAL]; + if (rta && get_addr_rta(&saddr, rta, AF_INET6)) + goto get_failed; + + rta = greinfo[IFLA_GRE_REMOTE]; + if (rta && get_addr_rta(&daddr, rta, AF_INET6)) + goto get_failed; + if (greinfo[IFLA_GRE_IKEY]) ikey = rta_getattr_u32(greinfo[IFLA_GRE_IKEY]); @@ -153,12 +165,6 @@ get_failed: if (greinfo[IFLA_GRE_OFLAGS]) oflags = rta_getattr_u16(greinfo[IFLA_GRE_OFLAGS]); - if (greinfo[IFLA_GRE_LOCAL]) - memcpy(&laddr, RTA_DATA(greinfo[IFLA_GRE_LOCAL]), sizeof(laddr)); - - if (greinfo[IFLA_GRE_REMOTE]) - memcpy(&raddr, RTA_DATA(greinfo[IFLA_GRE_REMOTE]), sizeof(raddr)); - if (greinfo[IFLA_GRE_TTL]) hop_limit = rta_getattr_u8(greinfo[IFLA_GRE_TTL]); @@ -236,17 +242,11 @@ get_failed: } else if (!matches(*argv, "ocsum")) { oflags |= GRE_CSUM; } else if (!matches(*argv, "remote")) { - 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 (!matches(*argv, "local")) { - 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")) { NEXT_ARG(); link = ll_name_to_index(*argv); @@ -398,8 +398,10 @@ get_failed: addattr32(n, 1024, IFLA_GRE_OKEY, okey); addattr_l(n, 1024, IFLA_GRE_IFLAGS, &iflags, 2); addattr_l(n, 1024, IFLA_GRE_OFLAGS, &oflags, 2); - addattr_l(n, 1024, IFLA_GRE_LOCAL, &laddr, sizeof(laddr)); - addattr_l(n, 1024, IFLA_GRE_REMOTE, &raddr, sizeof(raddr)); + if (is_addrtype_inet(&saddr)) + addattr_l(n, 1024, IFLA_GRE_LOCAL, saddr.data, saddr.bytelen); + if (is_addrtype_inet(&daddr)) + addattr_l(n, 1024, IFLA_GRE_REMOTE, daddr.data, daddr.bytelen); if (link) addattr32(n, 1024, IFLA_GRE_LINK, link); addattr_l(n, 1024, IFLA_GRE_TTL, &hop_limit, 1); From patchwork Mon Feb 12 20:17:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 872365 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hW5Y6K3W"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgH6p1hfsz9sRm for ; Tue, 13 Feb 2018 07:18:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932104AbeBLUSU (ORCPT ); Mon, 12 Feb 2018 15:18:20 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:45251 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752400AbeBLUSM (ORCPT ); Mon, 12 Feb 2018 15:18:12 -0500 Received: by mail-lf0-f66.google.com with SMTP id x196so22053878lfd.12 for ; Mon, 12 Feb 2018 12:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ObYznyFi32Xu5feqPVPIbo/86cZI6yYPHy9qfLORd0s=; b=hW5Y6K3WvxUNUjQniCNJXU6rRcYpR1f/b6cB5y/KjLzXcS3lpj6Iz7srg0Wy7oe907 8rW5SZI7ZKJt+xGW0oWvCoaSpWwzcbFTLrx35O0g2yhDorWd5km9VNfcXUOmWggYSFWk edxdGzZKC/z4gcWVAIwZdrNx+Gr8R4MgSSVhuNpIFpvELt/df1qWlb+D688K6za2G2xK bqaFFyRGcaqPo2C6nY6daGdnEFGn2xW6WsKcs+7nTJ5PXkWDx/eqBCYaoSwh80FWMroP C7LVFFU+m5bo5NETuT83M18xuqI8Eh/U3lm+PXz3ExiPlQLRy0PRsp6EsQAw3CaTbvPx v5eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ObYznyFi32Xu5feqPVPIbo/86cZI6yYPHy9qfLORd0s=; b=Caxcvq7DRli4iIRL2DZ/JbcuzPGBuED2gzH7auWuBDAVyf5u/uaeYBNIsKZrWIQKr4 oW+rOg5XzhUCglAnuUKDyAQLVlrnoLeSVI6FHsCok2b5WMF5t5QhAbiLYlnmiDQWkhXV tPQWG0+jOqr3ANOTswKEISq0zfS7K5BdoZtADBMmQ8iywO4I2imi72KSJ+C+s5qv0ut0 FJzKLPHaD1neET8TlKzfmHpTj6gxKH+NJQ+jdZKFqWKz3rGxHArBlGLcXjZtCWWUomvA W+J1uDWCN8MKKC5ZUgA28yqTSRDYRFLAaCfRJcZNhoIn1BaaiMyMOEiq73pO5VEDUplU jcWQ== X-Gm-Message-State: APf1xPAiCRNsATQ9ilHPHeH/+Ybt+Ty8klLYjS4jA+2g2augZsMX0Q80 FAJeMXmScY9qHjyg7NF5x1zItg== X-Google-Smtp-Source: AH8x226kGIWRjRmnKpgQD4vjWU7pwblS0WvY36KtIK2OOmGLrZyUNwUbv4fc1HlsYx0KND1KXqmUew== X-Received: by 10.25.162.72 with SMTP id l69mr8646889lfe.38.1518466690520; Mon, 12 Feb 2018 12:18:10 -0800 (PST) Received: from tuxracer.localdomain ([2a01:6d80::195:20:96:53]) by smtp.gmail.com with ESMTPSA id f199sm230269lfg.44.2018.02.12.12.18.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Feb 2018 12:18:09 -0800 (PST) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH iproute2-next v3 4/4] iptnl/ip6tnl: Unify local/remote endpoint and 6rd address parsing Date: Mon, 12 Feb 2018 22:17:59 +0200 Message-Id: <1518466679-3605-5-git-send-email-serhe.popovych@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> References: <1518466679-3605-1-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- ip/link_ip6tnl.c | 40 +++++++++++---------- ip/link_iptnl.c | 103 +++++++++++++++++++++++++++--------------------------- 2 files changed, 73 insertions(+), 70 deletions(-) diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c index 8a45d42..77a9090 100644 --- 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 bc1074e..acd9f45 100644 --- 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); } }