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

fix for bug 468

Browse Source
This commit is contained in:
Tom Henderson
2009-02-18 20:57:33 -08:00
parent 34c7ac0277
commit d2d4e0bfc8
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/internet-stack/arp-cache.cc
View File

@@ -185,7 +185,7 @@ ArpCache::HandleWaitReplyTimeout (void)
for (CacheI i = m_arpCache.begin (); i != m_arpCache.end (); i++)
{
entry = (*i).second;
if (entry != 0 && entry->IsWaitReply () && entry->IsExpiring () )
if (entry != 0 && entry->IsWaitReply ())
{
if (entry->GetRetries () < m_maxRetries)
{
@@ -374,19 +374,6 @@ ArpCache::Entry::GetTimeout (void) const
/* NOTREACHED */
}
}
bool
ArpCache::Entry::IsExpiring (void) const
{
NS_LOG_FUNCTION_NOARGS ();
Time timeout = GetTimeout ();
Time delta = Simulator::Now () - m_lastSeen;
NS_LOG_DEBUG ("delta=" << delta.GetSeconds () << "s");
if (delta >= timeout)
{
return true;
}
return false;
}
bool
ArpCache::Entry::IsExpired (void) const
{

14
src/internet-stack/arp-cache.h
View File

@@ -164,22 +164,8 @@ public:
*
* This function returns true if the time elapsed strictly exceeds
* the timeout value (i.e., is not less than or equal to the timeout).
* Differs from IsExpiring() only in the boundary condition
* delta == timeout.
* \see IsExpiring
*/
bool IsExpired (void) const;
/**
* \return True if this entry is timing out or has already timed out;
* false otherwise.
*
* This function returns true if the time elapsed is equal to or exceeds
* the timeout value. Differs from IsExpired() only in the boundary
* condition delta == timeout.
* \see IsExpired
*/
bool IsExpiring (void) const;
/**
* \returns 0 is no packet is pending, the next packet to send if
* packets are pending.