X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp_local.c;h=06bafbb4be83e40105e89a53f0672b667ad5dd47;hb=0c56217a307556524cfc92a1aeb1eb72112271d2;hp=af54b73e2a27c30a8810db2283f5b23567dcfc75;hpb=0a715cd03fe55719b8bc78cad0cf761df690157a;p=vpp.git diff --git a/src/vnet/udp/udp_local.c b/src/vnet/udp/udp_local.c index af54b73e2a2..06bafbb4be8 100644 --- a/src/vnet/udp/udp_local.c +++ b/src/vnet/udp/udp_local.c @@ -36,6 +36,12 @@ typedef struct 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 @@ -54,6 +60,48 @@ 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, @@ -61,8 +109,6 @@ udp46_local_inline (vlib_main_t * vm, { 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); @@ -114,8 +160,8 @@ udp46_local_inline (vlib_main_t * vm, /* 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 { @@ -172,33 +218,7 @@ udp46_local_inline (vlib_main_t * vm, 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; - } - else if (is_ip4) - { - icmp4_error_set_vnet_buffer (b0, - ICMP4_destination_unreachable, - ICMP4_destination_unreachable_port_unreachable, - 0); - next0 = UDP_LOCAL_NEXT_ICMP; - n_no_listener++; - } - else - { - icmp6_error_set_vnet_buffer (b0, - ICMP6_destination_unreachable, - ICMP6_destination_unreachable_port_unreachable, - 0); - next0 = UDP_LOCAL_NEXT_ICMP; - n_no_listener++; - } + udp_dispatch_error (node, b0, advance0, is_ip4, &next0); } else { @@ -210,33 +230,7 @@ udp46_local_inline (vlib_main_t * vm, 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; - } - else if (is_ip4) - { - icmp4_error_set_vnet_buffer (b1, - ICMP4_destination_unreachable, - ICMP4_destination_unreachable_port_unreachable, - 0); - next1 = UDP_LOCAL_NEXT_ICMP; - n_no_listener++; - } - else - { - icmp6_error_set_vnet_buffer (b1, - ICMP6_destination_unreachable, - ICMP6_destination_unreachable_port_unreachable, - 0); - next1 = UDP_LOCAL_NEXT_ICMP; - n_no_listener++; - } + udp_dispatch_error (node, b1, advance1, is_ip4, &next1); } else { @@ -292,7 +286,7 @@ udp46_local_inline (vlib_main_t * vm, /* 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); @@ -316,33 +310,7 @@ udp46_local_inline (vlib_main_t * vm, 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; - } - else if (is_ip4) - { - icmp4_error_set_vnet_buffer (b0, - ICMP4_destination_unreachable, - ICMP4_destination_unreachable_port_unreachable, - 0); - next0 = UDP_LOCAL_NEXT_ICMP; - n_no_listener++; - } - else - { - icmp6_error_set_vnet_buffer (b0, - ICMP6_destination_unreachable, - ICMP6_destination_unreachable_port_unreachable, - 0); - next0 = UDP_LOCAL_NEXT_ICMP; - n_no_listener++; - } + udp_dispatch_error (node, b0, advance0, is_ip4, &next0); } else { @@ -377,17 +345,9 @@ udp46_local_inline (vlib_main_t * vm, 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) @@ -409,7 +369,7 @@ VLIB_REGISTER_NODE (udp4_local_node) = { .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 = { @@ -431,7 +391,7 @@ VLIB_REGISTER_NODE (udp6_local_node) = { .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 = { @@ -447,9 +407,9 @@ VLIB_REGISTER_NODE (udp6_local_node) = { /* *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; @@ -484,7 +444,7 @@ udp_register_dst_port (vlib_main_t * vm, 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); } @@ -528,7 +488,7 @@ udp_unregister_dst_port (vlib_main_t * vm, udp_dst_port_t dst_port, u8 is_ip4) 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; @@ -633,10 +593,10 @@ udp_local_init (vlib_main_t * vm) ( /* 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);