Attachment #1613 for bug #1697

View | Details | Raw Unified | Return to bug 1697
Collapse All | Expand All

(-)a/RELEASE_NOTES (+2 lines)

Lines 24-29	Link Here

Bugs fixed

Bugs fixed

----------

----------

- Bug 1390 - ICMPv6 Redirect are handled correctly only for /64 networks

- Bug 1643 - NdiscCache creation and existence checks

- Bug 1643 - NdiscCache creation and existence checks

- Bug 1646 - ICMPv6 Redirect are sent from global address instead of link-local

- Bug 1646 - ICMPv6 Redirect are sent from global address instead of link-local

- Bug 1662 - m_type not set for Ipv6OptionRouterAlertHeader

- Bug 1662 - m_type not set for Ipv6OptionRouterAlertHeader

Lines 32-37	Link Here

- Bug 1669 - ns-3 should support binding two and three (possibly more) arguments

- 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 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 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 1700 - Ipv6RawSocket does not honor the bound address when sending packets

- Bug 1701 - Ipv6StaticRouting: the source address should match the destination scope

- Bug 1701 - Ipv6StaticRouting: the source address should match the destination scope

- Bug 1702 - Ipv6InterfaceContainer::SetRouter should not always add the router as the default router

- Bug 1702 - Ipv6InterfaceContainer::SetRouter should not always add the router as the default router




    }
}

void Ipv6L3Protocol::IpForward (Ptr<const NetDevice> idev, Ptr<Ipv6Route> rtentry, Ptr<const Packet> p, const Ipv6Header& header)
{
  NS_LOG_FUNCTION (this << rtentry << p << header);
  NS_LOG_LOGIC ("Forwarding logic for node: " << m_node->GetId ());

   * exists.
   */

  if (m_sendIcmpv6Redirect && (rtentry->GetOutputDevice ()==idev))
      ((!rtentry->GetGateway ().IsAny () && rtentry->GetGateway ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64)))
      || (rtentry->GetDestination ().CombinePrefix (Ipv6Prefix (64)) == header.GetSourceAddress ().CombinePrefix (Ipv6Prefix (64)))))
    {
      NS_LOG_LOGIC ("ICMPv6 redirect!");
      Ptr<Icmpv6L4Protocol> icmpv6 = GetIcmpv6 ();

  SendRealOut (rtentry, packet, ipHeader);
}

void Ipv6L3Protocol::IpMulticastForward (Ptr<const NetDevice> idev, Ptr<Ipv6MulticastRoute> mrtentry, Ptr<const Packet> p, const Ipv6Header& header)
{
  NS_LOG_FUNCTION (this << mrtentry << p << header);
  NS_LOG_LOGIC ("Multicast forwarding logic for node: " << m_node->GetId ());





  /**
   * \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<const NetDevice> idev, Ptr<Ipv6Route> rtentry, Ptr<const Packet> 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<const NetDevice> idev, Ptr<Ipv6MulticastRoute> mrtentry, Ptr<const Packet> p, const Ipv6Header& header);

  /**
   * \brief Deliver a packet.

(-)a/src/internet/model/ipv6-routing-protocol.h (-2 / +2 lines)

Lines 56-63	Link Here

public:

public:

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  typedef Callback<void, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;

  typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6Route>, Ptr<const Packet>, const Ipv6Header &> UnicastForwardCallback;

  typedef Callback<void, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;

  typedef Callback<void, Ptr<const NetDevice>, Ptr<Ipv6MulticastRoute>, Ptr<const Packet>, const Ipv6Header &> MulticastForwardCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, uint32_t > LocalDeliverCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, uint32_t > LocalDeliverCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, Socket::SocketErrno > ErrorCallback;

  typedef Callback<void, Ptr<const Packet>, const Ipv6Header &, Socket::SocketErrno > ErrorCallback;

(-)a/src/internet/model/ipv6-static-routing.cc (-2 / +2 lines)

Lines 555-561	Link Here

555

      if (mrtentry)

557

      if (mrtentry)

556

558

557

          NS_LOG_LOGIC ("Multicast route found");

559

          NS_LOG_LOGIC ("Multicast route found");

558

          mcb (mrtentry, p, header); // multicast forwarding callback

560

          mcb (idev, mrtentry, p, header); // multicast forwarding callback

559

          return true;

561

          return true;

560

562

561

      else

563

      else

Lines 607-613	Link Here

607

  if (rtentry != 0)

609

  if (rtentry != 0)

608

610

609

      NS_LOG_LOGIC ("Found unicast destination- calling unicast callback");

611

      NS_LOG_LOGIC ("Found unicast destination- calling unicast callback");

610

      ucb (rtentry, p, header);  // unicast forwarding callback

612

      ucb (idev, rtentry, p, header);  // unicast forwarding callback

611

      return true;

613

      return true;

612

614

613

  else

615

  else

Return to bug 1697