From 4faabb58982f8a1e6c9147fcd7d96f0c780adce7 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Thu, 13 Feb 2014 22:53:39 +0100 Subject: [PATCH] Bug 1855 - SixLowPanNetDevice is not correctly indexed --- RELEASE_NOTES | 3 ++- src/sixlowpan/model/sixlowpan-net-device.cc | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 6b6e3caea..b071334b5 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -31,7 +31,6 @@ New user-visible features Bugs fixed ---------- -- Bug 1852 - cairo-wideint-private.h error cannot find definitions for fixed-width integral types - Bug 1739 - The endpoint is not deallocated for UDP sockets - Bug 1786 - os << int64x64_t prints un-normalized fractional values - Bug 1808 - FlowMon relies on IPv4's Identification field to trace packets @@ -40,6 +39,8 @@ Bugs fixed - Bug 1838 - FlowMonitorHelper must not be copied. - Bug 1841 - FlowMonitor fails to install if IPv4 is not installed in the node - Bug 1846 - IPv6 should send Destination Unreachable if no route is available +- Bug 1852 - cairo-wideint-private.h error cannot find definitions for fixed-width integral types +- Bug 1855 - SixLowPanNetDevice is not correctly indexed Release 3.19 ============= diff --git a/src/sixlowpan/model/sixlowpan-net-device.cc b/src/sixlowpan/model/sixlowpan-net-device.cc index 48aca33ad..b0c84b926 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.cc +++ b/src/sixlowpan/model/sixlowpan-net-device.cc @@ -252,15 +252,13 @@ void SixLowPanNetDevice::ReceiveFromDevice (Ptr incomingPort, void SixLowPanNetDevice::SetIfIndex (const uint32_t index) { NS_LOG_FUNCTION (this << index); - // NS_ASSERT_MSG ( m_port != 0, "Sixlowpan: can't find any lower-layer protocol " << m_port ); m_ifIndex = index; } uint32_t SixLowPanNetDevice::GetIfIndex (void) const { NS_LOG_FUNCTION (this); - // NS_ASSERT_MSG ( m_port != 0, "Sixlowpan: can't find any lower-layer protocol " << m_port ); - return m_netDevice->GetIfIndex (); + return m_ifIndex; } Ptr SixLowPanNetDevice::GetChannel (void) const