commit 2e02ba0ddaa8fecbd4b6397787658bd29fcca749
author Klement Sekera <ksekera@cisco.com> Fri Nov 30 14:37:03 2018 +0100
committer Dave Barach <openvpp@barachs.net> Tue Dec 04 21:46:13 2018 +0000
tree 6b99899860249d2add26424274db3bd7b56099f2
parent 01f3f894fc180060ef8ee1c8b4acb4421d12ebe3

ipsec: simplify bumping counters - cosmetic change

Change-Id: Ibb55427ed49d0277854a352922c6c4bb007bf072
Signed-off-by: Klement Sekera <ksekera@cisco.com>

src/vnet/ipsec/ah_decrypt.c

diff --git a/src/vnet/ipsec/ah_decrypt.c b/src/vnet/ipsec/ah_decrypt.c
index a2fc07f..c8c8902 100644
--- a/src/vnet/ipsec/ah_decrypt.c
+++ b/src/vnet/ipsec/ah_decrypt.c
@@ -158,14 +158,8 @@
 
 	      if (PREDICT_FALSE (rv))
 		{
-		  if (is_ip6)
-		    vlib_node_increment_counter (vm,
-						 ah6_decrypt_node.index,
-						 AH_DECRYPT_ERROR_REPLAY, 1);
-		  else
-		    vlib_node_increment_counter (vm,
-						 ah4_decrypt_node.index,
-						 AH_DECRYPT_ERROR_REPLAY, 1);
+		  vlib_node_increment_counter (vm, node->node_index,
+					       AH_DECRYPT_ERROR_REPLAY, 1);
 		  goto trace;
 		}
 	    }
@@ -212,16 +206,9 @@
 
 	      if (PREDICT_FALSE (memcmp (digest, sig, icv_size)))
 		{
-		  if (is_ip6)
-		    vlib_node_increment_counter (vm,
-						 ah6_decrypt_node.index,
-						 AH_DECRYPT_ERROR_INTEG_ERROR,
-						 1);
-		  else
-		    vlib_node_increment_counter (vm,
-						 ah4_decrypt_node.index,
-						 AH_DECRYPT_ERROR_INTEG_ERROR,
-						 1);
+		  vlib_node_increment_counter (vm, node->node_index,
+					       AH_DECRYPT_ERROR_INTEG_ERROR,
+					       1);
 		  goto trace;
 		}
 
@@ -248,16 +235,9 @@
 		next0 = AH_DECRYPT_NEXT_IP6_INPUT;
 	      else
 		{
-		  if (is_ip6)
-		    vlib_node_increment_counter (vm,
-						 ah6_decrypt_node.index,
-						 AH_DECRYPT_ERROR_DECRYPTION_FAILED,
-						 1);
-		  else
-		    vlib_node_increment_counter (vm,
-						 ah4_decrypt_node.index,
-						 AH_DECRYPT_ERROR_DECRYPTION_FAILED,
-						 1);
+		  vlib_node_increment_counter (vm, node->node_index,
+					       AH_DECRYPT_ERROR_DECRYPTION_FAILED,
+					       1);
 		  goto trace;
 		}
 	    }
@@ -320,14 +300,8 @@
 	}
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
-  if (is_ip6)
-    vlib_node_increment_counter (vm, ah6_decrypt_node.index,
-				 AH_DECRYPT_ERROR_RX_PKTS,
-				 from_frame->n_vectors);
-  else
-    vlib_node_increment_counter (vm, ah4_decrypt_node.index,
-				 AH_DECRYPT_ERROR_RX_PKTS,
-				 from_frame->n_vectors);
+  vlib_node_increment_counter (vm, node->node_index, AH_DECRYPT_ERROR_RX_PKTS,
+			       from_frame->n_vectors);
 
   return from_frame->n_vectors;
 }