Attachment #1625 for bug #1702

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

(-)a/RELEASE_NOTES (+1 lines)

Lines 37-42	Link Here

- Bug 1697 - ICMPv6 Redirect trigger contains multiple bugs

- 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 1703 - Nodes don't react to a DAD

- Bug 1703 - Nodes don't react to a DAD

- Bug 1712 - The IP (v4 and v6) forwarding needs a test

- Bug 1712 - The IP (v4 and v6) forwarding needs a test

- Bug 1718 - Ipv4StaticRouting log component is misspelled

- Bug 1718 - Ipv4StaticRouting log component is misspelled




  Ipv6AddressHelper ipv6;
  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer i1 = ipv6.Assign (d1);
  i1.SetForwarding (1, true);
  i1.SetDefaultRouteInAllNodes (1);
  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
  i2.SetForwarding (0, true);
  i2.SetDefaultRouteInAllNodes (0);

  stackHelper.PrintRoutingTable (n0);






  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer iic1 = ipv6.Assign (ndc1);
  iic1.SetForwarding (2, true);
  iic1.SetForwarding (1, true);
  iic1.SetDefaultRouteInAllNodes (1);

  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer iic2 = ipv6.Assign (ndc2);
  iic2.SetForwarding (0, true);
  iic2.SetDefaultRouteInAllNodes (0);

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


(-)a/examples/ipv6/loose-routing-ipv6.cc (-10 / +20 lines)

Lines 106-136	Link Here

106

107

  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));

107

  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));

108

  Ipv6InterfaceContainer i1 = ipv6.Assign (d1);

108

  Ipv6InterfaceContainer i1 = ipv6.Assign (d1);

109

  i1.SetRouter (1, true);

109

  i1.SetForwarding (1, true);

110

  i1.SetDefaultRouteInAllNodes (1);

110

111

  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));

112

  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));

112

  Ipv6InterfaceContainer i2 = ipv6.Assign (d2);

113

  Ipv6InterfaceContainer i2 = ipv6.Assign (d2);

113

  i2.SetRouter (1, true);

114

  i2.SetForwarding (1, true);

115

  i2.SetDefaultRouteInAllNodes (1);

114

116

115

  ipv6.SetBase (Ipv6Address ("2001:3::"), Ipv6Prefix (64));

117

  ipv6.SetBase (Ipv6Address ("2001:3::"), Ipv6Prefix (64));

116

  Ipv6InterfaceContainer i3 = ipv6.Assign (d3);

118

  Ipv6InterfaceContainer i3 = ipv6.Assign (d3);

117

  i3.SetRouter (0, true);

119

  i3.SetForwarding (0, true);

118

  i3.SetRouter (1, true);

120

  i3.SetDefaultRouteInAllNodes (0);

121

  i3.SetForwarding (1, true);

122

  i3.SetDefaultRouteInAllNodes (1);

119

123

120

  ipv6.SetBase (Ipv6Address ("2001:4::"), Ipv6Prefix (64));

124

  ipv6.SetBase (Ipv6Address ("2001:4::"), Ipv6Prefix (64));

121

  Ipv6InterfaceContainer i4 = ipv6.Assign (d4);

125

  Ipv6InterfaceContainer i4 = ipv6.Assign (d4);

122

  i4.SetRouter (0, true);

126

  i4.SetForwarding (0, true);

123

  i4.SetRouter (1, true);

127

  i4.SetDefaultRouteInAllNodes (0);

128

  i4.SetForwarding (1, true);

129

  i4.SetDefaultRouteInAllNodes (1);

124

130

125

  ipv6.SetBase (Ipv6Address ("2001:5::"), Ipv6Prefix (64));

131

  ipv6.SetBase (Ipv6Address ("2001:5::"), Ipv6Prefix (64));

126

  Ipv6InterfaceContainer i5 = ipv6.Assign (d5);

132

  Ipv6InterfaceContainer i5 = ipv6.Assign (d5);

127

  i5.SetRouter (0, true);

133

  i5.SetForwarding (0, true);

128

  i5.SetRouter (1, true);

134

  i5.SetDefaultRouteInAllNodes (0);

135

  i5.SetForwarding (1, true);

136

  i5.SetDefaultRouteInAllNodes (1);

129

137

130

  ipv6.SetBase (Ipv6Address ("2001:6::"), Ipv6Prefix (64));

138

  ipv6.SetBase (Ipv6Address ("2001:6::"), Ipv6Prefix (64));

