Attachment #1000 for bug #947

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




 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
 */
#include "ipv4-routing-helper.h"
#include "ns3/node.h"
#include "ns3/node-list.h"
#include "ns3/simulator.h"
#include "ns3/ipv4-routing-protocol.h"

namespace ns3 {

Ipv4RoutingHelper::~Ipv4RoutingHelper ()
{}

void
Ipv4RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr<OutputStreamWrapper> stream)
{
  for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)
  {
    Ptr<Node> node = NodeList::GetNode (i);
    Ptr<Ipv4RoutingProtocol> rp = node->GetObject<Ipv4RoutingProtocol> ();
    Simulator::Schedule(printTime,&Ipv4RoutingProtocol::PrintRoutingTable,rp,stream);
  }
}

void
Ipv4RoutingHelper::PrintRoutingTableAllEvery (Time printTime, Ptr<OutputStreamWrapper> stream)
{
  for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)
  {
    Ptr<Node> node = NodeList::GetNode (i);
    Ptr<Ipv4RoutingProtocol> rp = node->GetObject<Ipv4RoutingProtocol> ();
    Simulator::Schedule(printTime,&Ipv4RoutingProtocol::PrintRoutingTable,rp,stream);
  }
  Simulator::Schedule(printTime,&Ipv4RoutingHelper::PrintRoutingTableAllEvery,this,printTime,stream);
}

void
Ipv4RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
{
  Ptr<Ipv4RoutingProtocol> rp = node->GetObject<Ipv4RoutingProtocol> ();
  Simulator::Schedule (printTime, &Ipv4RoutingProtocol::PrintRoutingTable, rp, stream);
}

void
Ipv4RoutingHelper::PrintRoutingTableEvery (Time printTime,Ptr<Node> node, Ptr<OutputStreamWrapper> stream)
{
  Ptr<Ipv4RoutingProtocol> rp = node->GetObject<Ipv4RoutingProtocol> ();
  Simulator::Schedule (printTime, &Ipv4RoutingProtocol::PrintRoutingTable, rp, stream);
  Simulator::Schedule(printTime,&Ipv4RoutingHelper::PrintRoutingTableEvery,this, printTime, node, stream);
}


} // namespace ns3

(-)a/src/helper/ipv4-routing-helper.h (+32 lines)

Lines 21-26	Link Here

#define IPV4_ROUTING_HELPER_H

#define IPV4_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 58-63	Link Here

   * \returns a newly-created routing protocol

   * \returns a newly-created routing protocol

*/

*/

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

  virtual Ptr<Ipv4RoutingProtocol> 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 when logging ascii traces.

*/

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

/**

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

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

   * \param stream The output stream object to use when logging ascii traces.

*/

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

/**

   * \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 when logging ascii traces.

*/

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

/**

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

   * \param printTime the time interval for 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 when logging ascii traces.

*/

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

};

};

} // namespace ns3

} // namespace ns3

(-)a/src/node/ipv4-routing-protocol.h (+3 lines)

Lines 25-30	Link Here

#include "ipv4-header.h"

#include "ipv4-header.h"

#include "ipv4-interface-address.h"

#include "ipv4-interface-address.h"

#include "ipv4.h"

#include "ipv4.h"

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

namespace ns3 {

namespace ns3 {

Lines 140-145	Link Here

140

   * Typically, invoked directly or indirectly from ns3::Ipv4::SetRoutingProtocol

141

   * Typically, invoked directly or indirectly from ns3::Ipv4::SetRoutingProtocol

141

*/

142

*/

142

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

143

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

144

145

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

143

};

146

};

144

147

145

} //namespace ns3

148

} //namespace ns3

(-)a/src/routing/aodv/aodv-routing-protocol.cc (+7 lines)

Lines 246-251	Link Here

246

247

248

void

248

void

249

RoutingProtocol::PrintRoutingTable (Ptr<OutputStreamWrapper> stream)

250

251

  *stream->GetStream () << "Node: " << m_ipv4->GetObject<Node> ()->GetId () << " Time: " << Simulator::Now().GetSeconds () << "s ";

252

  m_routingTable.Print (stream);

253

254

255

void

249

RoutingProtocol::Start ()

256

RoutingProtocol::Start ()

250

257

251

  NS_LOG_FUNCTION (this);

