espressif/esp-lwip
1
0
Fork 0
mirror of https://github.com/espressif/esp-lwip.git synced 2025-08-06 18:23:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug for tcp recv assert

Browse Source
This commit is contained in:
xueyunfei
2020-11-19 11:02:59 +08:00
parent 889c3875bf
commit 7285b846a2
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/tcp_in.c
View File

@ -1575,7 +1575,23 @@ tcp_receive(struct tcp_pcb *pcb)
struct tcp_seg *cseg = pcb->ooseq; struct tcp_seg *cseg = pcb->ooseq;
seqno = pcb->ooseq->tcphdr->seqno; seqno = pcb->ooseq->tcphdr->seqno;
#if ESP_LWIP
if (pcb->rcv_wnd < TCP_TCPLEN(cseg)) {
LWIP_DEBUGF(TCP_OOSEQ_DEBUG,
("tcp_receive: OOSEQ packet out of wnd "
"seqno=%"U32_F" wnd =%"U32_F" len=%"U16_F"\
snd_wl1=%"U32_F" snd_wl2 =%"U32_F" f = %"X16_F" tf=%"U16_F"\n",
seqno,pcb->rcv_wnd,cseg->len,pcb->snd_wl1,pcb->snd_wl1,\
TCPH_FLAGS((cseg)->tcphdr),pcb->flags));
cseg->len = pcb->rcv_wnd;
if((TCPH_FLAGS((cseg)->tcphdr) & TCP_SYN) || (TCPH_FLAGS((cseg)->tcphdr) & TCP_FIN)) {
cseg->len -= 1;
}
pbuf_realloc(cseg->p, cseg->len);
tcp_segs_free(cseg->next);
cseg->next = NULL;
}
#endif
pcb->rcv_nxt += TCP_TCPLEN(cseg); pcb->rcv_nxt += TCP_TCPLEN(cseg);
LWIP_ASSERT("tcp_receive: ooseq tcplen > rcv_wnd\n", LWIP_ASSERT("tcp_receive: ooseq tcplen > rcv_wnd\n",
pcb->rcv_wnd >= TCP_TCPLEN(cseg)); pcb->rcv_wnd >= TCP_TCPLEN(cseg));
@ -1780,6 +1796,17 @@ tcp_receive(struct tcp_pcb *pcb)
} }
/* Adjust length of segment to fit in the window. */ /* Adjust length of segment to fit in the window. */
next->next->len = (u16_t)(pcb->rcv_nxt + pcb->rcv_wnd - seqno); next->next->len = (u16_t)(pcb->rcv_nxt + pcb->rcv_wnd - seqno);
#if ESP_LWIP
if (TCPH_FLAGS(next->next->tcphdr) & TCP_SYN) {
LWIP_DEBUGF(TCP_OOSEQ_DEBUG,
("tcp_receive: ooseq not trimmed correctly to rcv_wnd "
"seqno=%"U32_F" wnd =%"U32_F" len=%"U16_F"\
snd_wl1=%"U32_F" snd_wl2 =%"U32_F" f = %"X16_F" tf=%"U16_F"\n",
seqno,pcb->rcv_wnd,next->next->len,pcb->snd_wl1,pcb->snd_wl1,\
TCPH_FLAGS(next->next->tcphdr),pcb->flags));
next->next->len -= 1;
}
#endif
pbuf_realloc(next->next->p, next->next->len); pbuf_realloc(next->next->p, next->next->len);
tcplen = TCP_TCPLEN(next->next); tcplen = TCP_TCPLEN(next->next);
LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n", LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n",

1
test/unit/lwipopts.h
View File

@ -101,6 +101,7 @@
#define ESP_GRATUITOUS_ARP 1 #define ESP_GRATUITOUS_ARP 1
#define ESP_LWIP_SELECT 1 #define ESP_LWIP_SELECT 1
#define ESP_LWIP_LOCK 1 #define ESP_LWIP_LOCK 1
#define TCP_OOSEQ_DEBUG LWIP_DBG_ON
#ifdef IP_NAPT #ifdef IP_NAPT
#define IP_NAPT_MAX 16 #define IP_NAPT_MAX 16