Attachment #1359 for bug #1393

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

(-)a/src/internet/helper/ipv6-routing-helper.cc (+55 lines)

Lines 18-23	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#include "ns3/node.h"

#include "ns3/node-list.h"

#include "ns3/simulator.h"

#include "ns3/ipv6-routing-protocol.h"

#include "ipv6-routing-helper.h"

#include "ipv6-routing-helper.h"

namespace ns3 {

namespace ns3 {

Lines 26-29	Link Here

void

Ipv6RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr<OutputStreamWrapper> stream) const

  for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)

      Ptr<Node> node = NodeList::GetNode (i);

      Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, this, node, stream);

void

Ipv6RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr<OutputStreamWrapper> stream) const

  for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)

      Ptr<Node> node = NodeList::GetNode (i);

      Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, this, printInterval, node, stream);

void

Ipv6RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const

  Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, this, node, stream);

void

Ipv6RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const

  Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, this, printInterval, node, stream);

void

Ipv6RoutingHelper::Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const

  Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();

  Ptr<Ipv6RoutingProtocol> rp = ipv6->GetRoutingProtocol ();

  NS_ASSERT (rp);

  rp->PrintRoutingTable (stream);

void

Ipv6RoutingHelper::PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const

  Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();

  Ptr<Ipv6RoutingProtocol> rp = ipv6->GetRoutingProtocol ();

  NS_ASSERT (rp);

  rp->PrintRoutingTable (stream);

  Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, this, printInterval, node, stream);

} // namespace ns3

} // namespace ns3

(-)a/src/internet/helper/ipv6-routing-helper.h (+52 lines)

Lines 22-27	Link Here

#define IPV6_ROUTING_HELPER_H

#define IPV6_ROUTING_HELPER_H

#include "ns3/ptr.h"

#include "ns3/ptr.h"

#include "ns3/nstime.h"

#include "ns3/output-stream-wrapper.h"

namespace ns3 {

namespace ns3 {

Lines 61-66	Link Here

   * \returns a newly-created routing protocol

   * \returns a newly-created routing protocol

*/

*/

  virtual Ptr<Ipv6RoutingProtocol> Create (Ptr<Node> node) const = 0;

  virtual Ptr<Ipv6RoutingProtocol> Create (Ptr<Node> node) const = 0;

/**

   * \brief prints the routing tables of all nodes at a particular time.

   * \param printTime the time at which the routing table is supposed to be printed.

   * \param stream The output stream object to use

   * This method calls the PrintRoutingTable() method of the

   * Ipv6RoutingProtocol stored in the Ipv6 object, for all nodes at the

   * specified time; the output format is routing protocol-specific.

*/

  void PrintRoutingTableAllAt (Time printTime, Ptr<OutputStreamWrapper> stream) const;

/**

   * \brief prints the routing tables of all nodes at regular intervals specified by user.

   * \param printInterval the time interval for which the routing table is supposed to be printed.

   * \param stream The output stream object to use

   * This method calls the PrintRoutingTable() method of the

   * Ipv6RoutingProtocol stored in the Ipv6 object, for all nodes at the

   * specified time interval; the output format is routing protocol-specific.

*/

  void PrintRoutingTableAllEvery (Time printInterval, Ptr<OutputStreamWrapper> stream) const;

/**

   * \brief prints the routing tables of a node at a particular time.

   * \param printTime the time at which the routing table is supposed to be printed.

   * \param node The node ptr for which we need the routing table to be printed

   * \param stream The output stream object to use

   * This method calls the PrintRoutingTable() method of the

   * Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node

   * at the specified time; the output format is routing protocol-specific.

*/

  void PrintRoutingTableAt (Time printTime, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;

100

101

/**

102

   * \brief prints the routing tables of a node at regular intervals specified by user.

103

   * \param printInterval the time interval for which the routing table is supposed to be printed.

104

   * \param node The node ptr for which we need the routing table to be printed

105

   * \param stream The output stream object to use

106

107

   * This method calls the PrintRoutingTable() method of the

108

   * Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node

109

   * at the specified interval; the output format is routing protocol-specific.

110

*/

111

  void PrintRoutingTableEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;

112

113

private:

114

  void Print (Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;

115

  void PrintEvery (Time printInterval, Ptr<Node> node, Ptr<OutputStreamWrapper> stream) const;

};

116

};

117

} // namespace ns3

118

} // namespace ns3

(-)a/src/internet/model/ipv4-routing-protocol.h (+5 lines)

Lines 142-147	Link Here

142

*/

142

*/

143

  virtual void SetIpv4 (Ptr<Ipv4> ipv4) = 0;

143

  virtual void SetIpv4 (Ptr<Ipv4> ipv4) = 0;

144

145

/**

146

   * \brief Print the Routing Table entries

147

148

   * \param stream the ostream the Routing table is printed to

149

*/

145

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const = 0;

150

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const = 0;

146

};

151

};

147

152




#include "ns3/node.h"
#include "ns3/ipv6-static-routing.h"
#include "ipv6-list-routing.h"
#include "ns3/simulator.h"

NS_LOG_COMPONENT_DEFINE ("Ipv6ListRouting");


}

void
Ipv6ListRouting::PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const
{
  NS_LOG_FUNCTION (this);

  *stream->GetStream () << "Node: " << m_ipv6->GetObject<Node> ()->GetId ()
                        << " Time: " << Simulator::Now ().GetSeconds () << "s "
                        << "Ipv6ListRouting table" << std::endl;
  for (Ipv6RoutingProtocolList::const_iterator i = m_routingProtocols.begin ();
       i != m_routingProtocols.end (); i++)
    {
      *stream->GetStream () << "  Priority: " << (*i).first << " Protocol: " << (*i).second->GetInstanceTypeId () << std::endl;
      (*i).second->PrintRoutingTable (stream);
    }
  *stream->GetStream () << std::endl;
}

