From 727abcda3ecdc8e6282a09f06b8f4dabb7a49cbb Mon Sep 17 00:00:00 2001 From: Guowang Shi Date: Wed, 19 Jun 2013 09:21:39 +0200 Subject: [PATCH] Bug 1697 - ICMPv6 Redirect trigger contains multiple bugs --- CHANGES.html | 5 +++++ RELEASE_NOTES | 2 ++ src/internet/model/ipv6-l3-protocol.cc | 13 ++++++++----- src/internet/model/ipv6-l3-protocol.h | 6 ++++-- src/internet/model/ipv6-routing-protocol.h | 4 ++-- src/internet/model/ipv6-static-routing.cc | 4 ++-- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index c2cc27a5c..2daa7e9fa 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -66,6 +66,11 @@ us a note on ns-developers mailing list.

Users of the event garbage collector, previously in tools, will now include it from the core module. +
  • The Ipv6 UnicastForwardCallback and MulticastForwardCallback + have a new parmater, the NetDevice the packet has been received from. + Existing Ipv6RoutingProtocols should update their RouteInput function + accordingly. E.g., from ucb (rtentry, p, header); to ucb (idev, rtentry, p, header); +

    • Changes to build system:

    diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 6052b48ed..7940fe14c 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -24,6 +24,7 @@ New user-visible features Bugs fixed ---------- +- Bug 1390 - ICMPv6 Redirect are handled correctly only for /64 networks - Bug 1643 - NdiscCache creation and existence checks - Bug 1646 - ICMPv6 Redirect are sent from global address instead of link-local - Bug 1662 - m_type not set for Ipv6OptionRouterAlertHeader @@ -32,6 +33,7 @@ Bugs fixed - Bug 1669 - ns-3 should support binding two and three (possibly more) arguments - Bug 1688 - Routers should advertise themselves from the link-local address - Bug 1689 - IPv6 shouldn't add a default gateway without checking the Router lifetime +- Bug 1697 - ICMPv6 Redirect trigger contains multiple bugs - Bug 1700 - Ipv6RawSocket does not honor the bound address when sending packets - Bug 1701 - Ipv6StaticRouting: the source address should match the destination scope - Bug 1703 - Nodes don't react to a DAD diff --git a/src/internet/model/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc index 9de2226f9..5a69767e9 100644 --- a/src/internet/model/ipv6-l3-protocol.cc +++ b/src/internet/model/ipv6-l3-protocol.cc @@ -883,7 +883,7 @@ void Ipv6L3Protocol::SendRealOut (Ptr route, Ptr packet, Ipv6 } } -void Ipv6L3Protocol::IpForward (Ptr rtentry, Ptr p, const Ipv6Header& header) +void Ipv6L3Protocol::IpForward (Ptr idev, Ptr rtentry, Ptr p, const Ipv6Header& header) { NS_LOG_FUNCTION (this << rtentry << p << header); NS_LOG_LOGIC ("Forwarding logic for node: " << m_node->GetId ()); @@ -920,9 +920,12 @@ void Ipv6L3Protocol::IpForward (Ptr rtentry, Ptr p, con * exists. */ - if (m_sendIcmpv6Redirect && - ((!rtentry->GetGateway ().IsAny () && rtentry->GetGateway ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64))) - || (rtentry->GetDestination ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64))))) + /* Theoretically we should also check if the redirect target is on the same network + * as the source node. On the other hand, we are sure that the router we're redirecting to + * used a link-local address. As a consequence, they MUST be on the same network, the link-local net. + */ + + if (m_sendIcmpv6Redirect && (rtentry->GetOutputDevice ()==idev)) { NS_LOG_LOGIC ("ICMPv6 redirect!"); Ptr icmpv6 = GetIcmpv6 (); @@ -953,7 +956,7 @@ void Ipv6L3Protocol::IpForward (Ptr rtentry, Ptr p, con SendRealOut (rtentry, packet, ipHeader); } -void Ipv6L3Protocol::IpMulticastForward (Ptr mrtentry, Ptr p, const Ipv6Header& header) +void Ipv6L3Protocol::IpMulticastForward (Ptr idev, Ptr mrtentry, Ptr p, const Ipv6Header& header) { NS_LOG_FUNCTION (this << mrtentry << p << header); NS_LOG_LOGIC ("Multicast forwarding logic for node: " << m_node->GetId ()); diff --git a/src/internet/model/ipv6-l3-protocol.h b/src/internet/model/ipv6-l3-protocol.h index 14163ce9f..b54ef92f9 100644 --- a/src/internet/model/ipv6-l3-protocol.h +++ b/src/internet/model/ipv6-l3-protocol.h @@ -420,19 +420,21 @@ private: /** * \brief Forward a packet. + * \param idev Pointer to ingress network device * \param rtentry route * \param p packet to forward * \param header IPv6 header to add to the packet */ - void IpForward (Ptr rtentry, Ptr p, const Ipv6Header& header); + void IpForward (Ptr idev, Ptr rtentry, Ptr p, const Ipv6Header& header); /** * \brief Forward a packet in multicast. + * \param idev Pointer to ingress network device * \param mrtentry route * \param p packet to forward * \param header IPv6 header to add to the packet */ - void IpMulticastForward (Ptr mrtentry, Ptr p, const Ipv6Header& header); + void IpMulticastForward (Ptr idev, Ptr mrtentry, Ptr p, const Ipv6Header& header); /** * \brief Deliver a packet. diff --git a/src/internet/model/ipv6-routing-protocol.h b/src/internet/model/ipv6-routing-protocol.h index 1d1b31d1f..b1cb9785a 100644 --- a/src/internet/model/ipv6-routing-protocol.h +++ b/src/internet/model/ipv6-routing-protocol.h @@ -56,8 +56,8 @@ class Ipv6RoutingProtocol : public Object public: static TypeId GetTypeId (void); - typedef Callback, Ptr, const Ipv6Header &> UnicastForwardCallback; - typedef Callback, Ptr, const Ipv6Header &> MulticastForwardCallback; + typedef Callback, Ptr, Ptr, const Ipv6Header &> UnicastForwardCallback; + typedef Callback, Ptr, Ptr, const Ipv6Header &> MulticastForwardCallback; typedef Callback, const Ipv6Header &, uint32_t > LocalDeliverCallback; typedef Callback, const Ipv6Header &, Socket::SocketErrno > ErrorCallback; diff --git a/src/internet/model/ipv6-static-routing.cc b/src/internet/model/ipv6-static-routing.cc index ef0745a65..2c842ee1a 100644 --- a/src/internet/model/ipv6-static-routing.cc +++ b/src/internet/model/ipv6-static-routing.cc @@ -559,7 +559,7 @@ bool Ipv6StaticRouting::RouteInput (Ptr p, const Ipv6Header &heade if (mrtentry) { NS_LOG_LOGIC ("Multicast route found"); - mcb (mrtentry, p, header); // multicast forwarding callback + mcb (idev, mrtentry, p, header); // multicast forwarding callback return true; } else @@ -611,7 +611,7 @@ bool Ipv6StaticRouting::RouteInput (Ptr p, const Ipv6Header &heade if (rtentry != 0) { NS_LOG_LOGIC ("Found unicast destination- calling unicast callback"); - ucb (rtentry, p, header); // unicast forwarding callback + ucb (idev, rtentry, p, header); // unicast forwarding callback return true; } else