From: Klement Sekera <klement@graphiant.com>
Date: Fri, 18 Feb 2022 15:11:14 +0000 (+0000)
Subject: nat: make tcp/udp/icmp packet counters consistent
X-Git-Tag: v22.10-rc0~363
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=caf4e754ea635b0ed028e9e8ecba29b32ff4a8a7;p=vpp.git

nat: make tcp/udp/icmp packet counters consistent

TCP/UDP packets which are dropped are not counted towards TCP/UDP
counters. Apply same behaviour to ICMP packets.

Type: improvement
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
Change-Id: I487fa7135ac8e49431a621fac213638d2dab31c8
---

diff --git a/src/plugins/nat/nat44-ed/nat44_ed_in2out.c b/src/plugins/nat/nat44-ed/nat44_ed_in2out.c
index 99db6010783..6e0a21d890a 100644
--- a/src/plugins/nat/nat44-ed/nat44_ed_in2out.c
+++ b/src/plugins/nat/nat44-ed/nat44_ed_in2out.c
@@ -1400,8 +1400,12 @@ nat44_ed_in2out_slow_path_node_fn_inline (vlib_main_t *vm,
 	      goto trace0;
 	    }
 
-	  vlib_increment_simple_counter (&sm->counters.slowpath.in2out.icmp,
-					 thread_index, cntr_sw_if_index0, 1);
+	  if (NAT_NEXT_DROP != next[0])
+	    {
+	      vlib_increment_simple_counter (
+		&sm->counters.slowpath.in2out.icmp, thread_index,
+		cntr_sw_if_index0, 1);
+	    }
 	  goto trace0;
 	}
 
diff --git a/src/plugins/nat/nat44-ed/nat44_ed_out2in.c b/src/plugins/nat/nat44-ed/nat44_ed_out2in.c
index 40a72122140..aa0cc508f08 100644
--- a/src/plugins/nat/nat44-ed/nat44_ed_out2in.c
+++ b/src/plugins/nat/nat44-ed/nat44_ed_out2in.c
@@ -1135,8 +1135,12 @@ nat44_ed_out2in_slow_path_node_fn_inline (vlib_main_t * vm,
 	      goto trace0;
 	    }
 
-	  vlib_increment_simple_counter (&sm->counters.slowpath.out2in.icmp,
-					 thread_index, sw_if_index0, 1);
+	  if (NAT_NEXT_DROP != next[0])
+	    {
+	      vlib_increment_simple_counter (
+		&sm->counters.slowpath.out2in.icmp, thread_index, sw_if_index0,
+		1);
+	    }
 	  goto trace0;
 	}