Attachment #1622 for bug #1702

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





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

  Ipv6StaticRoutingHelper staticRoutes;
  staticRoutes.SetDefaultRoute (iic1, 1);

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

  staticRoutes.SetDefaultRoute (iic2, 0);

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


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

Lines 117-121	Link Here

117

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

117

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

118

119

120

Ipv6Address Ipv6InterfaceContainer::GetLinkLocalAddress (uint32_t i)

121

122

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

123

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

124

  return address;

125

126

120

} /* namespace ns3 */

127

} /* namespace ns3 */

121

128





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

namespace ns3
{

   * \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 default route for the specified index.
   * \param i index
   * \param router the default router
   */
  void SetDefaultRoute (uint32_t i, uint32_t router) NS_DEPRECATED;

  /**
   * \brief Get the link-local address for the specified index.
   * \param i index
   * \return the link-local address
   */
  Ipv6Address GetLinkLocalAddress (uint32_t i);

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




#include "ns3/assert.h"
#include "ns3/ipv6-address.h"
#include "ns3/ipv6-routing-protocol.h"
#include "ns3/ipv6-interface-container.h"

#include "ipv6-static-routing-helper.h"


}
#endif


void Ipv6StaticRoutingHelper::SetDefaultRoute (Ptr<Node> n, uint32_t i, Ipv6Address routerAddr)
{
  Ptr<Ipv6> ipv6 = n->GetObject<Ipv6> ();
  Ptr<Ipv6StaticRouting> routing = GetStaticRouting (ipv6);
  routing->SetDefaultRoute (routerAddr, i);
}

void Ipv6StaticRoutingHelper::SetDefaultRoute (Ipv6InterfaceContainer ic, Ipv6Address routerAddr)
{
  Ipv6InterfaceContainer::Iterator iter;
  for (iter=ic.Begin(); iter!=ic.End(); iter++)
    {
      Ptr<Ipv6> ipv6 = iter->first;
      Ptr<Ipv6StaticRouting> routing = GetStaticRouting (ipv6);
      routing->SetDefaultRoute (routerAddr, iter->second);
    }
}

void Ipv6StaticRoutingHelper::SetDefaultRoute (Ipv6InterfaceContainer ic, uint32_t routerIndex)
{
  NS_ASSERT(ic.GetN () >= routerIndex);

  Ipv6InterfaceContainer::Iterator iter;
  Ipv6Address routerAddr = ic.GetLinkLocalAddress(routerIndex);
  uint32_t index;
  for (iter=ic.Begin(), index=0; iter!=ic.End(); iter++, index++)
    {
      if (index != routerIndex)
        {
          Ptr<Ipv6> ipv6 = iter->first;
          Ptr<Ipv6StaticRouting> routing = GetStaticRouting (ipv6);
          routing->SetDefaultRoute (routerAddr, iter->second);
        }
    }
}

} // namespace ns3




  void SetDefaultMulticastRoute (std::string nName, Ptr<NetDevice> nd);
  void SetDefaultMulticastRoute (std::string nName, std::string ndName);
#endif

  /**
   * \brief Set the default route for the specified node.
   * \param n Node
   * \param i output interface
   * \param router the default router address (must be link-local)
   */
  void SetDefaultRoute (Ptr<Node> n, uint32_t i, Ipv6Address routerAddr);

  /**
   * \brief Set the default route for a group of nodes.
   * \param ic the nodes' interfaces
   * \param router the default router address (must be link-local)
   */
  void SetDefaultRoute (Ipv6InterfaceContainer ic, Ipv6Address routerAddr);

  /**
   * \brief Set the default route for a group of nodes.
   * \param ic the nodes' interfaces
   * \param routerIndex the default router index in the Interface Container ic
   */
  void SetDefaultRoute (Ipv6InterfaceContainer ic, uint32_t routerIndex);

private:
  /**
   * \internal

Return to bug 1702