Attachment #343 for bug #451

View | Details | Raw Unified | Return to bug 451
Collapse All | Expand All




  for (CacheI i = m_arpCache.begin (); i != m_arpCache.end (); i++) 
    {
      entry = (*i).second;
      if (entry != 0 && entry->IsWaitReply () && entry->IsExpiring () )
          {
          if (entry->GetRetries () < m_maxRetries)
            {

  NS_LOG_FUNCTION (this << destination);
  m_ipv4Address = destination;
}
Time
ArpCache::Entry::GetTimeout (void) const
{
  switch (m_state) {
  case ArpCache::Entry::WAIT_REPLY:
    return m_arp->GetWaitReplyTimeout ();
  case ArpCache::Entry::DEAD:
    return m_arp->GetDeadTimeout ();
  case ArpCache::Entry::ALIVE:
    return m_arp->GetAliveTimeout ();
  default:
    NS_ASSERT (false);
    return Seconds (0);
    /* NOTREACHED */
  }
}
bool
ArpCache::Entry::IsExpiring (void) const
{
  NS_LOG_FUNCTION_NOARGS ();
  Time timeout = GetTimeout ();
  switch (m_state) {
  case ArpCache::Entry::WAIT_REPLY:
    timeout = m_arp->GetWaitReplyTimeout ();
    break;
  case ArpCache::Entry::DEAD:
    timeout = m_arp->GetDeadTimeout ();
    break;
  case ArpCache::Entry::ALIVE:
    timeout = m_arp->GetAliveTimeout ();
    break;
  default:
    NS_ASSERT (false);
    timeout = Seconds (0);
    /* NOTREACHED */
    break;
  }
  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
{
  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;
    {
      return false;
    }
}
Ptr<Packet> 
ArpCache::Entry::DequeuePending (void)

void 
ArpCache::Entry::UpdateSeen (void)
{
  NS_LOG_FUNCTION (m_macAddress << m_ipv4Address);
  m_lastSeen = Simulator::Now ();
}
uint32_t
ArpCache::Entry::GetRetries (void) const
{
  NS_LOG_FUNCTION (m_macAddress << m_ipv4Address);
  return m_retries;
}
void

(-)a/src/internet-stack/arp-cache.h (-2 / +19 lines)

Lines 160-168 public:	Link Here

160

*/

160

*/

161

    void SetIpv4Address (Ipv4Address destination);

161

    void SetIpv4Address (Ipv4Address destination);

162

/**

162

/**

163

     * \return True if this entry has timedout; false otherwise.

163

     * \return True if this entry has timed out; false otherwise.

164

165

     * This function returns true if the time elapsed strictly exceeds

166

     * the timeout value (i.e., is not less than or equal to the timeout).

167

     * Differs from IsExpiring() only in the boundary condition

168

     * delta == timeout.

169

     * \see IsExpiring

164

*/

170

*/

165

    bool IsExpired (void);

171

    bool IsExpired (void) const;

172

/**

173

     * \return True if this entry is timing out or has already timed out;

174

     * false otherwise.

175

176

     * This function returns true if the time elapsed is equal to or exceeds

177

     * the timeout value.  Differs from IsExpired() only in the boundary

178

     * condition delta == timeout.

179

     * \see IsExpired

180

*/

181

    bool IsExpiring (void) const;

166

182

167

/**

183

/**

168

     * \returns 0 is no packet is pending, the next packet to send if

184

     * \returns 0 is no packet is pending, the next packet to send if

Lines 191-196 public:	Link Here

191

};

207

};

192

208

193

    void UpdateSeen (void);

209

    void UpdateSeen (void);

210

    Time GetTimeout (void) const;

194

    ArpCache *m_arp;

211

    ArpCache *m_arp;

195

    ArpCacheEntryState_e m_state;

212

    ArpCacheEntryState_e m_state;

196

    Time m_lastSeen;

213

    Time m_lastSeen;

Return to bug 451