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

DequeuePending returns 0 upon error, not the other way round.

Browse Source
This commit is contained in:
Mathieu Lacage
2008-05-29 09:01:31 -07:00
parent 48fa3d344c
commit f173b434dd
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/internet-node/arp-l3-protocol.cc
View File

@@ -155,15 +155,12 @@ ArpL3Protocol::Receive(Ptr<NetDevice> device, Ptr<Packet> packet, uint16_t proto
<< " for waiting entry -- flush");
Address from_mac = arp.GetSourceHardwareAddress ();
entry->MarkAlive (from_mac);
while (true)
Ptr<Packet> pending = entry->DequeuePending();
while (pending != 0)
{
Ptr<Packet> pending = entry->DequeuePending();
if (pending != 0)
{
break;
}
cache->GetInterface ()->Send (pending,
arp.GetSourceIpv4Address ());
pending = entry->DequeuePending();
}
}
else
@@ -220,14 +217,11 @@ ArpL3Protocol::Lookup (Ptr<Packet> packet, Ipv4Address destination,
NS_LOG_LOGIC ("node="<<m_node->GetId ()<<
", wait reply for " << destination << " expired -- drop");
entry->MarkDead ();
while (true)
Ptr<Packet> pending = entry->DequeuePending();
while (pending != 0)
{
Ptr<Packet> pending = entry->DequeuePending();
if (pending != 0)
{
break;
}
m_dropTrace (pending);
pending = entry->DequeuePending();
}
m_dropTrace (packet);
}