udp_main_t udp_main;
-#define foreach_udp_input_next \
- _ (PUNT, "error-punt") \
- _ (DROP, "error-drop") \
+#define foreach_udp_local_next \
+ _ (PUNT4, "ip4-punt") \
+ _ (PUNT6, "ip6-punt") \
+ _ (DROP4, "ip4-drop") \
+ _ (DROP6, "ip6-drop") \
_ (ICMP4_ERROR, "ip4-icmp-error") \
_ (ICMP6_ERROR, "ip6-icmp-error")
typedef enum
{
-#define _(s,n) UDP_INPUT_NEXT_##s,
- foreach_udp_input_next
+#define _(s,n) UDP_LOCAL_NEXT_##s,
+ foreach_udp_local_next
#undef _
- UDP_INPUT_N_NEXT,
-} udp_input_next_t;
+ UDP_LOCAL_N_NEXT,
+} udp_local_next_t;
+
+#define udp_local_next_drop(is_ip4) ((is_ip4) ? UDP_LOCAL_NEXT_DROP4 : UDP_LOCAL_NEXT_DROP6)
+#define udp_local_next_punt(is_ip4) ((is_ip4) ? UDP_LOCAL_NEXT_PUNT4 : UDP_LOCAL_NEXT_PUNT6)
typedef struct
{
u16 src_port;
u16 dst_port;
u8 bound;
-} udp_rx_trace_t;
+} udp_local_rx_trace_t;
u8 *
format_udp_rx_trace (u8 * s, va_list * args)
{
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
- udp_rx_trace_t *t = va_arg (*args, udp_rx_trace_t *);
+ udp_local_rx_trace_t *t = va_arg (*args, udp_local_rx_trace_t *);
s = format (s, "UDP: src-port %d dst-port %d%s",
clib_net_to_host_u16 (t->src_port),
return s;
}
-typedef struct
-{
- /* Sparse vector mapping udp dst_port in network byte order
- to next index. */
- u16 *next_by_dst_port;
- u8 punt_unknown;
-} udp_input_runtime_t;
-
-vlib_node_registration_t udp4_input_node;
-vlib_node_registration_t udp6_input_node;
+vlib_node_registration_t udp4_local_node;
+vlib_node_registration_t udp6_local_node;
always_inline uword
-udp46_input_inline (vlib_main_t * vm,
+udp46_local_inline (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame, int is_ip4)
{
- udp_input_runtime_t *rt = is_ip4 ?
- (void *) vlib_node_get_runtime_data (vm, udp4_input_node.index)
- : (void *) vlib_node_get_runtime_data (vm, udp6_input_node.index);
+ udp_main_t *um = &udp_main;
__attribute__ ((unused)) u32 n_left_from, next_index, *from, *to_next;
word n_no_listener = 0;
- u8 punt_unknown = rt->punt_unknown;
+ u8 punt_unknown = is_ip4 ? um->punt_unknown4 : um->punt_unknown6;
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
{
error0 = UDP_ERROR_LENGTH_ERROR;
- next0 = UDP_INPUT_NEXT_DROP;
+ next0 = udp_local_next_drop (is_ip4);
}
else
{
vlib_buffer_length_in_chain (vm, b0)))
{
error0 = UDP_ERROR_LENGTH_ERROR;
- next0 = UDP_INPUT_NEXT_DROP;
+ next0 = udp_local_next_drop (is_ip4);
}
}
if (PREDICT_FALSE (b1->current_length < advance1 + sizeof (*h1)))
{
error1 = UDP_ERROR_LENGTH_ERROR;
- next1 = UDP_INPUT_NEXT_DROP;
+ next1 = udp_local_next_drop (is_ip4);
}
else
{
vlib_buffer_length_in_chain (vm, b1)))
{
error1 = UDP_ERROR_LENGTH_ERROR;
- next1 = UDP_INPUT_NEXT_DROP;
+ next1 = udp_local_next_drop (is_ip4);
}
}
/* Index sparse array with network byte order. */
dst_port0 = (error0 == 0) ? h0->dst_port : 0;
dst_port1 = (error1 == 0) ? h1->dst_port : 0;
- sparse_vec_index2 (rt->next_by_dst_port, dst_port0, dst_port1,
- &i0, &i1);
- next0 = (error0 == 0) ? vec_elt (rt->next_by_dst_port, i0) : next0;
- next1 = (error1 == 0) ? vec_elt (rt->next_by_dst_port, i1) : next1;
+ sparse_vec_index2 (is_ip4 ? um->next_by_dst_port4 :
+ um->next_by_dst_port6,
+ dst_port0, dst_port1, &i0, &i1);
+ next0 = (error0 == 0) ?
+ vec_elt (is_ip4 ? um->next_by_dst_port4 : um->next_by_dst_port6,
+ i0) : next0;
+ next1 = (error1 == 0) ?
+ vec_elt (is_ip4 ? um->next_by_dst_port4 : um->next_by_dst_port6,
+ i1) : next1;
if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
{
if (PREDICT_FALSE (punt_unknown))
{
b0->error = node->errors[UDP_ERROR_PUNT];
- next0 = UDP_INPUT_NEXT_PUNT;
+ next0 = udp_local_next_punt (is_ip4);
}
else if (is_ip4)
{
ICMP4_destination_unreachable,
ICMP4_destination_unreachable_port_unreachable,
0);
- next0 = UDP_INPUT_NEXT_ICMP4_ERROR;
+ next0 = UDP_LOCAL_NEXT_ICMP4_ERROR;
n_no_listener++;
}
else
ICMP6_destination_unreachable,
ICMP6_destination_unreachable_port_unreachable,
0);
- next0 = UDP_INPUT_NEXT_ICMP6_ERROR;
+ next0 = UDP_LOCAL_NEXT_ICMP6_ERROR;
n_no_listener++;
}
}
if (PREDICT_FALSE (punt_unknown))
{
b1->error = node->errors[UDP_ERROR_PUNT];
- next1 = UDP_INPUT_NEXT_PUNT;
+ next1 = udp_local_next_punt (is_ip4);
}
else if (is_ip4)
{
ICMP4_destination_unreachable,
ICMP4_destination_unreachable_port_unreachable,
0);
- next1 = UDP_INPUT_NEXT_ICMP4_ERROR;
+ next1 = UDP_LOCAL_NEXT_ICMP4_ERROR;
n_no_listener++;
}
else
ICMP6_destination_unreachable,
ICMP6_destination_unreachable_port_unreachable,
0);
- next1 = UDP_INPUT_NEXT_ICMP6_ERROR;
+ next1 = UDP_LOCAL_NEXT_ICMP6_ERROR;
n_no_listener++;
}
}
if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
{
- udp_rx_trace_t *tr = vlib_add_trace (vm, node,
- b0, sizeof (*tr));
+ udp_local_rx_trace_t *tr = vlib_add_trace (vm, node,
+ b0, sizeof (*tr));
if (b0->error != node->errors[UDP_ERROR_LENGTH_ERROR])
{
tr->src_port = h0 ? h0->src_port : 0;
tr->dst_port = h0 ? h0->dst_port : 0;
- tr->bound = (next0 != UDP_INPUT_NEXT_ICMP4_ERROR &&
- next0 != UDP_INPUT_NEXT_ICMP6_ERROR);
+ tr->bound = (next0 != UDP_LOCAL_NEXT_ICMP4_ERROR &&
+ next0 != UDP_LOCAL_NEXT_ICMP6_ERROR);
}
}
if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
{
- udp_rx_trace_t *tr = vlib_add_trace (vm, node,
- b1, sizeof (*tr));
+ udp_local_rx_trace_t *tr = vlib_add_trace (vm, node,
+ b1, sizeof (*tr));
if (b1->error != node->errors[UDP_ERROR_LENGTH_ERROR])
{
tr->src_port = h1 ? h1->src_port : 0;
tr->dst_port = h1 ? h1->dst_port : 0;
- tr->bound = (next1 != UDP_INPUT_NEXT_ICMP4_ERROR &&
- next1 != UDP_INPUT_NEXT_ICMP6_ERROR);
+ tr->bound = (next1 != UDP_LOCAL_NEXT_ICMP4_ERROR &&
+ next1 != UDP_LOCAL_NEXT_ICMP6_ERROR);
}
}
if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
{
b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
- next0 = UDP_INPUT_NEXT_DROP;
+ next0 = udp_local_next_drop (is_ip4);
goto trace_x1;
}
if (PREDICT_TRUE (clib_net_to_host_u16 (h0->length) <=
vlib_buffer_length_in_chain (vm, b0)))
{
- i0 = sparse_vec_index (rt->next_by_dst_port, h0->dst_port);
- next0 = vec_elt (rt->next_by_dst_port, i0);
+ i0 = sparse_vec_index (is_ip4 ? um->next_by_dst_port4 :
+ um->next_by_dst_port6, h0->dst_port);
+ next0 = vec_elt (is_ip4 ? um->next_by_dst_port4 :
+ um->next_by_dst_port6, i0);
if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
{
if (PREDICT_FALSE (punt_unknown))
{
b0->error = node->errors[UDP_ERROR_PUNT];
- next0 = UDP_INPUT_NEXT_PUNT;
+ next0 = udp_local_next_punt (is_ip4);
}
else if (is_ip4)
{
ICMP4_destination_unreachable,
ICMP4_destination_unreachable_port_unreachable,
0);
- next0 = UDP_INPUT_NEXT_ICMP4_ERROR;
+ next0 = UDP_LOCAL_NEXT_ICMP4_ERROR;
n_no_listener++;
}
else
ICMP6_destination_unreachable,
ICMP6_destination_unreachable_port_unreachable,
0);
- next0 = UDP_INPUT_NEXT_ICMP6_ERROR;
+ next0 = UDP_LOCAL_NEXT_ICMP6_ERROR;
n_no_listener++;
}
}
else
{
b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
- next0 = UDP_INPUT_NEXT_DROP;
+ next0 = udp_local_next_drop (is_ip4);
}
trace_x1:
if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
{
- udp_rx_trace_t *tr = vlib_add_trace (vm, node,
- b0, sizeof (*tr));
+ udp_local_rx_trace_t *tr = vlib_add_trace (vm, node,
+ b0, sizeof (*tr));
if (b0->error != node->errors[UDP_ERROR_LENGTH_ERROR])
{
tr->src_port = h0->src_port;
tr->dst_port = h0->dst_port;
- tr->bound = (next0 != UDP_INPUT_NEXT_ICMP4_ERROR &&
- next0 != UDP_INPUT_NEXT_ICMP6_ERROR);
+ tr->bound = (next0 != UDP_LOCAL_NEXT_ICMP4_ERROR &&
+ next0 != UDP_LOCAL_NEXT_ICMP6_ERROR);
}
}
};
static uword
-udp4_input (vlib_main_t * vm,
+udp4_local (vlib_main_t * vm,
vlib_node_runtime_t * node, vlib_frame_t * from_frame)
{
- return udp46_input_inline (vm, node, from_frame, 1 /* is_ip4 */ );
+ return udp46_local_inline (vm, node, from_frame, 1 /* is_ip4 */ );
}
static uword
-udp6_input (vlib_main_t * vm,
+udp6_local (vlib_main_t * vm,
vlib_node_runtime_t * node, vlib_frame_t * from_frame)
{
- return udp46_input_inline (vm, node, from_frame, 0 /* is_ip4 */ );
+ return udp46_local_inline (vm, node, from_frame, 0 /* is_ip4 */ );
}
-
/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (udp4_input_node) = {
- .function = udp4_input,
+VLIB_REGISTER_NODE (udp4_local_node) = {
+ .function = udp4_local,
.name = "ip4-udp-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
- .runtime_data_bytes = sizeof (udp_input_runtime_t),
-
.n_errors = UDP_N_ERROR,
.error_strings = udp_error_strings,
- .n_next_nodes = UDP_INPUT_N_NEXT,
+ .n_next_nodes = UDP_LOCAL_N_NEXT,
.next_nodes = {
-#define _(s,n) [UDP_INPUT_NEXT_##s] = n,
- foreach_udp_input_next
+#define _(s,n) [UDP_LOCAL_NEXT_##s] = n,
+ foreach_udp_local_next
#undef _
},
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (udp4_input_node, udp4_input);
+VLIB_NODE_FUNCTION_MULTIARCH (udp4_local_node, udp4_local);
/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (udp6_input_node) = {
- .function = udp6_input,
+VLIB_REGISTER_NODE (udp6_local_node) = {
+ .function = udp6_local,
.name = "ip6-udp-lookup",
/* Takes a vector of packets. */
.vector_size = sizeof (u32),
- .runtime_data_bytes = sizeof (udp_input_runtime_t),
-
.n_errors = UDP_N_ERROR,
.error_strings = udp_error_strings,
- .n_next_nodes = UDP_INPUT_N_NEXT,
+ .n_next_nodes = UDP_LOCAL_N_NEXT,
.next_nodes = {
-#define _(s,n) [UDP_INPUT_NEXT_##s] = n,
- foreach_udp_input_next
+#define _(s,n) [UDP_LOCAL_NEXT_##s] = n,
+ foreach_udp_local_next
#undef _
},
};
/* *INDENT-ON* */
-VLIB_NODE_FUNCTION_MULTIARCH (udp6_input_node, udp6_input);
+VLIB_NODE_FUNCTION_MULTIARCH (udp6_local_node, udp6_local);
static void
add_dst_port (udp_main_t * um,
{
udp_main_t *um = &udp_main;
udp_dst_port_info_t *pi;
- udp_input_runtime_t *rt;
u16 *n;
{
pi->node_index = node_index;
pi->next_index = vlib_node_add_next (vm,
- is_ip4 ? udp4_input_node.index
- : udp6_input_node.index, node_index);
+ is_ip4 ? udp4_local_node.index
+ : udp6_local_node.index, node_index);
/* Setup udp protocol -> next index sparse vector mapping. */
- /* *INDENT-OFF* */
- foreach_vlib_main({
- rt = vlib_node_get_runtime_data
- (this_vlib_main, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
- n = sparse_vec_validate (rt->next_by_dst_port,
+ if (is_ip4)
+ n = sparse_vec_validate (um->next_by_dst_port4,
+ clib_host_to_net_u16 (dst_port));
+ else
+ n = sparse_vec_validate (um->next_by_dst_port6,
clib_host_to_net_u16 (dst_port));
- n[0] = pi->next_index;
- });
- /* *INDENT-ON* */
+
+ n[0] = pi->next_index;
}
void
{
udp_main_t *um = &udp_main;
udp_dst_port_info_t *pi;
- udp_input_runtime_t *rt;
u16 *n;
pi = udp_get_dst_port_info (um, dst_port, is_ip4);
return;
/* Kill the mapping. Don't bother killing the pi, it may be back. */
- /* *INDENT-OFF* */
- foreach_vlib_main({
- rt = vlib_node_get_runtime_data
- (this_vlib_main, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
- n = sparse_vec_validate (rt->next_by_dst_port,
+ if (is_ip4)
+ n = sparse_vec_validate (um->next_by_dst_port4,
+ clib_host_to_net_u16 (dst_port));
+ else
+ n = sparse_vec_validate (um->next_by_dst_port6,
clib_host_to_net_u16 (dst_port));
- n[0] = SPARSE_VEC_INVALID_INDEX;
- });
- /* *INDENT-ON* */
+
+ n[0] = SPARSE_VEC_INVALID_INDEX;
+}
+
+bool
+udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4)
+{
+ udp_main_t *um = &udp_main;
+ u16 *n;
+
+ if (is_ip4)
+ n = sparse_vec_validate (um->next_by_dst_port4,
+ clib_host_to_net_u16 (dst_port));
+ else
+ n = sparse_vec_validate (um->next_by_dst_port6,
+ clib_host_to_net_u16 (dst_port));
+
+ return (n[0] != SPARSE_VEC_INVALID_INDEX);
}
void
udp_punt_unknown (vlib_main_t * vm, u8 is_ip4, u8 is_add)
{
- udp_input_runtime_t *rt;
-
+ udp_main_t *um = &udp_main;
{
clib_error_t *error = vlib_call_init_function (vm, udp_local_init);
if (error)
clib_error_report (error);
}
- rt = vlib_node_get_runtime_data
- (vm, is_ip4 ? udp4_input_node.index : udp6_input_node.index);
-
- rt->punt_unknown = is_add;
+ if (is_ip4)
+ um->punt_unknown4 = is_add;
+ else
+ um->punt_unknown6 = is_add;
}
/* Parse a UDP header. */
udp = p;
}
- memset (udp, 0, sizeof (udp[0]));
+ clib_memset (udp, 0, sizeof (udp[0]));
if (unformat (input, "src-port %d dst-port %d", &src_port, &dst_port))
{
udp->src_port = clib_host_to_net_u16 (src_port);
pn->unformat_edit = unformat_pg_udp_header;
}
-static void
-udp_local_node_runtime_init (vlib_main_t * vm)
-{
- udp_input_runtime_t *rt;
-
- rt = vlib_node_get_runtime_data (vm, udp4_input_node.index);
- rt->next_by_dst_port = sparse_vec_new
- ( /* elt bytes */ sizeof (rt->next_by_dst_port[0]),
- /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
- rt->punt_unknown = 0;
-
- rt = vlib_node_get_runtime_data (vm, udp6_input_node.index);
- rt->next_by_dst_port = sparse_vec_new
- ( /* elt bytes */ sizeof (rt->next_by_dst_port[0]),
- /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
- rt->punt_unknown = 0;
-}
-
clib_error_t *
udp_local_init (vlib_main_t * vm)
{
um->dst_port_info_by_dst_port[i] = hash_create (0, sizeof (uword));
}
- udp_setup_node (vm, udp4_input_node.index);
- udp_setup_node (vm, udp6_input_node.index);
+ udp_setup_node (vm, udp4_local_node.index);
+ udp_setup_node (vm, udp6_local_node.index);
- udp_local_node_runtime_init (vm);
+ um->punt_unknown4 = 0;
+ um->punt_unknown6 = 0;
+
+ um->next_by_dst_port4 = sparse_vec_new
+ ( /* elt bytes */ sizeof (um->next_by_dst_port4[0]),
+ /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
+
+ um->next_by_dst_port6 = sparse_vec_new
+ ( /* elt bytes */ sizeof (um->next_by_dst_port6[0]),
+ /* bits in index */ BITS (((udp_header_t *) 0)->dst_port));
#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 1 /* is_ip4 */);
foreach_udp4_dst_port
#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 0 /* is_ip4 */);
foreach_udp6_dst_port
#undef _
- ip4_register_protocol (IP_PROTOCOL_UDP, udp4_input_node.index);
+ ip4_register_protocol (IP_PROTOCOL_UDP, udp4_local_node.index);
/* Note: ip6 differs from ip4, UDP is hotwired to ip6-udp-lookup */
return 0;
}
VLIB_INIT_FUNCTION (udp_local_init);
-clib_error_t *
-udp_local_worker_init (vlib_main_t * vm)
-{
- udp_local_node_runtime_init (vm);
- return 0;
-}
-
-VLIB_WORKER_INIT_FUNCTION (udp_local_worker_init);
-
/*
* fd.io coding-style-patch-verification: ON
*
Code Review / vpp.git / blobdiff