From b67d39897642c43d5ae08a4a42f260183a3fa403 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Thu, 10 May 2007 07:33:26 +0200
Subject: [PATCH] convert Arp code to use Ptr<Node> instead of Node *

---
 src/internet-node/arp.cc | 16 ++++------------
 src/internet-node/arp.h  |  5 +++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/internet-node/arp.cc b/src/internet-node/arp.cc
index 8c702adf4..feb3ed6a0 100644
--- a/src/internet-node/arp.cc
+++ b/src/internet-node/arp.cc
@@ -36,17 +36,13 @@ namespace ns3 {
 
 const uint16_t Arp::PROT_NUMBER = 0x0806;
 
-Arp::Arp (Node *node)
+Arp::Arp (Ptr<Node> node)
   : L3Protocol (PROT_NUMBER, 0/* XXX: correct version number ? */ ),
     m_node (node)
-{
-  m_node->Ref ();
-}
+{}
 
 Arp::~Arp ()
-{
-  Dispose ();
-}
+{}
 
 void 
 Arp::DoDispose (void)
@@ -56,11 +52,7 @@ Arp::DoDispose (void)
       delete *i;
     }
   m_cacheList.clear ();
-  if (m_node != 0)
-    {
-      m_node->Unref ();
-      m_node = 0;
-    }
+  m_node = 0;
   L3Protocol::DoDispose ();
 }
 
diff --git a/src/internet-node/arp.h b/src/internet-node/arp.h
index ef909b2c8..d436a99a2 100644
--- a/src/internet-node/arp.h
+++ b/src/internet-node/arp.h
@@ -24,6 +24,7 @@
 #include <list>
 #include "ns3/ipv4-address.h"
 #include "ns3/mac-address.h"
+#include "ns3/ptr.h"
 #include "l3-protocol.h"
 
 namespace ns3 {
@@ -40,7 +41,7 @@ class Arp : public L3Protocol
 public:
   static const uint16_t PROT_NUMBER;
 
-  Arp (Node *node);
+  Arp (Ptr<Node> node);
   ~Arp ();
 
   virtual TraceResolver *CreateTraceResolver (TraceContext const &context);
@@ -57,7 +58,7 @@ private:
   void SendArpRequest (ArpCache const *cache, Ipv4Address to);
   void SendArpReply (ArpCache const *cache, Ipv4Address toIp, MacAddress toMac);
   CacheList m_cacheList;
-  Node *m_node;
+  Ptr<Node> m_node;
 };
 
 }//namespace ns3