From: Guillaume Solignac <gsoligna@cisco.com>
Date: Mon, 20 May 2019 13:58:46 +0000 (+0200)
Subject: Fix: bug prevented IPsec ipv4 SPDs to show correctly
X-Git-Tag: v20.01-rc0~486
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F19719%2F5;p=vpp.git

Fix: bug prevented IPsec ipv4 SPDs to show correctly

Because of the initialisation of the end of the range, the command show ipsec spd
on an ipv4 SPD didn't work correctly.

Change-Id: I3582382197bb6edef4fb077aac1e927ef4581cbf
Signed-off-by: Guillaume Solignac <gsoligna@cisco.com>
---

diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c
index 284dd6f5513..5bcfcdbeff1 100644
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -155,6 +155,7 @@ u8 *
 format_ipsec_policy (u8 * s, va_list * args)
 {
   u32 pi = va_arg (*args, u32);
+  ip46_type_t ip_type = IP46_TYPE_IP4;
   ipsec_main_t *im = &ipsec_main;
   ipsec_policy_t *p;
   vlib_counter_t counts;
@@ -177,15 +178,19 @@ format_ipsec_policy (u8 * s, va_list * args)
     {
       s = format (s, " sa %u", p->sa_id);
     }
+  if (p->is_ipv6)
+    {
+      ip_type = IP46_TYPE_IP6;
+    }
 
   s = format (s, "\n     local addr range %U - %U port range %u - %u",
-	      format_ip46_address, &p->laddr.start, IP46_TYPE_ANY,
-	      format_ip46_address, &p->laddr.stop, IP46_TYPE_ANY,
+	      format_ip46_address, &p->laddr.start, ip_type,
+	      format_ip46_address, &p->laddr.stop, ip_type,
 	      clib_net_to_host_u16 (p->lport.start),
 	      clib_net_to_host_u16 (p->lport.stop));
   s = format (s, "\n     remote addr range %U - %U port range %u - %u",
-	      format_ip46_address, &p->raddr.start, IP46_TYPE_ANY,
-	      format_ip46_address, &p->raddr.stop, IP46_TYPE_ANY,
+	      format_ip46_address, &p->raddr.start, ip_type,
+	      format_ip46_address, &p->raddr.stop, ip_type,
 	      clib_net_to_host_u16 (p->rport.start),
 	      clib_net_to_host_u16 (p->rport.stop));