ip: Move the IPv6 echo responder into the ping plugin 56/35356/2
authorNeale Ranns <neale@graphiant.com>
Thu, 17 Feb 2022 14:29:28 +0000 (14:29 +0000)
committerAndrew Yourtchenko <ayourtch@gmail.com>
Thu, 17 Feb 2022 16:02:49 +0000 (16:02 +0000)
Type: refactor

To be consistent with the location of the IPv4 responder

Signed-off-by: Neale Ranns <neale@graphiant.com>
Change-Id: Ie3a5c3ecc10755317591d7ff57b74770c2798e77

src/plugins/ping/ping.c
src/vnet/ip/icmp6.c

index 06cf7dd..2cc6b77 100644 (file)
@@ -576,6 +576,188 @@ VLIB_REGISTER_NODE (ip4_icmp_echo_request_node,static) = {
 };
 /* *INDENT-ON* */
 
+typedef enum
+{
+  ICMP6_ECHO_REQUEST_NEXT_LOOKUP,
+  ICMP6_ECHO_REQUEST_NEXT_OUTPUT,
+  ICMP6_ECHO_REQUEST_N_NEXT,
+} icmp6_echo_request_next_t;
+
+static uword
+ip6_icmp_echo_request (vlib_main_t *vm, vlib_node_runtime_t *node,
+                      vlib_frame_t *frame)
+{
+  u32 *from, *to_next;
+  u32 n_left_from, n_left_to_next, next_index;
+  ip6_main_t *im = &ip6_main;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
+
+  if (node->flags & VLIB_NODE_FLAG_TRACE)
+    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
+                                  /* stride */ 1,
+                                  sizeof (icmp6_input_trace_t));
+
+  while (n_left_from > 0)
+    {
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
+
+      while (n_left_from > 2 && n_left_to_next > 2)
+       {
+         vlib_buffer_t *p0, *p1;
+         ip6_header_t *ip0, *ip1;
+         icmp46_header_t *icmp0, *icmp1;
+         ip6_address_t tmp0, tmp1;
+         ip_csum_t sum0, sum1;
+         u32 bi0, bi1;
+         u32 fib_index0, fib_index1;
+         u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
+         u32 next1 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
+
+         bi0 = to_next[0] = from[0];
+         bi1 = to_next[1] = from[1];
+
+         from += 2;
+         n_left_from -= 2;
+         to_next += 2;
+         n_left_to_next -= 2;
+
+         p0 = vlib_get_buffer (vm, bi0);
+         p1 = vlib_get_buffer (vm, bi1);
+         ip0 = vlib_buffer_get_current (p0);
+         ip1 = vlib_buffer_get_current (p1);
+         icmp0 = ip6_next_header (ip0);
+         icmp1 = ip6_next_header (ip1);
+
+         /* Check icmp type to echo reply and update icmp checksum. */
+         sum0 = icmp0->checksum;
+         sum1 = icmp1->checksum;
+
+         ASSERT (icmp0->type == ICMP6_echo_request);
+         ASSERT (icmp1->type == ICMP6_echo_request);
+         sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
+                                icmp46_header_t, type);
+         sum1 = ip_csum_update (sum1, ICMP6_echo_request, ICMP6_echo_reply,
+                                icmp46_header_t, type);
+
+         icmp0->checksum = ip_csum_fold (sum0);
+         icmp1->checksum = ip_csum_fold (sum1);
+
+         icmp0->type = ICMP6_echo_reply;
+         icmp1->type = ICMP6_echo_reply;
+
+         /* Swap source and destination address. */
+         tmp0 = ip0->src_address;
+         tmp1 = ip1->src_address;
+
+         ip0->src_address = ip0->dst_address;
+         ip1->src_address = ip1->dst_address;
+
+         ip0->dst_address = tmp0;
+         ip1->dst_address = tmp1;
+
+         /* New hop count. */
+         ip0->hop_limit = im->host_config.ttl;
+         ip1->hop_limit = im->host_config.ttl;
+
+         /* Determine the correct lookup fib indices... */
+         fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+                               vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+         vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
+         /* Determine the correct lookup fib indices... */
+         fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
+                               vnet_buffer (p1)->sw_if_index[VLIB_RX]);
+         vnet_buffer (p1)->sw_if_index[VLIB_TX] = fib_index1;
+
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
+         p1->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
+
+         /* verify speculative enqueues, maybe switch current next frame */
+         /* if next0==next1==next_index then nothing special needs to be done
+          */
+         vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next,
+                                          n_left_to_next, bi0, bi1, next0,
+                                          next1);
+       }
+
+      while (n_left_from > 0 && n_left_to_next > 0)
+       {
+         vlib_buffer_t *p0;
+         ip6_header_t *ip0;
+         icmp46_header_t *icmp0;
+         u32 bi0;
+         ip6_address_t tmp0;
+         ip_csum_t sum0;
+         u32 fib_index0;
+         u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
+
+         bi0 = to_next[0] = from[0];
+
+         from += 1;
+         n_left_from -= 1;
+         to_next += 1;
+         n_left_to_next -= 1;
+
+         p0 = vlib_get_buffer (vm, bi0);
+         ip0 = vlib_buffer_get_current (p0);
+         icmp0 = ip6_next_header (ip0);
+
+         /* Check icmp type to echo reply and update icmp checksum. */
+         sum0 = icmp0->checksum;
+
+         ASSERT (icmp0->type == ICMP6_echo_request);
+         sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
+                                icmp46_header_t, type);
+
+         icmp0->checksum = ip_csum_fold (sum0);
+
+         icmp0->type = ICMP6_echo_reply;
+
+         /* Swap source and destination address. */
+         tmp0 = ip0->src_address;
+         ip0->src_address = ip0->dst_address;
+         ip0->dst_address = tmp0;
+
+         ip0->hop_limit = im->host_config.ttl;
+
+         /* if the packet is link local, we'll bounce through the link-local
+          * table with the RX interface correctly set */
+         fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
+                               vnet_buffer (p0)->sw_if_index[VLIB_RX]);
+         vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
+
+         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
+         /* Verify speculative enqueue, maybe switch current next frame */
+         vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+                                          n_left_to_next, bi0, next0);
+       }
+
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
+
+  vlib_error_count (vm, ip6_icmp_input_node.index,
+                   ICMP6_ERROR_ECHO_REPLIES_SENT, frame->n_vectors);
+
+  return frame->n_vectors;
+}
+
+VLIB_REGISTER_NODE (ip6_icmp_echo_request_node,static) = {
+  .function = ip6_icmp_echo_request,
+  .name = "ip6-icmp-echo-request",
+
+  .vector_size = sizeof (u32),
+
+  .format_trace = format_icmp6_input_trace,
+
+  .n_next_nodes = ICMP6_ECHO_REQUEST_N_NEXT,
+  .next_nodes = {
+    [ICMP6_ECHO_REQUEST_NEXT_LOOKUP] = "ip6-lookup",
+    [ICMP6_ECHO_REQUEST_NEXT_OUTPUT] = "interface-output",
+  },
+};
+
 /*
  * A swarm of address-family agnostic helper functions
  * for building and sending the ICMP echo request.
@@ -1481,6 +1663,8 @@ ping_cli_init (vlib_main_t * vm)
 
   ip4_icmp_register_type (vm, ICMP4_echo_request,
                          ip4_icmp_echo_request_node.index);
+  icmp6_register_type (vm, ICMP6_echo_request,
+                      ip6_icmp_echo_request_node.index);
 
   return 0;
 }
index b0fdadb..3c8300f 100644 (file)
@@ -256,190 +256,6 @@ VLIB_REGISTER_NODE (ip6_icmp_input_node) = {
 };
 /* *INDENT-ON* */
 
