From d29646249c5a179e6296751574573dfee7208d77 Mon Sep 17 00:00:00 2001 From: Borovkova Elena Date: Wed, 9 Sep 2009 13:59:11 +0400 Subject: [PATCH] removed outdated TODO : Enter commit message. Lines beginning with 'HG:' are removed. --- src/routing/aodv/aodv-routing-protocol.cc | 7 +++---- src/routing/aodv/aodv-routing-protocol.h | 4 ++-- src/routing/aodv/aodv.h | 4 +--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/routing/aodv/aodv-routing-protocol.cc b/src/routing/aodv/aodv-routing-protocol.cc index 6be930a69..1f276decf 100644 --- a/src/routing/aodv/aodv-routing-protocol.cc +++ b/src/routing/aodv/aodv-routing-protocol.cc @@ -347,7 +347,6 @@ RoutingProtocol::RouteInput (Ptr p, const Ipv4Header &header, } } - // TODO: local delivery to non-AODV interfaces // Forwarding return Forwarding (p, header, ucb, ecb); } @@ -449,7 +448,7 @@ RoutingProtocol::NotifyInterfaceUp (uint32_t i) // Add local broadcast record to the routing table Ptr dev = m_ipv4->GetNetDevice (m_ipv4->GetInterfaceForAddress (iface.GetLocal ())); RoutingTableEntry rt (/*device=*/dev, /*dst=*/iface.GetBroadcast (), /*know seqno=*/true, /*seqno=*/0, /*iface=*/iface, - /*hops=*/1, /*next hop=*/iface.GetBroadcast (), /*lifetime=*/Seconds (1e9)); // TODO use infty + /*hops=*/1, /*next hop=*/iface.GetBroadcast (), /*lifetime=*/Seconds (1e9)); m_routingTable.AddRoute (rt); // Allow neighbor manager use this interface for layer 2 feedback if possible @@ -529,7 +528,7 @@ RoutingProtocol::NotifyAddAddress (uint32_t i, Ipv4InterfaceAddress address) m_ipv4->GetInterfaceForAddress (iface.GetLocal ())); RoutingTableEntry rt (/*device=*/dev, /*dst=*/iface.GetBroadcast (), /*know seqno=*/true, /*seqno=*/0, /*iface=*/iface, /*hops=*/1, - /*next hop=*/iface.GetBroadcast (), /*lifetime=*/Seconds (1e9)); // TODO use infty + /*next hop=*/iface.GetBroadcast (), /*lifetime=*/Seconds (1e9)); m_routingTable.AddRoute (rt); } } @@ -564,7 +563,7 @@ RoutingProtocol::NotifyRemoveAddress (uint32_t i, Ipv4InterfaceAddress address) // Add local broadcast record to the routing table Ptr dev = m_ipv4->GetNetDevice (m_ipv4->GetInterfaceForAddress (iface.GetLocal ())); RoutingTableEntry rt (/*device=*/dev, /*dst=*/iface.GetBroadcast (), /*know seqno=*/true, /*seqno=*/0, /*iface=*/iface, - /*hops=*/1, /*next hop=*/iface.GetBroadcast (), /*lifetime=*/Seconds (1e9)); // TODO use infty + /*hops=*/1, /*next hop=*/iface.GetBroadcast (), /*lifetime=*/Seconds (1e9)); m_routingTable.AddRoute (rt); } if (m_socketAddresses.empty ()) diff --git a/src/routing/aodv/aodv-routing-protocol.h b/src/routing/aodv/aodv-routing-protocol.h index 5ff281bb0..ec5edd480 100644 --- a/src/routing/aodv/aodv-routing-protocol.h +++ b/src/routing/aodv/aodv-routing-protocol.h @@ -83,7 +83,7 @@ public: bool GetHelloEnable () const { return EnableHello; } //\} private: - ///\name Protocol parameters. TODO document + ///\name Protocol parameters. //\{ uint32_t RreqRetries; ///< Maximum number of retransmissions of RREQ with TTL = NetDiameter to discover a route uint16_t RreqRateLimit; ///< Maximum number of RREQ per second. @@ -223,7 +223,7 @@ private: void Drop(Ptr, const Ipv4Header &, Socket::SocketErrno); /// Hello timer - Timer htimer; // TODO independent hello timers for all interfaces + Timer htimer; /// Schedule next send of hello message void HelloTimerExpire (); /// RREQ rate limit timer diff --git a/src/routing/aodv/aodv.h b/src/routing/aodv/aodv.h index 4dec57c08..ca3260b2d 100644 --- a/src/routing/aodv/aodv.h +++ b/src/routing/aodv/aodv.h @@ -33,9 +33,7 @@ * \ingroup routing * \defgroup aodv AODV * - * \brief RFC concerted AODV manet routing model - * - * TODO more docs + * \brief Ad hoc on demand distance vector (AODV) routing protocol manet, RFC3561 */ #endif /* AODV_H_ */