d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for a bug in the change that walks the scoreboard backwards from

Browse Source 
the tail (in tcp_sack_option()). The bug was caused by incorrect
accounting of the retransmitted bytes in the sackhint.

Reported by:    Kris Kennaway.
Submitted by:   Noritoshi Demizu.
This commit is contained in:
Paul Saab 2005-06-06 19:46:53 +00:00
parent 75190ff847
commit db4b83fe49
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147061
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet/tcp_sack.c
View File

@ -508,8 +508,6 @@ tcp_sack_option(struct tcpcb *tp, struct tcphdr *th, u_char *cp, int optlen)
cur->start = sblkp->end;
cur->rxmit = SEQ_MAX(cur->rxmit, cur->start);
}
/* Go to the previous hole. */
cur = TAILQ_PREV(cur, sackhole_head, scblink);
} else {
/* Data acks at least the end of hole */
if (SEQ_GEQ(sblkp->end, cur->end)) {
@ -535,10 +533,17 @@ tcp_sack_option(struct tcpcb *tp, struct tcphdr *th, u_char *cp, int optlen)
cur->end);
}
}
/* Go to the previous sack block. */
sblkp--;
}
tp->sackhint.sack_bytes_rexmit += (cur->rxmit - cur->start);
/*
* Testing sblkp->start against cur->start tells us whether
* we're done with the sack block or the sack hole.
* Accordingly, we advance one or the other.
*/
if (SEQ_LEQ(sblkp->start, cur->start))
cur = TAILQ_PREV(cur, sackhole_head, scblink);
else
sblkp--;
}
return (0);
}