mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-25 00:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed congestion window bug where the pcb->cwnd variable overflowed when increased.

Browse Source
This commit is contained in:
kieranm 2002-10-24 10:57:44 +00:00
parent 05b8bf216c
commit 8fe9e007c9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/tcp_in.c
View File

@ -641,7 +641,7 @@ tcp_receive(struct tcp_pcb *pcb)
} else { } else {
/* Inflate the congestion window, but not if it means that /* Inflate the congestion window, but not if it means that
the value overflows. */ the value overflows. */
if(pcb->cwnd + pcb->mss > pcb->cwnd) { if((u16_t)(pcb->cwnd + pcb->mss) > pcb->cwnd) {
pcb->cwnd += pcb->mss; pcb->cwnd += pcb->mss;
} }
@ -677,15 +677,16 @@ tcp_receive(struct tcp_pcb *pcb)
ssthresh). */ ssthresh). */
if(pcb->state >= ESTABLISHED) { if(pcb->state >= ESTABLISHED) {
if(pcb->cwnd < pcb->ssthresh) { if(pcb->cwnd < pcb->ssthresh) {
if(pcb->cwnd + pcb->mss > pcb->cwnd) { if((u16_t)(pcb->cwnd + pcb->mss) > pcb->cwnd) {
pcb->cwnd += pcb->mss; pcb->cwnd += pcb->mss;
} }
DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: slow start cwnd %u\n", pcb->cwnd)); DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: slow start cwnd %u\n", pcb->cwnd));
} else { } else {
if(pcb->cwnd + pcb->mss * pcb->mss / pcb->cwnd > pcb->cwnd) { u16_t new_cwnd = (pcb->cwnd + pcb->mss * pcb->mss / pcb->cwnd);
pcb->cwnd += pcb->mss * pcb->mss / pcb->cwnd; if(new_cwnd > pcb->cwnd) {
pcb->cwnd = new_cwnd;
} }
DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: congestion avoidance cwnd %u\n", pcb->cwnd)); DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: congestion avoidance cwnd %u\n", pcb->cwnd));
} }
} }
DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: ACK for %lu, unacked->seqno %lu:%lu\n", DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: ACK for %lu, unacked->seqno %lu:%lu\n",