From b25206c736c91da50cc80b62a3073100799bb496 Mon Sep 17 00:00:00 2001 From: Borovkova Elena Date: Fri, 14 Aug 2009 13:35:47 +0400 Subject: [PATCH] RoutingProtocol::DropFromQueue killed --- src/routing/aodv/aodv-routing-protocol.cc | 12 ++---------- src/routing/aodv/aodv-routing-protocol.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/routing/aodv/aodv-routing-protocol.cc b/src/routing/aodv/aodv-routing-protocol.cc index 4d57b615f..6c239e005 100644 --- a/src/routing/aodv/aodv-routing-protocol.cc +++ b/src/routing/aodv/aodv-routing-protocol.cc @@ -970,7 +970,6 @@ RoutingProtocol::RecvReply (Ptr p, Ipv4Address receiver, Ipv4Address sen toNextHopToDst.InsertPrecursor (toOrigin.GetNextHop ()); m_routingTable.Update (toNextHopToDst); - // TODO add operation over unidirectional links Ptr packet = Create (); packet->AddHeader (rrepHeader); TypeHeader tHeader (AODVTYPE_RREP); @@ -1091,8 +1090,7 @@ RoutingProtocol::RouteRequestTimerExpire (Ipv4Address dst, uint16_t lastTtl ) m_addressReqTimer.erase(dst); m_routingTable.DeleteRoute(dst); NS_LOG_LOGIC ("Route not found. Drop packet with dst " << dst); - DropFromQueue (dst); - // TODO drop packet from queue and deliver Destination Unreachable message to the application. + m_queue.DropPacketWithDst(dst); return; } @@ -1115,7 +1113,7 @@ RoutingProtocol::RouteRequestTimerExpire (Ipv4Address dst, uint16_t lastTtl ) NS_LOG_LOGIC ("Route down. Stop search. Drop packet with destination " << dst); m_addressReqTimer.erase(dst); m_routingTable.DeleteRoute(dst); - DropFromQueue (dst); + m_queue.DropPacketWithDst(dst); } } @@ -1203,12 +1201,6 @@ RoutingProtocol::SendPacketFromQueue (Ipv4Address dst, Ptr route ) ucb (route, queueEntry.GetPacket (), queueEntry.GetIpv4Header ()); } } -void -RoutingProtocol::DropFromQueue (Ipv4Address dst) -{ - NS_LOG_FUNCTION(this); - m_queue.DropPacketWithDst(dst); -} void RoutingProtocol::Send (Ptr route, Ptr packet, const Ipv4Header & header ) diff --git a/src/routing/aodv/aodv-routing-protocol.h b/src/routing/aodv/aodv-routing-protocol.h index ed14f56ad..a1b206671 100644 --- a/src/routing/aodv/aodv-routing-protocol.h +++ b/src/routing/aodv/aodv-routing-protocol.h @@ -239,7 +239,6 @@ private: /// Notify that packet is dropped for some reason void Drop(Ptr, const Ipv4Header &, Socket::SocketErrno) {} - void DropFromQueue (Ipv4Address dst); ///\name Timers. TODO comment each one //\{