* [PATCH iproute2] ip6tunnel: Align ipv6 tunnel key display with ipv4
@ 2017-01-10 10:45 David Forster
2017-01-13 1:35 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: David Forster @ 2017-01-10 10:45 UTC (permalink / raw)
To: netdev, stephen; +Cc: dforster
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH iproute2] ip6tunnel: Align ipv6 tunnel key display with ipv4
2017-01-10 10:45 [PATCH iproute2] ip6tunnel: Align ipv6 tunnel key display with ipv4 David Forster
@ 2017-01-13 1:35 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2017-01-13 1:35 UTC (permalink / raw)
To: David Forster; +Cc: netdev
On Tue, 10 Jan 2017 10:45:54 +0000
David Forster <dforster@brocade.com> wrote:
> 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
Applied thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-13 1:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-10 10:45 [PATCH iproute2] ip6tunnel: Align ipv6 tunnel key display with ipv4 David Forster
2017-01-13 1:35 ` Stephen Hemminger
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).