Attachment #206 for bug #253

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

(-)a/src/internet-stack/arp-cache.cc (-2 / +42 lines)

Lines 47-56 ArpCache::GetTypeId (void)	Link Here

                   MakeTimeAccessor (&ArpCache::m_deadTimeout),

                   MakeTimeAccessor (&ArpCache::m_deadTimeout),

                   MakeTimeChecker ())

                   MakeTimeChecker ())

    .AddAttribute ("WaitReplyTimeout",

    .AddAttribute ("WaitReplyTimeout",

                   "When this timeout expires, the matching cache entry is marked dead",

                   "When this timeout expires, the matching cache entry will retry the ArpRequest unless MaxRetries has been exceeded, in which case it is marked dead",

                   TimeValue (Seconds (1)),

                   TimeValue (Seconds (1)),

                   MakeTimeAccessor (&ArpCache::m_waitReplyTimeout),

                   MakeTimeAccessor (&ArpCache::m_waitReplyTimeout),

                   MakeTimeChecker ())

                   MakeTimeChecker ())

    .AddAttribute ("MaxRetries",

                   "Number of retransmissions of ArpRequest before marking dead",

                   UintegerValue (3),

                   MakeUintegerAccessor (&ArpCache::m_maxRetries),

                   MakeUintegerChecker<uint32_t> ())

    .AddAttribute ("PendingQueueSize",

    .AddAttribute ("PendingQueueSize",

                   "The size of the queue for packets pending an arp reply.",

                   "The size of the queue for packets pending an arp reply.",

                   UintegerValue (3),

                   UintegerValue (3),

Lines 142-147 ArpCache::GetWaitReplyTimeout (void) con	Link Here

142

  return m_waitReplyTimeout;

147

  return m_waitReplyTimeout;

143

148

144

149

150

uint32_t

151

ArpCache::GetMaxRetries (void) const

152

153

  NS_LOG_FUNCTION_NOARGS ();

154

  return m_maxRetries;

155

156

145

void

157

void

146

ArpCache::Flush (void)

158

ArpCache::Flush (void)

147

159

Lines 178-184 ArpCache::Add (Ipv4Address to)	Link Here

178

190

179

ArpCache::Entry::Entry (ArpCache *arp)

191

ArpCache::Entry::Entry (ArpCache *arp)

180

  : m_arp (arp),

192

  : m_arp (arp),

181

    m_state (ALIVE)

193

    m_state (ALIVE),

194

    m_retries (0),

195

    m_waitTimer (Timer::CANCEL_ON_DESTROY)

182

196

183

  NS_LOG_FUNCTION_NOARGS ();

197

  NS_LOG_FUNCTION_NOARGS ();

184

198

Lines 218-223 ArpCache::Entry::MarkAlive (Address macA	Link Here

218

  NS_ASSERT (m_state == WAIT_REPLY);

232

  NS_ASSERT (m_state == WAIT_REPLY);

219

  m_macAddress = macAddress;

233

  m_macAddress = macAddress;

220

  m_state = ALIVE;

234

  m_state = ALIVE;

235

  m_retries = 0;

221

  UpdateSeen ();

236

  UpdateSeen ();

222

237

223

238

Lines 308-312 ArpCache::Entry::UpdateSeen (void)	Link Here

308

  m_lastSeen = Simulator::Now ();

323

  m_lastSeen = Simulator::Now ();

309

324

310

325

326

uint32_t

327

ArpCache::Entry::GetRetries (void) const

328

329

  NS_LOG_FUNCTION_NOARGS ();

330

  return m_retries;

331

332

void

333

ArpCache::Entry::IncrementRetries (void)

334

335

  NS_LOG_FUNCTION_NOARGS ();

336

  m_retries++;

337

  UpdateSeen ();

338

339

void

340

ArpCache::Entry::ClearRetries (void)

341

342

  NS_LOG_FUNCTION_NOARGS ();

343

  m_retries = 0;

344

345

Timer*

346

ArpCache::Entry::GetWaitTimer (void)

347

348

  return &m_waitTimer;

349

350

311

} // namespace ns3

351

} // namespace ns3

312

352




#include <list>
#include "ns3/packet.h"
#include "ns3/nstime.h"
#include "ns3/timer.h"
#include "ns3/net-device.h"
#include "ns3/ipv4-address.h"
#include "ns3/address.h"

  Time GetAliveTimeout (void) const;
  Time GetDeadTimeout (void) const;
  Time GetWaitReplyTimeout (void) const;
  uint32_t GetMaxRetries (void) const;

  /**
   * \brief Do lookup in the ARP chache against an IP address

     * \return True if the state of this entry is wait_reply; false otherwise.
     */
    bool IsWaitReply (void);
    
    /**
     * \return The MacAddress of this entry
     */

     * \return True if this entry has timedout; false otherwise.
     */
    bool IsExpired (void);

    /**
     * \returns 0 is no packet is pending, the next packet to send if 
     *            packets are pending.
     */
    Ptr<Packet> DequeuePending (void);
    /**
     * \returns number of retries that have been sent for an ArpRequest
     *  in WaitReply state.
     */
    uint32_t GetRetries (void) const;
    /**
     * \brief Increment the counter of number of retries for an entry
     */
    void IncrementRetries (void);
    /**
     * \brief Zero the counter of number of retries for an entry
     */
    void ClearRetries (void);
    /**
     * \brief Get raw pointer to Timer associated with WAIT_REPLY
     *        state.  For internal use by ArpL3Protocol.
     */
    Timer* GetWaitTimer (void);
  private:
    enum ArpCacheEntryState_e {
      ALIVE,

    Time m_lastSeen;
    Address m_macAddress;
    std::list<Ptr<Packet> > m_pending;
    uint32_t m_retries;
    Timer m_waitTimer; 
  };

private:

  Time m_waitReplyTimeout;
  uint32_t m_pendingQueueSize;
  Cache m_arpCache;
  uint32_t m_maxRetries;
};



