vti/tunnel: Unify ikey/okey printing

For vti6 tunnel we print [io]key in dotted-quad notation
(ipv4 address) while in vti we do that in hex format.

For vti tunnel we print [io]key only if value is not
zero while for vti6 we miss such check.

Unify vti and vti6 tunnel [io]key output.

While here enlarge s2 buffer to the same size as in rest
of tunnel support code (64 bytes) and check return from
inet_ntop().

Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/link_vti.c b/ip/link_vti.c
index baaaf2f2ab5e7a13301d08fb8d72060637c36abd..1439e53c61171d082f7b34f436ee3df87b5b5b76 100644 (file)
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -167,8 +167,7 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 {
        const char *local = "any";
        const char *remote = "any";
-       __u32 key;
-       char s2[IFNAMSIZ];
+       char s2[64];
 
        if (!tb)
                return;
@@ -200,14 +199,21 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                }
        }
 
-       if (tb[IFLA_VTI_IKEY] &&
-           (key = rta_getattr_u32(tb[IFLA_VTI_IKEY])))
-               print_0xhex(PRINT_ANY, "ikey", "ikey %#x ", ntohl(key));
+       if (tb[IFLA_VTI_IKEY]) {
+               struct rtattr *rta = tb[IFLA_VTI_IKEY];
+               __u32 key = rta_getattr_u32(rta);
 
+               if (key && inet_ntop(AF_INET, RTA_DATA(rta), s2, sizeof(s2)))
+                       print_string(PRINT_ANY, "ikey", "ikey %s ", s2);
+       }
+
+       if (tb[IFLA_VTI_OKEY]) {
+               struct rtattr *rta = tb[IFLA_VTI_OKEY];
+               __u32 key = rta_getattr_u32(rta);
 
-       if (tb[IFLA_VTI_OKEY] &&
-           (key = rta_getattr_u32(tb[IFLA_VTI_OKEY])))
-               print_0xhex(PRINT_ANY, "okey", "okey %#x ", ntohl(key));
+               if (key && inet_ntop(AF_INET, RTA_DATA(rta), s2, sizeof(s2)))
+                       print_string(PRINT_ANY, "okey", "okey %s ", s2);
+       }
 
        if (tb[IFLA_VTI_FWMARK]) {
                __u32 fwmark = rta_getattr_u32(tb[IFLA_VTI_FWMARK]);

diff --git a/ip/link_vti6.c b/ip/link_vti6.c
index 952dbb08aa1143a03598cb77e43f6839ce4bbcfd..6b61e3d3229b959c612e7036897626885f1c5e57 100644 (file)
--- a/ip/link_vti6.c
+++ b/ip/link_vti6.c
@@ -199,13 +199,19 @@ static void vti6_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        }
 
        if (tb[IFLA_VTI_IKEY]) {
-               inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_IKEY]), s2, sizeof(s2));
-               print_string(PRINT_ANY, "ikey", "ikey %s ", s2);
+               struct rtattr *rta = tb[IFLA_VTI_IKEY];
+               __u32 key = rta_getattr_u32(rta);
+
+               if (key && inet_ntop(AF_INET, RTA_DATA(rta), s2, sizeof(s2)))
+                       print_string(PRINT_ANY, "ikey", "ikey %s ", s2);
        }
 
        if (tb[IFLA_VTI_OKEY]) {
-               inet_ntop(AF_INET, RTA_DATA(tb[IFLA_VTI_OKEY]), s2, sizeof(s2));
-               print_string(PRINT_ANY, "okey", "okey %s ", s2);
+               struct rtattr *rta = tb[IFLA_VTI_OKEY];
+               __u32 key = rta_getattr_u32(rta);
+
+               if (key && inet_ntop(AF_INET, RTA_DATA(rta), s2, sizeof(s2)))
+                       print_string(PRINT_ANY, "okey", "okey %s ", s2);
        }
 
        if (tb[IFLA_VTI_FWMARK]) {