From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH iproute2 2/3] link_iptnl: Print tunnel mode Date: Tue, 2 Jan 2018 11:54:13 -0800 Message-ID: <20180102115413.37666ab5@xeon-e3> References: <1514906959-9719-1-git-send-email-serhe.popovych@gmail.com> <1514906959-9719-3-git-send-email-serhe.popovych@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org To: Serhey Popovych Return-path: Received: from mail-pl0-f65.google.com ([209.85.160.65]:46316 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbeABTyQ (ORCPT ); Tue, 2 Jan 2018 14:54:16 -0500 Received: by mail-pl0-f65.google.com with SMTP id i6so29271400plt.13 for ; Tue, 02 Jan 2018 11:54:15 -0800 (PST) In-Reply-To: <1514906959-9719-3-git-send-email-serhe.popovych@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, 2 Jan 2018 17:29:18 +0200 Serhey Popovych wrote: > Tunnel mode does not appear in parameters print for iptnl > supported tunnels like ipip and sit, while printed for > ip6tnl. > > Print tunnel mode with "proto" field for JSON and without > any name when printing to cli to follow ip6tnl behaviour. > > Signed-off-by: Serhey Popovych > --- > ip/link_iptnl.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c > index d4d935b..afd1696 100644 > --- a/ip/link_iptnl.c > +++ b/ip/link_iptnl.c > @@ -372,6 +372,23 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[ > if (tb[IFLA_IPTUN_COLLECT_METADATA]) > print_bool(PRINT_ANY, "external", "external ", true); > > + if (tb[IFLA_IPTUN_PROTO]) { > + switch (rta_getattr_u8(tb[IFLA_IPTUN_PROTO])) { > + case IPPROTO_IPIP: > + print_string(PRINT_ANY, "proto", "%s ", "ip4ip4"); > + break; > + case IPPROTO_IPV6: > + print_string(PRINT_ANY, "proto", "%s ", "ip6ip"); > + break; > + case IPPROTO_MPLS: > + print_string(PRINT_ANY, "proto", "%s ", "mplsip"); > + break; > + case 0: > + print_string(PRINT_ANY, "proto", "%s ", "any"); > + break; > + } > + } > + > if (tb[IFLA_IPTUN_REMOTE]) { > unsigned int addr = rta_getattr_u32(tb[IFLA_IPTUN_REMOTE]); > In iproute2 utilities the output format must match the input format. I don't see "proto ip4ip4" as a valid option.