dpdk: fix ipsec coverity warnings 33/7033/3
authorSergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Wed, 7 Jun 2017 08:13:06 +0000 (09:13 +0100)
committerDamjan Marion <dmarion.lists@gmail.com>
Wed, 7 Jun 2017 12:40:44 +0000 (12:40 +0000)
CID 161044 and 161045

Change-Id: I50a450e231e387f05e354e3b07dc777ab864d018
Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
src/plugins/dpdk/ipsec/esp_encrypt.c

index f996d7d..8e94850 100644 (file)
@@ -293,7 +293,8 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
              oh0->esp.seq = clib_net_to_host_u32 (sa0->seq);
            }
 
-         if (PREDICT_TRUE (sa0->is_tunnel && !sa0->is_tunnel_ip6))
+         if (PREDICT_TRUE
+             (!is_ipv6 && sa0->is_tunnel && !sa0->is_tunnel_ip6))
            {
              oh0->ip4.src_address.as_u32 = sa0->tunnel_src_addr.ip4.as_u32;
              oh0->ip4.dst_address.as_u32 = sa0->tunnel_dst_addr.ip4.as_u32;
@@ -302,7 +303,7 @@ dpdk_esp_encrypt_node_fn (vlib_main_t * vm,
              next0 = ESP_ENCRYPT_NEXT_IP4_LOOKUP;
              vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
            }
-         else if (sa0->is_tunnel && sa0->is_tunnel_ip6)
+         else if (is_ipv6 && sa0->is_tunnel && sa0->is_tunnel_ip6)
            {
              oh6_0->ip6.src_address.as_u64[0] =
                sa0->tunnel_src_addr.ip6.as_u64[0];