diff --git a/CHANGES.html b/CHANGES.html
index 9d091ecda..d4125a29b 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -54,6 +54,10 @@ us a note on ns-developers mailing list.
Changes from ns-3.26 to ns-3.27
New API:
+- Function PrintRoutingTable has been extended to add an optional Time::Units
+ parameter to specify the time units used on the report. The new parameter is
+ optional and if not specified defaults to the previous behavior (Time::S).
+
Changes to existing API:
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 944ae6063..73bcae5bb 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -26,12 +26,11 @@ Bugs fixed
----------
- Bug 2007 - uan: Remove deprecation on SetRxThresholdDb
- Bug 2450 - LogDistancePropagationLossModel is not continuous
-- Bug 2477 - DCF manager assert
- Bug 2492 - uan: Make use of RxGain attribute in UanPhyGen class
- Bug 2511 - HT Greenfield is not working
- Bug 2521 - Include ipv6-option.h in wscript
-- Bug 2529 - Missing trace when Block ACK timeout is triggered or when missing MPDUs are announced by a Block ACK response
-- Bug 2532 - Inconsistencies between 802.11n MCS and NSS value reported in TXVECTOR
+- Bug 2527 - PrintRoutingTable extended to add an optional Time::Units parameter
+- Bug 2530 - Rename aodv::SetBalckListTimeout to aodv::SetBlackListTimeout
Known issues
------------
diff --git a/src/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc
index f2ced413f..5082f7d4e 100644
--- a/src/aodv/model/aodv-routing-protocol.cc
+++ b/src/aodv/model/aodv-routing-protocol.cc
@@ -318,11 +318,11 @@ RoutingProtocol::DoDispose ()
}
void
-RoutingProtocol::PrintRoutingTable (Ptr stream) const
+RoutingProtocol::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
*stream->GetStream () << "Node: " << m_ipv4->GetObject ()->GetId ()
- << "; Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << "; Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", AODV Routing table" << std::endl;
m_routingTable.Print (stream);
diff --git a/src/aodv/model/aodv-routing-protocol.h b/src/aodv/model/aodv-routing-protocol.h
index 892acb9b3..a379c0321 100644
--- a/src/aodv/model/aodv-routing-protocol.h
+++ b/src/aodv/model/aodv-routing-protocol.h
@@ -71,8 +71,8 @@ public:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
-
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
+
// Handle protocol parameters
Time GetMaxQueueTime () const { return m_maxQueueTime; }
void SetMaxQueueTime (Time t);
diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc
index 0d93e7a8a..f5439eda2 100644
--- a/src/click/model/ipv4-click-routing.cc
+++ b/src/click/model/ipv4-click-routing.cc
@@ -557,7 +557,7 @@ Ipv4ClickRouting::RouteInput (Ptr p, const Ipv4Header &header,
}
void
-Ipv4ClickRouting::PrintRoutingTable (Ptr stream) const
+Ipv4ClickRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
}
diff --git a/src/click/model/ipv4-click-routing.h b/src/click/model/ipv4-click-routing.h
index acc321f51..f590814d5 100644
--- a/src/click/model/ipv4-click-routing.h
+++ b/src/click/model/ipv4-click-routing.h
@@ -255,7 +255,7 @@ public:
virtual bool RouteInput (Ptr p, const Ipv4Header &header, Ptr idev,
UnicastForwardCallback ucb, MulticastForwardCallback mcb,
LocalDeliverCallback lcb, ErrorCallback ecb);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
virtual void NotifyInterfaceUp (uint32_t interface);
virtual void NotifyInterfaceDown (uint32_t interface);
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
diff --git a/src/dsdv/model/dsdv-routing-protocol.cc b/src/dsdv/model/dsdv-routing-protocol.cc
index 46c0ae524..c82627fc5 100644
--- a/src/dsdv/model/dsdv-routing-protocol.cc
+++ b/src/dsdv/model/dsdv-routing-protocol.cc
@@ -229,11 +229,11 @@ RoutingProtocol::DoDispose ()
}
void
-RoutingProtocol::PrintRoutingTable (Ptr stream) const
+RoutingProtocol::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
*stream->GetStream () << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", DSDV Routing table" << std::endl;
m_routingTable.Print (stream);
diff --git a/src/dsdv/model/dsdv-routing-protocol.h b/src/dsdv/model/dsdv-routing-protocol.h
index 8b046ebc7..c15f077a9 100644
--- a/src/dsdv/model/dsdv-routing-protocol.h
+++ b/src/dsdv/model/dsdv-routing-protocol.h
@@ -68,7 +68,7 @@ public:
Ptr RouteOutput (Ptr p, const Ipv4Header &header, Ptr oif, Socket::SocketErrno &sockerr);
bool RouteInput (Ptr p, const Ipv4Header &header, Ptr idev, UnicastForwardCallback ucb,
MulticastForwardCallback mcb, LocalDeliverCallback lcb, ErrorCallback ecb);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
virtual void NotifyInterfaceUp (uint32_t interface);
virtual void NotifyInterfaceDown (uint32_t interface);
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
diff --git a/src/internet/helper/ipv4-routing-helper.cc b/src/internet/helper/ipv4-routing-helper.cc
index 90f33fada..c4943b4e2 100644
--- a/src/internet/helper/ipv4-routing-helper.cc
+++ b/src/internet/helper/ipv4-routing-helper.cc
@@ -36,59 +36,59 @@ Ipv4RoutingHelper::~Ipv4RoutingHelper ()
}
void
-Ipv4RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream)
+Ipv4RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream, Time::Unit unit)
{
for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)
{
Ptr node = NodeList::GetNode (i);
- Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, node, stream);
+ Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, node, stream, unit);
}
}
void
-Ipv4RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream)
+Ipv4RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream, Time::Unit unit)
{
for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)
{
Ptr node = NodeList::GetNode (i);
- Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream);
+ Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream, unit);
}
}
void
-Ipv4RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream)
+Ipv4RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream, Time::Unit unit)
{
- Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, node, stream);
+ Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, node, stream, unit);
}
void
-Ipv4RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream)
+Ipv4RoutingHelper::PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit)
{
- Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream);
+ Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream, unit);
}
void
-Ipv4RoutingHelper::Print (Ptr node, Ptr stream)
+Ipv4RoutingHelper::Print (Ptr node, Ptr stream, Time::Unit unit)
{
Ptr ipv4 = node->GetObject ();
if (ipv4)
{
Ptr rp = ipv4->GetRoutingProtocol ();
NS_ASSERT (rp);
- rp->PrintRoutingTable (stream);
+ rp->PrintRoutingTable (stream, unit);
}
}
void
-Ipv4RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream)
+Ipv4RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit)
{
Ptr ipv4 = node->GetObject ();
if (ipv4)
{
Ptr rp = ipv4->GetRoutingProtocol ();
NS_ASSERT (rp);
- rp->PrintRoutingTable (stream);
- Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream);
+ rp->PrintRoutingTable (stream, unit);
+ Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream, unit);
}
}
diff --git a/src/internet/helper/ipv4-routing-helper.h b/src/internet/helper/ipv4-routing-helper.h
index 4bbb5b78b..d5e0776cb 100644
--- a/src/internet/helper/ipv4-routing-helper.h
+++ b/src/internet/helper/ipv4-routing-helper.h
@@ -69,47 +69,51 @@ public:
* \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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv4RoutingProtocol stored in the Ipv4 object, for all nodes at the
* specified time; the output format is routing protocol-specific.
*/
- static void PrintRoutingTableAllAt (Time printTime, Ptr stream);
+ static void PrintRoutingTableAllAt (Time printTime, Ptr stream, Time::Unit unit = Time::S);
/**
* \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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv4RoutingProtocol stored in the Ipv4 object, for all nodes at the
* specified time interval; the output format is routing protocol-specific.
*/
- static void PrintRoutingTableAllEvery (Time printInterval, Ptr stream);
+ static void PrintRoutingTableAllEvery (Time printInterval, Ptr stream, Time::Unit unit = Time::S);
/**
* \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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv4RoutingProtocol stored in the Ipv4 object, for the selected node
* at the specified time; the output format is routing protocol-specific.
*/
- static void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream);
+ static void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream, Time::Unit unit = Time::S);
/**
* \brief prints the routing tables of a node at regular intervals specified by user.
* \param printInterval 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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv4RoutingProtocol stored in the Ipv4 object, for the selected node
* at the specified interval; the output format is routing protocol-specific.
*/
- static void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream);
+ static void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit = Time::S);
/**
* \brief prints the neighbor cache of all nodes at a particular time.
@@ -190,24 +194,26 @@ private:
* \brief prints the routing tables of a node.
* \param node The node ptr for which we need the routing table to be printed
* \param stream The output stream object to use
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv4RoutingProtocol stored in the Ipv4 object;
* the output format is routing protocol-specific.
*/
- static void Print (Ptr node, Ptr stream);
+ static void Print (Ptr node, Ptr stream, Time::Unit unit = Time::S);
/**
* \brief prints the routing tables of a node at regular intervals specified by user.
* \param printInterval 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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv4RoutingProtocol stored in the Ipv4 object, for the selected node
* at the specified interval; the output format is routing protocol-specific.
*/
- static void PrintEvery (Time printInterval, Ptr node, Ptr stream);
+ static void PrintEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit = Time::S);
/**
* \brief prints the neighbor cache of a node.
diff --git a/src/internet/helper/ipv6-routing-helper.cc b/src/internet/helper/ipv6-routing-helper.cc
index 2f980167b..6ae748ea6 100644
--- a/src/internet/helper/ipv6-routing-helper.cc
+++ b/src/internet/helper/ipv6-routing-helper.cc
@@ -36,59 +36,59 @@ Ipv6RoutingHelper::~Ipv6RoutingHelper ()
}
void
-Ipv6RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream)
+Ipv6RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream, Time::Unit unit)
{
for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)
{
Ptr node = NodeList::GetNode (i);
- Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, node, stream);
+ Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, node, stream, unit);
}
}
void
-Ipv6RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream)
+Ipv6RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream, Time::Unit unit)
{
for (uint32_t i = 0; i < NodeList::GetNNodes (); i++)
{
Ptr node = NodeList::GetNode (i);
- Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream);
+ Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream, unit);
}
}
void
-Ipv6RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream)
+Ipv6RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream, Time::Unit unit)
{
- Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, node, stream);
+ Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, node, stream, unit);
}
void
-Ipv6RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream)
+Ipv6RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream, Time::Unit unit)
{
- Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream);
+ Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream, unit);
}
void
-Ipv6RoutingHelper::Print (Ptr node, Ptr stream)
+Ipv6RoutingHelper::Print (Ptr node, Ptr stream, Time::Unit unit)
{
Ptr ipv6 = node->GetObject ();
if (ipv6)
{
Ptr rp = ipv6->GetRoutingProtocol ();
NS_ASSERT (rp);
- rp->PrintRoutingTable (stream);
+ rp->PrintRoutingTable (stream, unit);
}
}
void
-Ipv6RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream)
+Ipv6RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit)
{
Ptr ipv6 = node->GetObject ();
if (ipv6)
{
Ptr rp = ipv6->GetRoutingProtocol ();
NS_ASSERT (rp);
- rp->PrintRoutingTable (stream);
- Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream);
+ rp->PrintRoutingTable (stream, unit);
+ Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream, unit);
}
}
diff --git a/src/internet/helper/ipv6-routing-helper.h b/src/internet/helper/ipv6-routing-helper.h
index 4f4521eb8..6056f983a 100644
--- a/src/internet/helper/ipv6-routing-helper.h
+++ b/src/internet/helper/ipv6-routing-helper.h
@@ -70,47 +70,51 @@ public:
* \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
+ * \param unit The time unit to be used in the report
*
* 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.
*/
- static void PrintRoutingTableAllAt (Time printTime, Ptr stream);;
+ static void PrintRoutingTableAllAt (Time printTime, Ptr stream, Time::Unit unit = Time::S);
/**
* \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
+ * \param unit The time unit to be used in the report
*
* 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.
*/
- static void PrintRoutingTableAllEvery (Time printInterval, Ptr stream);
+ static void PrintRoutingTableAllEvery (Time printInterval, Ptr stream, Time::Unit unit = Time::S);
/**
* \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
+ * \param unit The time unit to be used in the report
*
* 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.
*/
- static void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream);
+ static void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream, Time::Unit unit = Time::S);
/**
* \brief prints the routing tables of a node at regular intervals specified by user.
* \param printInterval 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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node
* at the specified interval; the output format is routing protocol-specific.
*/
- static void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream);
+ static void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit = Time::S);
/**
* \brief prints the neighbor cache of all nodes at a particular time.
@@ -191,24 +195,26 @@ private:
* \brief prints the routing tables of a node.
* \param node The node ptr for which we need the routing table to be printed
* \param stream The output stream object to use
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv6RoutingProtocol stored in the Ipv6 object;
* the output format is routing protocol-specific.
*/
- static void Print (Ptr node, Ptr stream);
+ static void Print (Ptr node, Ptr stream, Time::Unit unit);
/**
* \brief prints the routing tables of a node at regular intervals specified by user.
* \param printInterval 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
+ * \param unit The time unit to be used in the report
*
* This method calls the PrintRoutingTable() method of the
* Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node
* at the specified interval; the output format is routing protocol-specific.
*/
- static void PrintEvery (Time printInterval, Ptr node, Ptr stream);
+ static void PrintEvery (Time printInterval, Ptr node, Ptr stream, Time::Unit unit);
/**
* \brief prints the neighbor cache of a node.
diff --git a/src/internet/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc
index a429d585d..6fd695399 100644
--- a/src/internet/model/ipv4-global-routing.cc
+++ b/src/internet/model/ipv4-global-routing.cc
@@ -398,14 +398,14 @@ Ipv4GlobalRouting::DoDispose (void)
// Formatted like output of "route -n" command
void
-Ipv4GlobalRouting::PrintRoutingTable (Ptr stream) const
+Ipv4GlobalRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this << stream);
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", Ipv4GlobalRouting table" << std::endl;
if (GetNRoutes () > 0)
diff --git a/src/internet/model/ipv4-global-routing.h b/src/internet/model/ipv4-global-routing.h
index e12499689..d58c1b6ef 100644
--- a/src/internet/model/ipv4-global-routing.h
+++ b/src/internet/model/ipv4-global-routing.h
@@ -98,7 +98,7 @@ public:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
/**
* \brief Add a host route to the global routing table.
diff --git a/src/internet/model/ipv4-list-routing.cc b/src/internet/model/ipv4-list-routing.cc
index c851b6f84..7a25906b9 100644
--- a/src/internet/model/ipv4-list-routing.cc
+++ b/src/internet/model/ipv4-list-routing.cc
@@ -70,18 +70,18 @@ Ipv4ListRouting::DoDispose (void)
}
void
-Ipv4ListRouting::PrintRoutingTable (Ptr stream) const
+Ipv4ListRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this << stream);
*stream->GetStream () << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", Ipv4ListRouting table" << std::endl;
for (Ipv4RoutingProtocolList::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);
+ (*i).second->PrintRoutingTable (stream, unit);
}
}
diff --git a/src/internet/model/ipv4-list-routing.h b/src/internet/model/ipv4-list-routing.h
index d6f7ebc36..2a7dc6fa6 100644
--- a/src/internet/model/ipv4-list-routing.h
+++ b/src/internet/model/ipv4-list-routing.h
@@ -22,6 +22,7 @@
#include
#include "ns3/ipv4-routing-protocol.h"
#include "ns3/simulator.h"
+#include "ns3/nstime.h"
namespace ns3 {
@@ -88,7 +89,7 @@ public:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
protected:
virtual void DoDispose (void);
diff --git a/src/internet/model/ipv4-routing-protocol.h b/src/internet/model/ipv4-routing-protocol.h
index 24af15814..bf720754c 100644
--- a/src/internet/model/ipv4-routing-protocol.h
+++ b/src/internet/model/ipv4-routing-protocol.h
@@ -26,6 +26,7 @@
#include "ns3/ipv4-interface-address.h"
#include "ipv4.h"
#include "ns3/output-stream-wrapper.h"
+#include "ns3/nstime.h"
namespace ns3 {
@@ -165,9 +166,11 @@ public:
/**
* \brief Print the Routing Table entries
*
- * \param stream the ostream the Routing table is printed to
+ * \param stream The ostream the Routing table is printed to
+ * \param unit The time unit to be used in the report
*/
- virtual void PrintRoutingTable (Ptr stream) const = 0;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const = 0;
+
};
} // namespace ns3
diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc
index 44d3b1351..2fcb4d236 100644
--- a/src/internet/model/ipv4-static-routing.cc
+++ b/src/internet/model/ipv4-static-routing.cc
@@ -690,14 +690,14 @@ Ipv4StaticRouting::SetIpv4 (Ptr ipv4)
}
// Formatted like output of "route -n" command
void
-Ipv4StaticRouting::PrintRoutingTable (Ptr stream) const
+Ipv4StaticRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this << stream);
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", Ipv4StaticRouting table" << std::endl;
if (GetNRoutes () > 0)
diff --git a/src/internet/model/ipv4-static-routing.h b/src/internet/model/ipv4-static-routing.h
index 64eb5f36d..257b09c29 100644
--- a/src/internet/model/ipv4-static-routing.h
+++ b/src/internet/model/ipv4-static-routing.h
@@ -85,7 +85,7 @@ public:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
/**
* \brief Add a network route to the static routing table.
diff --git a/src/internet/model/ipv6-list-routing.cc b/src/internet/model/ipv6-list-routing.cc
index 3f0835279..ca7489e90 100644
--- a/src/internet/model/ipv6-list-routing.cc
+++ b/src/internet/model/ipv6-list-routing.cc
@@ -210,19 +210,19 @@ void Ipv6ListRouting::NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6A
}
void
-Ipv6ListRouting::PrintRoutingTable (Ptr stream) const
+Ipv6ListRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this);
*stream->GetStream () << "Node: " << m_ipv6->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", 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);
+ (*i).second->PrintRoutingTable (stream, unit);
}
}
diff --git a/src/internet/model/ipv6-list-routing.h b/src/internet/model/ipv6-list-routing.h
index 9d50c6a2d..c60e964fb 100644
--- a/src/internet/model/ipv6-list-routing.h
+++ b/src/internet/model/ipv6-list-routing.h
@@ -98,13 +98,7 @@ public:
virtual void NotifyAddRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());
virtual void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());
virtual void SetIpv6 (Ptr ipv6);
-
- /**
- * \brief Print the Routing Table entries
- *
- * \param stream the ostream the Routing table is printed to
- */
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
protected:
/**
diff --git a/src/internet/model/ipv6-routing-protocol.h b/src/internet/model/ipv6-routing-protocol.h
index c381bf94b..f6dcd58f9 100644
--- a/src/internet/model/ipv6-routing-protocol.h
+++ b/src/internet/model/ipv6-routing-protocol.h
@@ -30,6 +30,7 @@
#include "ipv6-interface-address.h"
#include "ipv6.h"
#include "ns3/output-stream-wrapper.h"
+#include "ns3/nstime.h"
namespace ns3 {
@@ -191,9 +192,11 @@ public:
/**
* \brief Print the Routing Table entries
*
- * \param stream the ostream the Routing table is printed to
+ * \param stream The ostream the Routing table is printed to
+ * \param unit The time unit to be used in the report
*/
- virtual void PrintRoutingTable (Ptr stream) const = 0;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const = 0;
+
};
} // namespace ns3
diff --git a/src/internet/model/ipv6-static-routing.cc b/src/internet/model/ipv6-static-routing.cc
index d7e2c24fe..eae740659 100644
--- a/src/internet/model/ipv6-static-routing.cc
+++ b/src/internet/model/ipv6-static-routing.cc
@@ -79,14 +79,14 @@ void Ipv6StaticRouting::SetIpv6 (Ptr ipv6)
// Formatted like output of "route -n" command
void
-Ipv6StaticRouting::PrintRoutingTable (Ptr stream) const
+Ipv6StaticRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this << stream);
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv6->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", Ipv6StaticRouting table" << std::endl;
if (GetNRoutes () > 0)
diff --git a/src/internet/model/ipv6-static-routing.h b/src/internet/model/ipv6-static-routing.h
index c30d84304..ee49e064d 100644
--- a/src/internet/model/ipv6-static-routing.h
+++ b/src/internet/model/ipv6-static-routing.h
@@ -237,13 +237,7 @@ public:
virtual void NotifyAddRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());
virtual void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());
virtual void SetIpv6 (Ptr ipv6);
-
- /**
- * \brief Print the Routing Table entries
- *
- * \param stream the ostream the Routing table is printed to
- */
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
protected:
/**
diff --git a/src/internet/model/rip.cc b/src/internet/model/rip.cc
index 973d60722..58ca129c8 100644
--- a/src/internet/model/rip.cc
+++ b/src/internet/model/rip.cc
@@ -482,15 +482,15 @@ void Rip::SetIpv4 (Ptr ipv4)
}
}
-void Rip::PrintRoutingTable (Ptr stream) const
+void Rip::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this << stream);
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", IPv4 RIP table" << std::endl;
if (!m_routes.empty ())
diff --git a/src/internet/model/rip.h b/src/internet/model/rip.h
index a220d2c90..c957e6532 100644
--- a/src/internet/model/rip.h
+++ b/src/internet/model/rip.h
@@ -194,7 +194,7 @@ public:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
/**
* Split Horizon strategy type. See \RFC{2453}.
diff --git a/src/internet/model/ripng.cc b/src/internet/model/ripng.cc
index 6b3c7082e..f6335208e 100644
--- a/src/internet/model/ripng.cc
+++ b/src/internet/model/ripng.cc
@@ -466,15 +466,15 @@ void RipNg::SetIpv6 (Ptr ipv6)
}
}
-void RipNg::PrintRoutingTable (Ptr stream) const
+void RipNg::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
NS_LOG_FUNCTION (this << stream);
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv6->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", IPv6 RIPng table" << std::endl;
if (!m_routes.empty ())
diff --git a/src/internet/model/ripng.h b/src/internet/model/ripng.h
index e485c0940..9530451ea 100644
--- a/src/internet/model/ripng.h
+++ b/src/internet/model/ripng.h
@@ -199,7 +199,7 @@ public:
virtual void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop,
uint32_t interface, Ipv6Address prefixToUse = Ipv6Address::GetZero ());
virtual void SetIpv6 (Ptr ipv6);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
/**
* Split Horizon strategy type. See \RFC{2080}.
diff --git a/src/internet/test/ipv4-list-routing-test-suite.cc b/src/internet/test/ipv4-list-routing-test-suite.cc
index beb871d84..a139ed4d4 100644
--- a/src/internet/test/ipv4-list-routing-test-suite.cc
+++ b/src/internet/test/ipv4-list-routing-test-suite.cc
@@ -34,7 +34,7 @@ public:
void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address) {}
void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address) {}
void SetIpv4 (Ptr ipv4) {}
- void PrintRoutingTable (Ptr stream) const {}
+ void PrintRoutingTable (Ptr stream, Time::Unit unit) const {}
};
class Ipv4BRouting : public Ipv4RoutingProtocol {
@@ -48,7 +48,7 @@ public:
void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address) {}
void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address) {}
void SetIpv4 (Ptr ipv4) {}
- void PrintRoutingTable (Ptr stream) const {}
+ void PrintRoutingTable (Ptr stream, Time::Unit unit) const {}
};
class Ipv4ListRoutingNegativeTestCase : public TestCase
diff --git a/src/internet/test/ipv6-list-routing-test-suite.cc b/src/internet/test/ipv6-list-routing-test-suite.cc
index 17db30ba9..cb9a9e68a 100644
--- a/src/internet/test/ipv6-list-routing-test-suite.cc
+++ b/src/internet/test/ipv6-list-routing-test-suite.cc
@@ -38,7 +38,7 @@ public:
GetZero ()) {}
void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse) {}
void SetIpv6 (Ptr ipv6) {}
- virtual void PrintRoutingTable (Ptr stream) const {};
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit) const {};
};
class Ipv6BRouting : public Ipv6RoutingProtocol {
@@ -55,7 +55,7 @@ public:
GetZero ()) {}
void NotifyRemoveRoute (Ipv6Address dst, Ipv6Prefix mask, Ipv6Address nextHop, uint32_t interface, Ipv6Address prefixToUse) {}
void SetIpv6 (Ptr ipv6) {}
- virtual void PrintRoutingTable (Ptr stream) const {};
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit) const {};
};
class Ipv6ListRoutingNegativeTestCase : public TestCase
diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
index 048cf59d2..e51869359 100644
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
@@ -696,7 +696,7 @@ Ipv4NixVectorRouting::RouteInput (Ptr p, const Ipv4Header &header,
}
void
-Ipv4NixVectorRouting::PrintRoutingTable (Ptr stream) const
+Ipv4NixVectorRouting::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
CheckCacheStateAndFlush ();
@@ -704,8 +704,8 @@ Ipv4NixVectorRouting::PrintRoutingTable (Ptr stream) const
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", Nix Routing" << std::endl;
*os << "NixCache:" << std::endl;
diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
index edb85e1fe..c248fe22c 100644
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
@@ -31,6 +31,7 @@
#include "ns3/ipv4-route.h"
#include "ns3/nix-vector.h"
#include "ns3/bridge-net-device.h"
+#include "ns3/nstime.h"
namespace ns3 {
@@ -158,8 +159,8 @@ private:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
-
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
+
/*
* Flushes routing caches if required.
*/
diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc
index 181181a99..3c86e46c7 100644
--- a/src/olsr/model/olsr-routing-protocol.cc
+++ b/src/olsr/model/olsr-routing-protocol.cc
@@ -251,13 +251,13 @@ void RoutingProtocol::DoDispose ()
}
void
-RoutingProtocol::PrintRoutingTable (Ptr stream) const
+RoutingProtocol::PrintRoutingTable (Ptr stream, Time::Unit unit) const
{
std::ostream* os = stream->GetStream ();
*os << "Node: " << m_ipv4->GetObject ()->GetId ()
- << ", Time: " << Now ().As (Time::S)
- << ", Local time: " << GetObject ()->GetLocalTime ().As (Time::S)
+ << ", Time: " << Now ().As (unit)
+ << ", Local time: " << GetObject ()->GetLocalTime ().As (unit)
<< ", OLSR Routing table" << std::endl;
*os << "Destination\t\tNextHop\t\tInterface\tDistance\n";
@@ -283,7 +283,7 @@ RoutingProtocol::PrintRoutingTable (Ptr stream) const
if (m_hnaRoutingTable->GetNRoutes () > 0)
{
*os << " HNA Routing Table: ";
- m_hnaRoutingTable->PrintRoutingTable (stream);
+ m_hnaRoutingTable->PrintRoutingTable (stream, unit);
}
else
{
diff --git a/src/olsr/model/olsr-routing-protocol.h b/src/olsr/model/olsr-routing-protocol.h
index e867cb0d8..0fb21286b 100644
--- a/src/olsr/model/olsr-routing-protocol.h
+++ b/src/olsr/model/olsr-routing-protocol.h
@@ -310,7 +310,7 @@ private:
virtual void NotifyAddAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void NotifyRemoveAddress (uint32_t interface, Ipv4InterfaceAddress address);
virtual void SetIpv4 (Ptr ipv4);
- virtual void PrintRoutingTable (Ptr stream) const;
+ virtual void PrintRoutingTable (Ptr stream, Time::Unit unit = Time::S) const;
void DoDispose ();