--- a/src/devices/wifi/dcf-manager.cc Fri Jun 26 15:34:16 2009 +0200
+++ b/src/devices/wifi/dcf-manager.cc Fri Jun 26 15:38:03 2009 +0200
@@ -577,7 +577,7 @@
//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;
--- a/src/internet-stack/ipv4-interface.cc Fri Jun 26 15:34:16 2009 +0200
+++ b/src/internet-stack/ipv4-interface.cc Fri Jun 26 15:38:03 2009 +0200
@@ -43,7 +43,7 @@
"The arp cache for this ipv4 interface",
PointerValue (0),
MakePointerAccessor (&Ipv4Interface::m_cache),
- MakePointerChecker<Ipv4Interface> ())
+ MakePointerChecker<ArpCache> ())
;
;
return tid;
--- a/src/node/udp-socket.cc Fri Jun 26 15:34:16 2009 +0200
+++ b/src/node/udp-socket.cc Fri Jun 26 15:38:03 2009 +0200
@@ -58,13 +58,13 @@
.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<int32_t> ())
.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.",