ipsec: Use .api declared error counters

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

diff --git a/src/vnet/ipsec/ipsec_tun_in.c b/src/vnet/ipsec/ipsec_tun_in.c
index 4f8af00..8e97fbc 100644 (file)
--- a/src/vnet/ipsec/ipsec_tun_in.c
+++ b/src/vnet/ipsec/ipsec_tun_in.c
@@ -24,31 +24,10 @@
 #include <vnet/ipsec/ipsec_io.h>
 #include <vnet/ipsec/ipsec_punt.h>
 #include <vnet/ipsec/ipsec_tun.h>
+#include <vnet/ipsec/ipsec.api_enum.h>
 #include <vnet/ip/ip4_input.h>
 
-/* Statistics (not really errors) */
-#define foreach_ipsec_tun_protect_input_error                     \
-  _(RX, "good packets received")                                  \
-  _(DISABLED, "ipsec packets received on disabled interface")     \
-  _(NO_TUNNEL, "no matching tunnel")                              \
-  _(TUNNEL_MISMATCH, "SPI-tunnel mismatch")                       \
-  _(NAT_KEEPALIVE, "NAT Keepalive")                               \
-  _(TOO_SHORT, "Too Short")                                       \
-  _(SPI_0, "SPI 0")
-
-static char *ipsec_tun_protect_input_error_strings[] = {
-#define _(sym,string) string,
-  foreach_ipsec_tun_protect_input_error
-#undef _
-};
-
-typedef enum
-{
-#define _(sym,str) IPSEC_TUN_PROTECT_INPUT_ERROR_##sym,
-  foreach_ipsec_tun_protect_input_error
-#undef _
-    IPSEC_TUN_PROTECT_INPUT_N_ERROR,
-} ipsec_tun_protect_input_error_t;
+typedef vl_counter_ipsec_tun_enum_t ipsec_tun_protect_input_error_t;
 
 typedef enum ipsec_tun_next_t_
 {
@@ -93,14 +72,14 @@ ipsec_ip4_if_no_tunnel (vlib_node_runtime_t * node,
 {
   if (PREDICT_FALSE (0 == esp->spi))
     {
-      b->error = node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_SPI_0];
+      b->error = node->errors[IPSEC_TUN_ERROR_SPI_0];
       b->punt_reason = ipsec_punt_reason[(ip4->protocol == IP_PROTOCOL_UDP ?
                                          IPSEC_PUNT_IP4_SPI_UDP_0 :
                                          IPSEC_PUNT_IP4_NO_SUCH_TUNNEL)];
     }
   else
     {
-      b->error = node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_NO_TUNNEL];
+      b->error = node->errors[IPSEC_TUN_ERROR_NO_TUNNEL];
       b->punt_reason = ipsec_punt_reason[IPSEC_PUNT_IP4_NO_SUCH_TUNNEL];
     }
   return VNET_DEVICE_INPUT_NEXT_PUNT;
@@ -110,7 +89,7 @@ always_inline u16
 ipsec_ip6_if_no_tunnel (vlib_node_runtime_t * node,
                        vlib_buffer_t * b, const esp_header_t * esp)
 {
-  b->error = node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_NO_TUNNEL];
+  b->error = node->errors[IPSEC_TUN_ERROR_NO_TUNNEL];
   b->punt_reason = ipsec_punt_reason[IPSEC_PUNT_IP6_NO_SUCH_TUNNEL];
 
   return VNET_DEVICE_INPUT_NEXT_PUNT;
@@ -186,18 +165,34 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
        {
          ip60 = (ip6_header_t *) ip40;
          esp0 = (esp_header_t *) (ip60 + 1);
-         hdr_sz0 = sizeof (ip6_header_t);
+         buf_rewind0 = hdr_sz0 = sizeof (ip6_header_t);
        }
       else
        {
-         /* NAT UDP port 4500 case, don't advance any more */
          if (ip40->protocol == IP_PROTOCOL_UDP)
            {
+             /* NAT UDP port 4500 case, don't advance any more */
              esp0 =
                (esp_header_t *) ((u8 *) ip40 + ip4_header_bytes (ip40) +
                                  sizeof (udp_header_t));
              hdr_sz0 = 0;
              buf_rewind0 = ip4_header_bytes (ip40) + sizeof (udp_header_t);
+
+             const udp_header_t *udp0 =
+               (udp_header_t *) ((u8 *) ip40 + ip4_header_bytes (ip40));
+
+             /* length 9 = sizeof(udp_header) + 1 byte of special SPI */
+             if (clib_net_to_host_u16 (udp0->length) == 9 &&
+                 esp0->spi_bytes[0] == 0xff)
+               {
+                 b[0]->error = node->errors[IPSEC_TUN_ERROR_NAT_KEEPALIVE];
+
+                 next[0] = VNET_DEVICE_INPUT_NEXT_IP4_DROP;
+                 len0 = 0;
+
+                 vlib_buffer_advance (b[0], -buf_rewind0);
+                 goto trace00;
+               }
            }
          else
            {
@@ -213,15 +208,11 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
 
       if (len0 < sizeof (esp_header_t))
        {
-         if (esp0->spi_bytes[0] == 0xff)
-           b[0]->error =
-             node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_NAT_KEEPALIVE];
-         else
-           b[0]->error =
-             node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_TOO_SHORT];
+         b[0]->error = node->errors[IPSEC_TUN_ERROR_TOO_SHORT];
 
          next[0] = is_ip6 ? VNET_DEVICE_INPUT_NEXT_IP6_DROP :
                             VNET_DEVICE_INPUT_NEXT_IP4_DROP;
+         vlib_buffer_advance (b[0], -buf_rewind0);
          goto trace00;
        }
 
@@ -296,7 +287,7 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_increment_combined_counter
            (drop_counter, thread_index, sw_if_index0, 1, len0);
          n_disabled++;
-         b[0]->error = node->errors[IPSEC_TUN_PROTECT_INPUT_ERROR_DISABLED];
+         b[0]->error = node->errors[IPSEC_TUN_ERROR_DISABLED];
          next[0] = is_ip6 ? VNET_DEVICE_INPUT_NEXT_IP6_DROP :
                             VNET_DEVICE_INPUT_NEXT_IP4_DROP;
          goto trace00;
@@ -364,12 +355,10 @@ ipsec_tun_protect_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
                                     thread_index,
                                     last_sw_if_index, n_packets, n_bytes);
 
