matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gre6/tunnel: Output flowlabel after tclass 

To follow ip6tnl output print flowlabel after tclass
in link_gre6.c.

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Serhey Popovych 2018-01-10 17:53:14 +02:00 committed by Stephen Hemminger
parent e3945d92b0
commit 763cf4956d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ip/link_gre6.c
View File

@ -444,18 +444,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val); print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
} }
if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {
print_bool(PRINT_ANY,
"ip6_tnl_f_use_orig_flowlabel",
"flowlabel inherit ",
true);
} else if (tb[IFLA_GRE_FLOWINFO]) {
__u32 val = ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL);
snprintf(s2, sizeof(s2), "0x%05x", val);
print_string(PRINT_ANY, "flowlabel", "flowlabel %s ", s2);
}
if (flags & IP6_TNL_F_USE_ORIG_TCLASS) { if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
print_bool(PRINT_ANY, print_bool(PRINT_ANY,
"ip6_tnl_f_use_orig_tclass", "ip6_tnl_f_use_orig_tclass",
@ -468,6 +456,18 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
print_string(PRINT_ANY, "tclass", "tclass %s ", s2); print_string(PRINT_ANY, "tclass", "tclass %s ", s2);
} }
if (flags & IP6_TNL_F_USE_ORIG_FLOWLABEL) {
print_bool(PRINT_ANY,
"ip6_tnl_f_use_orig_flowlabel",
"flowlabel inherit ",
true);
} else if (tb[IFLA_GRE_FLOWINFO]) {
__u32 val = ntohl(flowinfo & IP6_FLOWINFO_FLOWLABEL);
snprintf(s2, sizeof(s2), "0x%05x", val);
print_string(PRINT_ANY, "flowlabel", "flowlabel %s ", s2);
}
if (flags & IP6_TNL_F_RCV_DSCP_COPY) if (flags & IP6_TNL_F_RCV_DSCP_COPY)
print_bool(PRINT_ANY, print_bool(PRINT_ANY,
"ip6_tnl_f_rcv_dscp_copy", "ip6_tnl_f_rcv_dscp_copy",