ioam: migrate old MULTIARCH macros to VLIB_NODE_FN

[vpp.git] / src / plugins / ioam / ip6 / ioam_cache_node.c

diff --git a/src/plugins/ioam/ip6/ioam_cache_node.c b/src/plugins/ioam/ip6/ioam_cache_node.c
index d930f33..018077f 100644 (file)
--- a/src/plugins/ioam/ip6/ioam_cache_node.c
+++ b/src/plugins/ioam/ip6/ioam_cache_node.c
@@ -217,8 +217,6 @@ format_ip6_add_from_cache_hbh_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t ip6_add_from_cache_hbh_node;
-
 #define foreach_ip6_add_from_cache_hbh_error \
 _(PROCESSED, "Pkts w/ added ip6 hop-by-hop options")
 
@@ -249,10 +247,9 @@ typedef enum
 } ip6_ioam_cache_input_next_t;
 
 
-static uword
-ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm,
-                               vlib_node_runtime_t * node,
-                               vlib_frame_t * frame)
+VLIB_NODE_FN (ip6_add_from_cache_hbh_node) (vlib_main_t * vm,
+                                           vlib_node_runtime_t * node,
+                                           vlib_frame_t * frame)
 {
   ioam_cache_main_t *cm = &ioam_cache_main;
   u32 n_left_from, *from, *to_next;
@@ -344,18 +341,17 @@ ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm,
          hbh0 = (ip6_hop_by_hop_header_t *) (ip0 + 1);
          srh0 = (ip6_sr_header_t *) ((u8 *) hbh0 + rewrite_len);
          /* $$$ tune, rewrite_len is a multiple of 8 */
-         clib_memcpy (hbh0, rewrite, rewrite_len);
-         clib_memcpy (srh0, cm->sr_rewrite_template, sr_rewrite_len);
+         clib_memcpy_fast (hbh0, rewrite, rewrite_len);
+         clib_memcpy_fast (srh0, cm->sr_rewrite_template, sr_rewrite_len);
          /* Copy dst address into the DA slot in the segment list */
-         clib_memcpy (srh0->segments, ip0->dst_address.as_u64,
-                      sizeof (ip6_address_t));
+         clib_memcpy_fast (srh0->segments, ip0->dst_address.as_u64,
+                           sizeof (ip6_address_t));
          /* Rewrite the ip6 dst address with the first hop */
-         clib_memcpy (ip0->dst_address.as_u64, entry->next_hop.as_u64,
-                      sizeof (ip6_address_t));
-         clib_memcpy (&srh0->segments[1],
-                      (u8 *) hbh0 + entry->my_address_offset,
-                      sizeof (ip6_address_t));
-         srh0->segments_left--;
+         clib_memcpy_fast (ip0->dst_address.as_u64, entry->next_hop.as_u64,
+                           sizeof (ip6_address_t));
+         clib_memcpy_fast (&srh0->segments[1],
+                           (u8 *) hbh0 + entry->my_address_offset,
+                           sizeof (ip6_address_t));
          ioam_cache_entry_free (entry);
 
          /* Patch the protocol chain, insert the h-b-h (type 0) header */
@@ -385,7 +381,7 @@ ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, ip6_add_from_cache_hbh_node.index,
+  vlib_node_increment_counter (vm, cm->ip6_add_from_cache_hbh_node_index,
                               IP6_ADD_FROM_CACHE_HBH_ERROR_PROCESSED,
                               processed);
   return frame->n_vectors;
@@ -393,7 +389,6 @@ ip6_add_from_cache_hbh_node_fn (vlib_main_t * vm,
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ip6_add_from_cache_hbh_node) =
 {
-  .function = ip6_add_from_cache_hbh_node_fn,
   .name = "ip6-add-from-cache-hop-by-hop",
   .vector_size = sizeof (u32),
   .format_trace = format_ip6_add_from_cache_hbh_trace,
@@ -411,8 +406,6 @@ VLIB_REGISTER_NODE (ip6_add_from_cache_hbh_node) =
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_add_from_cache_hbh_node,
-                             ip6_add_from_cache_hbh_node_fn)
 /*
  * fd.io coding-style-patch-verification: ON
  *