merge with HEAD ns-3.5-rc2
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Fri, 26 Jun 2009 15:38:03 +0200
changeset 46178562a42accf6
parent 4616 a84f60b6cd12
parent 4615 605a0290ba5f
child 4618 9d977b974ddc
merge with HEAD
     1.1 --- a/src/devices/wifi/dcf-manager.cc	Fri Jun 26 15:34:16 2009 +0200
     1.2 +++ b/src/devices/wifi/dcf-manager.cc	Fri Jun 26 15:38:03 2009 +0200
     1.3 @@ -577,7 +577,7 @@
     1.4      //this may be caused only if PHY has started to receive a packet
     1.5      //inside SIFS, so, we check that lastRxStart was maximum a SIFS
     1.6      //ago
     1.7 -    NS_ASSERT(Simulator::Now () - m_lastRxStart < m_sifs);
     1.8 +    NS_ASSERT(Simulator::Now () - m_lastRxStart <= m_sifs);
     1.9      m_lastRxEnd = Simulator::Now ();
    1.10      m_lastRxDuration = m_lastRxEnd - m_lastRxStart;
    1.11      m_lastRxReceivedOk = true;
     2.1 --- a/src/internet-stack/ipv4-interface.cc	Fri Jun 26 15:34:16 2009 +0200
     2.2 +++ b/src/internet-stack/ipv4-interface.cc	Fri Jun 26 15:38:03 2009 +0200
     2.3 @@ -43,7 +43,7 @@
     2.4                     "The arp cache for this ipv4 interface",
     2.5                     PointerValue (0),
     2.6                     MakePointerAccessor (&Ipv4Interface::m_cache),
     2.7 -                   MakePointerChecker<Ipv4Interface> ())
     2.8 +                   MakePointerChecker<ArpCache> ())
     2.9      ;
    2.10      ;
    2.11    return tid;
     3.1 --- a/src/node/udp-socket.cc	Fri Jun 26 15:34:16 2009 +0200
     3.2 +++ b/src/node/udp-socket.cc	Fri Jun 26 15:38:03 2009 +0200
     3.3 @@ -58,13 +58,13 @@
     3.4      .AddAttribute ("IpMulticastIf",
     3.5                     "interface index for outgoing multicast on this socket; -1 indicates to use default interface",
     3.6                     IntegerValue (-1),
     3.7 -                   MakeUintegerAccessor (&UdpSocket::GetIpMulticastTtl,
     3.8 -                                         &UdpSocket::SetIpMulticastTtl),
     3.9 +                   MakeIntegerAccessor (&UdpSocket::GetIpMulticastIf,
    3.10 +                                         &UdpSocket::SetIpMulticastIf),
    3.11                     MakeIntegerChecker<int32_t> ())
    3.12      .AddAttribute ("IpMulticastLoop",
    3.13                     "whether outgoing multicast sent also to loopback interface",
    3.14                     BooleanValue (false),
    3.15 -                   MakeUintegerAccessor (&UdpSocket::GetIpMulticastLoop,
    3.16 +                   MakeBooleanAccessor (&UdpSocket::GetIpMulticastLoop,
    3.17                                           &UdpSocket::SetIpMulticastLoop),
    3.18                     MakeBooleanChecker ())
    3.19      .AddAttribute ("MtuDiscover", "If enabled, every outgoing ip packet will have the DF flag set.",