dpo: migrate old MULTIARCH macros to VLIB_NODE_FN

[vpp.git] / src / vnet / dpo / dvr_dpo.c

diff --git a/src/vnet/dpo/dvr_dpo.c b/src/vnet/dpo/dvr_dpo.c
index 1aa1654..877f42a 100644 (file)
--- a/src/vnet/dpo/dvr_dpo.c
+++ b/src/vnet/dpo/dvr_dpo.c
@@ -18,6 +18,9 @@
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 
+#ifndef CLIB_MARCH_VARIANT
+dvr_dpo_t *dvr_dpo_pool;
+
 /**
  * The 'DB' of DVR DPOs.
  * There is one per-interface per-L3 proto, so this is a per-interface vector
@@ -122,6 +125,7 @@ dvr_dpo_add_or_lock (u32 sw_if_index,
 
     dpo_set(dpo, DPO_DVR, dproto, dvr_dpo_get_index(dd));
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 
 static clib_error_t *
@@ -162,7 +166,8 @@ dvr_dpo_interface_delete (vnet_main_t * vnm,
 VNET_SW_INTERFACE_ADD_DEL_FUNCTION(
     dvr_dpo_interface_delete);
 
-u8*
+#ifndef CLIB_MARCH_VARIANT
+static u8*
 format_dvr_dpo (u8* s, va_list *ap)
 {
     index_t index = va_arg(*ap, index_t);
@@ -224,6 +229,7 @@ dvr_dpo_module_init (void)
                  &dvr_dpo_vft,
                  dvr_dpo_nodes);
 }
+#endif /* CLIB_MARCH_VARIANT */
 
 /**
  * @brief Interface DPO trace data
@@ -288,10 +294,14 @@ dvr_dpo_inline (vlib_main_t * vm,
                     (u8*)ethernet_buffer_get_header(b0));
             len1 = ((u8*)vlib_buffer_get_current(b1) -
                     (u8*)ethernet_buffer_get_header(b1));
-            vnet_buffer(b0)->l2.l2_len = len0;
-            vnet_buffer(b1)->l2.l2_len = len1;
-            vnet_buffer(b0)->flags |= VNET_OPAQUE_F_IS_DVR;
-            vnet_buffer(b1)->flags |= VNET_OPAQUE_F_IS_DVR;
+            vnet_buffer(b0)->l2.l2_len =
+                vnet_buffer(b0)->ip.save_rewrite_length =
+                   len0;
+            vnet_buffer(b1)->l2.l2_len =
+                vnet_buffer(b1)->ip.save_rewrite_length =
+                    len1;
+            b0->flags |= VNET_BUFFER_F_IS_DVR;
+            b1->flags |= VNET_BUFFER_F_IS_DVR;
 
             vlib_buffer_advance(b0, -len0);
             vlib_buffer_advance(b1, -len1);
@@ -349,8 +359,10 @@ dvr_dpo_inline (vlib_main_t * vm,
              */
             len0 = ((u8*)vlib_buffer_get_current(b0) -
                     (u8*)ethernet_buffer_get_header(b0));
