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

(-)a/RELEASE_NOTES (+1 lines)
 Lines 30-35    Link Here 
30 
- Bug 1678 - C++11 compliance problem with std::pair"
 30 
- Bug 1678 - C++11 compliance problem with std::pair"
31 
- Bug 1683 - IPv6 autoconfigured don't use *infinite* lifetimes
 31 
- Bug 1683 - IPv6 autoconfigured don't use *infinite* lifetimes
32 
- Bug 1669 - ns-3 should support binding two and three (possibly more) arguments
 32 
- Bug 1669 - ns-3 should support binding two and three (possibly more) arguments
33 
- Bug 1688 - Routers should advertise themselves from the link-local address
33 
- Bug 1689 - IPv6 shouldn't add a default gateway without checking the Router lifetime
 34 
- Bug 1689 - IPv6 shouldn't add a default gateway without checking the Router lifetime
34 
- Bug 1700 - Ipv6RawSocket does not honor the bound address when sending packets
 35 
- Bug 1700 - Ipv6RawSocket does not honor the bound address when sending packets
35 
- Bug 1701 - Ipv6StaticRouting: the source address should match the destination scope
 36 
- 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 

          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
          

          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 
    

  

        

          88
          
    {

          88
          
    {

        

        

          89
          
      uint32_t other;

          89
          
      uint32_t other;

        

        

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

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

        

          
            

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


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

            

        

          92
          

          92
          

        

        

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

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

        

        

          94
          
        {

          94
          
        {

        

  

    

    

       Lines 109-115
       
    
  Link Here 
    

  

        

          109
          
{

          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
          

          115
          

        



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




  

    

    

       Lines 97-102
       
    
  Link Here 
    

  

        

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

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

        

        

          98
          
{

          98
          
{

        

        

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

          99
          
  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
          

        






  

  Return to bug 1688