http_static: fix reply data leak
[vpp.git] / src / vnet / ipsec / ipsec_input.c
index 0c572c8..48f7dea 100644 (file)
@@ -52,6 +52,7 @@ typedef struct
   ip_protocol_t proto;
   u32 spd;
   u32 policy_index;
+  u32 policy_type;
   u32 sa_id;
   u32 spi;
   u32 seq;
@@ -65,9 +66,10 @@ format_ipsec_input_trace (u8 * s, va_list * args)
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
   ipsec_input_trace_t *t = va_arg (*args, ipsec_input_trace_t *);
 
-  s = format (s, "%U: sa_id %u spd %u policy %d spi %u (0x%08x) seq %u",
-             format_ip_protocol, t->proto, t->sa_id,
-             t->spd, t->policy_index, t->spi, t->spi, t->seq);
+  s =
+    format (s, "%U: sa_id %u type: %u spd %u policy %d spi %u (0x%08x) seq %u",
+           format_ip_protocol, t->proto, t->sa_id, t->policy_type, t->spd,
+           t->policy_index, t->spi, t->spi, t->seq);
 
   return s;
 }
@@ -151,17 +153,30 @@ ipsec4_input_spd_find_flow_cache_entry (ipsec_main_t *im, u32 sa, u32 da,
 }
 
 always_inline void
-ipsec_fp_in_5tuple_from_ip4_range (ipsec_fp_5tuple_t *tuple, u32 la, u32 ra,
+ipsec_fp_in_5tuple_from_ip4_range (ipsec_fp_5tuple_t *tuple, u32 sa, u32 da,
                                   u32 spi, u8 action)
 {
   clib_memset (tuple->l3_zero_pad, 0, sizeof (tuple->l3_zero_pad));
-  tuple->laddr.as_u32 = la;
-  tuple->raddr.as_u32 = ra;
+  tuple->laddr.as_u32 = da;
+  tuple->raddr.as_u32 = sa;
   tuple->spi = spi;
   tuple->action = action;
   tuple->is_ipv6 = 0;
 }
 
+always_inline void
+ipsec_fp_in_5tuple_from_ip6_range (ipsec_fp_5tuple_t *tuple, ip6_address_t *sa,
+                                  ip6_address_t *da, u32 spi, u8 action)
+
+{
+  clib_memcpy (&tuple->ip6_laddr, da, sizeof (ip6_address_t));
+  clib_memcpy (&tuple->ip6_raddr, sa, sizeof (ip6_address_t));
+
+  tuple->spi = spi;
+  tuple->action = action;
+  tuple->is_ipv6 = 1;
+}
+
 always_inline ipsec_policy_t *
 ipsec_input_policy_match (ipsec_spd_t *spd, u32 sa, u32 da,
                          ipsec_spd_policy_type_t policy_type)
@@ -258,6 +273,347 @@ ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la,
   return 0;
 }
 