(-)a/src/internet-stack/arp-l3-protocol.cc (+44 lines)

Lines 159-164 ArpL3Protocol::Receive(Ptr<NetDevice> de	Link Here

159

                     << " for waiting entry -- flush");

159

                     << " for waiting entry -- flush");

160

              Address from_mac = arp.GetSourceHardwareAddress ();

160

              Address from_mac = arp.GetSourceHardwareAddress ();

161

              entry->MarkAlive (from_mac);

161

              entry->MarkAlive (from_mac);

162

              entry->ClearRetries ();

163

              entry->GetWaitTimer ()->Cancel ();

162

              Ptr<Packet> pending = entry->DequeuePending();

164

              Ptr<Packet> pending = entry->DequeuePending();

163

              while (pending != 0)

165

              while (pending != 0)

164

166

Lines 190-195 ArpL3Protocol::Receive(Ptr<NetDevice> de	Link Here

190

                arp.GetDestinationIpv4Address () << " -- drop");

192

                arp.GetDestinationIpv4Address () << " -- drop");

191

193

192

194

195

196

void

197

ArpL3Protocol::HandleWaitTimeout (Ptr<ArpCache> cache, Ipv4Address destination)

198

199

  NS_LOG_FUNCTION_NOARGS ();

200

  ArpCache::Entry *entry = cache->Lookup (destination);

201

  if (entry != 0 && entry->IsWaitReply ())

202

203

      if (entry->GetRetries () < cache->GetMaxRetries () )

204

205

          NS_LOG_LOGIC ("node="<<m_node->GetId ()<<

206

                    ", ArpWaitTimeout for " << destination << " expired -- send arp request since retries = " << entry->GetRetries ());

207

          SendArpRequest (cache, destination);

208

          entry->GetWaitTimer ()->Schedule ();

209

          entry->IncrementRetries ();

210

