X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fah_encrypt.c;h=b4e9af3480284420b344c178080b11aa58b5bb3a;hb=e5d34919b;hp=d12ca6704f052a6fe841a9e4601ec37a29e394dd;hpb=72f2a3acb797797416a96dc10312ccd431126de7;p=vpp.git

diff --git a/src/vnet/ipsec/ah_encrypt.c b/src/vnet/ipsec/ah_encrypt.c
index d12ca6704f0..b4e9af34802 100644
--- a/src/vnet/ipsec/ah_encrypt.c
+++ b/src/vnet/ipsec/ah_encrypt.c
@@ -24,9 +24,8 @@
 #include <vnet/ipsec/ah.h>
 
 #define foreach_ah_encrypt_next \
-  _ (DROP, "error-drop")            \
-  _ (IP4_LOOKUP, "ip4-lookup")      \
-  _ (IP6_LOOKUP, "ip6-lookup")      \
+  _ (DROP, "error-drop")                           \
+  _ (HANDOFF, "handoff")                           \
   _ (INTERFACE_OUTPUT, "interface-output")
 
 
@@ -75,8 +74,8 @@ format_ah_encrypt_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   ah_encrypt_trace_t *t = va_arg (*args, ah_encrypt_trace_t *);
 
-  s = format (s, "ah: sa-index %d spi %u seq %u:%u integrity %U",
-	      t->sa_index, t->spi, t->seq_hi, t->seq_lo,
+  s = format (s, "ah: sa-index %d spi %u (0x%08x) seq %u:%u integrity %U",
+	      t->sa_index, t->spi, t->spi, t->seq_hi, t->seq_lo,
 	      format_ipsec_integ_alg, t->integ_alg);
   return s;
 }
@@ -183,6 +182,21 @@ ah_encrypt_inline (vlib_main_t * vm,
       pd->sa_index = current_sa_index;
       next[0] = AH_ENCRYPT_NEXT_DROP;
 
+      if (PREDICT_FALSE (~0 == sa0->encrypt_thread_index))
+	{
+	  /* this is the first packet to use this SA, claim the SA
+	   * for this thread. this could happen simultaneously on
+	   * another thread */
+	  clib_atomic_cmp_and_swap (&sa0->encrypt_thread_index, ~0,
+				    ipsec_sa_assign_thread (thread_index));
+	}
+
+      if (PREDICT_TRUE (thread_index != sa0->encrypt_thread_index))
+	{
+	  next[0] = AH_ENCRYPT_NEXT_HANDOFF;
+	  goto next;
+	}
+
       if (PREDICT_FALSE (esp_seq_advance (sa0)))
 	{
 	  b[0]->error = node->errors[AH_ENCRYPT_ERROR_SEQ_CYCLED];
@@ -216,12 +230,12 @@ ah_encrypt_inline (vlib_main_t * vm,
       /* transport mode save the eth header before it is overwritten */
       if (PREDICT_FALSE (!ipsec_sa_is_set_IS_TUNNEL (sa0)))
 	{
-	  ethernet_header_t *ieh0 = (ethernet_header_t *)
-	    ((u8 *) vlib_buffer_get_current (b[0]) -
-	     sizeof (ethernet_header_t));
-	  ethernet_header_t *oeh0 =
-	    (ethernet_header_t *) ((u8 *) ieh0 + (adv - icv_size));
-	  clib_memcpy_fast (oeh0, ieh0, sizeof (ethernet_header_t));
+	  const u32 l2_len = vnet_buffer (b[0])->ip.save_rewrite_length;
+	  u8 *l2_hdr_in = (u8 *) vlib_buffer_get_current (b[0]) - l2_len;
+
+	  u8 *l2_hdr_out = l2_hdr_in + adv - icv_size;
+
+	  clib_memcpy_le32 (l2_hdr_out, l2_hdr_in, l2_len);
 	}
 
       vlib_buffer_advance (b[0], adv - icv_size);
@@ -292,7 +306,7 @@ ah_encrypt_inline (vlib_main_t * vm,
 	{
 	  clib_memcpy_fast (&oh0->ip4.address_pair,
 			    &sa0->ip4_hdr.address_pair,
-			    sizeof (ip4_address_t));
+			    sizeof (ip4_address_pair_t));
 
 	  next[0] = sa0->dpo.dpoi_next_node;
 	  vnet_buffer (b[0])->ip.adj_index[VLIB_TX] = sa0->dpo.dpoi_index;
@@ -420,9 +434,9 @@ VLIB_REGISTER_NODE (ah4_encrypt_node) = {
 
   .n_next_nodes = AH_ENCRYPT_N_NEXT,
   .next_nodes = {
-#define _(s,n) [AH_ENCRYPT_NEXT_##s] = n,
-    foreach_ah_encrypt_next
-#undef _
+    [AH_ENCRYPT_NEXT_DROP] = "ip4-drop",
+    [AH_ENCRYPT_NEXT_HANDOFF] = "ah4-encrypt-handoff",
+    [AH_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "interface-output",
   },
 };
 /* *INDENT-ON* */
@@ -446,9 +460,9 @@ VLIB_REGISTER_NODE (ah6_encrypt_node) = {
 
   .n_next_nodes = AH_ENCRYPT_N_NEXT,
   .next_nodes = {
-#define _(s,n) [AH_ENCRYPT_NEXT_##s] = n,
-    foreach_ah_encrypt_next
-#undef _
+    [AH_ENCRYPT_NEXT_DROP] = "ip6-drop",
+    [AH_ENCRYPT_NEXT_HANDOFF] = "ah6-encrypt-handoff",
+    [AH_ENCRYPT_NEXT_INTERFACE_OUTPUT] = "interface-output",
   },
 };
 /* *INDENT-ON* */