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

vxlan: show correct ttl inherit info 

We should only show ttl inherit when IFLA_VXLAN_TTL_INHERIT supplied.
Otherwise show the ttl number, or auto when it is 0.

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Hangbin Liu 2018-09-27 15:28:36 +08:00 committed by Stephen Hemminger
parent b45e300024
commit 952a7a1931
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ip/iplink_vxlan.c
View File

@ -145,7 +145,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
NEXT_ARG(); NEXT_ARG();
check_duparg(&attrs, IFLA_VXLAN_TTL, "ttl", *argv); check_duparg(&attrs, IFLA_VXLAN_TTL, "ttl", *argv);
if (strcmp(*argv, "inherit") == 0) { if (strcmp(*argv, "inherit") == 0) {
addattr_l(n, 1024, IFLA_VXLAN_TTL_INHERIT, NULL, 0); addattr(n, 1024, IFLA_VXLAN_TTL_INHERIT);
} else if (strcmp(*argv, "auto") == 0) { } else if (strcmp(*argv, "auto") == 0) {
addattr8(n, 1024, IFLA_VXLAN_TTL, ttl); addattr8(n, 1024, IFLA_VXLAN_TTL, ttl);
} else { } else {
@ -527,12 +527,16 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
print_string(PRINT_FP, NULL, "tos %s ", "inherit"); print_string(PRINT_FP, NULL, "tos %s ", "inherit");
} }
if (tb[IFLA_VXLAN_TTL]) if (tb[IFLA_VXLAN_TTL_INHERIT] &&
ttl = rta_getattr_u8(tb[IFLA_VXLAN_TTL]); rta_getattr_u8(tb[IFLA_VXLAN_TTL_INHERIT])) {
if (is_json_context() || ttl)
print_uint(PRINT_ANY, "ttl", "ttl %u ", ttl);
else
print_string(PRINT_FP, NULL, "ttl %s ", "inherit"); print_string(PRINT_FP, NULL, "ttl %s ", "inherit");
} else if (tb[IFLA_VXLAN_TTL]) {
ttl = rta_getattr_u8(tb[IFLA_VXLAN_TTL]);
if (is_json_context() || ttl)
print_uint(PRINT_ANY, "ttl", "ttl %u ", ttl);
else
print_string(PRINT_FP, NULL, "ttl %s ", "auto");
}
if (tb[IFLA_VXLAN_LABEL]) { if (tb[IFLA_VXLAN_LABEL]) {
__u32 label = rta_getattr_u32(tb[IFLA_VXLAN_LABEL]); __u32 label = rta_getattr_u32(tb[IFLA_VXLAN_LABEL]);