diff options
| author | liuxianliang <[email protected]> | 2021-06-28 11:18:28 +0800 |
|---|---|---|
| committer | liuxianliang <[email protected]> | 2021-06-28 11:18:28 +0800 |
| commit | 9f45c13ac9600caaf24c1527b7ed60e6fa00e948 (patch) | |
| tree | b713f8520ab7908fd58777bea985a271457650bd | |
| parent | da1302cbda8607b1e7e4b3ead07ba515b5c878b9 (diff) | |
[update] the "event_callback" will be change by RT-Thread dfs.
| -rw-r--r-- | components/net/lwip-2.0.2/src/api/sockets.c | 3 | ||||
| -rw-r--r-- | components/net/lwip-2.0.3/src/api/sockets.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/components/net/lwip-2.0.2/src/api/sockets.c b/components/net/lwip-2.0.2/src/api/sockets.c index dc2477b611..87e0f86dff 100644 --- a/components/net/lwip-2.0.2/src/api/sockets.c +++ b/components/net/lwip-2.0.2/src/api/sockets.c @@ -531,7 +531,8 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) return -1; } LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); - // 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 - LWIP_SOCKET_OFFSET]; /* See event_callback: If data comes in right away after an accept, even diff --git a/components/net/lwip-2.0.3/src/api/sockets.c b/components/net/lwip-2.0.3/src/api/sockets.c index d2be138be6..87e0f86dff 100644 --- a/components/net/lwip-2.0.3/src/api/sockets.c +++ b/components/net/lwip-2.0.3/src/api/sockets.c @@ -531,7 +531,8 @@ lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen) return -1; } LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET)); - 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 - LWIP_SOCKET_OFFSET]; /* See event_callback: If data comes in right away after an accept, even |