Fix IPSec CLI key parsing

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

diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c
index d617555..ef4113a 100644 (file)
--- a/src/vnet/ipsec/ipsec_input.c
+++ b/src/vnet/ipsec/ipsec_input.c
@@ -44,6 +44,7 @@ static char *ipsec_input_error_strings[] = {
 
 typedef struct
 {
+  u32 spd;
   u32 sa_id;
   u32 spi;
   u32 seq;
@@ -65,11 +66,14 @@ format_ipsec_input_trace (u8 * s, va_list * args)
 
   if (t->sa_id != 0)
     {
-      s = format (s, "esp: sa_id %u spi %u seq %u", t->sa_id, t->spi, t->seq);
+      s =
+       format (s, "esp: sa_id %u spd %u spi %u seq %u", t->sa_id, t->spd,
+               t->spi, t->seq);
     }
   else
     {
-      s = format (s, "esp: no sa spi %u seq %u", t->spi, t->seq);
+      s =
+       format (s, "esp: no sa spd %u spi %u seq %u", t->spd, t->spi, t->seq);
     }
   return s;
 }
@@ -129,9 +133,9 @@ ip6_addr_match_range (ip6_address_t * a, ip6_address_t * la,
 }
 
 always_inline ipsec_policy_t *
-ipsec_input_ip6_protect_policy_match (ipsec_spd_t * spd,
-                                     ip6_address_t * sa,
-                                     ip6_address_t * da, u32 spi)
+ipsec6_input_protect_policy_match (ipsec_spd_t * spd,
+                                  ip6_address_t * sa,
+                                  ip6_address_t * da, u32 spi)
 {
   ipsec_main_t *im = &ipsec_main;
   ipsec_policy_t *p;
@@ -168,12 +172,11 @@ ipsec_input_ip6_protect_policy_match (ipsec_spd_t * spd,
   return 0;
 }
 
-static vlib_node_registration_t ipsec_input_ip4_node;
+static vlib_node_registration_t ipsec4_input_node;
 
-static uword
-ipsec_input_ip4_node_fn (vlib_main_t * vm,
-                        vlib_node_runtime_t * node,
-                        vlib_frame_t * from_frame)
+VLIB_NODE_FN (ipsec4_input_node) (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * from_frame)
 {
   u32 n_left_from, *from, next_index, *to_next;
   ipsec_main_t *im = &ipsec_main;
@@ -209,10 +212,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
          b0 = vlib_get_buffer (vm, bi0);
          b0->flags |= VNET_BUFFER_F_IS_IP4;
          b0->flags &= ~VNET_BUFFER_F_IS_IP6;
-         c0 =
-           vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index
-                                        [VLIB_RX], &next0, b0,
-                                        sizeof (c0[0]));
+         c0 = vnet_feature_next_with_data (&next0, b0, sizeof (c0[0]));
 
          spd0 = pool_elt_at_index (im->spds, c0->spd_index);
 
@@ -255,7 +255,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
                  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
                  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
                  vnet_buffer (b0)->ipsec.flags = 0;
-                 next0 = im->esp_decrypt_next_index;
+                 next0 = im->esp4_decrypt_next_index;
                  vlib_buffer_advance (b0, ((u8 *) esp0 - (u8 *) ip0));
                  goto trace0;
                }
@@ -273,6 +273,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
                        tr->sa_id = p0->sa_id;
                      tr->spi = clib_host_to_net_u32 (esp0->spi);
                      tr->seq = clib_host_to_net_u32 (esp0->seq);
+                     tr->spd = spd0->id;
                    }
                }
 
@@ -298,7 +299,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
                  p0->counter.bytes += clib_net_to_host_u16 (ip0->length);
                  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
                  vnet_buffer (b0)->ipsec.flags = 0;
-                 next0 = im->ah_decrypt_next_index;
+                 next0 = im->ah4_decrypt_next_index;
                  goto trace1;
                }
              /* FIXME bypass and discard */
@@ -313,6 +314,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
                        tr->sa_id = p0->sa_id;
                      tr->spi = clib_host_to_net_u32 (ah0->spi);
                      tr->seq = clib_host_to_net_u32 (ah0->seq_no);
+                     tr->spd = spd0->id;
                    }
                }
            }