-typedef enum
-{
-  ICMP6_ECHO_REQUEST_NEXT_LOOKUP,
-  ICMP6_ECHO_REQUEST_NEXT_OUTPUT,
-  ICMP6_ECHO_REQUEST_N_NEXT,
-} icmp6_echo_request_next_t;
-
-static uword
-ip6_icmp_echo_request (vlib_main_t * vm,
-                      vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 *from, *to_next;
-  u32 n_left_from, n_left_to_next, next_index;
-  ip6_main_t *im = &ip6_main;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  if (node->flags & VLIB_NODE_FLAG_TRACE)
-    vlib_trace_frame_buffers_only (vm, node, from, frame->n_vectors,
-                                  /* stride */ 1,
-                                  sizeof (icmp6_input_trace_t));
-
-  while (n_left_from > 0)
-    {
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 2 && n_left_to_next > 2)
-       {
-         vlib_buffer_t *p0, *p1;
-         ip6_header_t *ip0, *ip1;
-         icmp46_header_t *icmp0, *icmp1;
-         ip6_address_t tmp0, tmp1;
-         ip_csum_t sum0, sum1;
-         u32 bi0, bi1;
-         u32 fib_index0, fib_index1;
-         u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
-         u32 next1 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
-
-         bi0 = to_next[0] = from[0];
-         bi1 = to_next[1] = from[1];
-
-         from += 2;
-         n_left_from -= 2;
-         to_next += 2;
-         n_left_to_next -= 2;
-
-         p0 = vlib_get_buffer (vm, bi0);
-         p1 = vlib_get_buffer (vm, bi1);
-         ip0 = vlib_buffer_get_current (p0);
-         ip1 = vlib_buffer_get_current (p1);
-         icmp0 = ip6_next_header (ip0);
-         icmp1 = ip6_next_header (ip1);
-
-         /* Check icmp type to echo reply and update icmp checksum. */
-         sum0 = icmp0->checksum;
-         sum1 = icmp1->checksum;
-
-         ASSERT (icmp0->type == ICMP6_echo_request);
-         ASSERT (icmp1->type == ICMP6_echo_request);
-         sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
-                                icmp46_header_t, type);
-         sum1 = ip_csum_update (sum1, ICMP6_echo_request, ICMP6_echo_reply,
-                                icmp46_header_t, type);
-
-         icmp0->checksum = ip_csum_fold (sum0);
-         icmp1->checksum = ip_csum_fold (sum1);
-
-         icmp0->type = ICMP6_echo_reply;
-         icmp1->type = ICMP6_echo_reply;
-
-         /* Swap source and destination address. */
-         tmp0 = ip0->src_address;
-         tmp1 = ip1->src_address;
-
-         ip0->src_address = ip0->dst_address;
-         ip1->src_address = ip1->dst_address;
-
-         ip0->dst_address = tmp0;
-         ip1->dst_address = tmp1;
-
-         /* New hop count. */
-         ip0->hop_limit = im->host_config.ttl;
-         ip1->hop_limit = im->host_config.ttl;
-
-         /* Determine the correct lookup fib indices... */
-         fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-                               vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-         vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
-         /* Determine the correct lookup fib indices... */
-         fib_index1 = vec_elt (im->fib_index_by_sw_if_index,
-                               vnet_buffer (p1)->sw_if_index[VLIB_RX]);
-         vnet_buffer (p1)->sw_if_index[VLIB_TX] = fib_index1;
-
-         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
-         p1->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
-
-         /* verify speculative enqueues, maybe switch current next frame */
-         /* if next0==next1==next_index then nothing special needs to be done */
-         vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
-                                          to_next, n_left_to_next,
-                                          bi0, bi1, next0, next1);
-       }
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-       {
-         vlib_buffer_t *p0;
-         ip6_header_t *ip0;
-         icmp46_header_t *icmp0;
-         u32 bi0;
-         ip6_address_t tmp0;
-         ip_csum_t sum0;
-         u32 fib_index0;
-         u32 next0 = ICMP6_ECHO_REQUEST_NEXT_LOOKUP;
-
-         bi0 = to_next[0] = from[0];
-
-         from += 1;
-         n_left_from -= 1;
-         to_next += 1;
-         n_left_to_next -= 1;
-
-         p0 = vlib_get_buffer (vm, bi0);
-         ip0 = vlib_buffer_get_current (p0);
-         icmp0 = ip6_next_header (ip0);
-
-         /* Check icmp type to echo reply and update icmp checksum. */
-         sum0 = icmp0->checksum;
-
-         ASSERT (icmp0->type == ICMP6_echo_request);
-         sum0 = ip_csum_update (sum0, ICMP6_echo_request, ICMP6_echo_reply,
-                                icmp46_header_t, type);
-
-         icmp0->checksum = ip_csum_fold (sum0);
-
-         icmp0->type = ICMP6_echo_reply;
-
-         /* Swap source and destination address. */
-         tmp0 = ip0->src_address;
-         ip0->src_address = ip0->dst_address;
-         ip0->dst_address = tmp0;
-
-         ip0->hop_limit = im->host_config.ttl;
-
-         /* if the packet is link local, we'll bounce through the link-local
-          * table with the RX interface correctly set */
-         fib_index0 = vec_elt (im->fib_index_by_sw_if_index,
-                               vnet_buffer (p0)->sw_if_index[VLIB_RX]);
-         vnet_buffer (p0)->sw_if_index[VLIB_TX] = fib_index0;
-
-         p0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
-         /* Verify speculative enqueue, maybe switch current next frame */
-         vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-                                          to_next, n_left_to_next,
-                                          bi0, next0);
-       }
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_error_count (vm, ip6_icmp_input_node.index,
-                   ICMP6_ERROR_ECHO_REPLIES_SENT, frame->n_vectors);
-
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (ip6_icmp_echo_request_node,static) = {
-  .function = ip6_icmp_echo_request,
-  .name = "ip6-icmp-echo-request",
-
-  .vector_size = sizeof (u32),
-
-  .format_trace = format_icmp6_input_trace,
-
-  .n_next_nodes = ICMP6_ECHO_REQUEST_N_NEXT,
-  .next_nodes = {
-    [ICMP6_ECHO_REQUEST_NEXT_LOOKUP] = "ip6-lookup",
-    [ICMP6_ECHO_REQUEST_NEXT_OUTPUT] = "interface-output",
-  },
-};
-/* *INDENT-ON* */
-
 typedef enum
 {
   IP6_ICMP_ERROR_NEXT_DROP,
@@ -808,9 +624,6 @@ icmp6_init (vlib_main_t * vm)
   cm->min_valid_length_by_type[ICMP6_redirect] =
     sizeof (icmp6_redirect_header_t);
 
-  icmp6_register_type (vm, ICMP6_echo_request,
-                      ip6_icmp_echo_request_node.index);
-
   return (NULL);
 }