258

  NS_LOG_FUNCTION (this);

(-)a/src/routing/aodv/aodv-routing-protocol.h (+1 lines)

Lines 70-75	Link Here

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream);

  //\}

  //\}

  ///\name Handle protocol parameters

  ///\name Handle protocol parameters




}

void
RoutingTableEntry::Print (Ptr<OutputStreamWrapper> stream) const
{
  std::ostream* os = stream->GetStream();
  *os << m_ipv4Route->GetDestination () << "\t" << m_ipv4Route->GetGateway ()
      << "\t" << m_iface.GetLocal () << "\t";
  switch (m_flag)
    {
    case VALID:
      {
        *os << "UP";
        break;
      }
    case INVALID:
      {
        *os << "DOWN";
        break;
      }
    case IN_SEARCH:
      {
        *os << "IN_SEARCH";
        break;
      }
    }
  *os << "\t" << (m_lifeTime - Simulator::Now ()).GetSeconds () << "\t"
      << m_hops << "\n";
}


}

void
RoutingTable::Print (Ptr<OutputStreamWrapper> stream)
{
  Purge ();
  *stream->GetStream () << "\nAODV Routing table\n"
      << "Destination\tGateway\t\tInterface\tFlag\tExpire\tHops\n";
  for (std::map<Ipv4Address, RoutingTableEntry>::const_iterator i =
      m_ipv4AddressEntry.begin (); i != m_ipv4AddressEntry.end (); ++i)
    {
      i->second.Print (stream);
    }
  *stream->GetStream () << "\n";
}

}




#include "ns3/ipv4-route.h"
#include "ns3/timer.h"
#include "ns3/net-device.h"
#include "ns3/output-stream-wrapper.h"

namespace ns3 {
namespace aodv {

  {
    return (m_ipv4Route->GetDestination () == dst);
  }
  void Print(Ptr<OutputStreamWrapper> stream) const;

private:
  /// Valid Destination Sequence Number flag

   */
  bool MarkLinkAsUnidirectional(Ipv4Address neighbor, Time blacklistTimeout);
  /// Print routing table
  void Print(Ptr<OutputStreamWrapper> stream);

private:
  std::map<Ipv4Address, RoutingTableEntry> m_ipv4AddressEntry;

(-)a/src/routing/global-routing/ipv4-global-routing.cc (+6 lines)

Lines 382-387	Link Here

382

  Ipv4RoutingProtocol::DoDispose ();

382

  Ipv4RoutingProtocol::DoDispose ();

383

384

385

void

386

Ipv4GlobalRouting::PrintRoutingTable(Ptr<OutputStreamWrapper> stream)

387

388

