diff -r e72b8f4c25bb RELEASE_NOTES --- a/RELEASE_NOTES Sun Jul 20 11:29:28 2014 +0200 +++ b/RELEASE_NOTES Sun Jul 20 15:47:11 2014 -0700 @@ -34,6 +34,7 @@ - Bug 1943 - Waveform generator signal duration calc error - Bug 1951 - AODV does not update nexthop for 1-hop nodes - Bug 1955 - The IPv4 identification field should be unique per (source, destination, protocol) tuple +- Bug 1858 - wireless examples not correctly recording packet reception Known issues ------------ diff -r e72b8f4c25bb examples/wireless/wifi-simple-adhoc-grid.cc --- a/examples/wireless/wifi-simple-adhoc-grid.cc Sun Jul 20 11:29:28 2014 +0200 +++ b/examples/wireless/wifi-simple-adhoc-grid.cc Sun Jul 20 15:47:11 2014 -0700 @@ -90,7 +90,10 @@ void ReceivePacket (Ptr socket) { - NS_LOG_UNCOND ("Received one packet!"); + while (socket->Recv ()) + { + NS_LOG_UNCOND ("Received one packet!"); + } } static void GenerateTraffic (Ptr socket, uint32_t pktSize, diff -r e72b8f4c25bb examples/wireless/wifi-simple-adhoc.cc --- a/examples/wireless/wifi-simple-adhoc.cc Sun Jul 20 11:29:28 2014 +0200 +++ b/examples/wireless/wifi-simple-adhoc.cc Sun Jul 20 15:47:11 2014 -0700 @@ -69,7 +69,10 @@ void ReceivePacket (Ptr socket) { - NS_LOG_UNCOND ("Received one packet!"); + while (socket->Recv ()) + { + NS_LOG_UNCOND ("Received one packet!"); + } } static void GenerateTraffic (Ptr socket, uint32_t pktSize, diff -r e72b8f4c25bb examples/wireless/wifi-simple-infra.cc --- a/examples/wireless/wifi-simple-infra.cc Sun Jul 20 11:29:28 2014 +0200 +++ b/examples/wireless/wifi-simple-infra.cc Sun Jul 20 15:47:11 2014 -0700 @@ -70,7 +70,10 @@ void ReceivePacket (Ptr socket) { - NS_LOG_UNCOND ("Received one packet!"); + while (socket->Recv ()) + { + NS_LOG_UNCOND ("Received one packet!"); + } } static void GenerateTraffic (Ptr socket, uint32_t pktSize, diff -r e72b8f4c25bb examples/wireless/wifi-simple-interference.cc --- a/examples/wireless/wifi-simple-interference.cc Sun Jul 20 11:29:28 2014 +0200 +++ b/examples/wireless/wifi-simple-interference.cc Sun Jul 20 15:47:11 2014 -0700 @@ -99,11 +99,16 @@ static inline std::string PrintReceivedPacket (Ptr socket) { Address addr; - socket->GetSockName (addr); - InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr); std::ostringstream oss; - oss << "Received one packet! Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort (); + + while (socket->Recv ()) + { + socket->GetSockName (addr); + InetSocketAddress iaddr = InetSocketAddress::ConvertFrom (addr); + + oss << "Received one packet! Socket: " << iaddr.GetIpv4 () << " port: " << iaddr.GetPort (); + } return oss.str (); } diff -r e72b8f4c25bb src/wave/examples/wave-simple-80211p.cc --- a/src/wave/examples/wave-simple-80211p.cc Sun Jul 20 11:29:28 2014 +0200 +++ b/src/wave/examples/wave-simple-80211p.cc Sun Jul 20 15:47:11 2014 -0700 @@ -75,7 +75,10 @@ void ReceivePacket (Ptr socket) { - NS_LOG_UNCOND ("Received one packet!"); + while (socket->Recv ()) + { + NS_LOG_UNCOND ("Received one packet!"); + } } static void GenerateTraffic (Ptr socket, uint32_t pktSize,