IPSEC: SPD counters in the stats sgement

[vpp.git] / src / vnet / ipsec / ah_encrypt.c

diff --git a/src/vnet/ipsec/ah_encrypt.c b/src/vnet/ipsec/ah_encrypt.c
index 856eab6..8b0c14f 100644 (file)
--- a/src/vnet/ipsec/ah_encrypt.c
+++ b/src/vnet/ipsec/ah_encrypt.c
@@ -125,17 +125,8 @@ ah_encrypt_inline (vlib_main_t * vm,
 
          if (PREDICT_FALSE (esp_seq_advance (sa0)))
            {
-             clib_warning ("sequence number counter has cycled SPI %u",
-                           sa0->spi);
-             if (is_ip6)
-               vlib_node_increment_counter (vm, ah6_encrypt_node.index,
-                                            AH_ENCRYPT_ERROR_SEQ_CYCLED, 1);
-             else
-               vlib_node_increment_counter (vm, ah4_encrypt_node.index,
-                                            AH_ENCRYPT_ERROR_SEQ_CYCLED, 1);
-             //TODO need to confirm if below is needed
-             to_next[0] = i_bi0;
-             to_next += 1;
+             vlib_node_increment_counter (vm, node->node_index,
+                                          AH_ENCRYPT_ERROR_SEQ_CYCLED, 1);
              goto trace;
            }
 
@@ -171,7 +162,7 @@ ah_encrypt_inline (vlib_main_t * vm,
                 sizeof (ethernet_header_t));
              ethernet_header_t *oeh0 =
                (ethernet_header_t *) ((u8 *) ieh0 + (adv - icv_size));
-             clib_memcpy (oeh0, ieh0, sizeof (ethernet_header_t));
+             clib_memcpy_fast (oeh0, ieh0, sizeof (ethernet_header_t));
            }
 
          vlib_buffer_advance (i_b0, adv - icv_size);
@@ -212,7 +203,7 @@ ah_encrypt_inline (vlib_main_t * vm,
            {
              ip_hdr_size = sizeof (ip4_header_t);
              oh0 = vlib_buffer_get_current (i_b0);
-             memset (oh0, 0, sizeof (ip4_and_ah_header_t));
+             clib_memset (oh0, 0, sizeof (ip4_and_ah_header_t));
 
              if (PREDICT_TRUE (sa0->is_tunnel))
                {
@@ -265,11 +256,11 @@ ah_encrypt_inline (vlib_main_t * vm,
            }
 
          u8 sig[64];
-         memset (sig, 0, sizeof (sig));
+         clib_memset (sig, 0, sizeof (sig));
          u8 *digest =
            vlib_buffer_get_current (i_b0) + ip_hdr_size +
            sizeof (ah_header_t);
-         memset (digest, 0, icv_size);
+         clib_memset (digest, 0, icv_size);
 
          unsigned size = hmac_calc (sa0->integ_alg, sa0->integ_key,
                                     sa0->integ_key_len,
@@ -314,28 +305,22 @@ ah_encrypt_inline (vlib_main_t * vm,
        }
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
-  if (is_ip6)
-    vlib_node_increment_counter (vm, ah6_encrypt_node.index,
-                                AH_ENCRYPT_ERROR_RX_PKTS,
-                                from_frame->n_vectors);
-  else
-    vlib_node_increment_counter (vm, ah4_encrypt_node.index,
-                                AH_ENCRYPT_ERROR_RX_PKTS,
-                                from_frame->n_vectors);
+  vlib_node_increment_counter (vm, node->node_index,
+                              AH_ENCRYPT_ERROR_RX_PKTS,
+                              from_frame->n_vectors);
 
   return from_frame->n_vectors;
 }
 
-static uword
-ah4_encrypt_node_fn (vlib_main_t * vm,
-                    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (ah4_encrypt_node) (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * from_frame)
 {
   return ah_encrypt_inline (vm, node, from_frame, 0 /* is_ip6 */ );
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ah4_encrypt_node) = {
-  .function = ah4_encrypt_node_fn,
   .name = "ah4-encrypt",
   .vector_size = sizeof (u32),
   .format_trace = format_ah_encrypt_trace,
@@ -353,18 +338,15 @@ VLIB_REGISTER_NODE (ah4_encrypt_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ah4_encrypt_node, ah4_encrypt_node_fn);
-
-static uword
-ah6_encrypt_node_fn (vlib_main_t * vm,
-                    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (ah6_encrypt_node) (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * from_frame)
 {
   return ah_encrypt_inline (vm, node, from_frame, 1 /* is_ip6 */ );
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ah6_encrypt_node) = {
-  .function = ah6_encrypt_node_fn,
   .name = "ah6-encrypt",
   .vector_size = sizeof (u32),
   .format_trace = format_ah_encrypt_trace,
@@ -382,7 +364,6 @@ VLIB_REGISTER_NODE (ah6_encrypt_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ah6_encrypt_node, ah6_encrypt_node_fn);
 /*
  * fd.io coding-style-patch-verification: ON
  *