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

fix(lwip): fix exist more pbufs after TX_SINGLE_PBUF enabled

Browse Source
This commit is contained in:
Zhang Jun Hao
2018-07-24 16:58:56 +08:00
parent 7d4b222028
commit c250b3ed2e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/lwip/lwip/src/core/tcp_out.c
View File

@ -481,6 +481,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
LWIP_ASSERT("inconsistent oversize vs. len", (oversize == 0) || (pos == len)); LWIP_ASSERT("inconsistent oversize vs. len", (oversize == 0) || (pos == len));
#endif /* TCP_OVERSIZE */ #endif /* TCP_OVERSIZE */
#if !LWIP_NETIF_TX_SINGLE_PBUF
/* /*
* Phase 2: Chain a new pbuf to the end of pcb->unsent. * Phase 2: Chain a new pbuf to the end of pcb->unsent.
* *
@ -491,6 +492,10 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
* We don't extend segments containing SYN/FIN flags or options * We don't extend segments containing SYN/FIN flags or options
* (len==0). The new pbuf is kept in concat_p and pbuf_cat'ed at * (len==0). The new pbuf is kept in concat_p and pbuf_cat'ed at
* the end. * the end.
*
* This phase is skipped for LWIP_NETIF_TX_SINGLE_PBUF as we could only execute
* it after rexmit puts a segment from unacked to unsent and at this point,
* oversize info is lost.
*/ */
if ((pos < len) && (space > 0) && (last_unsent->len > 0)) { if ((pos < len) && (space > 0) && (last_unsent->len > 0)) {
u16_t seglen = LWIP_MIN(space, len - pos); u16_t seglen = LWIP_MIN(space, len - pos);
@ -543,6 +548,7 @@ tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
pos += seglen; pos += seglen;
} }
#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
} else { } else {
#if TCP_OVERSIZE #if TCP_OVERSIZE
LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)", LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)",