Attachment #2074 for bug #2145

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




  return entry;
}

void
ArpCache::Remove (ArpCache::Entry *entry)
{
  NS_LOG_FUNCTION (this << entry);
  
  for (CacheI i = m_arpCache.begin (); i != m_arpCache.end (); i++)
    {
      if ((*i).second == entry)
        {
          m_arpCache.erase (i);
          entry->ClearPendingPacket (); //clear the pending packets for entry's ipaddress
          delete entry;
          return;
        }
    }
  NS_LOG_WARN ("Entry not found in this ARP Cache");
}

ArpCache::Entry::Entry (ArpCache *arp)
  : m_arp (arp),
    m_state (ALIVE),

  NS_LOG_FUNCTION (this);
  return (m_state == WAIT_REPLY) ? true : false;
}
bool
ArpCache::Entry::IsPermanent (void)
{
  NS_LOG_FUNCTION (this);
  return (m_state == PERMANENT) ? true : false;
}


void 
ArpCache::Entry::MarkDead (void) 
{
  NS_LOG_FUNCTION (this);
  NS_ASSERT (m_state == ALIVE || m_state == WAIT_REPLY || m_state == DEAD);
  m_state = DEAD;
  ClearRetries ();
  UpdateSeen ();

  ClearRetries ();
  UpdateSeen ();
}
void
ArpCache::Entry::MarkPermanent (void)
{
  NS_LOG_FUNCTION (this);
  NS_ASSERT (m_state == ALIVE);
  m_state = PERMANENT;
  ClearRetries ();
  UpdateSeen ();
}
void 
ArpCache::Entry::MarkWaitReply (Ptr<Packet> waiting)
{
  NS_LOG_FUNCTION (this << waiting);
  NS_ASSERT (m_state == ALIVE || m_state == DEAD);
  NS_ASSERT (m_pending.empty ());
  m_state = WAIT_REPLY;
  m_pending.push_back (waiting);
  UpdateSeen ();
  m_arp->StartWaitReplyTimer ();
}
bool
ArpCache::Entry::UpdateWaitReply (Ptr<Packet> waiting)
{

  m_pending.push_back (waiting);
  return true;
}

ArpCache::Entry::MarkWaitReply (Ptr<Packet> waiting)
{
  NS_LOG_FUNCTION (this << waiting);
  NS_ASSERT (m_state == ALIVE || m_state == DEAD);
  NS_ASSERT (m_pending.empty ());
  m_state = WAIT_REPLY;
  m_pending.push_back (waiting);
  UpdateSeen ();
  m_arp->StartWaitReplyTimer ();
}

Address
ArpCache::Entry::GetMacAddress (void) const

      return m_arp->GetDeadTimeout ();
    case ArpCache::Entry::ALIVE:
      return m_arp->GetAliveTimeout ();
    case ArpCache::Entry::PERMANENT:
      return Time::Max ();
    default:
      NS_ASSERT (false);
      return Seconds (0);

    }
}
void 
ArpCache::Entry::ClearPendingPacket (void)
{
  NS_LOG_FUNCTION (this);
  m_pending.clear ();
}
void 
ArpCache::Entry::UpdateSeen (void)
{
  NS_LOG_FUNCTION (this);

(-)a/src/internet/model/arp-cache.h (-2 / +20 lines)

Lines 151-156 public:	Link Here

151

*/

151

*/

152

  ArpCache::Entry *Add (Ipv4Address to);

152

  ArpCache::Entry *Add (Ipv4Address to);

153

/**

153

/**

154

   * \brief Remove an entry.

155

   * \param entry pointer to delete it from the list

156

*/

157

  void Remove (ArpCache::Entry *entry);

158

/**

154

   * \brief Clear the ArpCache of all entries

159

   * \brief Clear the ArpCache of all entries

155

*/

160

*/

156

  void Flush (void);

161

  void Flush (void);

Lines 186-191 public:	Link Here

186

*/

191

*/

187

    void MarkWaitReply (Ptr<Packet> waiting);

192

    void MarkWaitReply (Ptr<Packet> waiting);

188

/**

193

/**

194

     * \brief Changes the state of this entry to Permanent if it was Alive

195

*/

196

    void MarkPermanent (void);

197

/**

189

     * \param waiting

198

     * \param waiting

190

     * \return

199

     * \return

191

*/

200

*/

Lines 202-211 public:	Link Here

202

     * \return True if the state of this entry is wait_reply; false otherwise.

211

     * \return True if the state of this entry is wait_reply; false otherwise.

203

*/

212

*/

204

    bool IsWaitReply (void);

213

    bool IsWaitReply (void);

205

214

/**

215

     * \return True if the state of this entry is permanent; false otherwise.

216

*/

217

    bool IsPermanent (void);

206

/**

218

/**

207

     * \return The MacAddress of this entry

219

     * \return The MacAddress of this entry

208

*/

220

*/

221

209

    Address GetMacAddress (void) const;

222

    Address GetMacAddress (void) const;

210

/**

223

/**

211

     * \return The Ipv4Address for this entry

224

     * \return The Ipv4Address for this entry

Lines 228-233 public:	Link Here

228

*/

241

*/

229

    Ptr<Packet> DequeuePending (void);

242

    Ptr<Packet> DequeuePending (void);

230

/**

243

/**

244

     * \brief Clear the pending packet list

245

*/

246

    void ClearPendingPacket (void);

247

/**

231

     * \returns number of retries that have been sent for an ArpRequest

248

     * \returns number of retries that have been sent for an ArpRequest

232

     *  in WaitReply state.

249

     *  in WaitReply state.

233

*/

250

*/

Lines 248-254 private:	Link Here

248

    enum ArpCacheEntryState_e {

265

    enum ArpCacheEntryState_e {

249

      ALIVE,

266

      ALIVE,

250

      WAIT_REPLY,

267

      WAIT_REPLY,

251

      DEAD

268

      DEAD,

269

      PERMANENT

252

};

270

};

253

271

254

/**

272

/**

Return to bug 2145