From 93d827a8dd95ec5ca826f44fb8bbb67fb37fa1db Mon Sep 17 00:00:00 2001 From: "Kirill V. Andreev" Date: Fri, 26 Jun 2009 15:25:51 +0200 Subject: [PATCH 1/3] bug 595: PHY may start receive packet inside SIFS. Fix stray assert --- src/devices/wifi/dcf-manager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/wifi/dcf-manager.cc b/src/devices/wifi/dcf-manager.cc index 7b71217b8..ec2b0e1fc 100644 --- a/src/devices/wifi/dcf-manager.cc +++ b/src/devices/wifi/dcf-manager.cc @@ -577,7 +577,7 @@ DcfManager::NotifyTxStartNow (Time duration) //this may be caused only if PHY has started to receive a packet //inside SIFS, so, we check that lastRxStart was maximum a SIFS //ago - NS_ASSERT(Simulator::Now () - m_lastRxStart < m_sifs); + NS_ASSERT(Simulator::Now () - m_lastRxStart <= m_sifs); m_lastRxEnd = Simulator::Now (); m_lastRxDuration = m_lastRxEnd - m_lastRxStart; m_lastRxReceivedOk = true; From af3c9b638e5c6dd9bf1da2317902faae38565ff2 Mon Sep 17 00:00:00 2001 From: "Kirill V. Andreev" Date: Fri, 26 Jun 2009 15:27:39 +0200 Subject: [PATCH 2/3] bug 610: Wrong PointerChecker in attribute of Ipv4Interface --- src/internet-stack/ipv4-interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internet-stack/ipv4-interface.cc b/src/internet-stack/ipv4-interface.cc index ac841e96c..3d1779fce 100644 --- a/src/internet-stack/ipv4-interface.cc +++ b/src/internet-stack/ipv4-interface.cc @@ -43,7 +43,7 @@ Ipv4Interface::GetTypeId (void) "The arp cache for this ipv4 interface", PointerValue (0), MakePointerAccessor (&Ipv4Interface::m_cache), - MakePointerChecker ()) + MakePointerChecker ()) ; ; return tid; From bb9b379e0adc35c49069c046bedfce3c1b5a3fdb Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Fri, 26 Jun 2009 15:31:20 +0200 Subject: [PATCH 3/3] buggy attribute definitions. --- src/node/udp-socket.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node/udp-socket.cc b/src/node/udp-socket.cc index c9f370662..9f399a346 100644 --- a/src/node/udp-socket.cc +++ b/src/node/udp-socket.cc @@ -58,13 +58,13 @@ UdpSocket::GetTypeId (void) .AddAttribute ("IpMulticastIf", "interface index for outgoing multicast on this socket; -1 indicates to use default interface", IntegerValue (-1), - MakeUintegerAccessor (&UdpSocket::GetIpMulticastTtl, - &UdpSocket::SetIpMulticastTtl), + MakeIntegerAccessor (&UdpSocket::GetIpMulticastIf, + &UdpSocket::SetIpMulticastIf), MakeIntegerChecker ()) .AddAttribute ("IpMulticastLoop", "whether outgoing multicast sent also to loopback interface", BooleanValue (false), - MakeUintegerAccessor (&UdpSocket::GetIpMulticastLoop, + MakeBooleanAccessor (&UdpSocket::GetIpMulticastLoop, &UdpSocket::SetIpMulticastLoop), MakeBooleanChecker ()) .AddAttribute ("MtuDiscover", "If enabled, every outgoing ip packet will have the DF flag set.",