RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #14060 from miri64/lwip_sock/fix/re-recv-signal

Browse Source 
lwip_sock: re-issue receive events if there are still received messages after `*_recv()` or `*_accept()` was called.
This commit is contained in:
MichelRottleuthner 2020-05-22 15:59:25 +02:00 committed by GitHub
commit b13a4d6c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/lwip/contrib/sock/lwip_sock.c
View File

@ -548,6 +548,13 @@ int lwip_sock_recv(struct netconn *conn, uint32_t timeout, struct netbuf **buf)
/* unset flags */ /* unset flags */
#if LWIP_SO_RCVTIMEO #if LWIP_SO_RCVTIMEO
netconn_set_recvtimeout(conn, 0); netconn_set_recvtimeout(conn, 0);
#endif
#if IS_ACTIVE(SOCK_HAS_ASYNC)
lwip_sock_base_t *sock = netconn_get_callback_arg(conn);
if (sock && sock->async_cb.gen && cib_avail(&conn->recvmbox.mbox.cib)) {
sock->async_cb.gen(sock, SOCK_ASYNC_MSG_RECV, sock->async_cb_arg);
}
#endif #endif
return res; return res;
} }

7
pkg/lwip/contrib/sock/tcp/lwip_sock_tcp.c
View File

@ -254,6 +254,13 @@ int sock_tcp_accept(sock_tcp_queue_t *queue, sock_tcp_t **sock,
} }
#if LWIP_SO_RCVTIMEO #if LWIP_SO_RCVTIMEO
netconn_set_recvtimeout(queue->base.conn, 0); netconn_set_recvtimeout(queue->base.conn, 0);
#endif
#if IS_ACTIVE(SOCK_HAS_ASYNC)
if (queue->base.async_cb.gen &&
cib_avail(&queue->base.conn->acceptmbox.mbox.cib)) {
queue->base.async_cb.gen(&queue->base, SOCK_ASYNC_CONN_RECV,
queue->base.async_cb_arg);
}
#endif #endif
mutex_unlock(&queue->mutex); mutex_unlock(&queue->mutex);
return res; return res;