Attachment #1611 for bug #1688

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

(-)a/RELEASE_NOTES (+1 lines)

Lines 30-35	Link Here

- Bug 1678 - C++11 compliance problem with std::pair"

- Bug 1678 - C++11 compliance problem with std::pair"

- Bug 1683 - IPv6 autoconfigured don't use *infinite* lifetimes

- Bug 1683 - IPv6 autoconfigured don't use *infinite* lifetimes

- 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 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 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

(-)a/examples/ipv6/icmpv6-redirect.cc (-1 / +1 lines)

Lines 155-161	Link Here

155

  Ipv6InterfaceContainer iic2 = ipv6.Assign (ndc2);

155

  Ipv6InterfaceContainer iic2 = ipv6.Assign (ndc2);

156

  iic2.SetRouter (0, true);

156

  iic2.SetRouter (0, true);

157

158

  stackHelper.AddHostRouteTo (r1, iic2.GetAddress (1, 1), iic1.GetAddress (2, 1), iic1.GetInterfaceIndex (1));

158

  stackHelper.AddHostRouteTo (r1, iic2.GetAddress (1, 1), iic1.GetAddress (2, 0), iic1.GetInterfaceIndex (1));

159

160

  Simulator::Schedule (Seconds (0.0), &StackHelper::PrintRoutingTable, &stackHelper, r1);

160

  Simulator::Schedule (Seconds (0.0), &StackHelper::PrintRoutingTable, &stackHelper, r1);

161

  Simulator::Schedule (Seconds (3.0), &StackHelper::PrintRoutingTable, &stackHelper, sta1);

161

  Simulator::Schedule (Seconds (3.0), &StackHelper::PrintRoutingTable, &stackHelper, sta1);

(-)a/src/internet/helper/ipv6-interface-container.cc (-2 / +2 lines)

Lines 88-94	Link Here

      uint32_t other;

      uint32_t other;

      /* assume first global address is index 1 (0 is link-local) */

      /* assume first global address is index 1 (0 is link-local) */

      Ipv6Address routerAddress = ipv6->GetAddress (m_interfaces[i].second, 1).GetAddress ();

      Ipv6Address routerAddress = ipv6->GetAddress (m_interfaces[i].second, 0).GetAddress ();

      for (other = 0; other < m_interfaces.size (); other++)

      for (other = 0; other < m_interfaces.size (); other++)

Lines 109-115	Link Here

109

110

  Ptr<Ipv6> ipv6 = m_interfaces[i].first;

110

  Ptr<Ipv6> ipv6 = m_interfaces[i].first;

111

  Ptr<Ipv6> ipv6Router = m_interfaces[router].first;

111

  Ptr<Ipv6> ipv6Router = m_interfaces[router].first;

112

  Ipv6Address routerAddress = ipv6Router->GetAddress (m_interfaces[router].second, 1).GetAddress ();

112

  Ipv6Address routerAddress = ipv6Router->GetAddress (m_interfaces[router].second, 0).GetAddress ();

113

  Ptr<Ipv6StaticRouting> routing = 0;

113

  Ptr<Ipv6StaticRouting> routing = 0;

114

  Ipv6StaticRoutingHelper routingHelper;

114

  Ipv6StaticRoutingHelper routingHelper;

115

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

Lines 97-102	Link Here

void Ipv6StaticRouting::AddHostRouteTo (Ipv6Address dst, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse, uint32_t metric)

void Ipv6StaticRouting::AddHostRouteTo (Ipv6Address dst, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse, uint32_t metric)

  NS_LOG_FUNCTION (this << dst << nextHop << interface << prefixToUse << metric);

  NS_LOG_FUNCTION (this << dst << nextHop << interface << prefixToUse << metric);

100

  NS_ASSERT_MSG(nextHop.IsLinkLocal(), "Ipv6StaticRouting::AddHostRouteTo - Next hop must be link-local");

101

100

  AddNetworkRouteTo (dst, Ipv6Prefix::GetOnes (), nextHop, interface, prefixToUse, metric);

102

  AddNetworkRouteTo (dst, Ipv6Prefix::GetOnes (), nextHop, interface, prefixToUse, metric);

101

103

102

104

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 1688