mpls/mpls_api.c
)
+list(APPEND VNET_MULTIARCH_SOURCES
+ mpls/mpls_output.c
+ mpls/mpls_input.c
+ mpls/mpls_lookup.c
+ mpls/mpls_features.c
+)
+
list(APPEND VNET_HEADERS
mpls/mpls.h
mpls/mpls_types.h
/* IP4 enabled count by software interface */
u8 *mpls_enabled_by_sw_if_index;
+
+ u32 mpls_lookup_node_index;
} mpls_main_t;
extern mpls_main_t mpls_main;
return n_packets;
}
-static uword
-mpls_punt (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_punt_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
}
VLIB_REGISTER_NODE (mpls_punt_node) = {
- .function = mpls_punt,
.name = "mpls-punt",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_punt_node, mpls_punt)
-
-static uword
-mpls_drop (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_drop_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
}
VLIB_REGISTER_NODE (mpls_drop_node) = {
- .function = mpls_drop,
.name = "mpls-drop",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_drop_node, mpls_drop)
-
-static uword
-mpls_not_enabled (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_not_enabled_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
}
VLIB_REGISTER_NODE (mpls_not_enabled_node) = {
- .function = mpls_not_enabled,
.name = "mpls-not-enabled",
.vector_size = sizeof (u32),
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_not_enabled_node, mpls_not_enabled)
-
VNET_FEATURE_ARC_INIT (mpls_input, static) =
{
.arc_name = "mpls-input",
return s;
}
-vlib_node_registration_t mpls_input_node;
-
typedef struct {
u32 last_label;
u32 last_inner_fib_index;
return from_frame->n_vectors;
}
-static uword
-mpls_input (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_input_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
};
VLIB_REGISTER_NODE (mpls_input_node) = {
- .function = mpls_input,
.name = "mpls-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.format_trace = format_mpls_input_trace,
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_input_node, mpls_input)
-
+#ifndef CLIB_MARCH_VARIANT
static void
mpls_setup_nodes (vlib_main_t * vm)
{
}
VLIB_INIT_FUNCTION (mpls_input_init);
+#endif /* CLIB_MARCH_VARIANT */
#include <vnet/dpo/load_balance_map.h>
#include <vnet/dpo/replicate_dpo.h>
-/**
- * Static MPLS VLIB forwarding node
- */
-static vlib_node_registration_t mpls_lookup_node;
-
/**
* The arc/edge from the MPLS lookup node to the MPLS replicate node
*/
+#ifndef CLIB_MARCH_VARIANT
u32 mpls_lookup_to_replicate_edge;
+#endif /* CLIB_MARCH_VARIANT */
typedef struct {
u32 next_index;
return s;
}
-static inline uword
-mpls_lookup (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_lookup_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
- vlib_node_increment_counter (vm, mpls_lookup_node.index,
+ vlib_node_increment_counter (vm, mm->mpls_lookup_node_index,
MPLS_ERROR_PKTS_DECAP, from_frame->n_vectors);
return from_frame->n_vectors;
}
#undef mpls_error
};
-VLIB_REGISTER_NODE (mpls_lookup_node, static) = {
- .function = mpls_lookup,
+VLIB_REGISTER_NODE (mpls_lookup_node) = {
.name = "mpls-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.unformat_buffer = unformat_mpls_header,
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_lookup_node, mpls_lookup)
-
typedef struct {
u32 next_index;
u32 lb_index;
return s;
}
-static uword
-mpls_load_balance (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_load_balance_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * frame)
{
}
VLIB_REGISTER_NODE (mpls_load_balance_node) = {
- .function = mpls_load_balance,
.name = "mpls-load-balance",
.vector_size = sizeof (u32),
.format_trace = format_mpls_load_balance_trace,
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_load_balance_node, mpls_load_balance)
-
+#ifndef CLIB_MARCH_VARIANT
static clib_error_t *
mpls_lookup_init (vlib_main_t * vm)
{
+ mpls_main_t *mm = &mpls_main;
clib_error_t * error;
+ vlib_node_t *node = vlib_get_node_by_name (vm, (u8*)"mpls-lookup" );
+
+ mm->mpls_lookup_node_index = node->index;
if ((error = vlib_call_init_function (vm, mpls_init)))
return error;
mpls_lookup_to_replicate_edge =
vlib_node_add_named_next(vm,
- mpls_lookup_node.index,
+ mm->mpls_lookup_node_index,
"mpls-replicate");
return (NULL);
}
VLIB_INIT_FUNCTION (mpls_lookup_init);
+#endif /* CLIB_MARCH_VARIANT */
#undef mpls_error
};
-static inline uword
-mpls_output (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_output_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
}
VLIB_REGISTER_NODE (mpls_output_node) = {
- .function = mpls_output,
.name = "mpls-output",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.format_trace = format_mpls_output_trace,
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_output_node, mpls_output)
-
-static inline uword
-mpls_midchain (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_midchain_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
}
VLIB_REGISTER_NODE (mpls_midchain_node) = {
- .function = mpls_midchain,
.name = "mpls-midchain",
.vector_size = sizeof (u32),
.sibling_of = "mpls-output",
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_midchain_node, mpls_midchain)
-
/**
* @brief Next index values from the MPLS incomplete adj node
*/
* We pay a cost for this 'routing' node, but an incomplete adj is the
* exception case.
*/
-static inline uword
-mpls_adj_incomplete (vlib_main_t * vm,
+VLIB_NODE_FN (mpls_adj_incomplete_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
{
}
VLIB_REGISTER_NODE (mpls_adj_incomplete_node) = {
- .function = mpls_adj_incomplete,
.name = "mpls-adj-incomplete",
.format_trace = format_mpls_adj_incomplete_trace,
/* Takes a vector of packets. */
},
};
-VLIB_NODE_FUNCTION_MULTIARCH (mpls_adj_incomplete_node,
- mpls_adj_incomplete)