Change-Id: I2b324c77df2685a0bdfb617fb484022daf017d0b
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
+list(APPEND VNET_MULTIARCH_SOURCES
+ udp/udp_local.c
+ udp/udp_encap_node.c
+)
+
list(APPEND VNET_HEADERS
udp/udp_error.def
udp/udp.h
list(APPEND VNET_HEADERS
udp/udp_error.def
udp/udp.h
#include <vnet/dpo/load_balance.h>
#include <vnet/fib/ip4_fib.h>
#include <vnet/dpo/load_balance.h>
#include <vnet/fib/ip4_fib.h>
udp_connection_t *
udp_connection_alloc (u32 thread_index)
{
udp_connection_t *
udp_connection_alloc (u32 thread_index)
{
extern udp_main_t udp_main;
extern vlib_node_registration_t udp4_input_node;
extern vlib_node_registration_t udp6_input_node;
extern udp_main_t udp_main;
extern vlib_node_registration_t udp4_input_node;
extern vlib_node_registration_t udp6_input_node;
+extern vlib_node_registration_t udp4_local_node;
+extern vlib_node_registration_t udp6_local_node;
always_inline udp_connection_t *
udp_connection_get (u32 conn_index, u32 thread_index)
always_inline udp_connection_t *
udp_connection_get (u32 conn_index, u32 thread_index)
return frame->n_vectors;
}
return frame->n_vectors;
}
-static uword
-udp4_encap (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (udp4_encap_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return udp_encap_inline (vm, node, frame, 0);
}
{
return udp_encap_inline (vm, node, frame, 0);
}
-static uword
-udp6_encap (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (udp6_encap_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * frame)
{
return udp_encap_inline (vm, node, frame, 1);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (udp4_encap_node) = {
{
return udp_encap_inline (vm, node, frame, 1);
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (udp4_encap_node) = {
- .function = udp4_encap,
.name = "udp4-encap",
.vector_size = sizeof (u32),
.name = "udp4-encap",
.vector_size = sizeof (u32),
-VLIB_NODE_FUNCTION_MULTIARCH (udp4_encap_node, udp4_encap);
VLIB_REGISTER_NODE (udp6_encap_node) = {
VLIB_REGISTER_NODE (udp6_encap_node) = {
- .function = udp6_encap,
.name = "udp6-encap",
.vector_size = sizeof (u32),
.name = "udp6-encap",
.vector_size = sizeof (u32),
-VLIB_NODE_FUNCTION_MULTIARCH (udp6_encap_node, udp6_encap);
#include <vnet/udp/udp_packet.h>
#include <vppinfra/sparse_vec.h>
#include <vnet/udp/udp_packet.h>
#include <vppinfra/sparse_vec.h>
#define foreach_udp_local_next \
_ (PUNT4, "ip4-punt") \
_ (PUNT6, "ip6-punt") \
#define foreach_udp_local_next \
_ (PUNT4, "ip4-punt") \
_ (PUNT6, "ip6-punt") \
u8 bound;
} udp_local_rx_trace_t;
u8 bound;
} udp_local_rx_trace_t;
+#ifndef CLIB_MARCH_VARIANT
u8 *
format_udp_rx_trace (u8 * s, va_list * args)
{
u8 *
format_udp_rx_trace (u8 * s, va_list * args)
{
t->bound ? "" : " (no listener)");
return s;
}
t->bound ? "" : " (no listener)");
return s;
}
-
-vlib_node_registration_t udp4_local_node;
-vlib_node_registration_t udp6_local_node;
+#endif /* CLIB_MARCH_VARIANT */
always_inline uword
udp46_local_inline (vlib_main_t * vm,
always_inline uword
udp46_local_inline (vlib_main_t * vm,
-static uword
-udp4_local (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (udp4_local_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
{
return udp46_local_inline (vm, node, from_frame, 1 /* is_ip4 */ );
}
{
return udp46_local_inline (vm, node, from_frame, 1 /* is_ip4 */ );
}
-static uword
-udp6_local (vlib_main_t * vm,
- vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+VLIB_NODE_FN (udp6_local_node) (vlib_main_t * vm,
+ vlib_node_runtime_t * node,
+ vlib_frame_t * from_frame)
{
return udp46_local_inline (vm, node, from_frame, 0 /* is_ip4 */ );
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (udp4_local_node) = {
{
return udp46_local_inline (vm, node, from_frame, 0 /* is_ip4 */ );
}
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (udp4_local_node) = {
- .function = udp4_local,
.name = "ip4-udp-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.name = "ip4-udp-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
-VLIB_NODE_FUNCTION_MULTIARCH (udp4_local_node, udp4_local);
-
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (udp6_local_node) = {
/* *INDENT-OFF* */
VLIB_REGISTER_NODE (udp6_local_node) = {
- .function = udp6_local,
.name = "ip6-udp-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
.name = "ip6-udp-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
-VLIB_NODE_FUNCTION_MULTIARCH (udp6_local_node, udp6_local);
-
+#ifndef CLIB_MARCH_VARIANT
static void
add_dst_port (udp_main_t * um,
udp_dst_port_t dst_port, char *dst_port_name, u8 is_ip4)
static void
add_dst_port (udp_main_t * um,
udp_dst_port_t dst_port, char *dst_port_name, u8 is_ip4)
}
VLIB_INIT_FUNCTION (udp_local_init);
}
VLIB_INIT_FUNCTION (udp_local_init);
+#endif /* CLIB_MARCH_VARIANT */
/*
* fd.io coding-style-patch-verification: ON
/*
* fd.io coding-style-patch-verification: ON