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

vti: print keys in hex not dotted notation 

The ikey and okey value are normal u32 values. The input accepts
them in dotted, hex or decimal form. For output, hex seems like
the best form since they are not really addresses.

Suggested-by: Christian Langrock <christian.langrock@secunet.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2017-08-09 08:50:25 -07:00
parent 69fed534a5
commit fcfcc40b7d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ip/link_vti.c
View File

@ -210,8 +210,9 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{ {
const char *local = "any"; const char *local = "any";
const char *remote = "any"; const char *remote = "any";
__u32 key;
unsigned int link; unsigned int link;
char s2[64]; char s2[IFNAMSIZ];
if (!tb) if (!tb)
return; return;
@ -244,15 +245,14 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
fprintf(f, "dev %u ", link); fprintf(f, "dev %u ", link);
} }
if (tb[IFLA_VTI_IKEY]) { if (tb[IFLA_VTI_IKEY] &&
inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_IKEY]), s2, sizeof(s2)); (key = rta_getattr_u32(tb[IFLA_VTI_IKEY])))
fprintf(f, "ikey %s ", s2); fprintf(f, "ikey %#x ", ntohl(key));
}
if (tb[IFLA_VTI_OKEY]) {
inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_OKEY]), s2, sizeof(s2)); if (tb[IFLA_VTI_OKEY] &&
fprintf(f, "okey %s ", s2); (key = rta_getattr_u32(tb[IFLA_VTI_OKEY])))
} fprintf(f, "okey %#x ", ntohl(key));
if (tb[IFLA_VTI_FWMARK] && rta_getattr_u32(tb[IFLA_VTI_FWMARK])) { if (tb[IFLA_VTI_FWMARK] && rta_getattr_u32(tb[IFLA_VTI_FWMARK])) {
fprintf(f, "fwmark 0x%x ", fprintf(f, "fwmark 0x%x ",