pool_put (udp_main.connections[thread_index], uc);
}
-void
-udp_connection_delete (udp_connection_t * uc)
+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);
- session_transport_delete_notify (&uc->connection);
udp_connection_free (uc);
}
+void
+udp_connection_delete (udp_connection_t * uc)
+{
+ session_transport_delete_notify (&uc->connection);
+ udp_connection_cleanup (uc);
+}
+
+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;
+
+ 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));
+}
+
u32
udp_session_bind (u32 session_index, transport_endpoint_t * lcl)
{
vlib_main_t *vm = vlib_get_main ();
transport_endpoint_cfg_t *lcl_ext;
udp_connection_t *listener;
- udp_dst_port_info_t *pi;
+ u16 lcl_port_ho;
void *iface_ip;
- pi = udp_get_dst_port_info (um, clib_net_to_host_u16 (lcl->port),
- lcl->is_ip4);
+ lcl_port_ho = clib_net_to_host_u16 (lcl->port);
- if (pi && !pi->n_connections)
+ if (udp_connection_port_used_extern (lcl_port_ho, lcl->is_ip4))
{
clib_warning ("port already used");
- return -1;
+ return SESSION_E_PORTINUSE;
}
pool_get (um->listener_pool, listener);
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;
+ 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;
listener->c_flags |= TRANSPORT_CONNECTION_F_CLESS;
clib_spinlock_init (&listener->rx_lock);
- udp_connection_register_port (vm, clib_net_to_host_u16 (lcl->port),
- lcl->is_ip4);
+ udp_connection_register_port (vm, lcl_port_ho, lcl->is_ip4);
return listener->c_c_index;
}
{
udp_connection_t *uc;
uc = udp_connection_get (connection_index, thread_index);
- if (uc)
+ if (!uc)
+ return;
+ if (uc->flags & UDP_CONN_F_MIGRATED)
udp_connection_free (uc);
+ else
+ udp_connection_cleanup (uc);
}
u8 *
if (!uc)
return s;
if (uc->c_is_ip4)
- s = format (s, "[#%d][%s] %U:%d->%U:%d", uc->c_thread_index, "U",
- format_ip4_address, &uc->c_lcl_ip4,
+ s = format (s, "[%u:%u][%s] %U:%d->%U:%d", uc->c_thread_index,
+ uc->c_s_index, "U", format_ip4_address, &uc->c_lcl_ip4,
clib_net_to_host_u16 (uc->c_lcl_port), format_ip4_address,
&uc->c_rmt_ip4, clib_net_to_host_u16 (uc->c_rmt_port));
else
- s = format (s, "[#%d][%s] %U:%d->%U:%d", uc->c_thread_index, "U",
- format_ip6_address, &uc->c_lcl_ip6,
+ s = format (s, "[%u:%u][%s] %U:%d->%U:%d", uc->c_thread_index,
+ uc->c_s_index, "U", format_ip6_address, &uc->c_lcl_ip6,
clib_net_to_host_u16 (uc->c_lcl_port), format_ip6_address,
&uc->c_rmt_ip6, clib_net_to_host_u16 (uc->c_rmt_port));
return s;
}
+const char *udp_connection_flags_str[] = {
+#define _(sym, str) str,
+ foreach_udp_connection_flag
+#undef _
+};
+
+static u8 *
+format_udp_connection_flags (u8 * s, va_list * args)
+{
+ udp_connection_t *uc = va_arg (*args, udp_connection_t *);
+ int i, last = -1;
+
+ for (i = 0; i < UDP_CONN_N_FLAGS; i++)
+ if (uc->flags & (1 << i))
+ last = i;
+ for (i = 0; i < last; i++)
+ {
+ if (uc->flags & (1 << i))
+ s = format (s, "%s, ", udp_connection_flags_str[i]);
+ }
+ if (last >= 0)
+ s = format (s, "%s", udp_connection_flags_str[last]);
+ return s;
+}
+
+static u8 *
+format_udp_vars (u8 * s, va_list * args)
+{
+ udp_connection_t *uc = va_arg (*args, udp_connection_t *);
+ s = format (s, " index %u flags: %U", uc->c_c_index,
+ format_udp_connection_flags, uc);
+
+ if (!(uc->flags & UDP_CONN_F_LISTEN))
+ s = format (s, "\n");
+ return s;
+}
+
u8 *
format_udp_connection (u8 * s, va_list * args)
{
s = format (s, "%-50U", format_udp_connection_id, uc);
if (verbose)
{
- if (verbose == 1)
- s = format (s, "%-15s", "-");
- else
- s = format (s, "\n");
+ s = format (s, "%-15s",
+ (uc->flags & UDP_CONN_F_LISTEN) ? "LISTEN" : "OPENED", uc);
+ if (verbose > 1)
+ s = format (s, "\n%U", format_udp_vars, uc);
}
return s;
}
{
vlib_main_t *vm = vlib_get_main ();
u32 thread_index = vm->thread_index;
- udp_connection_t *uc;
ip46_address_t lcl_addr;
+ udp_connection_t *uc;
u16 lcl_port;
+ int rv;
- if (transport_alloc_local_endpoint (TRANSPORT_PROTO_UDP, rmt, &lcl_addr,
- &lcl_port))
- return -1;
+ 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 -1;
+ 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)
- {
- clib_warning ("Failed to allocate src port");
- return -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 */
Code Review / vpp.git / blobdiff