From: Stephen Hemminger <stephen@networkplumber.org>
To: Serhey Popovych <serhe.popovych@gmail.com>
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH iproute2 v2 2/3] link_iptnl: Print tunnel mode
Date: Tue, 2 Jan 2018 13:13:54 -0800 [thread overview]
Message-ID: <20180102131354.0e417fd4@xeon-e3> (raw)
In-Reply-To: <1514926965-22061-1-git-send-email-serhe.popovych@gmail.com>
On Tue, 2 Jan 2018 23:02:45 +0200
Serhey Popovych <serhe.popovych@gmail.com> wrote:
> Tunnel mode does not appear in parameters print for iptnl
> supported tunnels like ipip and sit, while printed for
> ip6tnl.
>
> Print tunnel mode as "proto" field name for JSON and
> without any name when printing to cli to follow ip6tnl
> behaviour.
>
> For non JSON output we have:
>
> $ ip -d link show dev sit1
>
> Before:
> -------
> 17: sit1@NONE: <NOARP> mtu 1480 qdisc noop state DOWN ...
> link/sit X.X.X.X brd 0.0.0.0 promiscuity 0
> sit remote any local X.X.X.X ...
> ~~~
>
> After:
> ------
> 17: sit1@NONE: <NOARP> mtu 1480 qdisc noop state DOWN ...
> link/sit X.X.X.X brd 0.0.0.0 promiscuity 0
> sit any remote any local X.X.X.X ...
> ^^^
>
> Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
> ---
> v2: Addressed comments: "proto ipip" vs "proto ip4ip4" for
> IPPROTO_IPIP tunnel type. Add example to message.
>
> ip/link_iptnl.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
> index d4d935b..b6ef95d 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 ", "ipip");
> + 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]);
Thanks for fixing the ip4 value.
When you fix one thing, you need to resend whole patch series.
next prev parent reply other threads:[~2018-01-02 21:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-02 15:29 [PATCH iproute2 0/3] iptnl/tunnel: Open JSON section, kill code duplication and print iptnl mode Serhey Popovych
2018-01-02 15:29 ` [PATCH iproute2 1/3] link_iptnl: Kill code duplication Serhey Popovych
2018-01-02 15:29 ` [PATCH iproute2 2/3] link_iptnl: Print tunnel mode Serhey Popovych
2018-01-02 19:54 ` Stephen Hemminger
2018-01-02 21:02 ` [PATCH iproute2 v2 " Serhey Popovych
2018-01-02 21:13 ` Stephen Hemminger [this message]
2018-01-02 21:29 ` Serhey Popovych
2018-01-02 15:29 ` [PATCH iproute2 3/3] link_iptnl: Open "encap" JSON object Serhey Popovych
-- strict thread matches above, loose matches on Subject: below --
2018-01-02 21:27 [PATCH iproute2 v2 0/3] iptnl/tunnel: Open JSON section, kill code duplication and print iptnl mode Serhey Popovych
2018-01-02 21:27 ` [PATCH iproute2 v2 2/3] link_iptnl: Print tunnel mode Serhey Popovych
2018-01-06 0:36 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180102131354.0e417fd4@xeon-e3 \
--to=stephen@networkplumber.org \
--cc=netdev@vger.kernel.org \
--cc=serhe.popovych@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.