@@ -323,7 +325,7 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
        }
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
-  vlib_node_increment_counter (vm, ipsec_input_ip4_node.index,
+  vlib_node_increment_counter (vm, ipsec4_input_node.index,
                               IPSEC_INPUT_ERROR_RX_PKTS,
                               from_frame->n_vectors);
 
@@ -332,9 +334,8 @@ ipsec_input_ip4_node_fn (vlib_main_t * vm,
 
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_input_ip4_node,static) = {
-  .function = ipsec_input_ip4_node_fn,
-  .name = "ipsec-input-ip4",
+VLIB_REGISTER_NODE (ipsec4_input_node,static) = {
+  .name = "ipsec4-input",
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_input_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -351,13 +352,12 @@ VLIB_REGISTER_NODE (ipsec_input_ip4_node,static) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
-     static vlib_node_registration_t ipsec_input_ip6_node;
+static vlib_node_registration_t ipsec6_input_node;
 
-     static uword
-       ipsec_input_ip6_node_fn (vlib_main_t * vm,
-                               vlib_node_runtime_t * node,
-                               vlib_frame_t * from_frame)
+
+VLIB_NODE_FN (ipsec6_input_node) (vlib_main_t * vm,
+                                 vlib_node_runtime_t * node,
+                                 vlib_frame_t * from_frame)
 {
   u32 n_left_from, *from, next_index, *to_next;
   ipsec_main_t *im = &ipsec_main;
@@ -382,6 +382,7 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
          ip4_ipsec_config_t *c0;
          ipsec_spd_t *spd0;
          ipsec_policy_t *p0 = 0;
+         ah_header_t *ah0;
          u32 header_size = sizeof (ip0[0]);
 
          bi0 = to_next[0] = from[0];
@@ -393,15 +394,13 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
          b0 = vlib_get_buffer (vm, bi0);
          b0->flags |= VNET_BUFFER_F_IS_IP6;
          b0->flags &= ~VNET_BUFFER_F_IS_IP4;
-         c0 =
-           vnet_feature_next_with_data (vnet_buffer (b0)->sw_if_index
-                                        [VLIB_RX], &next0, b0,
-                                        sizeof (c0[0]));
+         c0 = vnet_feature_next_with_data (&next0, b0, sizeof (c0[0]));
 
          spd0 = pool_elt_at_index (im->spds, c0->spd_index);
 
          ip0 = vlib_buffer_get_current (b0);
          esp0 = (esp_header_t *) ((u8 *) ip0 + header_size);
+         ah0 = (ah_header_t *) ((u8 *) ip0 + header_size);
 
          if (PREDICT_TRUE (ip0->protocol == IP_PROTOCOL_IPSEC_ESP))
            {
@@ -413,11 +412,11 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
                 clib_net_to_host_u16 (ip0->payload_length) + header_size,
                 spd0->id);
 #endif
-             p0 = ipsec_input_ip6_protect_policy_match (spd0,
-                                                        &ip0->src_address,
-                                                        &ip0->dst_address,
-                                                        clib_net_to_host_u32
-                                                        (esp0->spi));
+             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))
                {
@@ -427,11 +426,31 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
                  p0->counter.bytes += header_size;
                  vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
                  vnet_buffer (b0)->ipsec.flags = 0;
-                 next0 = im->esp_decrypt_next_index;
+                 next0 = im->esp6_decrypt_next_index;
                  vlib_buffer_advance (b0, header_size);
                  goto trace0;
                }
            }
+         else if (ip0->protocol == IP_PROTOCOL_IPSEC_AH)
+           {
+             p0 = ipsec6_input_protect_policy_match (spd0,
+                                                     &ip0->src_address,
+                                                     &ip0->dst_address,
+                                                     clib_net_to_host_u32
+                                                     (ah0->spi));
+
+             if (PREDICT_TRUE (p0 != 0))
+               {
+                 p0->counter.packets++;
+                 p0->counter.bytes +=
+                   clib_net_to_host_u16 (ip0->payload_length);
+                 p0->counter.bytes += header_size;
+                 vnet_buffer (b0)->ipsec.sad_index = p0->sa_index;
+                 vnet_buffer (b0)->ipsec.flags = 0;
+                 next0 = im->ah6_decrypt_next_index;
+                 goto trace0;
+               }
+           }
 
        trace0:
          if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
@@ -444,6 +463,7 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
                    tr->sa_id = p0->sa_id;
                  tr->spi = clib_host_to_net_u32 (esp0->spi);
                  tr->seq = clib_host_to_net_u32 (esp0->seq);
+                 tr->spd = spd0->id;
                }
            }
 
@@ -452,7 +472,7 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
        }
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
-  vlib_node_increment_counter (vm, ipsec_input_ip6_node.index,
+  vlib_node_increment_counter (vm, ipsec6_input_node.index,
                               IPSEC_INPUT_ERROR_RX_PKTS,
                               from_frame->n_vectors);
 
@@ -461,9 +481,8 @@ VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip4_node, ipsec_input_ip4_node_fn)
 
 
 /* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ipsec_input_ip6_node,static) = {
-  .function = ipsec_input_ip6_node_fn,
-  .name = "ipsec-input-ip6",
+VLIB_REGISTER_NODE (ipsec6_input_node,static) = {
+  .name = "ipsec6-input",
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_input_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -471,11 +490,10 @@ VLIB_REGISTER_NODE (ipsec_input_ip6_node,static) = {
   .n_errors = ARRAY_LEN(ipsec_input_error_strings),
   .error_strings = ipsec_input_error_strings,
 
-  .sibling_of = "ipsec-input-ip4",
+  .sibling_of = "ipsec4-input",
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ipsec_input_ip6_node, ipsec_input_ip6_node_fn)
 /*
  * fd.io coding-style-patch-verification: ON
  *