diff --git a/examples/routing/manet-routing-compare.cc b/examples/routing/manet-routing-compare.cc index 500c59780..0c603c478 100644 --- a/examples/routing/manet-routing-compare.cc +++ b/examples/routing/manet-routing-compare.cc @@ -120,18 +120,15 @@ RoutingExperiment::RoutingExperiment () } static inline std::string -PrintReceivedPacket (Ptr socket, Ptr packet) +PrintReceivedPacket (Ptr socket, Ptr packet, Address senderAddress) { - SocketAddressTag tag; - bool found; - found = packet->PeekPacketTag (tag); std::ostringstream oss; oss << Simulator::Now ().GetSeconds () << " " << socket->GetNode ()->GetId (); - if (found) + if (InetSocketAddress::IsMatchingType (senderAddress)) { - InetSocketAddress addr = InetSocketAddress::ConvertFrom (tag.GetAddress ()); + InetSocketAddress addr = InetSocketAddress::ConvertFrom (senderAddress); oss << " received one packet from " << addr.GetIpv4 (); } else @@ -145,11 +142,12 @@ void RoutingExperiment::ReceivePacket (Ptr socket) { Ptr packet; - while ((packet = socket->Recv ())) + Address senderAddress; + while ((packet = socket->RecvFrom (senderAddress))) { bytesTotal += packet->GetSize (); packetsReceived += 1; - NS_LOG_UNCOND (PrintReceivedPacket (socket, packet)); + NS_LOG_UNCOND (PrintReceivedPacket (socket, packet, senderAddress)); } }