IPSEC-AH: fix packet drop

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

diff --git a/src/vnet/ipsec/ah_decrypt.c b/src/vnet/ipsec/ah_decrypt.c
index e3e0071..9b0c16e 100644 (file)
--- a/src/vnet/ipsec/ah_decrypt.c
+++ b/src/vnet/ipsec/ah_decrypt.c
@@ -156,17 +156,14 @@ ah_decrypt_inline (vlib_main_t * vm,
 
              if (PREDICT_FALSE (rv))
                {
-                 clib_warning ("anti-replay SPI %u seq %u", sa0->spi, seq);
                  if (is_ip6)
                    vlib_node_increment_counter (vm,
                                                 ah6_decrypt_node.index,
                                                 AH_DECRYPT_ERROR_REPLAY, 1);
                  else
                    vlib_node_increment_counter (vm,
-                                                ah6_decrypt_node.index,
+                                                ah4_decrypt_node.index,
                                                 AH_DECRYPT_ERROR_REPLAY, 1);
-                 to_next[0] = i_bi0;
-                 to_next += 1;
                  goto trace;
                }
            }
@@ -179,11 +176,11 @@ ah_decrypt_inline (vlib_main_t * vm,
            {
              u8 sig[64];
              u8 digest[64];
-             memset (sig, 0, sizeof (sig));
-             memset (digest, 0, sizeof (digest));
+             clib_memset (sig, 0, sizeof (sig));
+             clib_memset (digest, 0, sizeof (digest));
              u8 *icv = ah0->auth_data;
              memcpy (digest, icv, icv_size);
-             memset (icv, 0, icv_size);
+             clib_memset (icv, 0, icv_size);
 
              if (is_ip6)
                {
@@ -223,8 +220,6 @@ ah_decrypt_inline (vlib_main_t * vm,
                                                 ah4_decrypt_node.index,
                                                 AH_DECRYPT_ERROR_INTEG_ERROR,
                                                 1);
-                 to_next[0] = i_bi0;
-                 to_next += 1;
                  goto trace;
                }
 
@@ -336,16 +331,15 @@ ah_decrypt_inline (vlib_main_t * vm,
   return from_frame->n_vectors;
 }
 
-static uword
-ah4_decrypt_node_fn (vlib_main_t * vm,
-                    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (ah4_decrypt_node) (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * from_frame)
 {
   return ah_decrypt_inline (vm, node, from_frame, 0 /* is_ip6 */ );
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ah4_decrypt_node) = {
-  .function = ah4_decrypt_node_fn,
   .name = "ah4-decrypt",
   .vector_size = sizeof (u32),
   .format_trace = format_ah_decrypt_trace,
@@ -363,18 +357,15 @@ VLIB_REGISTER_NODE (ah4_decrypt_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ah4_decrypt_node, ah4_decrypt_node_fn);
-
-static uword
-ah6_decrypt_node_fn (vlib_main_t * vm,
-                    vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (ah6_decrypt_node) (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * from_frame)
 {
   return ah_decrypt_inline (vm, node, from_frame, 1 /* is_ip6 */ );
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ah6_decrypt_node) = {
-  .function = ah6_decrypt_node_fn,
   .name = "ah6-decrypt",
   .vector_size = sizeof (u32),
   .format_trace = format_ah_decrypt_trace,
@@ -392,7 +383,6 @@ VLIB_REGISTER_NODE (ah6_decrypt_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ah6_decrypt_node, ah6_decrypt_node_fn);
 /*
  * fd.io coding-style-patch-verification: ON
  *