From cee4e4ac5e5d3c47b48b6b057e5143c6c5b5173b Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sun, 12 Oct 2014 16:03:16 +0200 Subject: [PATCH] Print RT/NC should be static functions --- RELEASE_NOTES | 2 + src/internet/bindings/modulegen__gcc_ILP32.py | 77 +++++++++++-------- src/internet/bindings/modulegen__gcc_LP64.py | 77 +++++++++++-------- src/internet/helper/ipv4-routing-helper.cc | 44 +++++------ src/internet/helper/ipv4-routing-helper.h | 24 +++--- src/internet/helper/ipv6-routing-helper.cc | 44 +++++------ src/internet/helper/ipv6-routing-helper.h | 24 +++--- 7 files changed, 156 insertions(+), 136 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index aeebaba94..e62e447f5 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -23,6 +23,8 @@ New user-visible features ------------------------- - It is now possible to print the Neighbor Cache (ARP and NDISC) by using the RoutingProtocolHelper +- The PrintRoutingTable... and PrintNeighborCache... are now static funtions + i.e., it's not anymore needed to instantiate an helper just to use them. Bugs fixed ---------- diff --git a/src/internet/bindings/modulegen__gcc_ILP32.py b/src/internet/bindings/modulegen__gcc_ILP32.py index 33282fa9f..27572b8fc 100644 --- a/src/internet/bindings/modulegen__gcc_ILP32.py +++ b/src/internet/bindings/modulegen__gcc_ILP32.py @@ -2810,46 +2810,46 @@ def register_Ns3Ipv4RoutingHelper_methods(root_module, cls): 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', [param('ns3::Ptr< ns3::Node >', 'node')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) + is_static=True) return def register_Ns3Ipv4RoutingTableEntry_methods(root_module, cls): @@ -3534,46 +3534,46 @@ def register_Ns3Ipv6RoutingHelper_methods(root_module, cls): 'ns3::Ptr< ns3::Ipv6RoutingProtocol >', [param('ns3::Ptr< ns3::Node >', 'node')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) + is_static=True) return def register_Ns3Ipv6RoutingTableEntry_methods(root_module, cls): @@ -5198,6 +5198,11 @@ def register_Ns3TypeId_methods(root_module, cls): 'uint32_t', [], is_static=True) + ## type-id.h (module 'core'): std::size_t ns3::TypeId::GetSize() const [member function] + cls.add_method('GetSize', + 'std::size_t', + [], + is_const=True) ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation ns3::TypeId::GetTraceSource(uint32_t i) const [member function] cls.add_method('GetTraceSource', 'ns3::TypeId::TraceSourceInformation', @@ -5274,6 +5279,10 @@ def register_Ns3TypeId_methods(root_module, cls): cls.add_method('SetParent', 'ns3::TypeId', [param('ns3::TypeId', 'tid')]) + ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetSize(std::size_t size) [member function] + cls.add_method('SetSize', + 'ns3::TypeId', + [param('std::size_t', 'size')]) ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function] cls.add_method('SetUid', 'void', @@ -5324,7 +5333,6 @@ def register_Ns3Empty_methods(root_module, cls): return def register_Ns3Int64x64_t_methods(root_module, cls): - cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) @@ -5338,6 +5346,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right')) cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor] @@ -10106,7 +10115,6 @@ def register_Ns3TcpWestwood_methods(root_module, cls): return def register_Ns3Time_methods(root_module, cls): - cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right')) cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) @@ -10117,6 +10125,7 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right')) cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## nstime.h (module 'core'): ns3::Time::Time() [constructor] diff --git a/src/internet/bindings/modulegen__gcc_LP64.py b/src/internet/bindings/modulegen__gcc_LP64.py index 33282fa9f..27572b8fc 100644 --- a/src/internet/bindings/modulegen__gcc_LP64.py +++ b/src/internet/bindings/modulegen__gcc_LP64.py @@ -2810,46 +2810,46 @@ def register_Ns3Ipv4RoutingHelper_methods(root_module, cls): 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', [param('ns3::Ptr< ns3::Node >', 'node')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv4-routing-helper.h (module 'internet'): void ns3::Ipv4RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv4-routing-helper.h (module 'internet'): static void ns3::Ipv4RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) + is_static=True) return def register_Ns3Ipv4RoutingTableEntry_methods(root_module, cls): @@ -3534,46 +3534,46 @@ def register_Ns3Ipv6RoutingHelper_methods(root_module, cls): 'ns3::Ptr< ns3::Ipv6RoutingProtocol >', [param('ns3::Ptr< ns3::Node >', 'node')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintNeighborCacheEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintNeighborCacheEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableAllAt(ns3::Time printTime, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableAllEvery(ns3::Time printInterval, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAllEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableAt(ns3::Time printTime, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableAt', 'void', [param('ns3::Time', 'printTime'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) - ## ipv6-routing-helper.h (module 'internet'): void ns3::Ipv6RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) const [member function] + is_static=True) + ## ipv6-routing-helper.h (module 'internet'): static void ns3::Ipv6RoutingHelper::PrintRoutingTableEvery(ns3::Time printInterval, ns3::Ptr node, ns3::Ptr stream) [member function] cls.add_method('PrintRoutingTableEvery', 'void', [param('ns3::Time', 'printInterval'), param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::OutputStreamWrapper >', 'stream')], - is_const=True) + is_static=True) return def register_Ns3Ipv6RoutingTableEntry_methods(root_module, cls): @@ -5198,6 +5198,11 @@ def register_Ns3TypeId_methods(root_module, cls): 'uint32_t', [], is_static=True) + ## type-id.h (module 'core'): std::size_t ns3::TypeId::GetSize() const [member function] + cls.add_method('GetSize', + 'std::size_t', + [], + is_const=True) ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation ns3::TypeId::GetTraceSource(uint32_t i) const [member function] cls.add_method('GetTraceSource', 'ns3::TypeId::TraceSourceInformation', @@ -5274,6 +5279,10 @@ def register_Ns3TypeId_methods(root_module, cls): cls.add_method('SetParent', 'ns3::TypeId', [param('ns3::TypeId', 'tid')]) + ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::SetSize(std::size_t size) [member function] + cls.add_method('SetSize', + 'ns3::TypeId', + [param('std::size_t', 'size')]) ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function] cls.add_method('SetUid', 'void', @@ -5324,7 +5333,6 @@ def register_Ns3Empty_methods(root_module, cls): return def register_Ns3Int64x64_t_methods(root_module, cls): - cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', u'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', u'right')) @@ -5338,6 +5346,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', u'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', u'right')) cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor] @@ -10106,7 +10115,6 @@ def register_Ns3TcpWestwood_methods(root_module, cls): return def register_Ns3Time_methods(root_module, cls): - cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', u'right')) cls.add_binary_numeric_operator('*', root_module['ns3::Time'], root_module['ns3::Time'], param('int64_t const &', u'right')) @@ -10117,6 +10125,7 @@ def register_Ns3Time_methods(root_module, cls): cls.add_binary_comparison_operator('>') cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', u'right')) cls.add_output_stream_operator() + cls.add_binary_comparison_operator('<=') cls.add_binary_comparison_operator('==') cls.add_binary_comparison_operator('>=') ## nstime.h (module 'core'): ns3::Time::Time() [constructor] diff --git a/src/internet/helper/ipv4-routing-helper.cc b/src/internet/helper/ipv4-routing-helper.cc index c253f86ac..9ed5fbd07 100644 --- a/src/internet/helper/ipv4-routing-helper.cc +++ b/src/internet/helper/ipv4-routing-helper.cc @@ -36,39 +36,39 @@ Ipv4RoutingHelper::~Ipv4RoutingHelper () } void -Ipv4RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream) const +Ipv4RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, this, node, stream); + Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, node, stream); } } void -Ipv4RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream) const +Ipv4RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream); } } void -Ipv4RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream) { - Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, this, node, stream); + Simulator::Schedule (printTime, &Ipv4RoutingHelper::Print, node, stream); } void -Ipv4RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream) { - Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream); } void -Ipv4RoutingHelper::Print (Ptr node, Ptr stream) const +Ipv4RoutingHelper::Print (Ptr node, Ptr stream) { Ptr ipv4 = node->GetObject (); Ptr rp = ipv4->GetRoutingProtocol (); @@ -77,49 +77,49 @@ Ipv4RoutingHelper::Print (Ptr node, Ptr stream) const } void -Ipv4RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream) { Ptr ipv4 = node->GetObject (); Ptr rp = ipv4->GetRoutingProtocol (); NS_ASSERT (rp); rp->PrintRoutingTable (stream); - Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintEvery, printInterval, node, stream); } void -Ipv4RoutingHelper::PrintNeighborCacheAllAt (Time printTime, Ptr stream) const +Ipv4RoutingHelper::PrintNeighborCacheAllAt (Time printTime, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printTime, &Ipv4RoutingHelper::PrintArpCache, this, node, stream); + Simulator::Schedule (printTime, &Ipv4RoutingHelper::PrintArpCache, node, stream); } } void -Ipv4RoutingHelper::PrintNeighborCacheAllEvery (Time printInterval, Ptr stream) const +Ipv4RoutingHelper::PrintNeighborCacheAllEvery (Time printInterval, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, printInterval, node, stream); } } void -Ipv4RoutingHelper::PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream) { - Simulator::Schedule (printTime, &Ipv4RoutingHelper::PrintArpCache, this, node, stream); + Simulator::Schedule (printTime, &Ipv4RoutingHelper::PrintArpCache, node, stream); } void -Ipv4RoutingHelper::PrintNeighborCacheEvery (Time printInterval,Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintNeighborCacheEvery (Time printInterval,Ptr node, Ptr stream) { - Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, printInterval, node, stream); } void -Ipv4RoutingHelper::PrintArpCache (Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintArpCache (Ptr node, Ptr stream) { std::ostream* os = stream->GetStream (); @@ -147,7 +147,7 @@ Ipv4RoutingHelper::PrintArpCache (Ptr node, Ptr strea } void -Ipv4RoutingHelper::PrintArpCacheEvery (Time printInterval, Ptr node, Ptr stream) const +Ipv4RoutingHelper::PrintArpCacheEvery (Time printInterval, Ptr node, Ptr stream) { std::ostream* os = stream->GetStream (); @@ -172,7 +172,7 @@ Ipv4RoutingHelper::PrintArpCacheEvery (Time printInterval, Ptr node, PtrPrintArpCache (stream); } } - Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv4RoutingHelper::PrintArpCacheEvery, printInterval, node, stream); } } // namespace ns3 diff --git a/src/internet/helper/ipv4-routing-helper.h b/src/internet/helper/ipv4-routing-helper.h index f7edf680e..52bfc93df 100644 --- a/src/internet/helper/ipv4-routing-helper.h +++ b/src/internet/helper/ipv4-routing-helper.h @@ -72,7 +72,7 @@ public: * Ipv4RoutingProtocol stored in the Ipv4 object, for all nodes at the * specified time; the output format is routing protocol-specific. */ - void PrintRoutingTableAllAt (Time printTime, Ptr stream) const; + static void PrintRoutingTableAllAt (Time printTime, Ptr stream); /** * \brief prints the routing tables of all nodes at regular intervals specified by user. @@ -83,7 +83,7 @@ public: * Ipv4RoutingProtocol stored in the Ipv4 object, for all nodes at the * specified time interval; the output format is routing protocol-specific. */ - void PrintRoutingTableAllEvery (Time printInterval, Ptr stream) const; + static void PrintRoutingTableAllEvery (Time printInterval, Ptr stream); /** * \brief prints the routing tables of a node at a particular time. @@ -95,7 +95,7 @@ public: * Ipv4RoutingProtocol stored in the Ipv4 object, for the selected node * at the specified time; the output format is routing protocol-specific. */ - void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream) const; + static void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream); /** * \brief prints the routing tables of a node at regular intervals specified by user. @@ -107,7 +107,7 @@ public: * Ipv4RoutingProtocol stored in the Ipv4 object, for the selected node * at the specified interval; the output format is routing protocol-specific. */ - void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream); /** * \brief prints the neighbor cache of all nodes at a particular time. @@ -122,7 +122,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheAllAt (Time printTime, Ptr stream) const; + static void PrintNeighborCacheAllAt (Time printTime, Ptr stream); /** * \brief prints the neighbor cache of all nodes at regular intervals specified by user. @@ -137,7 +137,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheAllEvery (Time printInterval, Ptr stream) const; + static void PrintNeighborCacheAllEvery (Time printInterval, Ptr stream); /** * \brief prints the neighbor cache of a node at a particular time. @@ -153,7 +153,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream) const; + static void PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream); /** * \brief prints the neighbor cache of a node at regular intervals specified by user. @@ -169,7 +169,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintNeighborCacheEvery (Time printInterval, Ptr node, Ptr stream); /** * \brief Request a specified routing protocol <T> from Ipv4RoutingProtocol protocol @@ -195,7 +195,7 @@ private: * Ipv4RoutingProtocol stored in the Ipv4 object; * the output format is routing protocol-specific. */ - void Print (Ptr node, Ptr stream) const; + static void Print (Ptr node, Ptr stream); /** * \internal @@ -209,7 +209,7 @@ private: * Ipv4RoutingProtocol stored in the Ipv4 object, for the selected node * at the specified interval; the output format is routing protocol-specific. */ - void PrintEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintEvery (Time printInterval, Ptr node, Ptr stream); /** * \internal @@ -226,7 +226,7 @@ private: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintArpCache (Ptr node, Ptr stream) const; + static void PrintArpCache (Ptr node, Ptr stream); /** * \internal @@ -244,7 +244,7 @@ private: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintArpCacheEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintArpCacheEvery (Time printInterval, Ptr node, Ptr stream); }; diff --git a/src/internet/helper/ipv6-routing-helper.cc b/src/internet/helper/ipv6-routing-helper.cc index 5fd121288..09ca1703f 100644 --- a/src/internet/helper/ipv6-routing-helper.cc +++ b/src/internet/helper/ipv6-routing-helper.cc @@ -36,39 +36,39 @@ Ipv6RoutingHelper::~Ipv6RoutingHelper () } void -Ipv6RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream) const +Ipv6RoutingHelper::PrintRoutingTableAllAt (Time printTime, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, this, node, stream); + Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, node, stream); } } void -Ipv6RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream) const +Ipv6RoutingHelper::PrintRoutingTableAllEvery (Time printInterval, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream); } } void -Ipv6RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream) { - Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, this, node, stream); + Simulator::Schedule (printTime, &Ipv6RoutingHelper::Print, node, stream); } void -Ipv6RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintRoutingTableEvery (Time printInterval,Ptr node, Ptr stream) { - Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream); } void -Ipv6RoutingHelper::Print (Ptr node, Ptr stream) const +Ipv6RoutingHelper::Print (Ptr node, Ptr stream) { Ptr ipv6 = node->GetObject (); Ptr rp = ipv6->GetRoutingProtocol (); @@ -77,49 +77,49 @@ Ipv6RoutingHelper::Print (Ptr node, Ptr stream) const } void -Ipv6RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintEvery (Time printInterval, Ptr node, Ptr stream) { Ptr ipv6 = node->GetObject (); Ptr rp = ipv6->GetRoutingProtocol (); NS_ASSERT (rp); rp->PrintRoutingTable (stream); - Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintEvery, printInterval, node, stream); } void -Ipv6RoutingHelper::PrintNeighborCacheAllAt (Time printTime, Ptr stream) const +Ipv6RoutingHelper::PrintNeighborCacheAllAt (Time printTime, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printTime, &Ipv6RoutingHelper::PrintNdiscCache, this, node, stream); + Simulator::Schedule (printTime, &Ipv6RoutingHelper::PrintNdiscCache, node, stream); } } void -Ipv6RoutingHelper::PrintNeighborCacheAllEvery (Time printInterval, Ptr stream) const +Ipv6RoutingHelper::PrintNeighborCacheAllEvery (Time printInterval, Ptr stream) { for (uint32_t i = 0; i < NodeList::GetNNodes (); i++) { Ptr node = NodeList::GetNode (i); - Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, printInterval, node, stream); } } void -Ipv6RoutingHelper::PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream) { - Simulator::Schedule (printTime, &Ipv6RoutingHelper::PrintNdiscCache, this, node, stream); + Simulator::Schedule (printTime, &Ipv6RoutingHelper::PrintNdiscCache, node, stream); } void -Ipv6RoutingHelper::PrintNeighborCacheEvery (Time printInterval,Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintNeighborCacheEvery (Time printInterval,Ptr node, Ptr stream) { - Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, printInterval, node, stream); } void -Ipv6RoutingHelper::PrintNdiscCache (Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintNdiscCache (Ptr node, Ptr stream) { std::ostream* os = stream->GetStream (); @@ -147,7 +147,7 @@ Ipv6RoutingHelper::PrintNdiscCache (Ptr node, Ptr str } void -Ipv6RoutingHelper::PrintNdiscCacheEvery (Time printInterval, Ptr node, Ptr stream) const +Ipv6RoutingHelper::PrintNdiscCacheEvery (Time printInterval, Ptr node, Ptr stream) { std::ostream* os = stream->GetStream (); @@ -172,7 +172,7 @@ Ipv6RoutingHelper::PrintNdiscCacheEvery (Time printInterval, Ptr node, Ptr ndiscCache->PrintNdiscCache (stream); } } - Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, this, printInterval, node, stream); + Simulator::Schedule (printInterval, &Ipv6RoutingHelper::PrintNdiscCacheEvery, printInterval, node, stream); } } // namespace ns3 diff --git a/src/internet/helper/ipv6-routing-helper.h b/src/internet/helper/ipv6-routing-helper.h index cd4b1a4ce..47ebfe6d4 100644 --- a/src/internet/helper/ipv6-routing-helper.h +++ b/src/internet/helper/ipv6-routing-helper.h @@ -74,7 +74,7 @@ public: * 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 stream) const; + static void PrintRoutingTableAllAt (Time printTime, Ptr stream);; /** * \brief prints the routing tables of all nodes at regular intervals specified by user. @@ -85,7 +85,7 @@ public: * 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 stream) const; + static void PrintRoutingTableAllEvery (Time printInterval, Ptr stream); /** * \brief prints the routing tables of a node at a particular time. @@ -97,7 +97,7 @@ public: * 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, Ptr stream) const; + static void PrintRoutingTableAt (Time printTime, Ptr node, Ptr stream); /** * \brief prints the routing tables of a node at regular intervals specified by user. @@ -109,7 +109,7 @@ public: * Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node * at the specified interval; the output format is routing protocol-specific. */ - void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintRoutingTableEvery (Time printInterval, Ptr node, Ptr stream); /** * \brief prints the neighbor cache of all nodes at a particular time. @@ -124,7 +124,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheAllAt (Time printTime, Ptr stream) const; + static void PrintNeighborCacheAllAt (Time printTime, Ptr stream); /** * \brief prints the neighbor cache of all nodes at regular intervals specified by user. @@ -139,7 +139,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheAllEvery (Time printInterval, Ptr stream) const; + static void PrintNeighborCacheAllEvery (Time printInterval, Ptr stream); /** * \brief prints the neighbor cache of a node at a particular time. @@ -155,7 +155,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream) const; + static void PrintNeighborCacheAt (Time printTime, Ptr node, Ptr stream); /** * \brief prints the neighbor cache of a node at regular intervals specified by user. @@ -171,7 +171,7 @@ public: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNeighborCacheEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintNeighborCacheEvery (Time printInterval, Ptr node, Ptr stream); /** * \brief Request a specified routing protocol <T> from Ipv6RoutingProtocol protocol @@ -197,7 +197,7 @@ private: * Ipv6RoutingProtocol stored in the Ipv6 object; * the output format is routing protocol-specific. */ - void Print (Ptr node, Ptr stream) const; + static void Print (Ptr node, Ptr stream); /** * \internal @@ -211,7 +211,7 @@ private: * Ipv6RoutingProtocol stored in the Ipv6 object, for the selected node * at the specified interval; the output format is routing protocol-specific. */ - void PrintEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintEvery (Time printInterval, Ptr node, Ptr stream); /** * \internal @@ -228,7 +228,7 @@ private: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNdiscCache (Ptr node, Ptr stream) const; + static void PrintNdiscCache (Ptr node, Ptr stream); /** * \internal @@ -246,7 +246,7 @@ private: \endverbatim * Note that the MAC address is printed as "type"-"size"-"actual address" */ - void PrintNdiscCacheEvery (Time printInterval, Ptr node, Ptr stream) const; + static void PrintNdiscCacheEvery (Time printInterval, Ptr node, Ptr stream); }; /**