void
Ipv6ListRouting::SetIpv6 (Ptr<Ipv6> ipv6)
{
  NS_LOG_FUNCTION (this << ipv6);

(-)a/src/internet/model/ipv6-list-routing.h (+7 lines)

Lines 104-109	Link Here

104

  virtual void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());

104

  virtual void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());

105

  virtual void SetIpv6 (Ptr<Ipv6> ipv6);

105

  virtual void SetIpv6 (Ptr<Ipv6> ipv6);

106

107

/**

108

   * \brief Print the Routing Table entries

109

110

   * \param stream the ostream the Routing table is printed to

111

*/

112

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const;

113

107

protected:

114

protected:

108

/**

115

/**

109

   * \brief Dispose this object.

116

   * \brief Dispose this object.

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

Lines 29-34	Link Here

#include "ipv6-header.h"

#include "ipv6-header.h"

#include "ipv6-interface-address.h"

#include "ipv6-interface-address.h"

#include "ipv6.h"

#include "ipv6.h"

#include "ns3/output-stream-wrapper.h"

namespace ns3 {

namespace ns3 {

Lines 171-176	Link Here

171

   * \param ipv6 the ipv6 object this routing protocol is being associated with

172

   * \param ipv6 the ipv6 object this routing protocol is being associated with

172

*/

173

*/

173

  virtual void SetIpv6 (Ptr<Ipv6> ipv6) = 0;

174

  virtual void SetIpv6 (Ptr<Ipv6> ipv6) = 0;

175

176

/**

177

   * \brief Print the Routing Table entries

178

179

   * \param stream the ostream the Routing table is printed to

180

*/

181

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const = 0;

174

};

182

};

175

183

176

} // namespace ns3

184

} // namespace ns3




 * Author: Sebastien Vincent <vincent@clarinet.u-strasbg.fr>
 */

#include <iomanip>
#include "ns3/log.h"
#include "ns3/node.h"
#include "ns3/packet.h"
#include "ns3/simulator.h"
#include "ns3/ipv6-route.h"
#include "ns3/net-device.h"


    }
}

// Formatted like output of "route -n" command
void
Ipv6StaticRouting::PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const
{
  NS_LOG_FUNCTION (this);
  std::ostream* os = stream->GetStream ();
  if (GetNRoutes () > 0)
    {
      *os << "Node: " << m_ipv6->GetObject<Node> ()->GetId ()
          << " Time: " << Simulator::Now ().GetSeconds () << "s "
          << "Ipv6StaticRouting table" << std::endl;

      for (uint32_t j = 0; j < GetNRoutes (); j++)
        {
          Ipv6RoutingTableEntry route = GetRoute (j);
          *os << route << std::endl;
        }
    }
}

void Ipv6StaticRouting::AddHostRouteTo (Ipv6Address dst, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse, uint32_t metric)
{
  NS_LOG_FUNCTION (this << dst << nextHop << interface << prefixToUse << metric);

  return mrtentry;
}

uint32_t Ipv6StaticRouting::GetNRoutes () const
{
  return m_networkRoutes.size ();
}

    }
}

Ipv6RoutingTableEntry Ipv6StaticRouting::GetRoute (uint32_t index) const
{
  NS_LOG_FUNCTION (this << index);
  uint32_t tmp = 0;

  for (NetworkRoutesCI it = m_networkRoutes.begin (); it != m_networkRoutes.end (); it++)
    {
      if (tmp == index)
        {

  return 0;
}

uint32_t Ipv6StaticRouting::GetMetric (uint32_t index) const
{
  NS_LOG_FUNCTION_NOARGS ();
  uint32_t tmp = 0;

  for (NetworkRoutesCI it = m_networkRoutes.begin (); it != m_networkRoutes.end (); it++)
    {
      if (tmp == index)
        {




   * \brief Get the number or entries in the routing table.
   * \return number of entries
   */
  uint32_t GetNRoutes () const;

  /**
   * \brief Get the default route.

   * \param i index
   * \return the route whose index is i
   */
  Ipv6RoutingTableEntry GetRoute (uint32_t i) const;

  /**
   * \brief Get a metric for route from the static unicast routing table.
   * \param index The index (into the routing table) of the route to retrieve.
   * \return If route is set, the metric is returned. If not, an infinity metric (0xffffffff) is returned
   */
  uint32_t GetMetric (uint32_t index) const;

  /**
   * \brief Remove a route from the routing table.

  virtual void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());
  virtual void SetIpv6 (Ptr<Ipv6> ipv6);

  /**
   * \brief Print the Routing Table entries
   *
   * \param stream the ostream the Routing table is printed to
   */
  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const;

protected:
  /**
   * \brief Dispose this object.

(-)a/src/internet/test/ipv6-list-routing-test-suite.cc (+2 lines)

Lines 38-43	Link Here

                         GetZero ()) {}

                         GetZero ()) {}

  void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse) {}

  void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse) {}

  void SetIpv6 (Ptr<Ipv6> ipv6) {}

  void SetIpv6 (Ptr<Ipv6> ipv6) {}

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const {};

};

};

class Ipv6BRouting : public Ipv6RoutingProtocol {

class Ipv6BRouting : public Ipv6RoutingProtocol {

Lines 54-59	Link Here

                         GetZero ()) {}

                         GetZero ()) {}

  void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse) {}

  void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse) {}

  void SetIpv6 (Ptr<Ipv6> ipv6) {}

  void SetIpv6 (Ptr<Ipv6> ipv6) {}

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const {};

};

};

class Ipv6ListRoutingNegativeTestCase : public TestCase

class Ipv6ListRoutingNegativeTestCase : public TestCase

Return to bug 1393