 //use this method to print the routing tables to output.

389

390

385

Ptr<Ipv4Route>

391

Ptr<Ipv4Route>

386

Ipv4GlobalRouting::RouteOutput (Ptr<Packet> p, const Ipv4Header &header, Ptr<NetDevice> oif, Socket::SocketErrno &sockerr)

392

Ipv4GlobalRouting::RouteOutput (Ptr<Packet> p, const Ipv4Header &header, Ptr<NetDevice> oif, Socket::SocketErrno &sockerr)

387

393

(-)a/src/routing/global-routing/ipv4-global-routing.h (+1 lines)

Lines 92-97	Link Here

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream);

/**

/**

 * \brief Add a host route to the global routing table.

 * \brief Add a host route to the global routing table.

(-)a/src/routing/list-routing/ipv4-list-routing.cc (+13 lines)

Lines 69-74	Link Here

void

void

Ipv4ListRouting::PrintRoutingTable (Ptr<OutputStreamWrapper> stream)

  for (Ipv4RoutingProtocolList::const_iterator i = m_routingProtocols.begin ();

      i != m_routingProtocols.end (); i++)

    *stream->GetStream () << "Printing for protocol " << (*i).second->GetInstanceTypeId () << " with priority " << (*i).first;

    (*i).second->PrintRoutingTable (stream);

void

Ipv4ListRouting::DoStart (void)

Ipv4ListRouting::DoStart (void)

  for (Ipv4RoutingProtocolList::iterator rprotoIter = m_routingProtocols.begin ();

  for (Ipv4RoutingProtocolList::iterator rprotoIter = m_routingProtocols.begin ();

Lines 297-302	Link Here

297

  void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

308

  void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

298

  void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

309

  void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

299

  void SetIpv4 (Ptr<Ipv4> ipv4) {}

310

  void SetIpv4 (Ptr<Ipv4> ipv4) {}

311

  void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) {}

300

};

312

};

301

313

302

class Ipv4BRouting : public Ipv4RoutingProtocol {

314

class Ipv4BRouting : public Ipv4RoutingProtocol {

Lines 310-315	Link Here

310

  void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

322

  void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

311

  void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

323

  void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address) {}

312

  void SetIpv4 (Ptr<Ipv4> ipv4) {}

324

  void SetIpv4 (Ptr<Ipv4> ipv4) {}

325

  void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) {}

313

};

326

};

314

327

315

class Ipv4ListRoutingNegativeTestCase : public TestCase

328

class Ipv4ListRoutingNegativeTestCase : public TestCase

(-)a/src/routing/list-routing/ipv4-list-routing.h (+1 lines)

Lines 85-90	Link Here

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream);

protected:

protected:

  void DoDispose (void);

  void DoDispose (void);

(-)a/src/routing/nix-vector-routing/ipv4-nix-vector-routing.cc (+6 lines)

Lines 657-662	Link Here

657

  return true;

657

  return true;

658

659

660

void

661

Ipv4NixVectorRouting::PrintRoutingTable(Ptr<OutputStreamWrapper> stream)

662

663

 //use this method to print the routing tables to output.

664

665

660

// virtual functions from Ipv4RoutingProtocol

666

// virtual functions from Ipv4RoutingProtocol

661

void

667

void

662

Ipv4NixVectorRouting::NotifyInterfaceUp (uint32_t i)

668

Ipv4NixVectorRouting::NotifyInterfaceUp (uint32_t i)

(-)a/src/routing/nix-vector-routing/ipv4-nix-vector-routing.h (+1 lines)

Lines 149-154	Link Here

149

    virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

149

    virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

150

    virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

150

    virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

151

    virtual void SetIpv4 (Ptr<Ipv4> ipv4);

151

    virtual void SetIpv4 (Ptr<Ipv4> ipv4);

152

    virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream);

152

153

154

    /* cache stores nix-vectors based on destination ip */

155

    /* cache stores nix-vectors based on destination ip */

(-)a/src/routing/olsr/olsr-routing-protocol.cc (+6 lines)

Lines 244-249	Link Here

244

  Ipv4RoutingProtocol::DoDispose ();

244

  Ipv4RoutingProtocol::DoDispose ();

245

246

247

void

248

RoutingProtocol::PrintRoutingTable (Ptr<OutputStreamWrapper> stream)

249

250

  *stream->GetStream () << "Node: " << m_ipv4->GetObject<Node> ()->GetId () << " Time: " << Simulator::Now().GetSeconds () << "s ";

251

252

247

void RoutingProtocol::DoStart ()

253

void RoutingProtocol::DoStart ()

248

254

249

  if (m_mainAddress == Ipv4Address ())

255

  if (m_mainAddress == Ipv4Address ())

(-)a/src/routing/olsr/olsr-routing-protocol.h (+1 lines)

Lines 184-189	Link Here

184

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

184

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

185

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

185

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

186

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

186

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

187

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream);

187

188

189

  void DoDispose ();

190

  void DoDispose ();

(-)a/src/routing/static-routing/ipv4-static-routing.cc (+6 lines)

Lines 699-704	Link Here

699

700

701

702

void

703

Ipv4StaticRouting::PrintRoutingTable(Ptr<OutputStreamWrapper> stream)

704

705

 //use this method to print the routing tables to output.

706

707

702

Ipv4Address

708

Ipv4Address

703

Ipv4StaticRouting::SourceAddressSelection (uint32_t interfaceIdx, Ipv4Address dest)

709

Ipv4StaticRouting::SourceAddressSelection (uint32_t interfaceIdx, Ipv4Address dest)

704

710

(-)a/src/routing/static-routing/ipv4-static-routing.h (+1 lines)

Lines 85-90	Link Here

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void SetIpv4 (Ptr<Ipv4> ipv4);

  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream);

/**

/**

 * \brief Add a network route to the static routing table.

 * \brief Add a network route to the static routing table.

Return to bug 947