# HG changeset patch
# User Tom Henderson <tomh@tomh.org>
# Date 1235019453 28800
# Node ID 19e25669237cfe4ad3ac3871d7e29bacbdbdf2ad
# Parent  3aca059abe6307e2111573ad06f74d4d2cb0da55
fix for bug 468

diff -r 3aca059abe63 -r 19e25669237c src/internet-stack/arp-cache.cc
--- a/src/internet-stack/arp-cache.cc	Wed Feb 18 18:31:57 2009 -0800
+++ b/src/internet-stack/arp-cache.cc	Wed Feb 18 20:57:33 2009 -0800
@@ -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
 {
diff -r 3aca059abe63 -r 19e25669237c src/internet-stack/arp-cache.h
--- a/src/internet-stack/arp-cache.h	Wed Feb 18 18:31:57 2009 -0800
+++ b/src/internet-stack/arp-cache.h	Wed Feb 18 20:57:33 2009 -0800
@@ -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.