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

internet: prevent null packet enqueueing in ARP.

Browse Source
This commit is contained in:
Tommaso Pecorella
2016-02-18 21:06:33 +01:00
parent dd2d0858d1
commit f7b98e4ef0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/internet/model/arp-cache.cc
View File

@@ -421,6 +421,8 @@ ArpCache::Entry::MarkWaitReply (Ptr<Packet> waiting)
NS_LOG_FUNCTION (this << waiting);
NS_ASSERT (m_state == ALIVE || m_state == DEAD);
NS_ASSERT (m_pending.empty ());
NS_ASSERT_MSG (waiting, "Can not add a null packet to the ARP queue");
m_state = WAIT_REPLY;
m_pending.push_back (waiting);
UpdateSeen ();

4
src/lte/test/epc-test-s1u-uplink.cc
View File

@@ -399,8 +399,8 @@ EpcS1uUlTestCase::DoRun ()
Ptr<ArpCache> ueArpCache = ueLteIpv4Iface->GetArpCache ();
ueArpCache->SetAliveTimeout (Seconds (1000));
ArpCache::Entry* arpCacheEntry = ueArpCache->Add (gwAddr);
arpCacheEntry->MarkWaitReply(0);
arpCacheEntry->MarkAlive (Mac48Address::GetBroadcast ());
arpCacheEntry->SetMacAddresss (Mac48Address::GetBroadcast ());
arpCacheEntry->MarkPermanent ();
PacketSinkHelper packetSinkHelper ("ns3::UdpSocketFactory",