svn commit: r216613 - stable/8/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Tue Dec 21 10:43:52 UTC 2010
Author: tuexen
Date: Tue Dec 21 10:43:51 2010
New Revision: 216613
URL: http://svn.freebsd.org/changeset/base/216613
Log:
MFC c216495:
Bugfix: Take also the nr-mapping array into account when detecting
gaps.
Approved by: re@
Modified:
stable/8/sys/netinet/sctp_indata.c
stable/8/sys/netinet/sctp_input.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/netinet/sctp_indata.c
==============================================================================
--- stable/8/sys/netinet/sctp_indata.c Tue Dec 21 09:33:06 2010 (r216612)
+++ stable/8/sys/netinet/sctp_indata.c Tue Dec 21 10:43:51 2010 (r216613)
@@ -2585,8 +2585,9 @@ sctp_process_data(struct mbuf **mm, int
int num_chunks = 0; /* number of control chunks processed */
int stop_proc = 0;
int chk_length, break_flag, last_chunk;
- int abort_flag = 0, was_a_gap = 0;
+ int abort_flag = 0, was_a_gap;
struct mbuf *m;
+ uint32_t highest_tsn;
/* set the rwnd */
sctp_set_rwnd(stcb, &stcb->asoc);
@@ -2594,11 +2595,12 @@ sctp_process_data(struct mbuf **mm, int
m = *mm;
SCTP_TCB_LOCK_ASSERT(stcb);
asoc = &stcb->asoc;
- if (compare_with_wrap(stcb->asoc.highest_tsn_inside_map,
- stcb->asoc.cumulative_tsn, MAX_TSN)) {
- /* there was a gap before this data was processed */
- was_a_gap = 1;
+ if (compare_with_wrap(asoc->highest_tsn_inside_nr_map, asoc->highest_tsn_inside_map, MAX_TSN)) {
+ highest_tsn = asoc->highest_tsn_inside_nr_map;
+ } else {
+ highest_tsn = asoc->highest_tsn_inside_map;
}
+ was_a_gap = compare_with_wrap(highest_tsn, stcb->asoc.cumulative_tsn, MAX_TSN);
/*
* setup where we got the last DATA packet from for any SACK that
* may need to go out. Don't bump the net. This is done ONLY when a
Modified: stable/8/sys/netinet/sctp_input.c
==============================================================================
--- stable/8/sys/netinet/sctp_input.c Tue Dec 21 09:33:06 2010 (r216612)
+++ stable/8/sys/netinet/sctp_input.c Tue Dec 21 10:43:51 2010 (r216613)
@@ -5650,13 +5650,15 @@ sctp_common_input_processing(struct mbuf
*/
}
if ((data_processed == 0) && (fwd_tsn_seen)) {
- int was_a_gap = 0;
+ int was_a_gap;
+ uint32_t highest_tsn;
- if (compare_with_wrap(stcb->asoc.highest_tsn_inside_map,
- stcb->asoc.cumulative_tsn, MAX_TSN)) {
- /* there was a gap before this data was processed */
- was_a_gap = 1;
+ if (compare_with_wrap(stcb->asoc.highest_tsn_inside_nr_map, stcb->asoc.highest_tsn_inside_map, MAX_TSN)) {
+ highest_tsn = stcb->asoc.highest_tsn_inside_nr_map;
+ } else {
+ highest_tsn = stcb->asoc.highest_tsn_inside_map;
}
+ was_a_gap = compare_with_wrap(highest_tsn, stcb->asoc.cumulative_tsn, MAX_TSN);
stcb->asoc.send_sack = 1;
sctp_sack_check(stcb, was_a_gap, &abort_flag);
if (abort_flag) {
More information about the svn-src-stable
mailing list