sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inet_close: ensure the TCP_CLOSE can be delivered normally

Browse Source 
Change-Id: I657433806d5dc851ce9bd7722f191f467f9ad458
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2019-12-24 19:57:34 +08:00 committed by patacongo
parent 5c5c08efcd
commit bb09471d63
1 changed files with 73 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
net/inet/inet_close.c
View File

@ -159,12 +159,11 @@ static uint16_t tcp_close_eventhandler(FAR struct net_driver_s *dev,
goto end_wait; goto end_wait;
} }
else if ((flags & TCP_NEWDATA) != 0)
{
#ifdef CONFIG_NET_TCP_WRITE_BUFFERS #ifdef CONFIG_NET_TCP_WRITE_BUFFERS
/* Check if all outstanding bytes have been ACKed */ /* Check if all outstanding bytes have been ACKed */
if (conn->tx_unacked != 0 || !sq_empty(&conn->write_q)) else if (conn->tx_unacked != 0 || !sq_empty(&conn->write_q))
{ {
/* No... we are still waiting for ACKs. Drop any received data, but /* No... we are still waiting for ACKs. Drop any received data, but
* do not yet report TCP_CLOSE in the response. * do not yet report TCP_CLOSE in the response.
@ -173,8 +172,10 @@ static uint16_t tcp_close_eventhandler(FAR struct net_driver_s *dev,
dev->d_len = 0; dev->d_len = 0;
flags &= ~TCP_NEWDATA; flags &= ~TCP_NEWDATA;
} }
else
#endif /* CONFIG_NET_TCP_WRITE_BUFFERS */ #endif /* CONFIG_NET_TCP_WRITE_BUFFERS */
else
{ {
/* Drop data received in this state and make sure that TCP_CLOSE /* Drop data received in this state and make sure that TCP_CLOSE
* is set in the response * is set in the response
@ -183,7 +184,6 @@ static uint16_t tcp_close_eventhandler(FAR struct net_driver_s *dev,
dev->d_len = 0; dev->d_len = 0;
flags = (flags & ~TCP_NEWDATA) | TCP_CLOSE; flags = (flags & ~TCP_NEWDATA) | TCP_CLOSE;
} }
}
UNUSED(conn); /* May not be used */ UNUSED(conn); /* May not be used */
return flags; return flags;
@ -199,6 +199,55 @@ end_wait:
} }
#endif /* NET_TCP_HAVE_STACK */ #endif /* NET_TCP_HAVE_STACK */
/****************************************************************************
* Name: tcp_close_txnotify
*
* Description:
* Notify the appropriate device driver that we are have data ready to
* be send (TCP)
*
* Input Parameters:
* psock - Socket state structure
* conn - The TCP connection structure
*
* Returned Value:
* None
*
****************************************************************************/
#ifdef NET_TCP_HAVE_STACK
static inline void tcp_close_txnotify(FAR struct socket *psock,
FAR struct tcp_conn_s *conn)
{
#ifdef CONFIG_NET_IPv4
#ifdef CONFIG_NET_IPv6
/* If both IPv4 and IPv6 support are enabled, then we will need to select
* the device driver using the appropriate IP domain.
*/
if (psock->s_domain == PF_INET)
#endif
{
/* Notify the device driver that send data is available */
netdev_ipv4_txnotify(conn->u.ipv4.laddr, conn->u.ipv4.raddr);
}
#endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4
else /* if (psock->s_domain == PF_INET6) */
#endif /* CONFIG_NET_IPv4 */
{
/* Notify the device driver that send data is available */
DEBUGASSERT(psock->s_domain == PF_INET6);
netdev_ipv6_txnotify(conn->u.ipv6.laddr, conn->u.ipv6.raddr);
}
#endif /* CONFIG_NET_IPv6 */
}
#endif /* NET_TCP_HAVE_STACK */
/**************************************************************************** /****************************************************************************
* Name: tcp_close_disconnect * Name: tcp_close_disconnect
* *
@ -288,7 +337,7 @@ static inline int tcp_close_disconnect(FAR struct socket *psock)
{ {
/* Set up to receive TCP data event callbacks */ /* Set up to receive TCP data event callbacks */
state.cl_cb->flags = (TCP_NEWDATA | TCP_DISCONN_EVENTS); state.cl_cb->flags = (TCP_NEWDATA | TCP_POLL | TCP_DISCONN_EVENTS);
state.cl_cb->event = tcp_close_eventhandler; state.cl_cb->event = tcp_close_eventhandler;
/* A non-NULL value of the priv field means that lingering is /* A non-NULL value of the priv field means that lingering is
@ -309,6 +358,10 @@ static inline int tcp_close_disconnect(FAR struct socket *psock)
nxsem_init(&state.cl_sem, 0, 0); nxsem_init(&state.cl_sem, 0, 0);
nxsem_setprotocol(&state.cl_sem, SEM_PRIO_NONE); nxsem_setprotocol(&state.cl_sem, SEM_PRIO_NONE);
/* Notify the device driver of the availability of TX data */
tcp_close_txnotify(psock, conn);
/* Wait for the disconnect event */ /* Wait for the disconnect event */
net_lockedwait(&state.cl_sem); net_lockedwait(&state.cl_sem);