void
udp_connection_free (udp_connection_t * uc)
{
- pool_put (udp_main.connections[uc->c_thread_index], 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);
+}
+
+void
+udp_connection_delete (udp_connection_t * uc)
+{
+ if ((uc->flags & UDP_CONN_F_OWNS_PORT)
+ || !(uc->flags & UDP_CONN_F_CONNECTED))
+ udp_unregister_dst_port (vlib_get_main (),
+ clib_net_to_host_u16 (uc->c_lcl_port),
+ uc->c_is_ip4);
+ session_transport_delete_notify (&uc->connection);
+ udp_connection_free (uc);
}
u32
listener->c_proto = TRANSPORT_PROTO_UDP;
listener->c_s_index = session_index;
listener->c_fib_index = lcl->fib_index;
+ listener->flags |= UDP_CONN_F_OWNS_PORT;
clib_spinlock_init (&listener->rx_lock);
node_index = lcl->is_ip4 ? udp4_input_node.index : udp6_input_node.index;
udp_register_dst_port (vm, clib_net_to_host_u16 (lcl->port), node_index,
- 1 /* is_ipv4 */ );
+ lcl->is_ip4);
return listener->c_c_index;
}
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;
}
void
udp_session_close (u32 connection_index, u32 thread_index)
{
- vlib_main_t *vm = vlib_get_main ();
udp_connection_t *uc;
+
uc = udp_connection_get (connection_index, thread_index);
- if (uc)
- {
- udp_unregister_dst_port (vm, clib_net_to_host_u16 (uc->c_lcl_port),
- uc->c_is_ip4);
- session_transport_delete_notify (&uc->connection);
- udp_connection_free (uc);
- }
+ if (!uc)
+ return;
+
+ if (!transport_max_tx_dequeue (&uc->connection))
+ udp_connection_delete (uc);
+ else
+ uc->flags |= UDP_CONN_F_CLOSING;
}
void
if (verbose)
{
if (verbose == 1)
- s = format (s, "%-15s\n", "-");
+ s = format (s, "%-15s", "-");
else
s = format (s, "\n");
}
u8 *
format_udp_half_open_session (u8 * s, va_list * args)
{
+ u32 __clib_unused tci = va_arg (*args, u32);
+ u32 __clib_unused thread_index = va_arg (*args, u32);
clib_warning ("BUG");
return 0;
}
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);
+ return format (s, "%U", format_udp_connection, uc, verbose);
}
u16
uc->c_is_ip4 = rmt->is_ip4;
uc->c_proto = TRANSPORT_PROTO_UDP;
uc->c_fib_index = rmt->fib_index;
+ uc->flags |= UDP_CONN_F_OWNS_PORT;
return uc->c_c_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;
}
/* *INDENT-OFF* */
-const static transport_proto_vft_t udp_proto = {
+static const transport_proto_vft_t udp_proto = {
.start_listen = udp_session_bind,
.connect = udp_open_connection,
.stop_listen = udp_session_unbind,
.format_connection = format_udp_session,
.format_half_open = format_udp_half_open_session,
.format_listener = format_udp_listener_session,
- .tx_type = TRANSPORT_TX_DGRAM,
- .service_type = TRANSPORT_SERVICE_CL,
+ .transport_options = {
+ .tx_type = TRANSPORT_TX_DGRAM,
+ .service_type = TRANSPORT_SERVICE_CL,
+ },
};
/* *INDENT-ON* */
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->is_connected = 1;
+ uc->flags |= UDP_CONN_F_CONNECTED;
return uc_index;
}
udpc_connection_listen (u32 session_index, transport_endpoint_t * lcl)
{
udp_connection_t *listener;
- u32 li;
- li = udp_session_bind (session_index, lcl);
- listener = udp_listener_get (li);
- listener->is_connected = 1;
- return li;
+ 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* */
-const static transport_proto_vft_t udpc_proto = {
+static const transport_proto_vft_t udpc_proto = {
.start_listen = udpc_connection_listen,
.stop_listen = udp_session_unbind,
.connect = udpc_connection_open,
.format_connection = format_udp_session,
.format_half_open = format_udp_half_open_session,
.format_listener = format_udp_listener_session,
- .tx_type = TRANSPORT_TX_DEQUEUE,
- .service_type = TRANSPORT_SERVICE_CL,
+ .transport_options = {
+ .tx_type = TRANSPORT_TX_DGRAM,
+ .service_type = TRANSPORT_SERVICE_VC,
+ .half_open_has_fifos = 1
+ },
};
/* *INDENT-ON* */
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;
int i;
- 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;
-
/*
* Registrations
*/
clib_spinlock_init (&um->peekers_readers_locks[i]);
clib_spinlock_init (&um->peekers_write_locks[i]);
}
- return error;
+ 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* */
+
static clib_error_t *
show_udp_punt_fn (vlib_main_t * vm, unformat_input_t * input,