X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.c;h=9c427a4a982e96e32c7d56de8ce5e6eacd1dcfd2;hb=e759bb543c38a682dc31492a3a0a58669a811538;hp=fedf2cc0224e67750574a813a21bb27685d083fd;hpb=68810624f84467503482b82662c980e8f0e36deb;p=vpp.git diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c index fedf2cc0224..9c427a4a982 100644 --- a/src/vnet/udp/udp.c +++ b/src/vnet/udp/udp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Cisco and/or its affiliates. + * Copyright (c) 2016-2020 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -13,297 +13,521 @@ * limitations under the License. */ -/** @file - udp state machine, etc. -*/ - #include #include #include #include +#include -udp_uri_main_t udp_uri_main; +udp_main_t udp_main; -u32 -udp_session_bind_ip4 (u32 session_index, transport_endpoint_t * lcl) +static void +udp_connection_register_port (vlib_main_t * vm, u16 lcl_port, u8 is_ip4) { - udp_uri_main_t *um = vnet_get_udp_main (); - udp_connection_t *listener; + udp_main_t *um = &udp_main; + udp_dst_port_info_t *pi; + u16 *n; - pool_get (um->udp_listeners, listener); - memset (listener, 0, sizeof (udp_connection_t)); - listener->c_lcl_port = clib_host_to_net_u16 (lcl->port); - listener->c_lcl_ip4.as_u32 = lcl->ip.ip4.as_u32; - listener->c_transport_proto = TRANSPORT_PROTO_UDP; - udp_register_dst_port (um->vlib_main, lcl->port, udp4_uri_input_node.index, - 1 /* is_ipv4 */ ); - return 0; -} - -u32 -udp_session_bind_ip6 (u32 session_index, transport_endpoint_t * lcl) -{ - udp_uri_main_t *um = vnet_get_udp_main (); - udp_connection_t *listener; + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + if (!pi) + { + udp_add_dst_port (um, lcl_port, 0, is_ip4); + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + pi->n_connections = 1; + } + else + { + pi->n_connections += 1; + /* Do not return. The fact that the pi is valid does not mean + * it's up to date */ + } - pool_get (um->udp_listeners, listener); - listener->c_lcl_port = clib_host_to_net_u16 (lcl->port); - clib_memcpy (&listener->c_lcl_ip6, &lcl->ip.ip6, sizeof (ip6_address_t)); - listener->c_transport_proto = TRANSPORT_PROTO_UDP; - udp_register_dst_port (um->vlib_main, lcl->port, - udp4_uri_input_node.index, 0 /* is_ipv4 */ ); - return 0; -} + pi->node_index = is_ip4 ? udp4_input_node.index : udp6_input_node.index; + pi->next_index = um->local_to_input_edge[is_ip4]; -u32 -udp_session_unbind_ip4 (u32 listener_index) -{ - vlib_main_t *vm = vlib_get_main (); - udp_connection_t *listener; - listener = udp_listener_get (listener_index); + /* Setup udp protocol -> next index sparse vector mapping. */ + if (is_ip4) + n = sparse_vec_validate (um->next_by_dst_port4, + clib_host_to_net_u16 (lcl_port)); + else + n = sparse_vec_validate (um->next_by_dst_port6, + clib_host_to_net_u16 (lcl_port)); - /* deregister the udp_local mapping */ - udp_unregister_dst_port (vm, listener->c_lcl_port, 1 /* is_ipv4 */ ); - return 0; + n[0] = pi->next_index; } -u32 -udp_session_unbind_ip6 (u32 listener_index) +static void +udp_connection_unregister_port (u16 lcl_port, u8 is_ip4) { - vlib_main_t *vm = vlib_get_main (); - udp_connection_t *listener; + udp_main_t *um = &udp_main; + udp_dst_port_info_t *pi; - listener = udp_listener_get (listener_index); + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + if (!pi) + return; - /* deregister the udp_local mapping */ - udp_unregister_dst_port (vm, listener->c_lcl_port, 0 /* is_ipv4 */ ); - return 0; + if (!pi->n_connections) + { + clib_warning ("no connections using port %u", lcl_port); + return; + } + + if (!clib_atomic_sub_fetch (&pi->n_connections, 1)) + udp_unregister_dst_port (0, lcl_port, is_ip4); } -transport_connection_t * -udp_session_get_listener (u32 listener_index) +void +udp_connection_share_port (u16 lcl_port, u8 is_ip4) { - udp_connection_t *us; + udp_main_t *um = &udp_main; + udp_dst_port_info_t *pi; - us = udp_listener_get (listener_index); - return &us->connection; + /* Done without a lock but the operation is atomic. Writers to pi hash + * table and vector should be guarded by a barrier sync */ + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + clib_atomic_fetch_add_rel (&pi->n_connections, 1); } -u32 -udp_push_header (transport_connection_t * tconn, vlib_buffer_t * b) +udp_connection_t * +udp_connection_alloc (u32 thread_index) { - udp_connection_t *us; - u8 *data; - udp_header_t *udp; + udp_main_t *um = &udp_main; + udp_connection_t *uc; + u32 will_expand = 0; + pool_get_aligned_will_expand (um->connections[thread_index], will_expand, + CLIB_CACHE_LINE_BYTES); - us = (udp_connection_t *) tconn; - - if (tconn->is_ip4) + if (PREDICT_FALSE (will_expand)) { - ip4_header_t *ip; - - data = vlib_buffer_get_current (b); - udp = (udp_header_t *) (data - sizeof (udp_header_t)); - ip = (ip4_header_t *) ((u8 *) udp - sizeof (ip4_header_t)); - - /* Build packet header, swap rx key src + dst fields */ - ip->src_address.as_u32 = us->c_lcl_ip4.as_u32; - ip->dst_address.as_u32 = us->c_rmt_ip4.as_u32; - ip->ip_version_and_header_length = 0x45; - ip->ttl = 254; - ip->protocol = IP_PROTOCOL_UDP; - ip->length = clib_host_to_net_u16 (b->current_length + sizeof (*udp)); - ip->checksum = ip4_header_checksum (ip); - - udp->src_port = us->c_lcl_port; - udp->dst_port = us->c_rmt_port; - udp->length = clib_host_to_net_u16 (b->current_length); - udp->checksum = 0; - - b->current_length = sizeof (*ip) + sizeof (*udp); - return SESSION_QUEUE_NEXT_IP4_LOOKUP; + clib_spinlock_lock_if_init (&udp_main.peekers_write_locks + [thread_index]); + pool_get_aligned (udp_main.connections[thread_index], uc, + CLIB_CACHE_LINE_BYTES); + clib_spinlock_unlock_if_init (&udp_main.peekers_write_locks + [thread_index]); } else { - vlib_main_t *vm = vlib_get_main (); - ip6_header_t *ip; - u16 payload_length; - int bogus = ~0; + pool_get_aligned (um->connections[thread_index], uc, + CLIB_CACHE_LINE_BYTES); + } + clib_memset (uc, 0, sizeof (*uc)); + uc->c_c_index = uc - um->connections[thread_index]; + uc->c_thread_index = thread_index; + uc->c_proto = TRANSPORT_PROTO_UDP; + clib_spinlock_init (&uc->rx_lock); + return uc; +} - data = vlib_buffer_get_current (b); - udp = (udp_header_t *) (data - sizeof (udp_header_t)); - ip = (ip6_header_t *) ((u8 *) udp - sizeof (ip6_header_t)); +void +udp_connection_free (udp_connection_t * uc) +{ + u32 thread_index = uc->c_thread_index; + if (CLIB_DEBUG) + clib_memset (uc, 0xFA, sizeof (*uc)); + pool_put (udp_main.connections[thread_index], uc); +} - /* Build packet header, swap rx key src + dst fields */ - clib_memcpy (&ip->src_address, &us->c_lcl_ip6, sizeof (ip6_address_t)); - clib_memcpy (&ip->dst_address, &us->c_rmt_ip6, sizeof (ip6_address_t)); +static void +udp_connection_cleanup (udp_connection_t * uc) +{ + transport_endpoint_cleanup (TRANSPORT_PROTO_UDP, &uc->c_lcl_ip, + uc->c_lcl_port); + udp_connection_unregister_port (clib_net_to_host_u16 (uc->c_lcl_port), + uc->c_is_ip4); + udp_connection_free (uc); +} - ip->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (0x6 << 28); +void +udp_connection_delete (udp_connection_t * uc) +{ + session_transport_delete_notify (&uc->connection); + udp_connection_cleanup (uc); +} - ip->hop_limit = 0xff; - ip->protocol = IP_PROTOCOL_UDP; +static u8 +udp_connection_port_used_extern (u16 lcl_port, u8 is_ip4) +{ + udp_main_t *um = vnet_get_udp_main (); + udp_dst_port_info_t *pi; - payload_length = vlib_buffer_length_in_chain (vm, b); - payload_length -= sizeof (*ip); + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + return (pi && !pi->n_connections + && udp_is_valid_dst_port (lcl_port, is_ip4)); +} - ip->payload_length = clib_host_to_net_u16 (payload_length); +static u16 +udp_default_mtu (udp_main_t * um, u8 is_ip4) +{ + u16 ip_hlen = is_ip4 ? sizeof (ip4_header_t) : sizeof (ip6_header_t); + return (um->default_mtu - sizeof (udp_header_t) - ip_hlen); +} - udp->checksum = ip6_tcp_udp_icmp_compute_checksum (vm, b, ip, &bogus); - ASSERT (!bogus); +static u32 +udp_session_bind (u32 session_index, transport_endpoint_t * lcl) +{ + udp_main_t *um = vnet_get_udp_main (); + vlib_main_t *vm = vlib_get_main (); + transport_endpoint_cfg_t *lcl_ext; + udp_connection_t *listener; + u16 lcl_port_ho; + void *iface_ip; - udp->src_port = us->c_lcl_port; - udp->dst_port = us->c_rmt_port; - udp->length = clib_host_to_net_u16 (b->current_length); - udp->checksum = 0; + lcl_port_ho = clib_net_to_host_u16 (lcl->port); - b->current_length = sizeof (*ip) + sizeof (*udp); + if (udp_connection_port_used_extern (lcl_port_ho, lcl->is_ip4)) + { + clib_warning ("port already used"); + return SESSION_E_PORTINUSE; + } - return SESSION_QUEUE_NEXT_IP6_LOOKUP; + pool_get (um->listener_pool, listener); + clib_memset (listener, 0, sizeof (udp_connection_t)); + + listener->c_lcl_port = lcl->port; + listener->c_c_index = listener - um->listener_pool; + + /* If we are provided a sw_if_index, bind using one of its ips */ + if (ip_is_zero (&lcl->ip, 1) && lcl->sw_if_index != ENDPOINT_INVALID_INDEX) + { + if ((iface_ip = ip_interface_get_first_ip (lcl->sw_if_index, + lcl->is_ip4))) + ip_set (&lcl->ip, iface_ip, lcl->is_ip4); } + ip_copy (&listener->c_lcl_ip, &lcl->ip, lcl->is_ip4); + listener->c_is_ip4 = lcl->is_ip4; + listener->c_proto = TRANSPORT_PROTO_UDP; + listener->c_s_index = session_index; + listener->c_fib_index = lcl->fib_index; + listener->mss = udp_default_mtu (um, listener->c_is_ip4); + listener->flags |= UDP_CONN_F_OWNS_PORT | UDP_CONN_F_LISTEN; + lcl_ext = (transport_endpoint_cfg_t *) lcl; + if (lcl_ext->transport_flags & TRANSPORT_CFG_F_CONNECTED) + listener->flags |= UDP_CONN_F_CONNECTED; + else + listener->c_flags |= TRANSPORT_CONNECTION_F_CLESS; + clib_spinlock_init (&listener->rx_lock); + + udp_connection_register_port (vm, lcl_port_ho, lcl->is_ip4); + return listener->c_c_index; } -transport_connection_t * -udp_session_get (u32 connection_index, u32 my_thread_index) +static u32 +udp_session_unbind (u32 listener_index) { - udp_uri_main_t *um = vnet_get_udp_main (); + udp_main_t *um = &udp_main; + udp_connection_t *listener; + + listener = udp_listener_get (listener_index); + udp_connection_unregister_port (clib_net_to_host_u16 (listener->c_lcl_port), + listener->c_is_ip4); + pool_put (um->listener_pool, listener); + return 0; +} +static transport_connection_t * +udp_session_get_listener (u32 listener_index) +{ udp_connection_t *us; - us = - pool_elt_at_index (um->udp_sessions[my_thread_index], connection_index); + + us = udp_listener_get (listener_index); return &us->connection; } -void -udp_session_close (u32 connection_index, u32 my_thread_index) +static u32 +udp_push_header (transport_connection_t * tc, vlib_buffer_t * b) +{ + udp_connection_t *uc; + vlib_main_t *vm = vlib_get_main (); + + uc = udp_connection_from_transport (tc); + + vlib_buffer_push_udp (b, uc->c_lcl_port, uc->c_rmt_port, 1); + if (tc->is_ip4) + vlib_buffer_push_ip4_custom (vm, b, &uc->c_lcl_ip4, &uc->c_rmt_ip4, + IP_PROTOCOL_UDP, 1 /* csum offload */ , + 0 /* is_df */ ); + else + vlib_buffer_push_ip6 (vm, b, &uc->c_lcl_ip6, &uc->c_rmt_ip6, + IP_PROTOCOL_UDP); + vnet_buffer (b)->sw_if_index[VLIB_RX] = 0; + vnet_buffer (b)->sw_if_index[VLIB_TX] = uc->c_fib_index; + b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; + + if (PREDICT_FALSE (uc->flags & UDP_CONN_F_CLOSING)) + { + if (!transport_max_tx_dequeue (&uc->connection)) + udp_connection_delete (uc); + } + + return 0; +} + +static transport_connection_t * +udp_session_get (u32 connection_index, u32 thread_index) { - udp_uri_main_t *um = vnet_get_udp_main (); - pool_put_index (um->udp_sessions[my_thread_index], connection_index); + udp_connection_t *uc; + uc = udp_connection_get (connection_index, thread_index); + if (uc) + return &uc->connection; + return 0; } -u8 * -format_udp_session_ip4 (u8 * s, va_list * args) +static void +udp_session_close (u32 connection_index, u32 thread_index) { - u32 uci = va_arg (*args, u32); - u32 thread_index = va_arg (*args, u32); - udp_connection_t *u4; + udp_connection_t *uc; - u4 = udp_connection_get (uci, thread_index); + uc = udp_connection_get (connection_index, thread_index); + if (!uc) + return; - s = format (s, "[%s] %U:%d->%U:%d", "udp", format_ip4_address, - &u4->c_lcl_ip4, clib_net_to_host_u16 (u4->c_lcl_port), - format_ip4_address, &u4->c_rmt_ip4, - clib_net_to_host_u16 (u4->c_rmt_port)); - return s; + if (!transport_max_tx_dequeue (&uc->connection)) + udp_connection_delete (uc); + else + uc->flags |= UDP_CONN_F_CLOSING; } -u8 * -format_udp_session_ip6 (u8 * s, va_list * args) +static void +udp_session_cleanup (u32 connection_index, u32 thread_index) { - u32 uci = va_arg (*args, u32); - u32 thread_index = va_arg (*args, u32); - udp_connection_t *tc = udp_connection_get (uci, thread_index); - s = format (s, "[%s] %U:%d->%U:%d", "udp", format_ip6_address, - &tc->c_lcl_ip6, clib_net_to_host_u16 (tc->c_lcl_port), - format_ip6_address, &tc->c_rmt_ip6, - clib_net_to_host_u16 (tc->c_rmt_port)); - return s; + udp_connection_t *uc; + uc = udp_connection_get (connection_index, thread_index); + if (!uc) + return; + if (uc->flags & UDP_CONN_F_MIGRATED) + udp_connection_free (uc); + else + udp_connection_cleanup (uc); } -u8 * -format_udp_listener_session_ip4 (u8 * s, va_list * args) +static int +udp_session_send_params (transport_connection_t * tconn, + transport_send_params_t * sp) { - u32 tci = va_arg (*args, u32); - udp_connection_t *tc = udp_listener_get (tci); - s = format (s, "[%s] %U:%d->%U:%d", "udp", format_ip4_address, - &tc->c_lcl_ip4, clib_net_to_host_u16 (tc->c_lcl_port), - format_ip4_address, &tc->c_rmt_ip4, - clib_net_to_host_u16 (tc->c_rmt_port)); - return s; + udp_connection_t *uc; + + uc = udp_connection_from_transport (tconn); + + /* No constraint on TX window */ + sp->snd_space = ~0; + /* TODO figure out MTU of output interface */ + sp->snd_mss = uc->mss; + sp->tx_offset = 0; + sp->flags = 0; + return 0; } -u8 * -format_udp_listener_session_ip6 (u8 * s, va_list * args) +static int +udp_open_connection (transport_endpoint_cfg_t * rmt) { - u32 tci = va_arg (*args, u32); - udp_connection_t *tc = udp_listener_get (tci); - s = format (s, "[%s] %U:%d->%U:%d", "udp", format_ip6_address, - &tc->c_lcl_ip6, clib_net_to_host_u16 (tc->c_lcl_port), - format_ip6_address, &tc->c_rmt_ip6, - clib_net_to_host_u16 (tc->c_rmt_port)); - return s; + vlib_main_t *vm = vlib_get_main (); + u32 thread_index = vm->thread_index; + udp_main_t *um = &udp_main; + ip46_address_t lcl_addr; + udp_connection_t *uc; + u16 lcl_port; + int rv; + + rv = transport_alloc_local_endpoint (TRANSPORT_PROTO_UDP, rmt, &lcl_addr, + &lcl_port); + if (rv) + { + if (rv != SESSION_E_PORTINUSE) + return rv; + + if (udp_connection_port_used_extern (lcl_port, rmt->is_ip4)) + return SESSION_E_PORTINUSE; + + /* If port in use, check if 5-tuple is also in use */ + if (session_lookup_connection (rmt->fib_index, &lcl_addr, &rmt->ip, + lcl_port, rmt->port, TRANSPORT_PROTO_UDP, + rmt->is_ip4)) + return SESSION_E_PORTINUSE; + + /* 5-tuple is available so increase lcl endpoint refcount and proceed + * with connection allocation */ + transport_share_local_endpoint (TRANSPORT_PROTO_UDP, &lcl_addr, + lcl_port); + goto conn_alloc; + } + + if (udp_is_valid_dst_port (lcl_port, rmt->is_ip4)) + { + /* If specific source port was requested abort */ + if (rmt->peer.port) + return SESSION_E_PORTINUSE; + + /* Try to find a port that's not used */ + while (udp_is_valid_dst_port (lcl_port, rmt->is_ip4)) + { + lcl_port = transport_alloc_local_port (TRANSPORT_PROTO_UDP, + &lcl_addr); + if (lcl_port < 1) + return SESSION_E_PORTINUSE; + } + } + +conn_alloc: + + udp_connection_register_port (vm, lcl_port, rmt->is_ip4); + + /* We don't poll main thread if we have workers */ + if (vlib_num_workers ()) + thread_index = 1; + + uc = udp_connection_alloc (thread_index); + ip_copy (&uc->c_rmt_ip, &rmt->ip, rmt->is_ip4); + ip_copy (&uc->c_lcl_ip, &lcl_addr, rmt->is_ip4); + uc->c_rmt_port = rmt->port; + uc->c_lcl_port = clib_host_to_net_u16 (lcl_port); + uc->c_is_ip4 = rmt->is_ip4; + uc->c_proto = TRANSPORT_PROTO_UDP; + uc->c_fib_index = rmt->fib_index; + uc->mss = rmt->mss ? rmt->mss : udp_default_mtu (um, uc->c_is_ip4); + uc->flags |= UDP_CONN_F_OWNS_PORT; + if (rmt->transport_flags & TRANSPORT_CFG_F_CONNECTED) + uc->flags |= UDP_CONN_F_CONNECTED; + else + uc->c_flags |= TRANSPORT_CONNECTION_F_CLESS; + + return uc->c_c_index; } -u16 -udp_send_mss_uri (transport_connection_t * t) +static transport_connection_t * +udp_session_get_half_open (u32 conn_index) { - /* TODO figure out MTU of output interface */ - return 400; + udp_connection_t *uc; + u32 thread_index; + + /* We don't poll main thread if we have workers */ + thread_index = vlib_num_workers ()? 1 : 0; + uc = udp_connection_get (conn_index, thread_index); + if (!uc) + return 0; + return &uc->connection; } -u32 -udp_send_space_uri (transport_connection_t * t) +static u8 * +format_udp_session (u8 * s, va_list * args) { - /* No constraint on TX window */ - return ~0; + u32 uci = va_arg (*args, u32); + u32 thread_index = va_arg (*args, u32); + u32 verbose = va_arg (*args, u32); + udp_connection_t *uc; + + uc = udp_connection_get (uci, thread_index); + return format (s, "%U", format_udp_connection, uc, verbose); } -int -udp_open_connection (transport_endpoint_t * tep) +static u8 * +format_udp_half_open_session (u8 * s, va_list * args) { - clib_warning ("Not implemented"); + u32 __clib_unused tci = va_arg (*args, u32); + u32 __clib_unused thread_index = va_arg (*args, u32); + clib_warning ("BUG"); return 0; } +static u8 * +format_udp_listener_session (u8 * s, va_list * args) +{ + u32 tci = va_arg (*args, u32); + u32 __clib_unused thread_index = va_arg (*args, u32); + u32 verbose = va_arg (*args, u32); + udp_connection_t *uc = udp_listener_get (tci); + return format (s, "%U", format_udp_connection, uc, verbose); +} + /* *INDENT-OFF* */ -const static transport_proto_vft_t udp4_proto = { - .bind = udp_session_bind_ip4, - .open = udp_open_connection, - .unbind = udp_session_unbind_ip4, +static const transport_proto_vft_t udp_proto = { + .start_listen = udp_session_bind, + .connect = udp_open_connection, + .stop_listen = udp_session_unbind, .push_header = udp_push_header, .get_connection = udp_session_get, .get_listener = udp_session_get_listener, + .get_half_open = udp_session_get_half_open, .close = udp_session_close, - .send_mss = udp_send_mss_uri, - .send_space = udp_send_space_uri, - .format_connection = format_udp_session_ip4, - .format_listener = format_udp_listener_session_ip4 + .cleanup = udp_session_cleanup, + .send_params = udp_session_send_params, + .format_connection = format_udp_session, + .format_half_open = format_udp_half_open_session, + .format_listener = format_udp_listener_session, + .transport_options = { + .name = "udp", + .short_name = "U", + .tx_type = TRANSPORT_TX_DGRAM, + .service_type = TRANSPORT_SERVICE_CL, + }, }; +/* *INDENT-ON* */ + +int +udpc_connection_open (transport_endpoint_cfg_t * rmt) +{ + udp_connection_t *uc; + /* Reproduce the logic of udp_open_connection to find the correct thread */ + u32 thread_index = vlib_num_workers ()? 1 : vlib_get_main ()->thread_index; + u32 uc_index; + uc_index = udp_open_connection (rmt); + if (uc_index == (u32) ~ 0) + return -1; + uc = udp_connection_get (uc_index, thread_index); + uc->flags |= UDP_CONN_F_CONNECTED; + return uc_index; +} -const static transport_proto_vft_t udp6_proto = { - .bind = udp_session_bind_ip6, - .open = udp_open_connection, - .unbind = udp_session_unbind_ip6, +u32 +udpc_connection_listen (u32 session_index, transport_endpoint_t * lcl) +{ + udp_connection_t *listener; + u32 li_index; + li_index = udp_session_bind (session_index, lcl); + if (li_index == (u32) ~ 0) + return -1; + listener = udp_listener_get (li_index); + listener->flags |= UDP_CONN_F_CONNECTED; + /* Fake udp listener, i.e., make sure session layer adds a udp instead of + * udpc listener to the lookup table */ + ((session_endpoint_cfg_t *) lcl)->transport_proto = TRANSPORT_PROTO_UDP; + return li_index; +} + +/* *INDENT-OFF* */ +static const transport_proto_vft_t udpc_proto = { + .start_listen = udpc_connection_listen, + .stop_listen = udp_session_unbind, + .connect = udpc_connection_open, .push_header = udp_push_header, .get_connection = udp_session_get, .get_listener = udp_session_get_listener, + .get_half_open = udp_session_get_half_open, .close = udp_session_close, - .send_mss = udp_send_mss_uri, - .send_space = udp_send_space_uri, - .format_connection = format_udp_session_ip6, - .format_listener = format_udp_listener_session_ip6 + .cleanup = udp_session_cleanup, + .send_params = udp_session_send_params, + .format_connection = format_udp_session, + .format_half_open = format_udp_half_open_session, + .format_listener = format_udp_listener_session, + .transport_options = { + .name = "udpc", + .short_name = "U", + .tx_type = TRANSPORT_TX_DGRAM, + .service_type = TRANSPORT_SERVICE_VC, + .half_open_has_fifos = 1 + }, }; /* *INDENT-ON* */ static clib_error_t * udp_init (vlib_main_t * vm) { - udp_uri_main_t *um = vnet_get_udp_main (); + udp_main_t *um = vnet_get_udp_main (); ip_main_t *im = &ip_main; vlib_thread_main_t *tm = vlib_get_thread_main (); u32 num_threads; - clib_error_t *error = 0; ip_protocol_info_t *pi; - - um->vlib_main = vm; - um->vnet_main = vnet_get_main (); - - if ((error = vlib_call_init_function (vm, ip_main_init))) - return error; - if ((error = vlib_call_init_function (vm, ip4_lookup_init))) - return error; - if ((error = vlib_call_init_function (vm, ip6_lookup_init))) - return error; + int i; /* * Registrations @@ -316,22 +540,49 @@ udp_init (vlib_main_t * vm) pi->format_header = format_udp_header; pi->unformat_pg_edit = unformat_pg_udp_header; - /* Register as transport with URI */ - session_register_transport (TRANSPORT_PROTO_UDP, 1, &udp4_proto); - session_register_transport (TRANSPORT_PROTO_UDP, 0, &udp6_proto); + transport_register_protocol (TRANSPORT_PROTO_UDP, &udp_proto, + FIB_PROTOCOL_IP4, ip4_lookup_node.index); + transport_register_protocol (TRANSPORT_PROTO_UDP, &udp_proto, + FIB_PROTOCOL_IP6, ip6_lookup_node.index); + transport_register_protocol (TRANSPORT_PROTO_UDPC, &udpc_proto, + FIB_PROTOCOL_IP4, ip4_lookup_node.index); + transport_register_protocol (TRANSPORT_PROTO_UDPC, &udpc_proto, + FIB_PROTOCOL_IP6, ip6_lookup_node.index); /* * Initialize data structures */ num_threads = 1 /* main thread */ + tm->n_threads; - vec_validate (um->udp_sessions, num_threads - 1); - - return error; + vec_validate (um->connections, num_threads - 1); + vec_validate (um->connection_peekers, num_threads - 1); + vec_validate (um->peekers_readers_locks, num_threads - 1); + vec_validate (um->peekers_write_locks, num_threads - 1); + + if (num_threads > 1) + for (i = 0; i < num_threads; i++) + { + clib_spinlock_init (&um->peekers_readers_locks[i]); + clib_spinlock_init (&um->peekers_write_locks[i]); + } + + um->local_to_input_edge[UDP_IP4] = + vlib_node_add_next (vm, udp4_local_node.index, udp4_input_node.index); + um->local_to_input_edge[UDP_IP6] = + vlib_node_add_next (vm, udp6_local_node.index, udp6_input_node.index); + + um->default_mtu = 1500; + return 0; } -VLIB_INIT_FUNCTION (udp_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (udp_init) = +{ + .runs_after = VLIB_INITS("ip_main_init", "ip4_lookup_init", + "ip6_lookup_init"), +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON