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

internet: Rename Ipv4L3Protocol::EnableRFC6621 attribute from commit 60dc6f91

Browse Source
This commit is contained in:
Tom Henderson
2019-10-30 20:35:22 -07:00
parent 0482b12b3c
commit 9944be4c36
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.html
View File

@@ -54,7 +54,7 @@ us a note on ns-developers mailing list.</p>
<h1>Changes from ns-3.30 to ns-3.31</h1>
<h2>New API:</h2>
<ul>
<li> New attributes for <b> Ipv4L3Protocol</b> have been added to enable RFC 6621-based duplicate packet detection (DPD) (<b>EnableRFC6621</b>) and to control the cache expiration time (<b>DuplicateExpire</b>).</li>
<li> New attributes for <b> Ipv4L3Protocol</b> have been added to enable RFC 6621-based duplicate packet detection (DPD) (<b>EnableDuplicatePacketDetection</b>) and to control the cache expiration time (<b>DuplicateExpire</b>).</li>
</ul>
<h2>Changes to existing API:</h2>
<ul>

8
src/internet/model/ipv4-l3-protocol.cc
View File

@@ -71,10 +71,10 @@ Ipv4L3Protocol::GetTypeId (void)
TimeValue (Seconds (30)),
MakeTimeAccessor (&Ipv4L3Protocol::m_fragmentExpirationTimeout),
MakeTimeChecker ())
.AddAttribute ("EnableRFC6621",
"Enable RFC 6621 packet de-duplication",
.AddAttribute ("EnableDuplicatePacketDetection",
"Enable multicast duplicate packet detection based on RFC 6621",
BooleanValue (false),
MakeBooleanAccessor (&Ipv4L3Protocol::m_enableRfc6621),
MakeBooleanAccessor (&Ipv4L3Protocol::m_enableDpd),
MakeBooleanChecker ())
.AddAttribute ("DuplicateExpire", "Expiration delay for duplicate cache entries",
TimeValue (MilliSeconds (1)),
@@ -649,7 +649,7 @@ Ipv4L3Protocol::Receive ( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t p
socket->ForwardUp (packet, ipHeader, ipv4Interface);
}
if (m_enableRfc6621 && ipHeader.GetDestination ().IsMulticast () && UpdateDuplicate (packet, ipHeader))
if (m_enableDpd && ipHeader.GetDestination ().IsMulticast () && UpdateDuplicate (packet, ipHeader))
{
NS_LOG_LOGIC ("Dropping received packet -- duplicate.");
m_dropTrace (ipHeader, packet, DROP_DUPLICATE, m_node->GetObject<Ipv4> (), interface);

2
src/internet/model/ipv4-l3-protocol.h
View File

@@ -576,7 +576,7 @@ private:
*/
void RemoveDuplicate (DupMap_t::const_iterator iter);
bool m_enableRfc6621; //!< Enable RFC 6621 de-duplication
bool m_enableDpd; //!< Enable multicast duplicate packet detection
DupMap_t m_dups; //!< map of packet duplicate tuples to expiry event
Time m_expire; //!< duplicate entry expiration delay

2
src/internet/test/ipv4-deduplication-test.cc
View File

@@ -266,7 +266,7 @@ Ipv4DeduplicationTest::DoRun (void)
{
// multicast target
const std::string targetAddr = "239.192.100.1";
Config::SetDefault ("ns3::Ipv4L3Protocol::EnableRFC6621", BooleanValue (m_mode != DISABLED));
Config::SetDefault ("ns3::Ipv4L3Protocol::EnableDuplicatePacketDetection", BooleanValue (m_mode != DISABLED));
Config::SetDefault ("ns3::Ipv4L3Protocol::DuplicateExpire", TimeValue (m_expire));
// Create topology