diff options
| author | rrs <rrs@FreeBSD.org> | 2008-05-20 09:51:36 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2008-05-20 09:51:36 +0000 |
| commit | a490cf2e7ef9d2e524f85d9cde3d5c8318409542 (patch) | |
| tree | 1a0aa0d15c801dddaf3552fba7a32112b8ee3590 /sys/netinet/sctp_cc_functions.c | |
| parent | e2e62f671f21faeeecccc183d7f97e99d951539d (diff) | |
| download | FreeBSD-src-a490cf2e7ef9d2e524f85d9cde3d5c8318409542.zip FreeBSD-src-a490cf2e7ef9d2e524f85d9cde3d5c8318409542.tar.gz | |
- Define changes in sctp.h
- Bug in CA that does not get us incrementing the PBA properly which
made us more conservative.
- comment updated in sctp_input.c
- memsets added before we log
- added arg to hmac id's
MFC after: 2 weeks
Diffstat (limited to 'sys/netinet/sctp_cc_functions.c')
| -rw-r--r-- | sys/netinet/sctp_cc_functions.c | 51 |
1 files changed, 13 insertions, 38 deletions
diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 90a809c..3e22a54 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -304,50 +304,25 @@ sctp_cwnd_update_after_sack(struct sctp_tcb *stcb, } } else { /* We are in congestion avoidance */ - if (net->flight_size + net->net_ack >= - net->cwnd) { - /* - * add to pba only if we had a - * cwnd's worth (or so) in flight OR - * the burst limit was applied. - */ - net->partial_bytes_acked += - net->net_ack; - - /* - * Do we need to increase (if pba is - * > cwnd)? - */ - if (net->partial_bytes_acked >= - net->cwnd) { - if (net->cwnd < - net->partial_bytes_acked) { - net->partial_bytes_acked -= - net->cwnd; - } else { - net->partial_bytes_acked = - 0; - } - net->cwnd += net->mtu; - if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { - sctp_log_cwnd(stcb, net, net->mtu, - SCTP_CWND_LOG_FROM_CA); - } - } else { - if (sctp_logging_level & SCTP_CWND_LOGGING_ENABLE) { - sctp_log_cwnd(stcb, net, net->net_ack, - SCTP_CWND_LOG_NOADV_CA); - } + /* + * Add to pba + */ + net->partial_bytes_acked += + net->net_ack; + + if ((net->flight_size + net->net_ack >= net->cwnd) && + (net->partial_bytes_acked >= net->cwnd)) { + net->partial_bytes_acked -= net->cwnd; + net->cwnd += net->mtu; + if (sctp_logging_level & SCTP_CWND_MONITOR_ENABLE) { + sctp_log_cwnd(stcb, net, net->mtu, + SCTP_CWND_LOG_FROM_CA); } } else { - unsigned int dif; - if (sctp_logging_level & SCTP_CWND_LOGGING_ENABLE) { sctp_log_cwnd(stcb, net, net->net_ack, SCTP_CWND_LOG_NOADV_CA); } - dif = net->cwnd - (net->flight_size + - net->net_ack); } } } else { |
