From: David Forster <dforster@brocade.com>
To: <netdev@vger.kernel.org>, <stephen@networkplumber.org>
Cc: <dforster@brocade.com>
Subject: [PATCH iproute2] ip6tunnel: Align ipv6 tunnel key display with ipv4
Date: Tue, 10 Jan 2017 10:45:54 +0000 [thread overview]
Message-ID: <1484045154-19128-1-git-send-email-dforster@brocade.com> (raw)
Show ipv6 tunnel keys on presence of GRE_KEY flag for tunnel types
other than GRE. Aligns ipv6 behaviour with ipv4.
Signed-off-by: dforster@brocade.com
---
ip/ip6tunnel.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
index b1c0ae6..b4a7def 100644
--- a/ip/ip6tunnel.c
+++ b/ip/ip6tunnel.c
@@ -111,16 +111,17 @@ static void print_tunnel(struct ip6_tnl_parm2 *p)
if (p->flags & IP6_TNL_F_RCV_DSCP_COPY)
printf(" dscp inherit");
- if (p->proto == IPPROTO_GRE) {
- if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key)
- printf(" key %u", ntohl(p->i_key));
- else if ((p->i_flags | p->o_flags) & GRE_KEY) {
- if (p->i_flags & GRE_KEY)
- printf(" ikey %u", ntohl(p->i_key));
- if (p->o_flags & GRE_KEY)
- printf(" okey %u", ntohl(p->o_key));
- }
+ if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) &&
+ p->o_key == p->i_key)
+ printf(" key %u", ntohl(p->i_key));
+ else {
+ if (p->i_flags & GRE_KEY)
+ printf(" ikey %u", ntohl(p->i_key));
+ if (p->o_flags & GRE_KEY)
+ printf(" okey %u", ntohl(p->o_key));
+ }
+ if (p->proto == IPPROTO_GRE) {
if (p->i_flags & GRE_SEQ)
printf("%s Drop packets out of sequence.", _SL_);
if (p->i_flags & GRE_CSUM)
--
2.1.4
next reply other threads:[~2017-01-10 10:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 10:45 David Forster [this message]
2017-01-13 1:35 ` [PATCH iproute2] ip6tunnel: Align ipv6 tunnel key display with ipv4 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=1484045154-19128-1-git-send-email-dforster@brocade.com \
--to=dforster@brocade.com \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).