u8 is_ipv6;
} gre_rx_trace_t;
-u8 *
+static u8 *
format_gre_rx_trace (u8 * s, va_list * args)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
vnet_interface_main_t *im = &gm->vnet_main->interface_main;
if (!is_ipv6)
- memset (&cached_tunnel_key.gtk_v4, 0xff,
- sizeof (cached_tunnel_key.gtk_v4));
+ clib_memset (&cached_tunnel_key.gtk_v4, 0xff,
+ sizeof (cached_tunnel_key.gtk_v4));
else
- memset (&cached_tunnel_key.gtk_v6, 0xff,
- sizeof (cached_tunnel_key.gtk_v6));
+ clib_memset (&cached_tunnel_key.gtk_v6, 0xff,
+ sizeof (cached_tunnel_key.gtk_v6));
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
return from_frame->n_vectors;
}
-static uword
-gre4_input (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (gre4_input_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
{
return gre_input (vm, node, from_frame, /* is_ip6 */ 0);
}
-static uword
-gre6_input (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (gre6_input_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
{
return gre_input (vm, node, from_frame, /* is_ip6 */ 1);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (gre4_input_node) = {
- .function = gre4_input,
.name = "gre4-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
};
VLIB_REGISTER_NODE (gre6_input_node) = {
- .function = gre6_input,
.name = "gre6-input",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.format_trace = format_gre_rx_trace,
.unformat_buffer = unformat_gre_header,
};
-
-VLIB_NODE_FUNCTION_MULTIARCH (gre4_input_node, gre4_input)
-VLIB_NODE_FUNCTION_MULTIARCH (gre6_input_node, gre6_input)
/* *INDENT-ON* */
+#ifndef CLIB_MARCH_VARIANT
void
gre_register_input_protocol (vlib_main_t * vm,
gre_protocol_t protocol, u32 node_index,
VLIB_INIT_FUNCTION (gre_input_init);
+#endif /* CLIB_MARCH_VARIANT */
/*
* fd.io coding-style-patch-verification: ON
*