From 431739dc4be1e8dbe3c2720bf38cee5b275103ed Mon Sep 17 00:00:00 2001 From: armink Date: Sun, 27 May 2018 21:12:16 +0800 Subject: [PATCH] [lwIP] Fix lwip 1.4.1 assert when using DFS_NET. --- components/net/lwip-1.4.1/src/api/sockets.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/net/lwip-1.4.1/src/api/sockets.c b/components/net/lwip-1.4.1/src/api/sockets.c index ab1d6acd7..c5bcf8b4a 100644 --- a/components/net/lwip-1.4.1/src/api/sockets.c +++ b/components/net/lwip-1.4.1/src/api/sockets.c @@ -392,7 +392,8 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) return -1; } LWIP_ASSERT("invalid socket index", (newsock >= 0) && (newsock < NUM_SOCKETS)); - LWIP_ASSERT("newconn->callback == event_callback", newconn->callback == event_callback); + /* RT-Thread has changed callback when using BSD socket API, so remove this assert. */ + /* LWIP_ASSERT("newconn->callback == event_callback", newconn->callback == event_callback); */ nsock = &sockets[newsock]; /* See event_callback: If data comes in right away after an accept, even