1.1 --- a/src/internet-stack/arp-cache.cc	Tue Mar 03 10:57:42 2009 +0000
     1.2 +++ b/src/internet-stack/arp-cache.cc	Wed Feb 18 20:57:33 2009 -0800
     1.3 @@ -185,7 +185,7 @@
     1.4    for (CacheI i = m_arpCache.begin (); i != m_arpCache.end (); i++) 
     1.5      {
     1.6        entry = (*i).second;
     1.7 -      if (entry != 0 && entry->IsWaitReply () && entry->IsExpiring () )
     1.8 +      if (entry != 0 && entry->IsWaitReply ())
     1.9            {
    1.10            if (entry->GetRetries () < m_maxRetries)
    1.11              {
    1.12 @@ -374,19 +374,6 @@
    1.13      /* NOTREACHED */
    1.14    }
    1.15  }
    1.16 -bool
    1.17 -ArpCache::Entry::IsExpiring (void) const
    1.18 -{
    1.19 -  NS_LOG_FUNCTION_NOARGS ();
    1.20 -  Time timeout = GetTimeout ();
    1.21 -  Time delta = Simulator::Now () - m_lastSeen;
    1.22 -  NS_LOG_DEBUG ("delta=" << delta.GetSeconds () << "s");
    1.23 -  if (delta >= timeout)
    1.24 -    {
    1.25 -      return true;
    1.26 -    }
    1.27 -  return false;
    1.28 -}
    1.29  bool 
    1.30  ArpCache::Entry::IsExpired (void) const
    1.31  {

     2.1 --- a/src/internet-stack/arp-cache.h	Tue Mar 03 10:57:42 2009 +0000
     2.2 +++ b/src/internet-stack/arp-cache.h	Wed Feb 18 20:57:33 2009 -0800
     2.3 @@ -164,23 +164,9 @@
     2.4       *
     2.5       * This function returns true if the time elapsed strictly exceeds
     2.6       * the timeout value (i.e., is not less than or equal to the timeout).
     2.7 -     * Differs from IsExpiring() only in the boundary condition 
     2.8 -     * delta == timeout.
     2.9 -     * \see IsExpiring
    2.10       */
    2.11      bool IsExpired (void) const;
    2.12      /**
    2.13 -     * \return True if this entry is timing out or has already timed out; 
    2.14 -     * false otherwise.
    2.15 -     *
    2.16 -     * This function returns true if the time elapsed is equal to or exceeds
    2.17 -     * the timeout value.  Differs from IsExpired() only in the boundary 
    2.18 -     * condition delta == timeout.
    2.19 -     * \see IsExpired
    2.20 -     */
    2.21 -    bool IsExpiring (void) const;
    2.22 -
    2.23 -    /**
    2.24       * \returns 0 is no packet is pending, the next packet to send if 
    2.25       *            packets are pending.
    2.26       */