mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-07-02 19:08:57 +00:00
Fixed bug #28098: Nagle can prevent fast retransmit from sending segment by basing the nagle-decision on TF_INFR also
This commit is contained in:
parent
4391463832
commit
43fd5c28b5
|
@ -46,6 +46,10 @@ HISTORY
|
||||||
|
|
||||||
++ Bugfixes:
|
++ Bugfixes:
|
||||||
|
|
||||||
|
2009-11-26: Simon Goldschmidt
|
||||||
|
* tcp.h: Fixed bug #28098: Nagle can prevent fast retransmit from sending
|
||||||
|
segment
|
||||||
|
|
||||||
2009-11-26: Simon Goldschmidt
|
2009-11-26: Simon Goldschmidt
|
||||||
* tcp.h, sockets.c: Fixed bug #28099: API required to disable Nagle
|
* tcp.h, sockets.c: Fixed bug #28099: API required to disable Nagle
|
||||||
algorithm at PCB level
|
algorithm at PCB level
|
||||||
|
|
|
@ -138,9 +138,10 @@ u32_t tcp_update_rcv_ann_wnd(struct tcp_pcb *pcb);
|
||||||
* - the TF_NODELAY flag is set (nagle algorithm turned off for this pcb) or
|
* - the TF_NODELAY flag is set (nagle algorithm turned off for this pcb) or
|
||||||
* - the only unsent segment is at least pcb->mss bytes long (or there is more
|
* - the only unsent segment is at least pcb->mss bytes long (or there is more
|
||||||
* than one unsent segment - with lwIP, this can happen although unsent->len < mss)
|
* than one unsent segment - with lwIP, this can happen although unsent->len < mss)
|
||||||
|
* - or if we are in fast-retransmit (TF_INFR)
|
||||||
*/
|
*/
|
||||||
#define tcp_do_output_nagle(tpcb) ((((tpcb)->unacked == NULL) || \
|
#define tcp_do_output_nagle(tpcb) ((((tpcb)->unacked == NULL) || \
|
||||||
((tpcb)->flags & TF_NODELAY) || \
|
((tpcb)->flags & (TF_NODELAY | TF_INFR)) || \
|
||||||
(((tpcb)->unsent != NULL) && (((tpcb)->unsent->next != NULL) || \
|
(((tpcb)->unsent != NULL) && (((tpcb)->unsent->next != NULL) || \
|
||||||
((tpcb)->unsent->len >= (tpcb)->mss))) \
|
((tpcb)->unsent->len >= (tpcb)->mss))) \
|
||||||
) ? 1 : 0)
|
) ? 1 : 0)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user