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

tcp: Changed parameter name from MIN_CWND to MinCwnd (ns-3 rules on naming) and fixed TcpLedbat test (minimum of 2*minCwnd was not correctly enforced in the test)

Browse Source
This commit is contained in:
Natale Patriciello
2018-06-06 22:43:09 +02:00
parent 24a89f3cdb
commit 598e2726bf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internet/model/tcp-ledbat.cc
View File

@@ -61,7 +61,7 @@ TcpLedbat::GetTypeId (void)
MakeEnumAccessor (&TcpLedbat::SetDoSs),
MakeEnumChecker (DO_SLOWSTART, "yes",
DO_NOT_SLOWSTART, "no"))
.AddAttribute ("MIN_CWND",
.AddAttribute ("MinCwnd",
"Minimum cWnd for Ledbat",
UintegerValue (2),
MakeUintegerAccessor (&TcpLedbat::m_minCwnd),

3
src/internet/test/tcp-ledbat-test.cc
View File

@@ -278,6 +278,7 @@ TcpLedbatDecrementTest::DoRun ()
void
TcpLedbatDecrementTest::ExecuteTest ()
{
UintegerValue minCwnd;
m_state = CreateObject <TcpSocketState> ();
m_state->m_cWnd = m_cWnd;
m_state->m_ssThresh = m_ssThresh;
@@ -288,6 +289,7 @@ TcpLedbatDecrementTest::ExecuteTest ()
Ptr<TcpLedbat> cong = CreateObject <TcpLedbat> ();
cong->SetAttribute ("SSParam", StringValue ("no"));
cong->SetAttribute ("NoiseFilterLen", UintegerValue (1));
cong->GetAttribute ("MinCwnd", minCwnd);
m_state->m_rcvTimestampValue = 2;
m_state->m_rcvTimestampEchoReply = 1;
@@ -300,6 +302,7 @@ TcpLedbatDecrementTest::ExecuteTest ()
cong->IncreaseWindow (m_state, m_segmentsAcked);
m_cWnd = m_cWnd - ((0.98 * m_segmentsAcked * m_segmentSize * m_segmentSize) / m_cWnd);
m_cWnd = std::max (m_cWnd, static_cast<uint32_t> (m_segmentSize * minCwnd.Get ()));
NS_TEST_ASSERT_MSG_EQ (m_state->m_cWnd.Get (), m_cWnd,
"cWnd has not updated correctly");