From: Igor Mikhailov (imichail) <imichail@cisco.com>
Date: Fri, 11 Jan 2019 21:59:04 +0000 (-0800)
Subject: Fix custom-dump for gre_add_del_tunnel: src and dst IPs
X-Git-Tag: v19.04-rc0~13
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F16767%2F2;p=vpp.git

Fix custom-dump for gre_add_del_tunnel: src and dst IPs

Change-Id: I747ca01dc8df9fb5e11168ec46979c4a1f1baa7c
Signed-off-by: Igor Mikhailov (imichail) <imichail@cisco.com>
---

diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 0d8b453188d..cf016003a47 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -1915,16 +1915,13 @@ static void *vl_api_gre_add_del_tunnel_t_print
   (vl_api_gre_add_del_tunnel_t * mp, void *handle)
 {
   u8 *s;
+  ip46_address_t src = to_ip46 (mp->is_ipv6, mp->src_address);
+  ip46_address_t dst = to_ip46 (mp->is_ipv6, mp->dst_address);
 
   s = format (0, "SCRIPT: gre_add_del_tunnel ");
 
-  s = format (s, "dst %U ", format_ip46_address,
-	      (ip46_address_t *) & (mp->dst_address),
-	      mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
-
-  s = format (s, "src %U ", format_ip46_address,
-	      (ip46_address_t *) & (mp->src_address),
-	      mp->is_ipv6 ? IP46_TYPE_IP6 : IP46_TYPE_IP4);
+  s = format (s, "dst %U ", format_ip46_address, &dst, IP46_TYPE_ANY);
+  s = format (s, "src %U ", format_ip46_address, &src, IP46_TYPE_ANY);
 
   s = format (s, "instance %d ", ntohl (mp->instance));