libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1471 from armink/fix_lwip141 

[lwIP] Fix lwip 1.4.1 assert when using DFS_NET.
This commit is contained in:
Bernard Xiong 2018-05-28 08:47:06 +08:00 committed by GitHub
parent 51db86ca52 431739dc4b
commit dce9072ecb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/net/lwip-1.4.1/src/api/sockets.c
View File

@ -392,7 +392,8 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
return -1; return -1;
} }
LWIP_ASSERT("invalid socket index", (newsock >= 0) && (newsock < NUM_SOCKETS)); 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]; nsock = &sockets[newsock];
/* See event_callback: If data comes in right away after an accept, even /* See event_callback: If data comes in right away after an accept, even