diff mbox

ip/link_vti*.c: Fix output for ikey/okey

Message ID c78b6c79-ea06-2d8c-2e12-21a3faa7dc22@secunet.com
State Accepted, archived
Delegated to: stephen hemminger
Headers show

Commit Message

Christian Langrock Aug. 8, 2017, 6:24 a.m. UTC 
Using hex values sounds reasonable.

BR,

Christian


Updated Patch:

Subject: [PATCH] ip/link_vti*.c: Fix output for ikey/okey

ikey and okey are normal u32 values. There's no reason to print them as
IPv4/IPv6 addresses. Instead print them as hex values.

Signed-off-by: Christian Langrock <christian.langrock@secunet.com>
---
 ip/link_vti.c  | 10 ++++------
 ip/link_vti6.c | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

        }
         if (tb[IFLA_VTI_FWMARK] && rta_getattr_u32(tb[IFLA_VTI_FWMARK])) {
diff mbox

Patch

diff --git a/ip/link_vti.c b/ip/link_vti.c
index d5242ac..f87623b 100644
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -244,14 +244,12 @@  static void vti_print_opt(struct link_util *lu,
FILE *f, struct rtattr *tb[])
                        fprintf(f, "dev %u ", link);
        }
 -       if (tb[IFLA_VTI_IKEY]) {
-               inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_IKEY]), s2,
sizeof(s2));
-               fprintf(f, "ikey %s ", s2);
+       if (tb[IFLA_VTI_IKEY] && rta_getattr_u32(tb[IFLA_VTI_IKEY])) {
+               fprintf(f, "ikey 0x%x ",
ntohl(rta_getattr_u32(tb[IFLA_VTI_IKEY])));
        }
 -       if (tb[IFLA_VTI_OKEY]) {
-               inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_OKEY]), s2,
sizeof(s2));
-               fprintf(f, "okey %s ", s2);
+       if (tb[IFLA_VTI_OKEY] && rta_getattr_u32(tb[IFLA_VTI_OKEY])) {
+               fprintf(f, "okey 0x%x ",
ntohl(rta_getattr_u32(tb[IFLA_VTI_OKEY])));
        }
         if (tb[IFLA_VTI_FWMARK] && rta_getattr_u32(tb[IFLA_VTI_FWMARK])) {
diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index 220b7df..6ae87dd 100644
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -247,14 +247,12 @@  static void vti6_print_opt(struct link_util *lu,
FILE *f, struct rtattr *tb[])
                        fprintf(f, "dev %u ", link);
        }
 -       if (tb[IFLA_VTI_IKEY]) {
-               inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_IKEY]), s2,
sizeof(s2));
-               fprintf(f, "ikey %s ", s2);
+       if (tb[IFLA_VTI_IKEY] && rta_getattr_u32(tb[IFLA_VTI_IKEY])) {
+               fprintf(f, "ikey %u ",
ntohl(rta_getattr_u32(tb[IFLA_VTI_IKEY])));
        }
 -       if (tb[IFLA_VTI_OKEY]) {
-               inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_OKEY]), s2,
sizeof(s2));
-               fprintf(f, "okey %s ", s2);
+       if (tb[IFLA_VTI_OKEY] && rta_getattr_u32(tb[IFLA_VTI_OKEY])) {
+               fprintf(f, "okey %u ",
ntohl(rta_getattr_u32(tb[IFLA_VTI_OKEY])));