From 88c5dfecb0d97e2342a8c6bfedf1eeacddb53838 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Sun, 13 May 2007 11:30:15 +0200
Subject: [PATCH] make the Node API more consistent

---
 src/internet-node/internet-node.cc | 2 +-
 src/internet-node/internet-node.h  | 2 +-
 src/node/node.cc                   | 6 ++++++
 src/node/node.h                    | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/internet-node/internet-node.cc b/src/internet-node/internet-node.cc
index 15b95c675..bcda19190 100644
--- a/src/internet-node/internet-node.cc
+++ b/src/internet-node/internet-node.cc
@@ -74,7 +74,7 @@ InternetNode::SetName (std::string name)
 }
 
 TraceResolver *
-InternetNode::CreateTraceResolver (TraceContext const &context)
+InternetNode::DoCreateTraceResolver (TraceContext const &context)
 {
   CompositeTraceResolver *resolver = new CompositeTraceResolver (context);
   Ptr<IIpv4Private> ipv4 = QueryInterface<IIpv4Private> (IIpv4Private::iid);
diff --git a/src/internet-node/internet-node.h b/src/internet-node/internet-node.h
index 04da92036..63d04ed6d 100644
--- a/src/internet-node/internet-node.h
+++ b/src/internet-node/internet-node.h
@@ -41,13 +41,13 @@ public:
   };
   InternetNode();
   virtual ~InternetNode ();
-  virtual TraceResolver *CreateTraceResolver (TraceContext const &context);
 
   void SetName(std::string name);
 protected:
   virtual void DoDispose(void);
 private:
   virtual void DoAddDevice (Ptr<NetDevice> device) const;
+  virtual TraceResolver *DoCreateTraceResolver (TraceContext const &context);
   bool ReceiveFromDevice (Ptr<NetDevice> device, const Packet &p, uint16_t protocolNumber) const;
   std::string      m_name;
 };
diff --git a/src/node/node.cc b/src/node/node.cc
index 81ba3e678..a4f5cf693 100644
--- a/src/node/node.cc
+++ b/src/node/node.cc
@@ -51,6 +51,12 @@ Node::Node(uint32_t sid)
 Node::~Node ()
 {}
 
+TraceResolver *
+Node::CreateTraceResolver (TraceContext const &context)
+{
+  return DoCreateTraceResolver (context);
+}
+
 uint32_t 
 Node::GetId (void) const
 {
diff --git a/src/node/node.h b/src/node/node.h
index f0c7d142e..d2e63cad6 100644
--- a/src/node/node.h
+++ b/src/node/node.h
@@ -45,7 +45,7 @@ public:
   Node(uint32_t); // Specify which system for a distributed simulation
   virtual ~Node();
 
-  virtual TraceResolver *CreateTraceResolver (TraceContext const &context) = 0;
+  TraceResolver *CreateTraceResolver (TraceContext const &context);
 
   uint32_t GetId (void) const;
   uint32_t GetSystemId (void) const;
@@ -62,6 +62,7 @@ public:
 protected:
   virtual void DoDispose (void);
 private:
+  virtual TraceResolver *DoCreateTraceResolver (TraceContext const &context) = 0;
   virtual void DoAddDevice (Ptr<NetDevice> device) const = 0;
 
   uint32_t    m_id;         // Node id for this node