fix bug 28
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 12 Jun 2007 10:53:38 +0200
changeset 757 f4a677b1f753
parent 756 d9fc71fb459c
child 758 e2f6fe585ab8
fix bug 28
src/internet-node/ipv4-impl.cc
src/internet-node/ipv4-impl.h
src/node/ipv4.h
--- a/src/internet-node/ipv4-impl.cc	Mon Jun 11 17:54:06 2007 +0200
+++ b/src/internet-node/ipv4-impl.cc	Tue Jun 12 10:53:38 2007 +0200
@@ -78,10 +78,10 @@
 {
   return m_ipv4->GetNRoutes ();
 }
-Ipv4Route *
+Ipv4Route 
 Ipv4Impl::GetRoute (uint32_t i)
 {
-  return m_ipv4->GetRoute (i);
+  return *m_ipv4->GetRoute (i);
 }
 void 
 Ipv4Impl::RemoveRoute (uint32_t i)
--- a/src/internet-node/ipv4-impl.h	Mon Jun 11 17:54:06 2007 +0200
+++ b/src/internet-node/ipv4-impl.h	Tue Jun 12 10:53:38 2007 +0200
@@ -50,7 +50,7 @@
   virtual void SetDefaultRoute (Ipv4Address nextHop, 
 				uint32_t interface);
   virtual uint32_t GetNRoutes (void);
-  virtual Ipv4Route *GetRoute (uint32_t i);
+  virtual Ipv4Route GetRoute (uint32_t i);
   virtual void RemoveRoute (uint32_t i);
   virtual uint32_t AddInterface (Ptr<NetDevice> device);
   virtual uint32_t GetNInterfaces (void);  
--- a/src/node/ipv4.h	Mon Jun 11 17:54:06 2007 +0200
+++ b/src/node/ipv4.h	Tue Jun 12 10:53:38 2007 +0200
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include "ns3/ipv4-address.h"
 #include "ns3/object.h"
+#include "ipv4-route.h"
 
 namespace ns3 {
 
@@ -110,7 +111,7 @@
    * \param i index of route to return
    * \returns the route whose index is i
    */
-  virtual Ipv4Route *GetRoute (uint32_t i) = 0;
+  virtual Ipv4Route GetRoute (uint32_t i) = 0;
   /**
    * \param i index of route to remove from routing table.
    */