espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-10 04:48:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_lwip_mt' into 'master'

Browse Source 
feat(lwip): Fix UDP recv NULL package

See merge request
This commit is contained in:
Wu Jian Gang
2018-07-06 19:29:57 +08:00
parent 9b1a32eaa1 9f998c64f5
commit 1738dc53ea
2 changed files with 8 additions and 0 deletions
components/lwip
include/lwip/apps/multi-threads/sys
socket.h
lwip/src/api
api_lib.c

1
components/lwip/include/lwip/apps/multi-threads/sys/socket.h

@ -106,6 +106,7 @@ int lwip_fcntl_mt(int s, int cmd, int val);
#define read(a,b,c) lwip_read_mt(a,b,c)
#define write(a,b,c) lwip_write_mt(a,b,c)
#define close(s) lwip_close_mt(s)
#define closesocket(s) lwip_close_mt(s)
#define fcntl(a,b,c) lwip_fcntl_mt(a,b,c)
#endif /* LWIP_POSIX_SOCKETS_IO_NAMES */

7
components/lwip/lwip/src/api/api_lib.c

@ -571,7 +571,14 @@ netconn_recv_data(struct netconn *conn, void **new_buf)
#endif /* LWIP_TCP && (LWIP_UDP || LWIP_RAW) */
#if (LWIP_UDP || LWIP_RAW)
{
#ifdef SOCKETS_MT
if (!buf) {
API_EVENT(conn, NETCONN_EVT_ERROR, 0);
return ERR_CLSD;
}
#else
LWIP_ASSERT("buf != NULL", buf != NULL);
#endif
len = netbuf_len((struct netbuf*)buf);
}
#endif /* (LWIP_UDP || LWIP_RAW) */