-  vlib_node_increment_counter (vm, node->node_index,
-                              IPSEC_TUN_PROTECT_INPUT_ERROR_RX,
-                              from_frame->n_vectors - (n_disabled +
-                                                       n_no_tunnel));
-  vlib_node_increment_counter (vm, node->node_index,
-                              IPSEC_TUN_PROTECT_INPUT_ERROR_NO_TUNNEL,
+  vlib_node_increment_counter (vm, node->node_index, IPSEC_TUN_ERROR_RX,
+                              from_frame->n_vectors -
+                                (n_disabled + n_no_tunnel));
+  vlib_node_increment_counter (vm, node->node_index, IPSEC_TUN_ERROR_NO_TUNNEL,
                               n_no_tunnel);
 
   vlib_buffer_enqueue_to_next (vm, node, from, nexts, from_frame->n_vectors);
@@ -390,8 +379,8 @@ VLIB_REGISTER_NODE (ipsec4_tun_input_node) = {
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_tun_protect_input_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN (ipsec_tun_protect_input_error_strings),
-  .error_strings = ipsec_tun_protect_input_error_strings,
+  .n_errors = IPSEC_TUN_N_ERROR,
+  .error_counters = ipsec_tun_error_counters,
   .sibling_of = "device-input",
 };
 /* *INDENT-ON* */
@@ -409,8 +398,8 @@ VLIB_REGISTER_NODE (ipsec6_tun_input_node) = {
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_tun_protect_input_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
-  .n_errors = ARRAY_LEN (ipsec_tun_protect_input_error_strings),
-  .error_strings = ipsec_tun_protect_input_error_strings,
+  .n_errors = IPSEC_TUN_N_ERROR,
+  .error_counters = ipsec_tun_error_counters,
   .sibling_of = "device-input",
 };
 /* *INDENT-ON* */