espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-01 16:16:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(LWIP): Socket(not server) must has linger

Browse Source 
Server linger must be disable.
This commit is contained in:
Dong Heng
2018-07-19 11:00:44 +08:00
parent 8a6c1a307f
commit da0d4cb749
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
components/lwip/apps/multi-threads/sockets_mt.c
View File

@ -706,6 +706,25 @@ static void lwip_sync_mt(int s, int how)
}
}
#if LWIP_SO_LINGER
static void lwip_socket_set_so_link(int s, int linger)
{
struct lwip_sock *sock = get_socket(s);
if (sock) {
/*
* linker:
* -1: nothing
* 0: free sent_buf immediately
*/
sock->conn->linger = linger;
}
}
#else
#error "LWIP_SO_LINGER must be enable"
#endif
int lwip_socket(int domain, int type, int protocol)
{
int s;
@ -729,8 +748,10 @@ int lwip_socket(int domain, int type, int protocol)
s = -1;
}
if (s >= 0)
if (s >= 0) {
lwip_socket_set_so_link(s, 0);
SOCK_MT_SET_SHUTDOWN(s, SOCK_MT_SHUTDOWN_NONE);
}
return s;
}
@ -768,6 +789,8 @@ int lwip_listen(int s, int backlog)
LWIP_ENTER_MT(s, SOCK_MT_STATE, SOCK_MT_STATE_LISTEN);
lwip_socket_set_so_link(s, -1);
ret = lwip_listen_esp(s, backlog);
LWIP_EXIT_MT(s, SOCK_MT_STATE, SOCK_MT_STATE_LISTEN);
@ -782,6 +805,8 @@ int lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
LWIP_ENTER_MT(s, SOCK_MT_STATE, SOCK_MT_STATE_ACCEPT)
lwip_socket_set_so_link(s, -1);
ret = lwip_accept_esp(s, addr, addrlen);
LWIP_EXIT_MT(s, SOCK_MT_STATE, SOCK_MT_STATE_ACCEPT);
@ -803,8 +828,10 @@ int lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
ret = -1;
}
if (ret >= 0)
if (ret >= 0) {
lwip_socket_set_so_link(s, 0);
SOCK_MT_SET_SHUTDOWN(ret, SOCK_MT_SHUTDOWN_NONE);
}
return ret;
}
@ -977,7 +1004,6 @@ int lwip_shutdown(int s, int how)
}
#endif
int lwip_close(int s)
{
int ret;