From 641ecb27364e61f126f4dfe55b5d35f5a3edbeca Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 12 Jun 2007 10:53:38 +0200 Subject: [PATCH] fix bug 28 --- src/internet-node/ipv4-impl.cc | 4 ++-- src/internet-node/ipv4-impl.h | 2 +- src/node/ipv4.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/internet-node/ipv4-impl.cc b/src/internet-node/ipv4-impl.cc index 5a4c62fe5..9c7754be9 100644 --- a/src/internet-node/ipv4-impl.cc +++ b/src/internet-node/ipv4-impl.cc @@ -78,10 +78,10 @@ Ipv4Impl::GetNRoutes (void) { 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) diff --git a/src/internet-node/ipv4-impl.h b/src/internet-node/ipv4-impl.h index b9ac88495..979eb02f9 100644 --- a/src/internet-node/ipv4-impl.h +++ b/src/internet-node/ipv4-impl.h @@ -50,7 +50,7 @@ public: 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 device); virtual uint32_t GetNInterfaces (void); diff --git a/src/node/ipv4.h b/src/node/ipv4.h index 5c3b55d64..1424884af 100644 --- a/src/node/ipv4.h +++ b/src/node/ipv4.h @@ -24,6 +24,7 @@ #include #include "ns3/ipv4-address.h" #include "ns3/object.h" +#include "ipv4-route.h" namespace ns3 { @@ -110,7 +111,7 @@ public: * \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. */