michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: sockets: Explicitly flush conn/pkt queue on close()

Browse source 
If a socket is closed without reading all data from peer or accepting
all pending connection, they will be leaked. So, flush queues
explicitly.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2017-06-13 20:19:08 +03:00 • committed by Jukka Rissanen
commit 49eaa2b722
1 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
subsys/net/lib/sockets/sockets.c
View file

@ -29,6 +29,23 @@ static inline void _k_fifo_wait_non_empty(struct k_fifo *fifo, int32_t timeout)
k_poll(events, ARRAY_SIZE(events), timeout);
}
static void zsock_flush_queue(struct net_context *ctx)
{
bool is_listen = net_context_get_state(ctx) == NET_CONTEXT_LISTENING;
void *p;
/* recv_q and accept_q are shared via a union */
while ((p = k_fifo_get(&ctx->recv_q, K_NO_WAIT)) != NULL) {
if (is_listen) {
NET_DBG("discarding ctx %p", p);
net_context_put(p);
} else {
NET_DBG("discarding pkt %p", p);
net_pkt_unref(p);
}
}
}
int zsock_socket(int family, int type, int proto)
{
struct net_context *ctx;
@ -45,6 +62,14 @@ int zsock_close(int sock)
{
struct net_context *ctx = INT_TO_POINTER(sock);
/* Reset callbacks to avoid any race conditions while
* flushing queues.
*/
net_context_accept(ctx, NULL, K_NO_WAIT, NULL);
net_context_recv(ctx, NULL, K_NO_WAIT, NULL);
zsock_flush_queue(ctx);
SET_ERRNO(net_context_put(ctx));
return 0;
}