| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1515599595-27958-8-git-send-email-serhe.popovych@gmail.com>
Date: Wed, 10 Jan 2018 17:53:15 +0200
From: Serhey Popovych <serhe.popovych@...il.com>
To: netdev@...r.kernel.org
Subject: [PATCH iproute2 v5 7/7] ip6tnl/tunnel: Output hoplimit before encapsulation limit
To follow gre6 output print hoplimit before encapsulation
limit in link_ip6tnl.c.
Signed-off-by: Serhey Popovych <serhe.popovych@...il.com>
---
ip/link_ip6tnl.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index 379eb33..bbc7878 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -387,6 +387,13 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
print_uint(PRINT_ANY, "link_index", "dev %u ", link);
}
+ if (tb[IFLA_IPTUN_TTL]) {
+ print_uint(PRINT_ANY,
+ "ttl",
+ "hoplimit %u ",
+ rta_getattr_u8(tb[IFLA_IPTUN_TTL]));
+ }
+
if (flags & IP6_TNL_F_IGN_ENCAP_LIMIT) {
print_bool(PRINT_ANY,
"ip6_tnl_f_ign_encap_limit",
@@ -398,12 +405,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
print_uint(PRINT_ANY, "encap_limit", "encaplimit %u ", val);
}
- if (tb[IFLA_IPTUN_TTL])
- print_uint(PRINT_ANY,
- "ttl",
- "hoplimit %u ",
- rta_getattr_u8(tb[IFLA_IPTUN_TTL]));
-
if (flags & IP6_TNL_F_USE_ORIG_TCLASS) {
print_bool(PRINT_ANY,
"ip6_tnl_f_use_orig_tclass",
--
1.7.10.4
Powered by blists - more mailing lists