Author: tuexen
Date: Fri May 7 20:02:36 2010
New Revision: 207756
URL: http://svn.freebsd.org/changeset/base/207756
Log:
MFC 206758, 206840, 206891, 206892, 207099, 207191, 207197
* Fix a bug where SACKs are not sent when they should.
* Get delayed SACK working again.
* Really print the nr_mapping array when it should be printed.
* Update highest_tsn variables when sliding mapping arrays.
* Sending a FWDTSN chunk should not affect the retran count.
* Cleanups.
Modified:
stable/8/sys/netinet/sctp_asconf.c
stable/8/sys/netinet/sctp_indata.c
stable/8/sys/netinet/sctp_output.c
stable/8/sys/netinet/sctputil.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)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/netinet/sctp_asconf.c
==============================================================================
--- stable/8/sys/netinet/sctp_asconf.c Fri May 7 19:48:50 2010
(r207755)
+++ stable/8/sys/netinet/sctp_asconf.c Fri May 7 20:02:36 2010
(r207756)
@@ -1113,7 +1113,7 @@ sctp_assoc_immediate_retrans(struct sctp
}
SCTP_TCB_LOCK_ASSERT(stcb);
#ifdef SCTP_AUDITING_ENABLED
- sctp_auditing(4, stcb->sctp_ep, stcb->asoc.deleted_primary);
+ sctp_auditing(4, stcb->sctp_ep, stcb,
stcb->asoc.deleted_primary);
#endif
sctp_chunk_output(stcb->sctp_ep, stcb, SCTP_OUTPUT_FROM_T3,
SCTP_SO_NOT_LOCKED);
if ((stcb->asoc.num_send_timers_up == 0) &&
Modified: stable/8/sys/netinet/sctp_indata.c
==============================================================================
--- stable/8/sys/netinet/sctp_indata.c Fri May 7 19:48:50 2010
(r207755)
+++ stable/8/sys/netinet/sctp_indata.c Fri May 7 20:02:36 2010
(r207756)
@@ -1466,7 +1466,7 @@ sctp_process_a_data_chunk(struct sctp_tc
asoc->send_sack = 1;
}
protocol_id = ch->dp.protocol_id;
- ordered = ((ch->ch.chunk_flags & SCTP_DATA_UNORDERED) == 0);
+ ordered = ((chunk_flags & SCTP_DATA_UNORDERED) == 0);
if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_MAP_LOGGING_ENABLE) {
sctp_log_map(tsn, asoc->cumulative_tsn,
asoc->highest_tsn_inside_map, SCTP_MAP_TSN_ENTERS);
}
@@ -2123,6 +2123,10 @@ failed_pdapi_express_del:
}
}
finish_express_del:
+ if (tsn == (asoc->cumulative_tsn + 1)) {
+ /* Update cum-ack */
+ asoc->cumulative_tsn = tsn;
+ }
if (last_chunk) {
*m = NULL;
}
@@ -2300,7 +2304,12 @@ sctp_slide_mapping_arrays(struct sctp_tc
if ((asoc->cumulative_tsn == highest_tsn) && (at >= 8)) {
/* The complete array was completed by a single FR */
/* highest becomes the cum-ack */
- int clr, i;
+ int clr;
+
+#ifdef INVARIANTS
+ unsigned int i;
+
+#endif
/* clear the array */
clr = ((at + 7) >> 3);
@@ -2309,12 +2318,14 @@ sctp_slide_mapping_arrays(struct sctp_tc
}
memset(asoc->mapping_array, 0, clr);
memset(asoc->nr_mapping_array, 0, clr);
+#ifdef INVARIANTS
for (i = 0; i < asoc->mapping_array_size; i++) {
if ((asoc->mapping_array[i]) ||
(asoc->nr_mapping_array[i])) {
printf("Error Mapping array's not clean at
clear\n");
sctp_print_mapping_array(asoc);
}
}
+#endif
asoc->mapping_array_base_tsn = asoc->cumulative_tsn + 1;
asoc->highest_tsn_inside_nr_map = asoc->highest_tsn_inside_map
= asoc->cumulative_tsn;
} else if (at >= 8) {
@@ -2371,16 +2382,20 @@ sctp_slide_mapping_arrays(struct sctp_tc
int ii;
for (ii = 0; ii < distance; ii++) {
- asoc->mapping_array[ii] =
- asoc->mapping_array[slide_from + ii];
- asoc->nr_mapping_array[ii] =
- asoc->nr_mapping_array[slide_from + ii];
+ asoc->mapping_array[ii] =
asoc->mapping_array[slide_from + ii];
+ asoc->nr_mapping_array[ii] =
asoc->nr_mapping_array[slide_from + ii];
}
for (ii = distance; ii < asoc->mapping_array_size;
ii++) {
asoc->mapping_array[ii] = 0;
asoc->nr_mapping_array[ii] = 0;
}
+ if (asoc->highest_tsn_inside_map + 1 ==
asoc->mapping_array_base_tsn) {
+ asoc->highest_tsn_inside_map += (slide_from <<
3);
+ }
+ if (asoc->highest_tsn_inside_nr_map + 1 ==
asoc->mapping_array_base_tsn) {
+ asoc->highest_tsn_inside_nr_map += (slide_from
<< 3);
+ }
asoc->mapping_array_base_tsn += (slide_from << 3);
if (SCTP_BASE_SYSCTL(sctp_logging_level) &
SCTP_MAP_LOGGING_ENABLE) {
sctp_log_map(asoc->mapping_array_base_tsn,
@@ -2808,25 +2823,7 @@ sctp_process_data(struct mbuf **mm, int
stcb->asoc.send_sack = 1;
}
/* Start a sack timer or QUEUE a SACK for sending */
- if ((stcb->asoc.cumulative_tsn == stcb->asoc.highest_tsn_inside_map) &&
- (stcb->asoc.mapping_array[0] != 0xff)) {
- if ((stcb->asoc.data_pkts_seen >= stcb->asoc.sack_freq) ||
- (stcb->asoc.delayed_ack == 0) ||
- (stcb->asoc.numduptsns) ||
- (stcb->asoc.send_sack == 1)) {
- if
(SCTP_OS_TIMER_PENDING(&stcb->asoc.dack_timer.timer)) {
-
(void)SCTP_OS_TIMER_STOP(&stcb->asoc.dack_timer.timer);
- }
- sctp_send_sack(stcb);
- } else {
- if
(!SCTP_OS_TIMER_PENDING(&stcb->asoc.dack_timer.timer)) {
- sctp_timer_start(SCTP_TIMER_TYPE_RECV,
- stcb->sctp_ep, stcb, NULL);
- }
- }
- } else {
- sctp_sack_check(stcb, was_a_gap, &abort_flag);
- }
+ sctp_sack_check(stcb, was_a_gap, &abort_flag);
if (abort_flag)
return (2);
Modified: stable/8/sys/netinet/sctp_output.c
==============================================================================
--- stable/8/sys/netinet/sctp_output.c Fri May 7 19:48:50 2010
(r207755)
+++ stable/8/sys/netinet/sctp_output.c Fri May 7 20:02:36 2010
(r207756)
@@ -8973,7 +8973,7 @@ sctp_chunk_retransmission(struct sctp_in
/* (void)SCTP_GETTIME_TIMEVAL(&chk->whoTo->last_sent_time); */
*cnt_out += 1;
chk->sent = SCTP_DATAGRAM_SENT;
- sctp_ucount_decr(asoc->sent_queue_retran_cnt);
+ /* sctp_ucount_decr(asoc->sent_queue_retran_cnt); */
if (fwd_tsn == 0) {
return (0);
} else {
Modified: stable/8/sys/netinet/sctputil.c
==============================================================================
--- stable/8/sys/netinet/sctputil.c Fri May 7 19:48:50 2010
(r207755)
+++ stable/8/sys/netinet/sctputil.c Fri May 7 20:02:36 2010
(r207756)
@@ -674,7 +674,7 @@ sctp_auditing(int from, struct sctp_inpc
sctp_audit_indx = 0;
}
rep = 1;
- SCTP_PRINTF("tot_flt_book:%d\n", tot_book);
+ SCTP_PRINTF("tot_flt_book:%d\n", tot_book_cnt);
stcb->asoc.total_flight_count = tot_book_cnt;
}
@@ -703,8 +703,8 @@ sctp_auditing(int from, struct sctp_inpc
}
}
if (lnet->flight_size != tot_out) {
- SCTP_PRINTF("net:%x flight was %d corrected to
%d\n",
- (uint32_t) lnet, lnet->flight_size,
+ SCTP_PRINTF("net:%p flight was %d corrected to
%d\n",
+ lnet, lnet->flight_size,
tot_out);
lnet->flight_size = tot_out;
}
@@ -1215,7 +1215,7 @@ sctp_print_mapping_array(struct sctp_ass
}
printf("Non renegable mapping array (last %d entries are zero):\n",
asoc->mapping_array_size - limit);
for (i = 0; i < limit; i++) {
- printf("%2.2x%c", asoc->mapping_array[i], ((i + 1) % 16) ? ' '
: '\n');
+ printf("%2.2x%c", asoc->nr_mapping_array[i], ((i + 1) % 16) ? '
' : '\n');
}
if (limit % 16)
printf("\n");
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