-            vnet_buffer(b0)->l2.l2_len = len0;
-            vnet_buffer(b0)->flags |= VNET_OPAQUE_F_IS_DVR;
+            vnet_buffer(b0)->l2.l2_len =
+                vnet_buffer(b0)->ip.save_rewrite_length =
+                    len0;
+            b0->flags |= VNET_BUFFER_F_IS_DVR;
             vlib_buffer_advance(b0, -len0);
 
             /*
@@ -389,16 +401,14 @@ format_dvr_dpo_trace (u8 * s, va_list * args)
     return s;
 }
 
-static uword
-ip4_dvr_dpo (vlib_main_t * vm,
+VLIB_NODE_FN (ip4_dvr_dpo_node) (vlib_main_t * vm,
              vlib_node_runtime_t * node,
              vlib_frame_t * from_frame)
 {
     return (dvr_dpo_inline(vm, node, from_frame, 0));
 }
 
-static uword
-ip6_dvr_dpo (vlib_main_t * vm,
+VLIB_NODE_FN (ip6_dvr_dpo_node) (vlib_main_t * vm,
              vlib_node_runtime_t * node,
              vlib_frame_t * from_frame)
 {
@@ -406,23 +416,18 @@ ip6_dvr_dpo (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (ip4_dvr_dpo_node) = {
-    .function = ip4_dvr_dpo,
     .name = "ip4-dvr-dpo",
     .vector_size = sizeof (u32),
     .format_trace = format_dvr_dpo_trace,
     .sibling_of = "ip4-rewrite",
 };
 VLIB_REGISTER_NODE (ip6_dvr_dpo_node) = {
-    .function = ip6_dvr_dpo,
     .name = "ip6-dvr-dpo",
     .vector_size = sizeof (u32),
     .format_trace = format_dvr_dpo_trace,
     .sibling_of = "ip6-rewrite",
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_dvr_dpo_node, ip4_dvr_dpo)
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_dvr_dpo_node, ip6_dvr_dpo)
-
 typedef enum dvr_reinject_next_t_
 {
     DVR_REINJECT_OUTPUT = 0,
@@ -464,17 +469,15 @@ dvr_reinject_inline (vlib_main_t * vm,
             b0 = vlib_get_buffer (vm, bi0);
             b1 = vlib_get_buffer (vm, bi1);
 
-            if (vnet_buffer(b0)->flags & VNET_OPAQUE_F_IS_DVR)
+            if (b0->flags & VNET_BUFFER_F_IS_DVR)
                 next0 = DVR_REINJECT_OUTPUT;
             else
-                vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_TX],
-                                  &next0, b0);
+                vnet_feature_next( &next0, b0);
 
-            if (vnet_buffer(b1)->flags & VNET_OPAQUE_F_IS_DVR)
+            if (b1->flags & VNET_BUFFER_F_IS_DVR)
                 next1 = DVR_REINJECT_OUTPUT;
             else
-                vnet_feature_next(vnet_buffer(b1)->sw_if_index[VLIB_TX],
-                                  &next1, b1);
+                vnet_feature_next( &next1, b1);
 
             if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
             {
@@ -511,11 +514,10 @@ dvr_reinject_inline (vlib_main_t * vm,
 
             b0 = vlib_get_buffer (vm, bi0);
 
-            if (vnet_buffer(b0)->flags & VNET_OPAQUE_F_IS_DVR)
+            if (b0->flags & VNET_BUFFER_F_IS_DVR)
                 next0 = DVR_REINJECT_OUTPUT;
             else
-                vnet_feature_next(vnet_buffer(b0)->sw_if_index[VLIB_TX],
-                                  &next0, b0);
+                vnet_feature_next( &next0, b0);
 
             if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
             {
@@ -533,16 +535,14 @@ dvr_reinject_inline (vlib_main_t * vm,
     return from_frame->n_vectors;
 }
 
-static uword
-ip4_dvr_reinject (vlib_main_t * vm,
+VLIB_NODE_FN (ip4_dvr_reinject_node) (vlib_main_t * vm,
                   vlib_node_runtime_t * node,
                   vlib_frame_t * from_frame)
 {
     return (dvr_reinject_inline(vm, node, from_frame));
 }
 
-static uword
-ip6_dvr_reinject (vlib_main_t * vm,
+VLIB_NODE_FN (ip6_dvr_reinject_node) (vlib_main_t * vm,
                   vlib_node_runtime_t * node,
                   vlib_frame_t * from_frame)
 {
@@ -550,7 +550,6 @@ ip6_dvr_reinject (vlib_main_t * vm,
 }
 
 VLIB_REGISTER_NODE (ip4_dvr_reinject_node) = {
-    .function = ip4_dvr_reinject,
     .name = "ip4-dvr-reinject",
     .vector_size = sizeof (u32),
     .format_trace = format_dvr_dpo_trace,
@@ -562,7 +561,6 @@ VLIB_REGISTER_NODE (ip4_dvr_reinject_node) = {
 };
 
 VLIB_REGISTER_NODE (ip6_dvr_reinject_node) = {
-    .function = ip6_dvr_reinject,
     .name = "ip6-dvr-reinject",
     .vector_size = sizeof (u32),
     .format_trace = format_dvr_dpo_trace,
@@ -587,5 +585,3 @@ VNET_FEATURE_INIT (ip6_dvr_reinject_feat_node, static) =
   .runs_after = VNET_FEATURES ("acl-plugin-out-ip6-fa"),
 };
 
-VLIB_NODE_FUNCTION_MULTIARCH (ip4_dvr_reinject_node, ip4_dvr_reinject)
-VLIB_NODE_FUNCTION_MULTIARCH (ip6_dvr_reinject_node, ip6_dvr_reinject)