Bug 1855 - SixLowPanNetDevice is not correctly indexed
authorTommaso Pecorella <tommaso.pecorella@unifi.it>
Thu, 13 Feb 2014 22:53:39 +0100
changeset 10617 e31b0f7602d8
parent 10616 ed02f0e3b1e7
child 10618 2b3691727172
Bug 1855 - SixLowPanNetDevice is not correctly indexed
RELEASE_NOTES
src/sixlowpan/model/sixlowpan-net-device.cc
--- a/RELEASE_NOTES	Tue Feb 11 14:38:25 2014 -0800
+++ b/RELEASE_NOTES	Thu Feb 13 22:53:39 2014 +0100
@@ -31,7 +31,6 @@
 
 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 @@
 - 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
 =============
--- a/src/sixlowpan/model/sixlowpan-net-device.cc	Tue Feb 11 14:38:25 2014 -0800
+++ b/src/sixlowpan/model/sixlowpan-net-device.cc	Thu Feb 13 22:53:39 2014 +0100
@@ -252,15 +252,13 @@
 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<Channel> SixLowPanNetDevice::GetChannel (void) const