#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
dpo_set(dpo, DPO_DVR, dproto, dvr_dpo_get_index(dd));
}
+#endif /* CLIB_MARCH_VARIANT */
static clib_error_t *
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);
&dvr_dpo_vft,
dvr_dpo_nodes);
}
+#endif /* CLIB_MARCH_VARIANT */
/**
* @brief Interface DPO trace data
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)
{
}
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,
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 (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))
{
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))
{
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)
{
}
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,
};
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,
.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)