211

      else

212

213

              NS_LOG_LOGIC ("node="<<m_node->GetId ()<<

214

                        ", wait reply for " << destination << " expired -- drop since max retries exceeded: " << entry->GetRetries ());

215

              entry->MarkDead ();

216

              Ptr<Packet> pending = entry->DequeuePending();

217

              while (pending != 0)

218

219

                  m_dropTrace (pending);

220

                  pending = entry->DequeuePending();

221

222

223

224

225

193

bool

226

bool

194

ArpL3Protocol::Lookup (Ptr<Packet> packet, Ipv4Address destination,

227

ArpL3Protocol::Lookup (Ptr<Packet> packet, Ipv4Address destination,

195

                       Ptr<NetDevice> device,

228

                       Ptr<NetDevice> device,

Lines 208-213 ArpL3Protocol::Lookup (Ptr<Packet> packe	Link Here

208

                        ", dead entry for " << destination << " expired -- send arp request");

241

                        ", dead entry for " << destination << " expired -- send arp request");

209

              entry->MarkWaitReply (packet);

242

              entry->MarkWaitReply (packet);

210

              SendArpRequest (cache, destination);

243

              SendArpRequest (cache, destination);

244

              // Timer already seeded, so just reschedule

245

              entry->GetWaitTimer ()->Schedule ();

211

246

212

          else if (entry->IsAlive ())

247

          else if (entry->IsAlive ())

213

248

Lines 215-223 ArpL3Protocol::Lookup (Ptr<Packet> packe	Link Here

215

                        ", alive entry for " << destination << " expired -- send arp request");

250

                        ", alive entry for " << destination << " expired -- send arp request");

216

              entry->MarkWaitReply (packet);

251

              entry->MarkWaitReply (packet);

217

              SendArpRequest (cache, destination);

252

              SendArpRequest (cache, destination);

253

              // Timer already seeded, so just reschedule

254

              entry->GetWaitTimer ()->Schedule ();

218

255

219

          else if (entry->IsWaitReply ())

256

          else if (entry->IsWaitReply ())

220

257

258

              // Is this dead code branch?

259

              NS_ASSERT (false);

221

              NS_LOG_LOGIC ("node="<<m_node->GetId ()<<

260

              NS_LOG_LOGIC ("node="<<m_node->GetId ()<<

222

                        ", wait reply for " << destination << " expired -- drop");

261

                        ", wait reply for " << destination << " expired -- drop");

223

              entry->MarkDead ();

262

              entry->MarkDead ();

Lines 264-269 ArpL3Protocol::Lookup (Ptr<Packet> packe	Link Here

264

      entry = cache->Add (destination);

303

      entry = cache->Add (destination);

265

      entry->MarkWaitReply (packet);

304

      entry->MarkWaitReply (packet);

266

      SendArpRequest (cache, destination);

305

      SendArpRequest (cache, destination);

306

      // Set up the wait timer to handle possible retransmissions

307

      entry->GetWaitTimer ()->SetFunction (&ns3::ArpL3Protocol::HandleWaitTimeout, this);

308

      entry->GetWaitTimer ()->SetArguments (cache, destination);

309

      entry->GetWaitTimer ()->SetDelay (cache->GetWaitReplyTimeout ());

310

      entry->GetWaitTimer ()->Schedule ();

267

311

268

  return false;

312

  return false;

269

313

(-)a/src/internet-stack/arp-l3-protocol.h (+3 lines)

Lines 69-74 public:	Link Here

	       Ptr<NetDevice> device,

	       Ptr<NetDevice> device,

               Ptr<ArpCache> cache,

               Ptr<ArpCache> cache,

	       Address *hardwareDestination);

	       Address *hardwareDestination);

  void HandleWaitTimeout (Ptr<ArpCache> cache, Ipv4Address destination);

protected:

protected:

  virtual void DoDispose (void);

  virtual void DoDispose (void);

private:

private:

Return to bug 253