diff options
| author | Bernard Xiong <[email protected]> | 2018-05-28 08:47:06 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-28 08:47:06 +0800 |
| commit | dce9072ecbaeaaaf8efd569ae96466547bab003f (patch) | |
| tree | 7c19f1643a7f4087b04876dd305fcb3db8170d31 | |
| parent | 51db86ca52c05ece57831151adb0970dca7610f0 (diff) | |
| parent | 431739dc4be1e8dbe3c2720bf38cee5b275103ed (diff) | |
Merge pull request #1471 from armink/fix_lwip141
[lwIP] Fix lwip 1.4.1 assert when using DFS_NET.
| -rw-r--r-- | components/net/lwip-1.4.1/src/api/sockets.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 ab1d6acd75..c5bcf8b4a2 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 |