ikev2: fix coverity warning 63/29263/4
authorFilip Tehlar <ftehlar@cisco.com>
Tue, 6 Oct 2020 08:04:10 +0000 (08:04 +0000)
committerBeno�t Ganne <bganne@cisco.com>
Tue, 13 Oct 2020 09:49:57 +0000 (09:49 +0000)
Type: fix

Change-Id: Iee96b3ea3e71ec248c3c3c98d153a08372b5faf0
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
src/plugins/ikev2/ikev2.c

index 44528e1..62a77f9 100644 (file)
@@ -2714,6 +2714,26 @@ ikev2_set_ip_address (ikev2_sa_t * sa, const void *src,
   ip_address_set (&sa->iaddr, iaddr, af);
 }
 
+static void
+ikev2_elog_uint_peers_addr (u32 exchange, ip4_header_t * ip4,
+                           ip6_header_t * ip6, u8 is_ip4)
+{
+  u32 src, dst;
+  if (is_ip4)
+    {
+      src = ip4->src_address.as_u32;
+      dst = ip4->dst_address.as_u32;
+    }
+  else
+    {
+      src = ip6->src_address.as_u32[3];
+      dst = ip6->dst_address.as_u32[3];
+    }
+  ikev2_elog_uint_peers (IKEV2_LOG_WARNING, "IKEv2 exchange %d "
+                        "received from %d.%d.%d.%d to %d.%d.%d.%d",
+                        exchange, src, dst);
+}
+
 static_always_inline uword
 ikev2_node_internal (vlib_main_t * vm,
                     vlib_node_runtime_t * node, vlib_frame_t * frame,
@@ -3118,11 +3138,7 @@ ikev2_node_internal (vlib_main_t * vm,
        }
       else
        {
-         ikev2_elog_uint_peers (IKEV2_LOG_WARNING, "IKEv2 exchange %d "
-                                "received from %d.%d.%d.%d to %d.%d.%d.%d",
-                                ike0->exchange,
-                                ip40->src_address.as_u32,
-                                ip40->dst_address.as_u32);
+         ikev2_elog_uint_peers_addr (ike0->exchange, ip40, ip60, is_ip4);
        }
 
     dispatch0: