#include <vnet/udp/udp_packet.h>
#include <vppinfra/sparse_vec.h>
-#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_LOCAL_NEXT_##s,
- foreach_udp_local_next
-#undef _
- UDP_LOCAL_N_NEXT,
+ UDP_LOCAL_NEXT_PUNT,
+ UDP_LOCAL_NEXT_DROP,
+ UDP_LOCAL_NEXT_ICMP,
+ 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;
u8 bound;
} udp_local_rx_trace_t;
+static vlib_error_desc_t udp_error_counters[] = {
+#define udp_error(f, n, s, d) { #n, d, VL_COUNTER_SEVERITY_##s },
+#include "udp_error.def"
+#undef udp_error
+};
+
+#define UDP_NO_NODE_SET ((u16) ~0)
+
#ifndef CLIB_MARCH_VARIANT
u8 *
format_udp_rx_trace (u8 * s, va_list * args)
}
#endif /* CLIB_MARCH_VARIANT */
+always_inline void
+udp_dispatch_error (vlib_node_runtime_t *node, vlib_buffer_t *b, u32 advance,
+ u8 is_ip4, u32 *next)
+{
+ udp_main_t *um = &udp_main;
+ u8 punt_unknown = is_ip4 ? um->punt_unknown4 : um->punt_unknown6;
+
+ if (PREDICT_FALSE (punt_unknown))
+ {
+ vlib_buffer_advance (b, -(word) advance);
+ b->error = node->errors[UDP_ERROR_PUNT];
+ *next = UDP_LOCAL_NEXT_PUNT;
+ }
+ else if (um->icmp_send_unreachable_disabled)
+ {
+ *next = UDP_LOCAL_NEXT_DROP;
+ b->error = node->errors[UDP_ERROR_NO_LISTENER];
+ }
+ else
+ {
+ /* move the pointer back so icmp-error can find the ip packet header */
+ vlib_buffer_advance (b, -(word) advance);
+
+ if (is_ip4)
+ {
+ icmp4_error_set_vnet_buffer (
+ b, ICMP4_destination_unreachable,
+ ICMP4_destination_unreachable_port_unreachable, 0);
+ b->error = node->errors[UDP_ERROR_NO_LISTENER];
+ *next = UDP_LOCAL_NEXT_ICMP;
+ }
+ else
+ {
+ icmp6_error_set_vnet_buffer (
+ b, ICMP6_destination_unreachable,
+ ICMP6_destination_unreachable_port_unreachable, 0);
+ b->error = node->errors[UDP_ERROR_NO_LISTENER];
+ *next = UDP_LOCAL_NEXT_ICMP;
+ }
+ }
+}
+
always_inline uword
udp46_local_inline (vlib_main_t * vm,
vlib_node_runtime_t * node,
{
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 = is_ip4 ? um->punt_unknown4 : um->punt_unknown6;
-
+ u16 *next_by_dst_port = (is_ip4 ?
+ um->next_by_dst_port4 : um->next_by_dst_port6);
from = vlib_frame_vector_args (from_frame);
n_left_from = from_frame->n_vectors;
/* ip4/6_local hands us the ip header, not the udp header */
if (is_ip4)
{
- advance0 = sizeof (ip4_header_t);
- advance1 = sizeof (ip4_header_t);
+ advance0 = ip4_header_bytes (vlib_buffer_get_current (b0));
+ advance1 = ip4_header_bytes (vlib_buffer_get_current (b1));
}
else
{
if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
{
error0 = UDP_ERROR_LENGTH_ERROR;
- next0 = udp_local_next_drop (is_ip4);
+ next0 = UDP_LOCAL_NEXT_DROP;
}
else
{
vlib_buffer_advance (b0, advance0);
h0 = vlib_buffer_get_current (b0);
- error0 = next0 = 0;
+ error0 = UDP_ERROR_NONE;
+ next0 = UDP_LOCAL_NEXT_PUNT;
if (PREDICT_FALSE (clib_net_to_host_u16 (h0->length) >
vlib_buffer_length_in_chain (vm, b0)))
{
error0 = UDP_ERROR_LENGTH_ERROR;
- next0 = udp_local_next_drop (is_ip4);
+ next0 = UDP_LOCAL_NEXT_DROP;
}
}
if (PREDICT_FALSE (b1->current_length < advance1 + sizeof (*h1)))
{
error1 = UDP_ERROR_LENGTH_ERROR;
- next1 = udp_local_next_drop (is_ip4);
+ next1 = UDP_LOCAL_NEXT_DROP;
}
else
{
vlib_buffer_advance (b1, advance1);
h1 = vlib_buffer_get_current (b1);
- error1 = next1 = 0;
+ error1 = UDP_ERROR_NONE;
+ next1 = UDP_LOCAL_NEXT_PUNT;
if (PREDICT_FALSE (clib_net_to_host_u16 (h1->length) >
vlib_buffer_length_in_chain (vm, b1)))
{
error1 = UDP_ERROR_LENGTH_ERROR;
- next1 = udp_local_next_drop (is_ip4);
+ next1 = UDP_LOCAL_NEXT_DROP;
}
}
/* 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 (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))
- {
- // move the pointer back so icmp-error can find the
- // ip packet header
- vlib_buffer_advance (b0, -(word) advance0);
+ sparse_vec_index2 (next_by_dst_port, dst_port0, dst_port1, &i0,
+ &i1);
+ next0 = (error0 == 0) ? vec_elt (next_by_dst_port, i0) : next0;
+ next1 = (error1 == 0) ? vec_elt (next_by_dst_port, i1) : next1;
- if (PREDICT_FALSE (punt_unknown))
- {
- b0->error = node->errors[UDP_ERROR_PUNT];
- next0 = udp_local_next_punt (is_ip4);
- }
- else if (is_ip4)
- {
- icmp4_error_set_vnet_buffer (b0,
- ICMP4_destination_unreachable,
- ICMP4_destination_unreachable_port_unreachable,
- 0);
- next0 = UDP_LOCAL_NEXT_ICMP4_ERROR;
- n_no_listener++;
- }
- else
- {
- icmp6_error_set_vnet_buffer (b0,
- ICMP6_destination_unreachable,
- ICMP6_destination_unreachable_port_unreachable,
- 0);
- next0 = UDP_LOCAL_NEXT_ICMP6_ERROR;
- n_no_listener++;
- }
+ if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX ||
+ next0 == UDP_NO_NODE_SET))
+ {
+ udp_dispatch_error (node, b0, advance0, is_ip4, &next0);
}
else
{
vlib_buffer_advance (b0, sizeof (*h0));
}
- if (PREDICT_FALSE (i1 == SPARSE_VEC_INVALID_INDEX))
+ if (PREDICT_FALSE (i1 == SPARSE_VEC_INVALID_INDEX ||
+ next1 == UDP_NO_NODE_SET))
{
- // move the pointer back so icmp-error can find the
- // ip packet header
- vlib_buffer_advance (b1, -(word) advance1);
-
- if (PREDICT_FALSE (punt_unknown))
- {
- b1->error = node->errors[UDP_ERROR_PUNT];
- next1 = udp_local_next_punt (is_ip4);
- }
- else if (is_ip4)
- {
- icmp4_error_set_vnet_buffer (b1,
- ICMP4_destination_unreachable,
- ICMP4_destination_unreachable_port_unreachable,
- 0);
- next1 = UDP_LOCAL_NEXT_ICMP4_ERROR;
- n_no_listener++;
- }
- else
- {
- icmp6_error_set_vnet_buffer (b1,
- ICMP6_destination_unreachable,
- ICMP6_destination_unreachable_port_unreachable,
- 0);
- next1 = UDP_LOCAL_NEXT_ICMP6_ERROR;
- n_no_listener++;
- }
+ udp_dispatch_error (node, b1, advance1, is_ip4, &next1);
}
else
{
{
tr->src_port = h0 ? h0->src_port : 0;
tr->dst_port = h0 ? h0->dst_port : 0;
- tr->bound = (next0 != UDP_LOCAL_NEXT_ICMP4_ERROR &&
- next0 != UDP_LOCAL_NEXT_ICMP6_ERROR);
+ tr->bound = (next0 != UDP_LOCAL_NEXT_ICMP);
}
}
if (PREDICT_FALSE (b1->flags & VLIB_BUFFER_IS_TRACED))
{
tr->src_port = h1 ? h1->src_port : 0;
tr->dst_port = h1 ? h1->dst_port : 0;
- tr->bound = (next1 != UDP_LOCAL_NEXT_ICMP4_ERROR &&
- next1 != UDP_LOCAL_NEXT_ICMP6_ERROR);
+ tr->bound = (next1 != UDP_LOCAL_NEXT_ICMP);
}
}
/* ip4/6_local hands us the ip header, not the udp header */
if (is_ip4)
- advance0 = sizeof (ip4_header_t);
+ advance0 = ip4_header_bytes (vlib_buffer_get_current (b0));
else
advance0 = sizeof (ip6_header_t);
if (PREDICT_FALSE (b0->current_length < advance0 + sizeof (*h0)))
{
b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
- next0 = udp_local_next_drop (is_ip4);
+ next0 = UDP_LOCAL_NEXT_DROP;
goto trace_x1;
}
if (PREDICT_TRUE (clib_net_to_host_u16 (h0->length) <=
vlib_buffer_length_in_chain (vm, b0)))
{
- 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);
+ i0 = sparse_vec_index (next_by_dst_port, h0->dst_port);
+ next0 = vec_elt (next_by_dst_port, i0);
- if (PREDICT_FALSE (i0 == SPARSE_VEC_INVALID_INDEX))
+ if (PREDICT_FALSE ((i0 == SPARSE_VEC_INVALID_INDEX) ||
+ next0 == UDP_NO_NODE_SET))
{
- // move the pointer back so icmp-error can find the
- // ip packet header
- vlib_buffer_advance (b0, -(word) advance0);
-
- if (PREDICT_FALSE (punt_unknown))
- {
- b0->error = node->errors[UDP_ERROR_PUNT];
- next0 = udp_local_next_punt (is_ip4);
- }
- else if (is_ip4)
- {
- icmp4_error_set_vnet_buffer (b0,
- ICMP4_destination_unreachable,
- ICMP4_destination_unreachable_port_unreachable,
- 0);
- next0 = UDP_LOCAL_NEXT_ICMP4_ERROR;
- n_no_listener++;
- }
- else
- {
- icmp6_error_set_vnet_buffer (b0,
- ICMP6_destination_unreachable,
- ICMP6_destination_unreachable_port_unreachable,
- 0);
- next0 = UDP_LOCAL_NEXT_ICMP6_ERROR;
- n_no_listener++;
- }
+ udp_dispatch_error (node, b0, advance0, is_ip4, &next0);
}
else
{
else
{
b0->error = node->errors[UDP_ERROR_LENGTH_ERROR];
- next0 = udp_local_next_drop (is_ip4);
+ next0 = UDP_LOCAL_NEXT_DROP;
}
trace_x1:
{
tr->src_port = h0->src_port;
tr->dst_port = h0->dst_port;
- tr->bound = (next0 != UDP_LOCAL_NEXT_ICMP4_ERROR &&
- next0 != UDP_LOCAL_NEXT_ICMP6_ERROR);
+ tr->bound = (next0 != UDP_LOCAL_NEXT_ICMP);
}
}
vlib_put_next_frame (vm, node, next_index, n_left_to_next);
}
- vlib_error_count (vm, node->node_index, UDP_ERROR_NO_LISTENER,
- n_no_listener);
return from_frame->n_vectors;
}
-static char *udp_error_strings[] = {
-#define udp_error(n,s) s,
-#include "udp_error.def"
-#undef udp_error
-};
-
VLIB_NODE_FN (udp4_local_node) (vlib_main_t * vm,
vlib_node_runtime_t * node,
vlib_frame_t * from_frame)
.vector_size = sizeof (u32),
.n_errors = UDP_N_ERROR,
- .error_strings = udp_error_strings,
+ .error_counters = udp_error_counters,
.n_next_nodes = UDP_LOCAL_N_NEXT,
.next_nodes = {
-#define _(s,n) [UDP_LOCAL_NEXT_##s] = n,
- foreach_udp_local_next
-#undef _
+ [UDP_LOCAL_NEXT_PUNT]= "ip4-punt",
+ [UDP_LOCAL_NEXT_DROP]= "ip4-drop",
+ [UDP_LOCAL_NEXT_ICMP]= "ip4-icmp-error",
},
.format_buffer = format_udp_header,
.vector_size = sizeof (u32),
.n_errors = UDP_N_ERROR,
- .error_strings = udp_error_strings,
+ .error_counters = udp_error_counters,
.n_next_nodes = UDP_LOCAL_N_NEXT,
.next_nodes = {
-#define _(s,n) [UDP_LOCAL_NEXT_##s] = n,
- foreach_udp_local_next
-#undef _
+ [UDP_LOCAL_NEXT_PUNT]= "ip6-punt",
+ [UDP_LOCAL_NEXT_DROP]= "ip6-drop",
+ [UDP_LOCAL_NEXT_ICMP]= "ip6-icmp-error",
},
.format_buffer = format_udp_header,
/* *INDENT-ON* */
#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)
+void
+udp_add_dst_port (udp_main_t * um, udp_dst_port_t dst_port,
+ char *dst_port_name, u8 is_ip4)
{
udp_dst_port_info_t *pi;
u32 i;
pi = udp_get_dst_port_info (um, dst_port, is_ip4);
if (!pi)
{
- add_dst_port (um, dst_port, 0, is_ip4);
+ udp_add_dst_port (um, dst_port, 0, is_ip4);
pi = udp_get_dst_port_info (um, dst_port, is_ip4);
ASSERT (pi);
}
n = sparse_vec_validate (um->next_by_dst_port6,
clib_host_to_net_u16 (dst_port));
- n[0] = SPARSE_VEC_INVALID_INDEX;
+ n[0] = UDP_NO_NODE_SET;
}
-bool
+u8
udp_is_valid_dst_port (udp_dst_port_t dst_port, u8 is_ip4)
{
udp_main_t *um = &udp_main;
n = sparse_vec_validate (um->next_by_dst_port6,
clib_host_to_net_u16 (dst_port));
- return (n[0] != SPARSE_VEC_INVALID_INDEX);
+ return (n[0] != SPARSE_VEC_INVALID_INDEX && n[0] != UDP_NO_NODE_SET);
}
void
( /* 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 */);
+#define _(n,s) udp_add_dst_port (um, UDP_DST_PORT_##s, #s, 1 /* is_ip4 */);
foreach_udp4_dst_port
#undef _
-#define _(n,s) add_dst_port (um, UDP_DST_PORT_##s, #s, 0 /* is_ip4 */);
+#define _(n,s) udp_add_dst_port (um, UDP_DST_PORT_##s, #s, 0 /* is_ip4 */);
foreach_udp6_dst_port
#undef _
ip4_register_protocol (IP_PROTOCOL_UDP, udp4_local_node.index);
Code Review / vpp.git / blobdiff