espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2026-06-05 21:04:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp_in: Fix incomplete closure if linger active

Browse Source 
If SO_LINGER enabled and lingering close is in progress, we have to
complete the closure to release the blocked api_msg: close(). Otherwise,
it might be blocked forever, as the linked pcb is removed.
This commit is contained in:
David Cermak
2022-09-04 09:58:32 +02:00
parent 0866f57860
commit 8b599aa152
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/tcp_in.c
+14
View File
@@ -68,6 +68,17 @@
/** Initial CWND calculation as defined RFC 2581 */
#define LWIP_TCP_CALC_INITIAL_CWND(mss) ((tcpwnd_size_t)LWIP_MIN((4U * (mss)), LWIP_MAX((2U * (mss)), 4380U)))
/** Complete potentially lingering closure of a PCB */
#if LWIP_SO_LINGER
#define TCP_POLL_LINGERING_CLOSE(pcb) do { \
err_t err_priv; \
LWIP_UNUSED_ARG(err_priv); \
TCP_EVENT_POLL(pcb, err_priv); \
} while(0)
#else
#define TCP_POLL_LINGERING_CLOSE(pcb)
#endif /* LWIP_SO_LINGER */
/* These variables are global to all functions involved in the input
processing of TCP segments. They are set by the tcp_input()
function. */
@@ -1000,6 +1011,7 @@ tcp_process(struct tcp_pcb *pcb)
TCP_RMV_ACTIVE(pcb);
pcb->state = TIME_WAIT;
TCP_REG(&tcp_tw_pcbs, pcb);
TCP_POLL_LINGERING_CLOSE(pcb);
} else {
tcp_ack_now(pcb);
pcb->state = CLOSING;
@@ -1018,6 +1030,7 @@ tcp_process(struct tcp_pcb *pcb)
TCP_RMV_ACTIVE(pcb);
pcb->state = TIME_WAIT;
TCP_REG(&tcp_tw_pcbs, pcb);
TCP_POLL_LINGERING_CLOSE(pcb);
}
break;
case CLOSING:
@@ -1028,6 +1041,7 @@ tcp_process(struct tcp_pcb *pcb)
TCP_RMV_ACTIVE(pcb);
pcb->state = TIME_WAIT;
TCP_REG(&tcp_tw_pcbs, pcb);
TCP_POLL_LINGERING_CLOSE(pcb);
}
break;
case LAST_ACK: