From: Anand B Jyoti <anand.b.jyoti@intel.com>
Date: Wed, 12 Jul 2017 02:42:31 +0000 (+0530)
Subject: vFW: ARPICMP packets shouldn't be processed by vFW
X-Git-Tag: opnfv-5.0.RC1~75^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8b92d721853117a67574ed3f3950cc1ae27a887a;p=samplevnf.git

vFW: ARPICMP packets shouldn't be processed by vFW

JIRA: SAMPLEVNF-52

The stats counters are wrong when ARPICMP pkts are received by VFW
pipeline in case of HWLB mode as the vFW is trying to process
these pkts.

The ARPICMP pkts shouldn't be processed by VFW pipeline, as these
packets are processed by ARPICMP pipeline in case of HWLB.

Change-Id: Iefe947a9f63fd4943f37900582656a9a4f957f5d
Signed-off-by: Anand B Jyoti <anand.b.jyoti@intel.com>
---

diff --git a/VNFs/vFW/pipeline/pipeline_vfw_be.c b/VNFs/vFW/pipeline/pipeline_vfw_be.c
index 7c532ed3..97508a77 100644
--- a/VNFs/vFW/pipeline/pipeline_vfw_be.c
+++ b/VNFs/vFW/pipeline/pipeline_vfw_be.c
@@ -599,9 +599,18 @@ rte_vfw_ipv4_packet_filter_and_process(struct rte_mbuf **pkts,
               /* remove this packet from remaining list */
               pkts_to_process &= ~pkt_mask;
 
-              if (enable_hwlb)
-                     if (!check_arp_icmp(pkt, vfw_pipe))
-                            discard = 1;
+	      if (enable_hwlb) {
+		      if (!check_arp_icmp(pkt, vfw_pipe)) {
+			      /* make next packet data the current */
+			      pkts_to_process = next_pkts_to_process;
+			      pos = next_pos;
+			      pkt = next_pkt;
+			      ihdr4 = next_iphdr;
+			      pkt_mask = 1LLU << pos;
+			      valid_packets &= ~pkt_mask;
+			      continue;
+		     }
+	      }
 
               uint32_t packet_length = rte_pktmbuf_pkt_len(pkt);
 
@@ -749,9 +758,18 @@ rte_vfw_ipv6_packet_filter_and_process(struct rte_mbuf **pkts,
               /* remove this packet from remaining list */
               pkts_to_process &= ~pkt_mask;
 
-              if (enable_hwlb)
-                     if (!check_arp_icmp(pkt, vfw_pipe))
-                            discard = 1;
+              if (enable_hwlb) {
+                     if (!check_arp_icmp(pkt, vfw_pipe)) {
+			     /* make next packet data the current */
+			     pkts_to_process = next_pkts_to_process;
+			     pos = next_pos;
+			     pkt = next_pkt;
+			     ihdr6 = next_iphdr;
+			     pkt_mask = 1LLU << pos;
+			     valid_packets &= ~pkt_mask;
+			     continue;
+		     }
+	      }
 
               uint32_t packet_length = rte_pktmbuf_pkt_len(pkt);