+always_inline void
+ipsec_collect_ah_trace (vlib_buffer_t **b, vlib_node_runtime_t *node,
+                       vlib_main_t *vm, ip4_header_t *ip0, ah_header_t *ah0,
+                       u8 has_space0, ipsec_spd_t *spd0, ipsec_policy_t *p0,
+                       u32 pi0)
+{
+  if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) &&
+      PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      ipsec_input_trace_t *tr = vlib_add_trace (vm, node, b[0], sizeof (*tr));
+
+      tr->proto = ip0->protocol;
+      tr->sa_id = p0 ? p0->sa_id : ~0;
+      tr->spi = has_space0 ? clib_net_to_host_u32 (ah0->spi) : ~0;
+      tr->seq = has_space0 ? clib_net_to_host_u32 (ah0->seq_no) : ~0;
+      tr->spd = spd0->id;
+      tr->policy_index = pi0;
+    }
+}
+
+always_inline void
+ipsec_ah_packet_process (vlib_main_t *vm, ipsec_main_t *im, ip4_header_t *ip0,
+                        ah_header_t *ah0, u32 thread_index, ipsec_spd_t *spd0,
+                        vlib_buffer_t **b, vlib_node_runtime_t *node,
+                        u64 *ipsec_bypassed, u64 *ipsec_dropped,
+                        u64 *ipsec_matched, u64 *ipsec_unprocessed, u16 *next)
+
+{
+  ipsec_policy_t *p0 = NULL;
+  u32 pi0 = ~0;
+  u8 has_space0;
+  /* if flow cache is enabled, first search through flow cache for a
+   * policy match and revert back to linear search on failure */
+  bool search_flow_cache = im->input_flow_cache_flag;
+
+  while (1)
+    {
+      if (search_flow_cache)
+       {
+         p0 = ipsec4_input_spd_find_flow_cache_entry (
+           im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
+           IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT);
+       }
+      else
+       {
+         p0 = ipsec_input_protect_policy_match (
+           spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
+           clib_net_to_host_u32 (ip0->dst_address.as_u32),
+           clib_net_to_host_u32 (ah0->spi));
+       }
+
+      has_space0 = vlib_buffer_has_space (b[0], (clib_address_t) (ah0 + 1) -
+                                                 (clib_address_t) ip0);
+
+      if (PREDICT_TRUE ((p0 != NULL) & (has_space0)))
+       {
+         *ipsec_matched += 1;
+         pi0 = p0 - im->policies;
+         vlib_increment_combined_counter (&ipsec_spd_policy_counters,
+                                          thread_index, pi0, 1,
+                                          clib_net_to_host_u16 (ip0->length));
+
+         vnet_buffer (b[0])->ipsec.sad_index = p0->sa_index;
+         next[0] = im->ah4_decrypt_next_index;
+         ipsec_collect_ah_trace (b, node, vm, ip0, ah0, has_space0, spd0, p0,
+                                 pi0);
+         return;
+       }
+      else
+       {
+         p0 = 0;
+         pi0 = ~0;
+       }
+      if (search_flow_cache)
+       {
+         p0 = ipsec4_input_spd_find_flow_cache_entry (
+           im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
+           IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
+       }
+
+      else
+       {
+         p0 = ipsec_input_policy_match (
+           spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
+           clib_net_to_host_u32 (ip0->dst_address.as_u32),
+           IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
+       }
+
+      if (PREDICT_TRUE ((p0 != NULL)))
+       {
+         *ipsec_bypassed += 1;
+         pi0 = p0 - im->policies;
+         vlib_increment_combined_counter (&ipsec_spd_policy_counters,
+                                          thread_index, pi0, 1,
+                                          clib_net_to_host_u16 (ip0->length));
+         ipsec_collect_ah_trace (b, node, vm, ip0, ah0, has_space0, spd0, p0,
+                                 pi0);
+         return;
+       }
+      else
+       {
+         p0 = 0;
+         pi0 = ~0;
+       };
+
+      if (search_flow_cache)
+       {
+         p0 = ipsec4_input_spd_find_flow_cache_entry (
+           im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
+           IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
+       }
+
+      else
+       {
+         p0 = ipsec_input_policy_match (
+           spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
+           clib_net_to_host_u32 (ip0->dst_address.as_u32),
+           IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
+       }
+
+      if (PREDICT_TRUE ((p0 != NULL)))
+       {
+         *ipsec_dropped += 1;
+         pi0 = p0 - im->policies;
+         vlib_increment_combined_counter (&ipsec_spd_policy_counters,
+                                          thread_index, pi0, 1,
+                                          clib_net_to_host_u16 (ip0->length));
+
+         next[0] = IPSEC_INPUT_NEXT_DROP;
+         ipsec_collect_ah_trace (b, node, vm, ip0, ah0, has_space0, spd0, p0,
+                                 pi0);
+         return;
+       }
+      else
+       {
+         p0 = 0;
+         pi0 = ~0;
+       };
+      /* flow cache search failed, retry with linear search */
+      if (search_flow_cache && p0 == NULL)
+       {
+         search_flow_cache = false;
+       }
+      else if (search_flow_cache == false && p0 == NULL)
+       {
+         /* Drop by default if no match on PROTECT, BYPASS or DISCARD */
+         *ipsec_unprocessed += 1;
+         next[0] = IPSEC_INPUT_NEXT_DROP;
+         return;
+       }
+    }
+}
+
+always_inline void
+ipsec_esp_packet_process (vlib_main_t *vm, ipsec_main_t *im, ip4_header_t *ip0,
+                         esp_header_t *esp0, u32 thread_index,
+                         ipsec_spd_t *spd0, vlib_buffer_t **b,
+                         vlib_node_runtime_t *node, u64 *ipsec_bypassed,
+                         u64 *ipsec_dropped, u64 *ipsec_matched,
+                         u64 *ipsec_unprocessed, u16 *next)
+
+{
+  ipsec_policy_t *p0 = NULL;
+  u32 pi0;
+  u8 has_space0;
+  bool search_flow_cache = false;
+  ipsec_policy_t *policies[1];
+  ipsec_fp_5tuple_t tuples[1];
+  bool ip_v6 = true;
+
+  /* if flow cache is enabled, first search through flow cache for a
+   * policy match for either protect, bypass or discard rules, in that
+   * order. if no match is found search_flow_cache is set to false (1)
+   * and we revert back to linear search
+   */
+
+  search_flow_cache = im->input_flow_cache_flag;
+udp_or_esp:
+
+  if (esp0->spi == 0)
+    {
+      /* RFC 4303, section 2.1: The SPI value of zero (0 is reserved for
+       * local, implementation-specific use and MUST NOT be sent on the wire.
+       */
+      *ipsec_unprocessed += 1;
+      next[0] = IPSEC_INPUT_NEXT_DROP;
+      return;
+    }
+
+  if (im->fp_spd_ipv4_in_is_enabled &&
+      PREDICT_TRUE (INDEX_INVALID != spd0->fp_spd.ip4_in_lookup_hash_idx))
+    {
+      ipsec_fp_in_5tuple_from_ip4_range (&tuples[0], ip0->src_address.as_u32,
+                                        ip0->dst_address.as_u32,
+                                        clib_net_to_host_u32 (esp0->spi),
+                                        IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT);
+      ipsec_fp_in_policy_match_n (&spd0->fp_spd, !ip_v6, tuples, policies, 1);
+      p0 = policies[0];
+    }
+  else if (search_flow_cache) /* attempt to match policy in flow cache */
+    {
+      p0 = ipsec4_input_spd_find_flow_cache_entry (
+       im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
+       IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT);
+    }
+
+  else /* linear search if flow cache is not enabled,
+       or flow cache search just failed */
+    {
+      p0 = ipsec_input_protect_policy_match (
+       spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
+       clib_net_to_host_u32 (ip0->dst_address.as_u32),
+       clib_net_to_host_u32 (esp0->spi));
+    }
+  has_space0 = vlib_buffer_has_space (b[0], (clib_address_t) (esp0 + 1) -
+                                             (clib_address_t) ip0);
+
+  if (PREDICT_TRUE ((p0 != NULL) & (has_space0)))
+    {
+      *ipsec_matched += 1;
+
+      pi0 = p0 - im->policies;
+      vlib_increment_combined_counter (&ipsec_spd_policy_counters,
+                                      thread_index, pi0, 1,
+                                      clib_net_to_host_u16 (ip0->length));
+
+      vnet_buffer (b[0])->ipsec.sad_index = p0->sa_index;
+      next[0] = im->esp4_decrypt_next_index;
+      vlib_buffer_advance (b[0], ((u8 *) esp0 - (u8 *) ip0));
+      goto trace0;
+    }
+  else
+    {
+      p0 = 0;
+      pi0 = ~0;
+    }
+  if (im->fp_spd_ipv4_in_is_enabled &&
+      PREDICT_TRUE (INDEX_INVALID != spd0->fp_spd.ip4_in_lookup_hash_idx))
+    {
+      tuples->action = IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS;
+      ipsec_fp_in_policy_match_n (&spd0->fp_spd, !ip_v6, tuples, policies, 1);
+      p0 = policies[0];
+    }
+  else if (search_flow_cache)
+    {
+      p0 = ipsec4_input_spd_find_flow_cache_entry (
+       im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
+       IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
+    }
+
+  else
+    {
+      p0 = ipsec_input_policy_match (
+       spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
+       clib_net_to_host_u32 (ip0->dst_address.as_u32),
+       IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
+    }
+
+  if (PREDICT_TRUE ((p0 != NULL)))
+    {
+      *ipsec_bypassed += 1;
+
+      pi0 = p0 - im->policies;
+      vlib_increment_combined_counter (&ipsec_spd_policy_counters,
+                                      thread_index, pi0, 1,
+                                      clib_net_to_host_u16 (ip0->length));
+
+      goto trace0;
+    }
+  else
+    {
+      p0 = 0;
+      pi0 = ~0;
+    };
+  if (im->fp_spd_ipv4_in_is_enabled &&
+      PREDICT_TRUE (INDEX_INVALID != spd0->fp_spd.ip4_in_lookup_hash_idx))
+    {
+      tuples->action = IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD;
+      ipsec_fp_in_policy_match_n (&spd0->fp_spd, !ip_v6, tuples, policies, 1);
+      p0 = policies[0];
+    }
+  else
+
+    if (search_flow_cache)
+    {
+      p0 = ipsec4_input_spd_find_flow_cache_entry (
+       im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
+       IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
+    }
+
+  else
+    {
+      p0 = ipsec_input_policy_match (
+       spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
+       clib_net_to_host_u32 (ip0->dst_address.as_u32),
+       IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
+    }
+
+  if (PREDICT_TRUE ((p0 != NULL)))
+    {
+      *ipsec_dropped += 1;
+
+      pi0 = p0 - im->policies;
+      vlib_increment_combined_counter (&ipsec_spd_policy_counters,
+                                      thread_index, pi0, 1,
+                                      clib_net_to_host_u16 (ip0->length));
+
+      next[0] = IPSEC_INPUT_NEXT_DROP;
+      goto trace0;
+    }
+  else
+    {
+      p0 = 0;
+      pi0 = ~0;
+    };
+  /* flow cache search failed, try again with linear search */
+  if (search_flow_cache && p0 == NULL)
+    {
+      search_flow_cache = false;
+      goto udp_or_esp;
+    }
+
+  /* Drop by default if no match on PROTECT, BYPASS or DISCARD */
+  *ipsec_unprocessed += 1;
+  next[0] = IPSEC_INPUT_NEXT_DROP;
+
+trace0:
+  if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) &&
+      PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
+    {
+      ipsec_input_trace_t *tr = vlib_add_trace (vm, node, b[0], sizeof (*tr));
+
+      tr->proto = ip0->protocol;
+      tr->sa_id = p0 ? p0->sa_id : ~0;
+      tr->spi = has_space0 ? clib_net_to_host_u32 (esp0->spi) : ~0;
+      tr->seq = has_space0 ? clib_net_to_host_u32 (esp0->seq) : ~0;
+      tr->spd = spd0->id;
+      tr->policy_index = pi0;
+    }
+}
+
 always_inline ipsec_policy_t *
 ipsec6_input_protect_policy_match (ipsec_spd_t * spd,
                                   ip6_address_t * sa,
@@ -321,18 +677,12 @@ VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
 
   while (n_left_from > 0)
     {
-      u32 next32, pi0;
+      u32 next32;
       ip4_header_t *ip0;
       esp_header_t *esp0 = NULL;
       ah_header_t *ah0;
       ip4_ipsec_config_t *c0;
       ipsec_spd_t *spd0;
-      ipsec_policy_t *p0 = NULL;
-      u8 has_space0;
-      bool search_flow_cache = false;
-      ipsec_policy_t *policies[1];
-      ipsec_fp_5tuple_t tuples[1];
-      bool ip_v6 = true;
 
       if (n_left_from > 2)
        {
@@ -348,330 +698,46 @@ VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
 
       ip0 = vlib_buffer_get_current (b[0]);
 
-      if (PREDICT_TRUE
-         (ip0->protocol == IP_PROTOCOL_IPSEC_ESP
-          || ip0->protocol == IP_PROTOCOL_UDP))
+      if (ip0->protocol == IP_PROTOCOL_UDP)
        {
-
-         esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
-         if (PREDICT_FALSE (ip0->protocol == IP_PROTOCOL_UDP))
-           {
-             /* FIXME Skip, if not a UDP encapsulated packet */
-             esp0 = (esp_header_t *) ((u8 *) esp0 + sizeof (udp_header_t));
-           }
-
-         // if flow cache is enabled, first search through flow cache for a
-         // policy match for either protect, bypass or discard rules, in that
-         // order. if no match is found search_flow_cache is set to false (1)
-         // and we revert back to linear search
-         search_flow_cache = im->input_flow_cache_flag;
-
-       esp_or_udp:
-         if (im->fp_spd_ipv4_in_is_enabled &&
-             PREDICT_TRUE (INDEX_INVALID !=
-                           spd0->fp_spd.ip4_in_lookup_hash_idx))
-           {
-             ipsec_fp_in_5tuple_from_ip4_range (
-               &tuples[0], ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               clib_net_to_host_u32 (esp0->spi),
-               IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT);
-             ipsec_fp_in_policy_match_n (&spd0->fp_spd, !ip_v6, tuples,
-                                         policies, 1);
-             p0 = policies[0];
-           }
-         else if (search_flow_cache) // attempt to match policy in flow cache
-           {
-             p0 = ipsec4_input_spd_find_flow_cache_entry (
-               im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT);
-           }
-
-         else // linear search if flow cache is not enabled,
-              // or flow cache search just failed
-           {
-             p0 = ipsec_input_protect_policy_match (
-               spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
-               clib_net_to_host_u32 (ip0->dst_address.as_u32),
-               clib_net_to_host_u32 (esp0->spi));
-           }
-
-         has_space0 =
-           vlib_buffer_has_space (b[0],
-                                  (clib_address_t) (esp0 + 1) -
-                                  (clib_address_t) ip0);
-
-         if (PREDICT_TRUE ((p0 != NULL) & (has_space0)))
-           {
-             ipsec_matched += 1;
-
-             pi0 = p0 - im->policies;
-             vlib_increment_combined_counter
-               (&ipsec_spd_policy_counters,
-                thread_index, pi0, 1, clib_net_to_host_u16 (ip0->length));
-
-             vnet_buffer (b[0])->ipsec.sad_index = p0->sa_index;
-             next[0] = im->esp4_decrypt_next_index;
-             vlib_buffer_advance (b[0], ((u8 *) esp0 - (u8 *) ip0));
-             goto trace0;
-           }
-         else
-           {
-             p0 = 0;
-             pi0 = ~0;
-           };
-
-         if (im->fp_spd_ipv4_in_is_enabled &&
-             PREDICT_TRUE (INDEX_INVALID !=
-                           spd0->fp_spd.ip4_in_lookup_hash_idx))
-           {
-             tuples->action = IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS;
-             ipsec_fp_in_policy_match_n (&spd0->fp_spd, !ip_v6, tuples,
-                                         policies, 1);
-             p0 = policies[0];
-           }
-         else if (search_flow_cache)
-           {
-             p0 = ipsec4_input_spd_find_flow_cache_entry (
-               im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
-           }
-
-         else
-           {
-             p0 = ipsec_input_policy_match (
-               spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
-               clib_net_to_host_u32 (ip0->dst_address.as_u32),
-               IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
-           }
-
-         if (PREDICT_TRUE ((p0 != NULL)))
-           {
-             ipsec_bypassed += 1;
-
-             pi0 = p0 - im->policies;
-             vlib_increment_combined_counter (
-               &ipsec_spd_policy_counters, thread_index, pi0, 1,
-               clib_net_to_host_u16 (ip0->length));
-
-             goto trace0;
-           }
-         else
-           {
-             p0 = 0;
-             pi0 = ~0;
-           };
-
-         if (im->fp_spd_ipv4_in_is_enabled &&
-             PREDICT_TRUE (INDEX_INVALID !=
-                           spd0->fp_spd.ip4_in_lookup_hash_idx))
-           {
-             tuples->action = IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD;
-             ipsec_fp_in_policy_match_n (&spd0->fp_spd, !ip_v6, tuples,
-                                         policies, 1);
-             p0 = policies[0];
-           }
-         else
-
-           if (search_flow_cache)
-           {
-             p0 = ipsec4_input_spd_find_flow_cache_entry (
-               im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
-           }
-
-         else
-           {
-             p0 = ipsec_input_policy_match (
-               spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
-               clib_net_to_host_u32 (ip0->dst_address.as_u32),
-               IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
-           }
-
-         if (PREDICT_TRUE ((p0 != NULL)))
-           {
-             ipsec_dropped += 1;
-
-             pi0 = p0 - im->policies;
-             vlib_increment_combined_counter (
-               &ipsec_spd_policy_counters, thread_index, pi0, 1,
-               clib_net_to_host_u16 (ip0->length));
-
-             next[0] = IPSEC_INPUT_NEXT_DROP;
-             goto trace0;
-           }
-         else
-           {
-             p0 = 0;
-             pi0 = ~0;
-           };
-
-         // flow cache search failed, try again with linear search
-         if (search_flow_cache && p0 == NULL)
-           {
-             search_flow_cache = false;
-             goto esp_or_udp;
-           }
-
-         /* Drop by default if no match on PROTECT, BYPASS or DISCARD */
-         ipsec_unprocessed += 1;
-         next[0] = IPSEC_INPUT_NEXT_DROP;
-
-       trace0:
-         if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) &&
-             PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
-           {
-             ipsec_input_trace_t *tr =
-               vlib_add_trace (vm, node, b[0], sizeof (*tr));
-
-             tr->proto = ip0->protocol;
-             tr->sa_id = p0 ? p0->sa_id : ~0;
-             tr->spi = has_space0 ? clib_net_to_host_u32 (esp0->spi) : ~0;
-             tr->seq = has_space0 ? clib_net_to_host_u32 (esp0->seq) : ~0;
-             tr->spd = spd0->id;
-             tr->policy_index = pi0;
+         udp_header_t *udp0 = NULL;
+         udp0 = (udp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
+
+         /* RFC5996 Section 2.23 "Port 4500 is reserved for
+          * UDP-encapsulated ESP and IKE."
+          */
+         if (clib_host_to_net_u16 (4500) == udp0->dst_port)
+           {
+             esp0 = (esp_header_t *) ((u8 *) udp0 + sizeof (udp_header_t));
+
+             ipsec_esp_packet_process (vm, im, ip0, esp0, thread_index, spd0,
+                                       b, node, &ipsec_bypassed,
+                                       &ipsec_dropped, &ipsec_matched,
+                                       &ipsec_unprocessed, next);
+             if (ipsec_bypassed > 0)
+               goto ipsec_bypassed;
            }
        }
+      else if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP))
+       {
+         esp0 = (esp_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
+         ipsec_esp_packet_process (vm, im, ip0, esp0, thread_index, spd0, b,
+                                   node, &ipsec_bypassed, &ipsec_dropped,
+                                   &ipsec_matched, &ipsec_unprocessed, next);
+         if (ipsec_bypassed > 0)
+           goto ipsec_bypassed;
+       }
       else if (ip0->protocol == IP_PROTOCOL_IPSEC_AH)
        {
          ah0 = (ah_header_t *) ((u8 *) ip0 + ip4_header_bytes (ip0));
 
-         // if flow cache is enabled, first search through flow cache for a
-         // policy match and revert back to linear search on failure
-         search_flow_cache = im->input_flow_cache_flag;
-
-       ah:
-         if (search_flow_cache)
-           {
-             p0 = ipsec4_input_spd_find_flow_cache_entry (
-               im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               IPSEC_SPD_POLICY_IP4_INBOUND_PROTECT);
-           }
-
-         else
-           {
-             p0 = ipsec_input_protect_policy_match (
-               spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
-               clib_net_to_host_u32 (ip0->dst_address.as_u32),
-               clib_net_to_host_u32 (ah0->spi));
-           }
-
-         has_space0 =
-           vlib_buffer_has_space (b[0],
-                                  (clib_address_t) (ah0 + 1) -
-                                  (clib_address_t) ip0);
-
-         if (PREDICT_TRUE ((p0 != NULL) & (has_space0)))
-           {
-             ipsec_matched += 1;
-
-             pi0 = p0 - im->policies;
-             vlib_increment_combined_counter
-               (&ipsec_spd_policy_counters,
-                thread_index, pi0, 1, clib_net_to_host_u16 (ip0->length));
-
-             vnet_buffer (b[0])->ipsec.sad_index = p0->sa_index;
-             next[0] = im->ah4_decrypt_next_index;
-             goto trace1;
-           }
-         else
-           {
-             p0 = 0;
-             pi0 = ~0;
-           }
-
-         if (search_flow_cache)
-           {
-             p0 = ipsec4_input_spd_find_flow_cache_entry (
-               im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
-           }
-
-         else
-           {
-             p0 = ipsec_input_policy_match (
-               spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
-               clib_net_to_host_u32 (ip0->dst_address.as_u32),
-               IPSEC_SPD_POLICY_IP4_INBOUND_BYPASS);
-           }
-
-         if (PREDICT_TRUE ((p0 != NULL)))
-           {
-             ipsec_bypassed += 1;
-
-             pi0 = p0 - im->policies;
-             vlib_increment_combined_counter (
-               &ipsec_spd_policy_counters, thread_index, pi0, 1,
-               clib_net_to_host_u16 (ip0->length));
-
-             goto trace1;
-           }
-         else
-           {
-             p0 = 0;
-             pi0 = ~0;
-           };
-
-         if (search_flow_cache)
-           {
-             p0 = ipsec4_input_spd_find_flow_cache_entry (
-               im, ip0->src_address.as_u32, ip0->dst_address.as_u32,
-               IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
-           }
-
-         else
-           {
-             p0 = ipsec_input_policy_match (
-               spd0, clib_net_to_host_u32 (ip0->src_address.as_u32),
-               clib_net_to_host_u32 (ip0->dst_address.as_u32),
-               IPSEC_SPD_POLICY_IP4_INBOUND_DISCARD);
-           }
-
-         if (PREDICT_TRUE ((p0 != NULL)))
-           {
-             ipsec_dropped += 1;
-
-             pi0 = p0 - im->policies;
-             vlib_increment_combined_counter (
-               &ipsec_spd_policy_counters, thread_index, pi0, 1,
-               clib_net_to_host_u16 (ip0->length));
-
-             next[0] = IPSEC_INPUT_NEXT_DROP;
-             goto trace1;
-           }
-         else
-           {
-             p0 = 0;
-             pi0 = ~0;
-           };
-
-         // flow cache search failed, retry with linear search
-         if (search_flow_cache && p0 == NULL)
-           {
-             search_flow_cache = false;
-             goto ah;
-           }
-
-         /* Drop by default if no match on PROTECT, BYPASS or DISCARD */
-         ipsec_unprocessed += 1;
-         next[0] = IPSEC_INPUT_NEXT_DROP;
-
-       trace1:
-         if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE) &&
-             PREDICT_FALSE (b[0]->flags & VLIB_BUFFER_IS_TRACED))
-           {
-             ipsec_input_trace_t *tr =
-               vlib_add_trace (vm, node, b[0], sizeof (*tr));
-
-             tr->proto = ip0->protocol;
-             tr->sa_id = p0 ? p0->sa_id : ~0;
-             tr->spi = has_space0 ? clib_net_to_host_u32 (ah0->spi) : ~0;
-             tr->seq = has_space0 ? clib_net_to_host_u32 (ah0->seq_no) : ~0;
-             tr->spd = spd0->id;
-             tr->policy_index = pi0;
-           }
+         ipsec_ah_packet_process (vm, im, ip0, ah0, thread_index, spd0, b,
+                                  node, &ipsec_bypassed, &ipsec_dropped,
+                                  &ipsec_matched, &ipsec_unprocessed, next);
        }
       else
        {
+       ipsec_bypassed:
          ipsec_unprocessed += 1;
        }
       n_left_from -= 1;
@@ -703,8 +769,6 @@ VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
-
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ipsec4_input_node) = {
   .name = "ipsec4-input-feature",
   .vector_size = sizeof (u32),
@@ -719,7 +783,6 @@ VLIB_REGISTER_NODE (ipsec4_input_node) = {
 #undef _
   },
 };
-/* *INDENT-ON* */
 
 extern vlib_node_registration_t ipsec6_input_node;
 
@@ -732,6 +795,9 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
   ipsec_main_t *im = &ipsec_main;
   u32 ipsec_unprocessed = 0;
   u32 ipsec_matched = 0;
+  ipsec_policy_t *policies[1];
+  ipsec_fp_5tuple_t tuples[1];
+  bool ip_v6 = true;
 
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
@@ -747,7 +813,7 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
 
       while (n_left_from > 0 && n_left_to_next > 0)
        {
-         u32 bi0, next0, pi0;
+         u32 bi0, next0, pi0 = ~0;
          vlib_buffer_t *b0;
          ip6_header_t *ip0;
          esp_header_t *esp0;
@@ -784,11 +850,22 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
                 clib_net_to_host_u16 (ip0->payload_length) + header_size,
                 spd0->id);
 #endif
-             p0 = ipsec6_input_protect_policy_match (spd0,
-                                                     &ip0->src_address,
-                                                     &ip0->dst_address,
-                                                     clib_net_to_host_u32
-                                                     (esp0->spi));
+             if (im->fp_spd_ipv6_in_is_enabled &&
+                 PREDICT_TRUE (INDEX_INVALID !=
+                               spd0->fp_spd.ip6_in_lookup_hash_idx))
+               {
+                 ipsec_fp_in_5tuple_from_ip6_range (
+                   &tuples[0], &ip0->src_address, &ip0->dst_address,
+                   clib_net_to_host_u32 (esp0->spi),
+                   IPSEC_SPD_POLICY_IP6_INBOUND_PROTECT);
+                 ipsec_fp_in_policy_match_n (&spd0->fp_spd, ip_v6, tuples,
+                                             policies, 1);
+                 p0 = policies[0];
+               }
+             else
+               p0 = ipsec6_input_protect_policy_match (
+                 spd0, &ip0->src_address, &ip0->dst_address,
+                 clib_net_to_host_u32 (esp0->spi));
 
              if (PREDICT_TRUE (p0 != 0))
                {
@@ -804,6 +881,8 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
                  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
                  next0 = im->esp6_decrypt_next_index;
                  vlib_buffer_advance (b0, header_size);
+                 /* TODO Add policy matching for bypass and discard policy
+                  * type */
                  goto trace0;
                }
              else
@@ -855,11 +934,16 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
                vlib_add_trace (vm, node, b0, sizeof (*tr));
 
              if (p0)
-               tr->sa_id = p0->sa_id;
+               {
+                 tr->sa_id = p0->sa_id;
+                 tr->policy_type = p0->type;
+               }
+
              tr->proto = ip0->protocol;
              tr->spi = clib_net_to_host_u32 (esp0->spi);
              tr->seq = clib_net_to_host_u32 (esp0->seq);
              tr->spd = spd0->id;
+             tr->policy_index = pi0;
            }
 
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
@@ -880,7 +964,6 @@ VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
 }
 
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ipsec6_input_node) = {
   .name = "ipsec6-input-feature",
   .vector_size = sizeof (u32),
@@ -895,7 +978,6 @@ VLIB_REGISTER_NODE (ipsec6_input_node) = {
 #undef _
   },
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON