F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp: Avoid overflow in htcp.cc

Browse Source
This commit is contained in:
Mingyu Park
2017-02-06 13:24:24 +01:00
parent c3ef4d098c
commit ead564e9dd
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@@ -70,6 +70,7 @@ Bugs fixed
- Bug 2577 - simulation crashes when A-MPDU and multiple TOS are used with RTS-CTS enabled
- Bug 2578 - Assert "Internal collision but no packet in queue" unexpectedly triggered
- Bug 2584 - MacLow triggers StartNext even if there is no TXOP
- Bug 2587 - Avoid overflow in htcp.cc
- Bug 2590 - Minor enhancements in red-queue-disc{.h, .cc}
- Bug 2591 - 802.11e Block Ack mechanism cannot be enabled on HT/VHT stations
- Bug 2594 - vht-wifi-network provides very low throughtput at MCS 6, 160 MHz, SGI

27
src/internet/model/tcp-htcp.cc
View File

@@ -118,7 +118,7 @@ Ptr<TcpCongestionOps> TcpHtcp::Fork (void)
}
void TcpHtcp::CongestionAvoidance (Ptr<TcpSocketState> tcb,
uint32_t segmentsAcked)
uint32_t segmentsAcked)
{
NS_LOG_FUNCTION (this << tcb << segmentsAcked);
if (segmentsAcked > 0)
@@ -128,7 +128,7 @@ void TcpHtcp::CongestionAvoidance (Ptr<TcpSocketState> tcb,
adder = std::max (1.0, adder);
tcb->m_cWnd += static_cast<uint32_t> (adder);
NS_LOG_INFO ("In CongAvoid, updated to cwnd " << tcb->m_cWnd
<< " ssthresh " << tcb->m_ssThresh);
<< " ssthresh " << tcb->m_ssThresh);
}
}
@@ -147,7 +147,7 @@ void TcpHtcp::UpdateAlpha (void)
double diffSec = diff.GetSeconds ();
// alpha=1+10(Delta-Delta_L)+[0.5(Delta-Delta_L)]^2 (seconds)
// from Leith and Shorten H-TCP paper
m_alpha = (1 + 10 * diffSec + 0.25 * (diffSec * diffSec));
m_alpha = (1 + 10 * diffSec + 0.25 * (diffSec * diffSec));
}
m_alpha = 2 * (1 - m_beta) * m_alpha;
if (m_alpha < 1)
@@ -160,26 +160,23 @@ void TcpHtcp::UpdateAlpha (void)
void TcpHtcp::UpdateBeta (void)
{
NS_LOG_FUNCTION (this);
if (m_lastThroughput > 0)
// Default value for m_beta
m_beta = m_defaultBackoff;
if (m_throughput > m_lastThroughput && m_lastThroughput > 0)
{
if (((m_throughput - m_lastThroughput) / m_lastThroughput) > m_throughputRatio)
{
m_beta = m_defaultBackoff;
}
else
uint32_t diff = m_throughput - m_lastThroughput;
if (diff / m_lastThroughput <= m_throughputRatio)
{
m_beta = m_minRtt.GetDouble () / m_maxRtt.GetDouble ();
}
}
else
{
m_beta = m_defaultBackoff;
}
NS_LOG_DEBUG ("Updated m_beta: " << m_beta);
}
uint32_t TcpHtcp::GetSsThresh (Ptr<const TcpSocketState> tcb,
uint32_t bytesInFlight)
uint32_t bytesInFlight)
{
NS_LOG_FUNCTION (this << tcb << bytesInFlight);
@@ -201,7 +198,7 @@ uint32_t TcpHtcp::GetSsThresh (Ptr<const TcpSocketState> tcb,
}
void TcpHtcp::PktsAcked (Ptr<TcpSocketState> tcb, uint32_t segmentsAcked,
const Time &rtt)
const Time &rtt)
{
NS_LOG_FUNCTION (this << tcb << segmentsAcked << rtt);