131

  Ipv6InterfaceContainer i6 = ipv6.Assign (d6);

139

  Ipv6InterfaceContainer i6 = ipv6.Assign (d6);

132

  i6.SetRouter (0, true);

140

  i6.SetForwarding (0, true);

133

  i6.SetRouter (1, true);

141

  i6.SetDefaultRouteInAllNodes (0);

142

  i6.SetForwarding (1, true);

143

  i6.SetDefaultRouteInAllNodes (1);

134

144

135

  NS_LOG_INFO ("Create Applications.");

145

  NS_LOG_INFO ("Create Applications.");

136

146




  NetDeviceContainer tmp2;
  tmp2.Add (d1.Get (1)); /* R */
  Ipv6InterfaceContainer iicr1 = ipv6.Assign (tmp2); /* R interface to the first subnet is just statically assigned */
  iicr1.SetForwarding (0, true);
  iicr1.SetDefaultRouteInAllNodes (0);
  iic1.Add (iicr1);

  /* add another IPv6 address for second prefix advertised on first subnet */

  NetDeviceContainer tmp3;
  tmp3.Add (d2.Get (0)); /* R */
  Ipv6InterfaceContainer iicr2 = ipv6.Assign (tmp3); /* R interface */
  iicr2.SetForwarding (0, true);
  iicr2.SetDefaultRouteInAllNodes (0);

  NetDeviceContainer tmp4;
  tmp4.Add (d2.Get (1)); /* n1 */




  NetDeviceContainer tmp2;
  tmp2.Add (d1.Get (1)); /* R */
  Ipv6InterfaceContainer iicr1 = ipv6.Assign (tmp2); /* R interface to the first subnet is just statically assigned */
  iicr1.SetForwarding (0, true);
  iicr1.SetDefaultRouteInAllNodes (0);
  iic1.Add (iicr1);

  /* second subnet R - n1 */

  NetDeviceContainer tmp3;
  tmp3.Add (d2.Get (0)); /* R */
  Ipv6InterfaceContainer iicr2 = ipv6.Assign (tmp3); /* R interface */
  iicr2.SetForwarding (0, true);
  iicr2.SetDefaultRouteInAllNodes (0);

  NetDeviceContainer tmp4;
  tmp4.Add (d2.Get (1)); /* n1 */




  Ipv6AddressHelper ipv6;
  ipv6.SetBase (Ipv6Address ("2001:1::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer i1 = ipv6.Assign (d1);
  i1.SetForwarding (1, true);
  i1.SetDefaultRouteInAllNodes (1);
  ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer i2 = ipv6.Assign (d2);
  i2.SetForwarding (0, true);
  i2.SetDefaultRouteInAllNodes (0);

  stackHelper.PrintRoutingTable (n0);





 
  ipv6.SetBase (Ipv6Address ("2001:0DB8:1::"), Ipv6Prefix (64));
  Ipv6InterfaceContainer i1 = ipv6.Assign (devs);
  i1.SetForwarding (1, true);
  i1.SetDefaultRouteInAllNodes (1);
  
  ipv6.SetBase (Ipv6Address ("2001:0DB8:2::"), Ipv6Prefix (64));
  Ipv6Address tapAddr = ipv6.NewAddress ();

  Ptr<FdNetDevice> fdevice = device->GetObject<FdNetDevice> ();
  fdevice-> SetIsMulticast (true);
  Ipv6InterfaceContainer i2 = ipv6.Assign (fdevs);
  i2.SetForwarding (0, true);
  i2.SetDefaultRouteInAllNodes (0);

  //
  // Create the Ping6 application.




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2008-2009 Strasbourg University
 *               2013 Universita' di Firenze
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
 *         Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */

#include "ns3/node-list.h"

#include "ipv6-interface-container.h"
#include "ns3/ipv6-static-routing-helper.h"

namespace ns3 {
{

Ipv6InterfaceContainer::Ipv6InterfaceContainer ()
{
}

Ipv6InterfaceContainer::Iterator
Ipv6InterfaceContainer::Begin (void) const
{
  return m_interfaces.begin ();
}

Ipv6InterfaceContainer::Iterator
Ipv6InterfaceContainer::End (void) const
{
  return m_interfaces.end ();


void Ipv6InterfaceContainer::SetRouter (uint32_t i, bool router)
{
  // This function is deprecated and should be substituted by:
  // SetForwarding (RouterInterfaceIndex, true);
  // SetDefaultRouteInAllNodes (RouterInterfaceIndex);

  Ptr<Ipv6> ipv6 = m_interfaces[i].first;
  ipv6->SetForwarding (m_interfaces[i].second, router);


    }
}

void Ipv6InterfaceContainer::SetForwarding (uint32_t i, bool router)
{
  Ptr<Ipv6> ipv6 = m_interfaces[i].first;
  ipv6->SetForwarding (m_interfaces[i].second, router);
}

void Ipv6InterfaceContainer::SetDefaultRouteInAllNodes (uint32_t router)
{
  Ptr<Ipv6> ipv6 = m_interfaces[router].first;
  uint32_t other;

  Ipv6Address routerAddress;
  for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[router].second); i++)
    {
      Ipv6InterfaceAddress routerIaddress;
      routerIaddress = ipv6->GetAddress (m_interfaces[router].second, i);
      if (routerIaddress.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
        {
          routerAddress = routerIaddress.GetAddress ();
          break;
        }
    }
  NS_ASSERT_MSG (routerAddress != Ipv6Address::GetAny (), "No link-local address found on router, aborting");

  for (other = 0; other < m_interfaces.size (); other++)
    {
      if (other != router)
        {
          Ptr<Ipv6StaticRouting> routing = 0;
          Ipv6StaticRoutingHelper routingHelper;

          ipv6 = m_interfaces[other].first;
          routing = routingHelper.GetStaticRouting (ipv6);
          routing->SetDefaultRoute (routerAddress, m_interfaces[other].second);
        }
    }
}

void Ipv6InterfaceContainer::SetDefaultRouteInAllNodes (Ipv6Address routerAddress)
{
  uint32_t routerIndex;
  bool found = false;
  for (uint32_t index = 0; index < m_interfaces.size (); index++)
    {
      Ptr<Ipv6> ipv6 = m_interfaces[index].first;
      for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
        {
          Ipv6Address addr = ipv6->GetAddress (m_interfaces[index].second, i).GetAddress ();
          if (addr == routerAddress)
            {
              routerIndex = index;
              found = true;
              break;
            }
        }
      if (found)
        {
          break;
        }
    }
  NS_ASSERT_MSG (found != true, "No such address in the interfaces. Aborting.");

  Ipv6Address routerLinkLocalAddress = GetLinkLocalAddress (routerIndex);
  uint32_t other;

  for (other = 0; other < m_interfaces.size (); other++)
    {
      if (other != routerIndex)
        {
          Ptr<Ipv6StaticRouting> routing = 0;
          Ipv6StaticRoutingHelper routingHelper;

          Ptr<Ipv6> ipv6 = m_interfaces[other].first;
          routing = routingHelper.GetStaticRouting (ipv6);
          routing->SetDefaultRoute (routerLinkLocalAddress, m_interfaces[other].second);
        }
    }
}


void Ipv6InterfaceContainer::SetDefaultRoute (uint32_t i, uint32_t router)
{
  NS_ASSERT_MSG (i != router, "A node shouldn't set itself as the default router, isn't it? Aborting.");

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

  Ipv6Address routerAddress = GetLinkLocalAddress (router);
  NS_ASSERT_MSG (routerAddress != Ipv6Address::GetAny (), "No link-local address found on router, aborting");

  Ptr<Ipv6StaticRouting> routing = 0;
  Ipv6StaticRoutingHelper routingHelper;


  routing->SetDefaultRoute (routerAddress, m_interfaces[i].second);
}


void Ipv6InterfaceContainer::SetDefaultRoute (uint32_t i, Ipv6Address routerAddr)
{
  uint32_t routerIndex;
  bool found = false;
  for (uint32_t index = 0; index < m_interfaces.size (); index++)
    {
      Ptr<Ipv6> ipv6 = m_interfaces[index].first;
      for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
        {
          Ipv6Address addr = ipv6->GetAddress (m_interfaces[index].second, i).GetAddress ();
          if (addr == routerAddr)
            {
              routerIndex = index;
              found = true;
              break;
            }
        }
      if (found)
        {
          break;
        }
    }
  NS_ASSERT_MSG (found != true, "No such address in the interfaces. Aborting.");

  NS_ASSERT_MSG (i != routerIndex, "A node shouldn't set itself as the default router, isn't it? Aborting.");

  Ptr<Ipv6> ipv6 = m_interfaces[i].first;
  Ipv6Address routerLinkLocalAddress = GetLinkLocalAddress (routerIndex);
  Ptr<Ipv6StaticRouting> routing = 0;
  Ipv6StaticRoutingHelper routingHelper;

  routing = routingHelper.GetStaticRouting (ipv6);
  routing->SetDefaultRoute (routerLinkLocalAddress, m_interfaces[i].second);
}


Ipv6Address Ipv6InterfaceContainer::GetLinkLocalAddress (uint32_t index)
{
  Ptr<Ipv6> ipv6 = m_interfaces[index].first;
  for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
    {
      Ipv6InterfaceAddress iAddress;
      iAddress = ipv6->GetAddress (m_interfaces[index].second, i);
      if (iAddress.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
        {
          return iAddress.GetAddress ();
        }
    }
  return Ipv6Address::GetAny ();
}

Ipv6Address Ipv6InterfaceContainer::GetLinkLocalAddress (Ipv6Address address)
{
  if (address.IsLinkLocal ())
    {
      return address;
    }

  uint32_t nodeIndex;
  bool found = false;
  for (uint32_t index = 0; index < m_interfaces.size (); index++)
    {
      Ptr<Ipv6> ipv6 = m_interfaces[index].first;
      for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[index].second); i++)
        {
          Ipv6Address addr = ipv6->GetAddress (m_interfaces[index].second, i).GetAddress ();
          if (addr == address)
            {
              nodeIndex = index;
              found = true;
              break;
            }
        }
      if (found)
        {
          break;
        }
    }
  NS_ASSERT_MSG (found != true, "No such address in the interfaces. Aborting.");

  Ptr<Ipv6> ipv6 = m_interfaces[nodeIndex].first;
  for (uint32_t i = 0; i < ipv6->GetNAddresses (m_interfaces[nodeIndex].second); i++)
    {
      Ipv6InterfaceAddress iAddress;
      iAddress = ipv6->GetAddress (m_interfaces[nodeIndex].second, i);
      if (iAddress.GetScope () == Ipv6InterfaceAddress::LINKLOCAL)
        {
          return iAddress.GetAddress ();
        }
    }
  return Ipv6Address::GetAny ();
}


} /* namespace ns3 */





/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2008-2009 Strasbourg University
 *               2013 Universita' di Firenze
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
 *         Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */

#ifndef IPV6_INTERFACE_CONTAINER_H


#include "ns3/ipv6.h"
#include "ns3/ipv6-address.h"
#include "ns3/deprecated.h"

namespace ns3
{

  Ipv6Address GetAddress (uint32_t i, uint32_t j) const;

  /**
   * \brief Get the link-local address for the specified index.
   * \param i index
   * \return the link-local address, or "::" if the interface has no link local address.
   */
  Ipv6Address GetLinkLocalAddress (uint32_t i);

  /**
   * \brief Get the link-local address for the node with the specified global address.
   * \param address the address to find.
   * \return the link-local address, or "::" if the interface has no link local address.
   */
  Ipv6Address GetLinkLocalAddress (Ipv6Address address);

  /**
   * \brief Add a couple IPv6/interface.
   * \param ipv6 IPv6 address
   * \param interface interface index

   * \param i index
   * \param router true : is a router, false : is an host
   */
  void SetRouter (uint32_t i, bool router) NS_DEPRECATED;

  /**
   * \brief Set the state of the stack (act as a router or as an host) for the specified index.
   * This automatically sets all the node's interfaces to the same forwarding state.
   * \param i index
   * \param state true : is a router, false : is an host
   */
  void SetForwarding (uint32_t i, bool state);

  /**
   * \brief Set the default route for all the devices (except the router itself).
   * \param router the default router index
   */
  void SetDefaultRouteInAllNodes (uint32_t router);

  /**
   * \brief Set the default route for all the devices (except the router itself).
   * Note that the route will be set to the link-local address of the node with the specified address.
   * \param routerAddr the default router address
   */
  void SetDefaultRouteInAllNodes (Ipv6Address routerAddr);

  /**
   * \brief Set the default route for the specified index.

   */
  void SetDefaultRoute (uint32_t i, uint32_t router);

  /**
   * \brief Set the default route for the specified index.
   * Note that the route will be set to the link-local address of the node with the specified address.
   * \param i index
   * \param routerAddr the default router address
   */
  void SetDefaultRoute (uint32_t i, Ipv6Address routerAddr);

private:
  typedef std::vector<std::pair<Ptr<Ipv6>, uint32_t> > InterfaceVector;


Return to bug 1702