--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py Thu Nov 12 10:20:26 2009 +0100
@@ -903,6 +903,11 @@
cls.add_method('Close',
'void',
[])
+ ## pcap-file.h: static bool ns3::PcapFile::Diff(std::string const & f1, std::string const & f2, uint32_t & sec, uint32_t & usec, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT) [member function]
+ cls.add_method('Diff',
+ 'bool',
+ [param('std::string const &', 'f1'), param('std::string const &', 'f2'), param('uint32_t &', 'sec'), param('uint32_t &', 'usec'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT')],
+ is_static=True)
## pcap-file.h: uint32_t ns3::PcapFile::GetDataLinkType() [member function]
cls.add_method('GetDataLinkType',
'uint32_t',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py Thu Nov 12 10:20:26 2009 +0100
@@ -51,6 +51,8 @@
module.add_class('ObjectBase', allow_subclassing=True)
## object-factory.h: ns3::ObjectFactory [class]
module.add_class('ObjectFactory')
+ ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> [class]
+ module.add_class('ObjectRefCount', template_parameters=['ns3::Object', 'ns3::ObjectBase'], parent=root_module['ns3::ObjectBase'])
## random-variable.h: ns3::RandomVariable [class]
module.add_class('RandomVariable')
## ref-count-base.h: ns3::RefCountBase [class]
@@ -144,7 +146,7 @@
## random-variable.h: ns3::NormalVariable [class]
module.add_class('NormalVariable', parent=root_module['ns3::RandomVariable'])
## object.h: ns3::Object [class]
- module.add_class('Object', automatic_type_narrowing=True, parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+ module.add_class('Object', automatic_type_narrowing=True, parent=root_module['ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase >'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## object.h: ns3::Object::AggregateIterator [class]
module.add_class('AggregateIterator', outer_class=root_module['ns3::Object'])
## object-factory.h: ns3::ObjectFactoryChecker [class]
@@ -304,6 +306,7 @@
register_Ns3Names_methods(root_module, root_module['ns3::Names'])
register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
+ register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase >'])
register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase'])
register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream'])
@@ -721,6 +724,43 @@
[param('std::string', 'tid')])
return
+def register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, cls):
+ ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount() [constructor]
+ cls.add_constructor([])
+ ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> const & o) [copy constructor]
+ cls.add_constructor([param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > const &', 'o')])
+ ## object-ref-count.h: int ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::GetReferenceCount() const [member function]
+ cls.add_method('GetReferenceCount',
+ 'int',
+ [],
+ is_const=True)
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Ref() const [member function]
+ cls.add_method('Ref',
+ 'void',
+ [],
+ is_const=True)
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Unref() const [member function]
+ cls.add_method('Unref',
+ 'void',
+ [],
+ is_const=True)
+ ## object-ref-count.h: int * ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::PeekCountPtr() const [member function]
+ cls.add_method('PeekCountPtr',
+ 'int *',
+ [],
+ is_const=True, visibility='protected')
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ShareCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> * other) [member function]
+ cls.add_method('ShareCount',
+ 'void',
+ [param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > *', 'other')],
+ visibility='protected')
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::DoDelete() [member function]
+ cls.add_method('DoDelete',
+ 'void',
+ [],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ return
+
def register_Ns3RandomVariable_methods(root_module, cls):
cls.add_output_stream_operator()
## random-variable.h: ns3::RandomVariable::RandomVariable() [constructor]
@@ -962,10 +1002,25 @@
cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')])
## system-wall-clock-ms.h: ns3::SystemWallClockMs::SystemWallClockMs() [constructor]
cls.add_constructor([])
- ## system-wall-clock-ms.h: long long unsigned int ns3::SystemWallClockMs::End() [member function]
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::End() [member function]
cls.add_method('End',
- 'long long unsigned int',
+ 'int64_t',
[])
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedReal() const [member function]
+ cls.add_method('GetElapsedReal',
+ 'int64_t',
+ [],
+ is_const=True)
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedSystem() const [member function]
+ cls.add_method('GetElapsedSystem',
+ 'int64_t',
+ [],
+ is_const=True)
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedUser() const [member function]
+ cls.add_method('GetElapsedUser',
+ 'int64_t',
+ [],
+ is_const=True)
## system-wall-clock-ms.h: void ns3::SystemWallClockMs::Start() [member function]
cls.add_method('Start',
'void',
@@ -1003,6 +1058,14 @@
cls.add_method('GetBaseDir',
'std::string',
[])
+ ## test.h: void ns3::TestCase::SetTempDir(std::string dir) [member function]
+ cls.add_method('SetTempDir',
+ 'void',
+ [param('std::string', 'dir')])
+ ## test.h: std::string ns3::TestCase::GetTempDir() [member function]
+ cls.add_method('GetTempDir',
+ 'std::string',
+ [])
## test.h: std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
cls.add_method('GetSourceDir',
'std::string',
@@ -1162,6 +1225,14 @@
cls.add_method('GetBaseDir',
'std::string',
[])
+ ## test.h: void ns3::TestSuite::SetTempDir(std::string dir) [member function]
+ cls.add_method('SetTempDir',
+ 'void',
+ [param('std::string', 'dir')])
+ ## test.h: std::string ns3::TestSuite::GetTempDir() [member function]
+ cls.add_method('GetTempDir',
+ 'std::string',
+ [])
## test.h: void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
cls.add_method('SetStream',
'void',
@@ -2046,6 +2117,11 @@
'void',
[],
visibility='protected', is_virtual=True)
+ ## object.h: void ns3::Object::DoDelete() [member function]
+ cls.add_method('DoDelete',
+ 'void',
+ [],
+ visibility='private', is_virtual=True)
return
def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py Thu Nov 12 10:20:26 2009 +0100
@@ -9,6 +9,8 @@
module.add_class('Rectangle')
## rectangle.h: ns3::Rectangle::Side [enumeration]
module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle'])
+ ## waypoint.h: ns3::Waypoint [class]
+ module.add_class('Waypoint')
## position-allocator.h: ns3::PositionAllocator [class]
module.add_class('PositionAllocator', parent=root_module['ns3::Object'])
## position-allocator.h: ns3::RandomDiscPositionAllocator [class]
@@ -19,6 +21,10 @@
module.add_class('RectangleChecker', parent=root_module['ns3::AttributeChecker'])
## rectangle.h: ns3::RectangleValue [class]
module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue'])
+ ## waypoint.h: ns3::WaypointChecker [class]
+ module.add_class('WaypointChecker', parent=root_module['ns3::AttributeChecker'])
+ ## waypoint.h: ns3::WaypointValue [class]
+ module.add_class('WaypointValue', parent=root_module['ns3::AttributeValue'])
## position-allocator.h: ns3::GridPositionAllocator [class]
module.add_class('GridPositionAllocator', parent=root_module['ns3::PositionAllocator'])
## position-allocator.h: ns3::GridPositionAllocator::LayoutType [enumeration]
@@ -35,6 +41,8 @@
module.add_enum('Mode', ['MODE_DISTANCE', 'MODE_TIME'], outer_class=root_module['ns3::RandomWalk2dMobilityModel'])
## random-waypoint-mobility-model.h: ns3::RandomWaypointMobilityModel [class]
module.add_class('RandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
+ ## waypoint-mobility-model.h: ns3::WaypointMobilityModel [class]
+ module.add_class('WaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel [class]
module.add_class('ConstantAccelerationMobilityModel', parent=root_module['ns3::MobilityModel'])
## constant-position-mobility-model.h: ns3::ConstantPositionMobilityModel [class]
@@ -117,17 +125,21 @@
def register_methods(root_module):
register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
register_Ns3Rectangle_methods(root_module, root_module['ns3::Rectangle'])
+ register_Ns3Waypoint_methods(root_module, root_module['ns3::Waypoint'])
register_Ns3PositionAllocator_methods(root_module, root_module['ns3::PositionAllocator'])
register_Ns3RandomDiscPositionAllocator_methods(root_module, root_module['ns3::RandomDiscPositionAllocator'])
register_Ns3RandomRectanglePositionAllocator_methods(root_module, root_module['ns3::RandomRectanglePositionAllocator'])
register_Ns3RectangleChecker_methods(root_module, root_module['ns3::RectangleChecker'])
register_Ns3RectangleValue_methods(root_module, root_module['ns3::RectangleValue'])
+ register_Ns3WaypointChecker_methods(root_module, root_module['ns3::WaypointChecker'])
+ register_Ns3WaypointValue_methods(root_module, root_module['ns3::WaypointValue'])
register_Ns3GridPositionAllocator_methods(root_module, root_module['ns3::GridPositionAllocator'])
register_Ns3ListPositionAllocator_methods(root_module, root_module['ns3::ListPositionAllocator'])
register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
register_Ns3RandomDirection2dMobilityModel_methods(root_module, root_module['ns3::RandomDirection2dMobilityModel'])
register_Ns3RandomWalk2dMobilityModel_methods(root_module, root_module['ns3::RandomWalk2dMobilityModel'])
register_Ns3RandomWaypointMobilityModel_methods(root_module, root_module['ns3::RandomWaypointMobilityModel'])
+ register_Ns3WaypointMobilityModel_methods(root_module, root_module['ns3::WaypointMobilityModel'])
register_Ns3ConstantAccelerationMobilityModel_methods(root_module, root_module['ns3::ConstantAccelerationMobilityModel'])
register_Ns3ConstantPositionMobilityModel_methods(root_module, root_module['ns3::ConstantPositionMobilityModel'])
register_Ns3ConstantVelocityMobilityModel_methods(root_module, root_module['ns3::ConstantVelocityMobilityModel'])
@@ -214,6 +226,20 @@
cls.add_instance_attribute('yMin', 'double', is_const=False)
return
+def register_Ns3Waypoint_methods(root_module, cls):
+ cls.add_output_stream_operator()
+ ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Waypoint const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::Waypoint const &', 'arg0')])
+ ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Time const & waypointTime, ns3::Vector const & waypointPosition) [constructor]
+ cls.add_constructor([param('ns3::Time const &', 'waypointTime'), param('ns3::Vector const &', 'waypointPosition')])
+ ## waypoint.h: ns3::Waypoint::Waypoint() [constructor]
+ cls.add_constructor([])
+ ## waypoint.h: ns3::Waypoint::position [variable]
+ cls.add_instance_attribute('position', 'ns3::Vector', is_const=False)
+ ## waypoint.h: ns3::Waypoint::time [variable]
+ cls.add_instance_attribute('time', 'ns3::Time', is_const=False)
+ return
+
def register_Ns3PositionAllocator_methods(root_module, cls):
## position-allocator.h: ns3::PositionAllocator::PositionAllocator(ns3::PositionAllocator const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PositionAllocator const &', 'arg0')])
@@ -329,6 +355,46 @@
[param('ns3::Rectangle const &', 'value')])
return
+def register_Ns3WaypointChecker_methods(root_module, cls):
+ ## waypoint.h: ns3::WaypointChecker::WaypointChecker() [constructor]
+ cls.add_constructor([])
+ ## waypoint.h: ns3::WaypointChecker::WaypointChecker(ns3::WaypointChecker const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::WaypointChecker const &', 'arg0')])
+ return
+
+def register_Ns3WaypointValue_methods(root_module, cls):
+ ## waypoint.h: ns3::WaypointValue::WaypointValue() [constructor]
+ cls.add_constructor([])
+ ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::WaypointValue const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::WaypointValue const &', 'arg0')])
+ ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::Waypoint const & value) [constructor]
+ cls.add_constructor([param('ns3::Waypoint const &', 'value')])
+ ## waypoint.h: ns3::Ptr<ns3::AttributeValue> ns3::WaypointValue::Copy() const [member function]
+ cls.add_method('Copy',
+ 'ns3::Ptr< ns3::AttributeValue >',
+ [],
+ is_const=True, is_virtual=True)
+ ## waypoint.h: bool ns3::WaypointValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+ cls.add_method('DeserializeFromString',
+ 'bool',
+ [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')],
+ is_virtual=True)
+ ## waypoint.h: ns3::Waypoint ns3::WaypointValue::Get() const [member function]
+ cls.add_method('Get',
+ 'ns3::Waypoint',
+ [],
+ is_const=True)
+ ## waypoint.h: std::string ns3::WaypointValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+ cls.add_method('SerializeToString',
+ 'std::string',
+ [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')],
+ is_const=True, is_virtual=True)
+ ## waypoint.h: void ns3::WaypointValue::Set(ns3::Waypoint const & value) [member function]
+ cls.add_method('Set',
+ 'void',
+ [param('ns3::Waypoint const &', 'value')])
+ return
+
def register_Ns3GridPositionAllocator_methods(root_module, cls):
## position-allocator.h: ns3::GridPositionAllocator::GridPositionAllocator(ns3::GridPositionAllocator const & arg0) [copy constructor]
cls.add_constructor([param('ns3::GridPositionAllocator const &', 'arg0')])
@@ -563,6 +629,56 @@
visibility='private', is_virtual=True)
return
+def register_Ns3WaypointMobilityModel_methods(root_module, cls):
+ ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel(ns3::WaypointMobilityModel const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::WaypointMobilityModel const &', 'arg0')])
+ ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel() [constructor]
+ cls.add_constructor([])
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::AddWaypoint(ns3::Waypoint const & waypoint) [member function]
+ cls.add_method('AddWaypoint',
+ 'void',
+ [param('ns3::Waypoint const &', 'waypoint')])
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::EndMobility() [member function]
+ cls.add_method('EndMobility',
+ 'void',
+ [])
+ ## waypoint-mobility-model.h: ns3::Waypoint ns3::WaypointMobilityModel::GetNextWaypoint() const [member function]
+ cls.add_method('GetNextWaypoint',
+ 'ns3::Waypoint',
+ [],
+ is_const=True)
+ ## waypoint-mobility-model.h: static ns3::TypeId ns3::WaypointMobilityModel::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## waypoint-mobility-model.h: uint32_t ns3::WaypointMobilityModel::WaypointsLeft() const [member function]
+ cls.add_method('WaypointsLeft',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoDispose() [member function]
+ cls.add_method('DoDispose',
+ 'void',
+ [],
+ visibility='private', is_virtual=True)
+ ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetPosition() const [member function]
+ cls.add_method('DoGetPosition',
+ 'ns3::Vector',
+ [],
+ is_const=True, visibility='private', is_virtual=True)
+ ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetVelocity() const [member function]
+ cls.add_method('DoGetVelocity',
+ 'ns3::Vector',
+ [],
+ is_const=True, visibility='private', is_virtual=True)
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
+ cls.add_method('DoSetPosition',
+ 'void',
+ [param('ns3::Vector const &', 'position')],
+ visibility='private', is_virtual=True)
+ return
+
def register_Ns3ConstantAccelerationMobilityModel_methods(root_module, cls):
## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel::ConstantAccelerationMobilityModel(ns3::ConstantAccelerationMobilityModel const & arg0) [copy constructor]
cls.add_constructor([param('ns3::ConstantAccelerationMobilityModel const &', 'arg0')])
@@ -703,6 +819,10 @@
module.add_function('MakeRectangleChecker',
'ns3::Ptr< ns3::AttributeChecker const >',
[])
+ ## waypoint.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeWaypointChecker() [free function]
+ module.add_function('MakeWaypointChecker',
+ 'ns3::Ptr< ns3::AttributeChecker const >',
+ [])
register_functions_ns3_Config(module.get_submodule('Config'), root_module)
register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py Thu Nov 12 10:20:26 2009 +0100
@@ -101,6 +101,10 @@
'ns3::TypeId',
[],
is_const=True, is_virtual=True)
+ ## ppp-header.h: uint16_t ns3::PppHeader::GetProtocol() [member function]
+ cls.add_method('GetProtocol',
+ 'uint16_t',
+ [])
## ppp-header.h: uint32_t ns3::PppHeader::GetSerializedSize() const [member function]
cls.add_method('GetSerializedSize',
'uint32_t',
@@ -121,6 +125,10 @@
'void',
[param('ns3::Buffer::Iterator', 'start')],
is_const=True, is_virtual=True)
+ ## ppp-header.h: void ns3::PppHeader::SetProtocol(uint16_t protocol) [member function]
+ cls.add_method('SetProtocol',
+ 'void',
+ [param('uint16_t', 'protocol')])
return
def register_Ns3PointToPointChannel_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py Thu Nov 12 10:20:26 2009 +0100
@@ -5,18 +5,16 @@
## data-output-interface.h: ns3::DataOutputCallback [class]
module.add_class('DataOutputCallback', allow_subclassing=True)
+ ## data-calculator.h: ns3::StatisticalSummary [class]
+ module.add_class('StatisticalSummary', allow_subclassing=True)
## data-calculator.h: ns3::DataCalculator [class]
module.add_class('DataCalculator', parent=root_module['ns3::Object'])
## data-collector.h: ns3::DataCollector [class]
module.add_class('DataCollector', parent=root_module['ns3::Object'])
## data-output-interface.h: ns3::DataOutputInterface [class]
module.add_class('DataOutputInterface', parent=root_module['ns3::Object'])
- ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int> [class]
- module.add_class('MinMaxAvgTotalCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
## omnet-data-output.h: ns3::OmnetDataOutput [class]
module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface'])
- ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class]
- module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
## sqlite-data-output.h: ns3::SqliteDataOutput [class]
module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface'])
## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class]
@@ -104,12 +102,11 @@
def register_methods(root_module):
register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback'])
+ register_Ns3StatisticalSummary_methods(root_module, root_module['ns3::StatisticalSummary'])
register_Ns3DataCalculator_methods(root_module, root_module['ns3::DataCalculator'])
register_Ns3DataCollector_methods(root_module, root_module['ns3::DataCollector'])
register_Ns3DataOutputInterface_methods(root_module, root_module['ns3::DataOutputInterface'])
- register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput'])
- register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator'])
register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput'])
register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator'])
register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >'])
@@ -146,6 +143,58 @@
'void',
[param('std::string', 'key'), param('std::string', 'variable'), param('ns3::Time', 'val')],
is_pure_virtual=True, is_virtual=True)
+ ## data-output-interface.h: void ns3::DataOutputCallback::OutputStatistic(std::string key, std::string variable, ns3::StatisticalSummary const * statSum) [member function]
+ cls.add_method('OutputStatistic',
+ 'void',
+ [param('std::string', 'key'), param('std::string', 'variable'), param('ns3::StatisticalSummary const *', 'statSum')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
+def register_Ns3StatisticalSummary_methods(root_module, cls):
+ ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary() [constructor]
+ cls.add_constructor([])
+ ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary(ns3::StatisticalSummary const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::StatisticalSummary const &', 'arg0')])
+ ## data-calculator.h: long int ns3::StatisticalSummary::getCount() const [member function]
+ cls.add_method('getCount',
+ 'long int',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getMax() const [member function]
+ cls.add_method('getMax',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getMean() const [member function]
+ cls.add_method('getMean',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getMin() const [member function]
+ cls.add_method('getMin',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getSqrSum() const [member function]
+ cls.add_method('getSqrSum',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getStddev() const [member function]
+ cls.add_method('getStddev',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getSum() const [member function]
+ cls.add_method('getSum',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getVariance() const [member function]
+ cls.add_method('getVariance',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
return
def register_Ns3DataCalculator_methods(root_module, cls):
@@ -161,6 +210,11 @@
cls.add_method('Enable',
'void',
[])
+ ## data-calculator.h: std::string ns3::DataCalculator::GetContext() const [member function]
+ cls.add_method('GetContext',
+ 'std::string',
+ [],
+ is_const=True)
## data-calculator.h: bool ns3::DataCalculator::GetEnabled() const [member function]
cls.add_method('GetEnabled',
'bool',
@@ -176,6 +230,10 @@
'void',
[param('ns3::DataOutputCallback &', 'callback')],
is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: void ns3::DataCalculator::SetContext(std::string const context) [member function]
+ cls.add_method('SetContext',
+ 'void',
+ [param('std::string const', 'context')])
## data-calculator.h: void ns3::DataCalculator::SetKey(std::string const key) [member function]
cls.add_method('SetKey',
'void',
@@ -296,27 +354,6 @@
visibility='protected', is_virtual=True)
return
-def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls):
- ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<unsigned int> const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')])
- ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator() [constructor]
- cls.add_constructor([])
- ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
- cls.add_method('Output',
- 'void',
- [param('ns3::DataOutputCallback &', 'callback')],
- is_const=True, is_virtual=True)
- ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Update(unsigned int const i) [member function]
- cls.add_method('Update',
- 'void',
- [param('unsigned int const', 'i')])
- ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::DoDispose() [member function]
- cls.add_method('DoDispose',
- 'void',
- [],
- visibility='protected', is_virtual=True)
- return
-
def register_Ns3OmnetDataOutput_methods(root_module, cls):
## omnet-data-output.h: ns3::OmnetDataOutput::OmnetDataOutput(ns3::OmnetDataOutput const & arg0) [copy constructor]
cls.add_constructor([param('ns3::OmnetDataOutput const &', 'arg0')])
@@ -334,26 +371,6 @@
visibility='protected', is_virtual=True)
return
-def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls):
- ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator(ns3::PacketSizeMinMaxAvgTotalCalculator const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PacketSizeMinMaxAvgTotalCalculator const &', 'arg0')])
- ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator() [constructor]
- cls.add_constructor([])
- ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
- cls.add_method('FrameUpdate',
- 'void',
- [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
- ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
- cls.add_method('PacketUpdate',
- 'void',
- [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
- ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::DoDispose() [member function]
- cls.add_method('DoDispose',
- 'void',
- [],
- visibility='protected', is_virtual=True)
- return
-
def register_Ns3SqliteDataOutput_methods(root_module, cls):
## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor]
cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')])
@@ -444,6 +461,10 @@
def register_functions(root_module):
module = root_module
+ ## data-calculator.h: bool ns3::isNaN(double x) [free function]
+ module.add_function('isNaN',
+ 'bool',
+ [param('double', 'x')])
register_functions_ns3_Config(module.get_submodule('Config'), root_module)
register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
--- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py Thu Nov 12 10:20:26 2009 +0100
@@ -17,29 +17,29 @@
import ns3_module_test
import ns3_module_mobility
import ns3_module_common
+import ns3_module_contrib
import ns3_module_node
-import ns3_module_contrib
+import ns3_module_tap_bridge
+import ns3_module_v4ping
+import ns3_module_static_routing
+import ns3_module_packet_sink
+import ns3_module_stats
+import ns3_module_onoff
import ns3_module_point_to_point
import ns3_module_internet_stack
-import ns3_module_tap_bridge
import ns3_module_csma
+import ns3_module_list_routing
+import ns3_module_virtual_net_device
import ns3_module_wifi
-import ns3_module_static_routing
-import ns3_module_v4ping
-import ns3_module_virtual_net_device
-import ns3_module_packet_sink
-import ns3_module_global_routing
-import ns3_module_stats
-import ns3_module_list_routing
import ns3_module_emu
import ns3_module_bridge
-import ns3_module_onoff
+import ns3_module_global_routing
import ns3_module_udp_echo
-import ns3_module_ping6
import ns3_module_nix_vector_routing
import ns3_module_olsr
+import ns3_module_radvd
+import ns3_module_ping6
import ns3_module_flow_monitor
-import ns3_module_radvd
import ns3_module_mesh
import ns3_module_helper
import ns3_module_dot11s
@@ -107,6 +107,17 @@
ns3_module_common__local.register_types(module)
root_module.end_section('ns3_module_common')
+ root_module.begin_section('ns3_module_contrib')
+ ns3_module_contrib.register_types(module)
+
+ try:
+ import ns3_module_contrib__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_contrib__local.register_types(module)
+
+ root_module.end_section('ns3_module_contrib')
root_module.begin_section('ns3_module_node')
ns3_module_node.register_types(module)
@@ -118,17 +129,72 @@
ns3_module_node__local.register_types(module)
root_module.end_section('ns3_module_node')
- root_module.begin_section('ns3_module_contrib')
- ns3_module_contrib.register_types(module)
+ root_module.begin_section('ns3_module_tap_bridge')
+ ns3_module_tap_bridge.register_types(module)
try:
- import ns3_module_contrib__local
+ import ns3_module_tap_bridge__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_tap_bridge__local.register_types(module)
+
+ root_module.end_section('ns3_module_tap_bridge')
+ root_module.begin_section('ns3_module_v4ping')
+ ns3_module_v4ping.register_types(module)
+
+ try:
+ import ns3_module_v4ping__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_v4ping__local.register_types(module)
+
+ root_module.end_section('ns3_module_v4ping')
+ root_module.begin_section('ns3_module_static_routing')
+ ns3_module_static_routing.register_types(module)
+
+ try:
+ import ns3_module_static_routing__local
except ImportError:
pass
else:
- ns3_module_contrib__local.register_types(module)
+ ns3_module_static_routing__local.register_types(module)
+
+ root_module.end_section('ns3_module_static_routing')
+ root_module.begin_section('ns3_module_packet_sink')
+ ns3_module_packet_sink.register_types(module)
+
+ try:
+ import ns3_module_packet_sink__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_packet_sink__local.register_types(module)
+
+ root_module.end_section('ns3_module_packet_sink')
+ root_module.begin_section('ns3_module_stats')
+ ns3_module_stats.register_types(module)
- root_module.end_section('ns3_module_contrib')
+ try:
+ import ns3_module_stats__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_stats__local.register_types(module)
+
+ root_module.end_section('ns3_module_stats')
+ root_module.begin_section('ns3_module_onoff')
+ ns3_module_onoff.register_types(module)
+
+ try:
+ import ns3_module_onoff__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_onoff__local.register_types(module)
+
+ root_module.end_section('ns3_module_onoff')
root_module.begin_section('ns3_module_point_to_point')
ns3_module_point_to_point.register_types(module)
@@ -151,17 +217,6 @@
ns3_module_internet_stack__local.register_types(module)
root_module.end_section('ns3_module_internet_stack')
- root_module.begin_section('ns3_module_tap_bridge')
- ns3_module_tap_bridge.register_types(module)
-
- try:
- import ns3_module_tap_bridge__local
- except ImportError:
- pass
- else:
- ns3_module_tap_bridge__local.register_types(module)
-
- root_module.end_section('ns3_module_tap_bridge')
root_module.begin_section('ns3_module_csma')
ns3_module_csma.register_types(module)
@@ -173,6 +228,28 @@
ns3_module_csma__local.register_types(module)
root_module.end_section('ns3_module_csma')
+ root_module.begin_section('ns3_module_list_routing')
+ ns3_module_list_routing.register_types(module)
+
+ try:
+ import ns3_module_list_routing__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_list_routing__local.register_types(module)
+
+ root_module.end_section('ns3_module_list_routing')
+ root_module.begin_section('ns3_module_virtual_net_device')
+ ns3_module_virtual_net_device.register_types(module)
+
+ try:
+ import ns3_module_virtual_net_device__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_virtual_net_device__local.register_types(module)
+
+ root_module.end_section('ns3_module_virtual_net_device')
root_module.begin_section('ns3_module_wifi')
ns3_module_wifi.register_types(module)
@@ -184,83 +261,6 @@
ns3_module_wifi__local.register_types(module)
root_module.end_section('ns3_module_wifi')
- root_module.begin_section('ns3_module_static_routing')
- ns3_module_static_routing.register_types(module)
-
- try:
- import ns3_module_static_routing__local
- except ImportError:
- pass
- else:
- ns3_module_static_routing__local.register_types(module)
-
- root_module.end_section('ns3_module_static_routing')
- root_module.begin_section('ns3_module_v4ping')
- ns3_module_v4ping.register_types(module)
-
- try:
- import ns3_module_v4ping__local
- except ImportError:
- pass
- else:
- ns3_module_v4ping__local.register_types(module)
-
- root_module.end_section('ns3_module_v4ping')
- root_module.begin_section('ns3_module_virtual_net_device')
- ns3_module_virtual_net_device.register_types(module)
-
- try:
- import ns3_module_virtual_net_device__local
- except ImportError:
- pass
- else:
- ns3_module_virtual_net_device__local.register_types(module)
-
- root_module.end_section('ns3_module_virtual_net_device')
- root_module.begin_section('ns3_module_packet_sink')
- ns3_module_packet_sink.register_types(module)
-
- try:
- import ns3_module_packet_sink__local
- except ImportError:
- pass
- else:
- ns3_module_packet_sink__local.register_types(module)
-
- root_module.end_section('ns3_module_packet_sink')
- root_module.begin_section('ns3_module_global_routing')
- ns3_module_global_routing.register_types(module)
-
- try:
- import ns3_module_global_routing__local
- except ImportError:
- pass
- else:
- ns3_module_global_routing__local.register_types(module)
-
- root_module.end_section('ns3_module_global_routing')
- root_module.begin_section('ns3_module_stats')
- ns3_module_stats.register_types(module)
-
- try:
- import ns3_module_stats__local
- except ImportError:
- pass
- else:
- ns3_module_stats__local.register_types(module)
-
- root_module.end_section('ns3_module_stats')
- root_module.begin_section('ns3_module_list_routing')
- ns3_module_list_routing.register_types(module)
-
- try:
- import ns3_module_list_routing__local
- except ImportError:
- pass
- else:
- ns3_module_list_routing__local.register_types(module)
-
- root_module.end_section('ns3_module_list_routing')
root_module.begin_section('ns3_module_emu')
ns3_module_emu.register_types(module)
@@ -283,17 +283,17 @@
ns3_module_bridge__local.register_types(module)
root_module.end_section('ns3_module_bridge')
- root_module.begin_section('ns3_module_onoff')
- ns3_module_onoff.register_types(module)
+ root_module.begin_section('ns3_module_global_routing')
+ ns3_module_global_routing.register_types(module)
try:
- import ns3_module_onoff__local
+ import ns3_module_global_routing__local
except ImportError:
pass
else:
- ns3_module_onoff__local.register_types(module)
+ ns3_module_global_routing__local.register_types(module)
- root_module.end_section('ns3_module_onoff')
+ root_module.end_section('ns3_module_global_routing')
root_module.begin_section('ns3_module_udp_echo')
ns3_module_udp_echo.register_types(module)
@@ -305,17 +305,6 @@
ns3_module_udp_echo__local.register_types(module)
root_module.end_section('ns3_module_udp_echo')
- root_module.begin_section('ns3_module_ping6')
- ns3_module_ping6.register_types(module)
-
- try:
- import ns3_module_ping6__local
- except ImportError:
- pass
- else:
- ns3_module_ping6__local.register_types(module)
-
- root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_nix_vector_routing')
ns3_module_nix_vector_routing.register_types(module)
@@ -338,6 +327,28 @@
ns3_module_olsr__local.register_types(module)
root_module.end_section('ns3_module_olsr')
+ root_module.begin_section('ns3_module_radvd')
+ ns3_module_radvd.register_types(module)
+
+ try:
+ import ns3_module_radvd__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_radvd__local.register_types(module)
+
+ root_module.end_section('ns3_module_radvd')
+ root_module.begin_section('ns3_module_ping6')
+ ns3_module_ping6.register_types(module)
+
+ try:
+ import ns3_module_ping6__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_ping6__local.register_types(module)
+
+ root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_flow_monitor')
ns3_module_flow_monitor.register_types(module)
@@ -349,17 +360,6 @@
ns3_module_flow_monitor__local.register_types(module)
root_module.end_section('ns3_module_flow_monitor')
- root_module.begin_section('ns3_module_radvd')
- ns3_module_radvd.register_types(module)
-
- try:
- import ns3_module_radvd__local
- except ImportError:
- pass
- else:
- ns3_module_radvd__local.register_types(module)
-
- root_module.end_section('ns3_module_radvd')
root_module.begin_section('ns3_module_mesh')
ns3_module_mesh.register_types(module)
@@ -549,6 +549,17 @@
ns3_module_common__local.register_methods(root_module)
root_module.end_section('ns3_module_common')
+ root_module.begin_section('ns3_module_contrib')
+ ns3_module_contrib.register_methods(root_module)
+
+ try:
+ import ns3_module_contrib__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_contrib__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_contrib')
root_module.begin_section('ns3_module_node')
ns3_module_node.register_methods(root_module)
@@ -560,17 +571,72 @@
ns3_module_node__local.register_methods(root_module)
root_module.end_section('ns3_module_node')
- root_module.begin_section('ns3_module_contrib')
- ns3_module_contrib.register_methods(root_module)
+ root_module.begin_section('ns3_module_tap_bridge')
+ ns3_module_tap_bridge.register_methods(root_module)
try:
- import ns3_module_contrib__local
+ import ns3_module_tap_bridge__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_tap_bridge__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_tap_bridge')
+ root_module.begin_section('ns3_module_v4ping')
+ ns3_module_v4ping.register_methods(root_module)
+
+ try:
+ import ns3_module_v4ping__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_v4ping__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_v4ping')
+ root_module.begin_section('ns3_module_static_routing')
+ ns3_module_static_routing.register_methods(root_module)
+
+ try:
+ import ns3_module_static_routing__local
except ImportError:
pass
else:
- ns3_module_contrib__local.register_methods(root_module)
+ ns3_module_static_routing__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_static_routing')
+ root_module.begin_section('ns3_module_packet_sink')
+ ns3_module_packet_sink.register_methods(root_module)
+
+ try:
+ import ns3_module_packet_sink__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_packet_sink__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_packet_sink')
+ root_module.begin_section('ns3_module_stats')
+ ns3_module_stats.register_methods(root_module)
- root_module.end_section('ns3_module_contrib')
+ try:
+ import ns3_module_stats__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_stats__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_stats')
+ root_module.begin_section('ns3_module_onoff')
+ ns3_module_onoff.register_methods(root_module)
+
+ try:
+ import ns3_module_onoff__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_onoff__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_onoff')
root_module.begin_section('ns3_module_point_to_point')
ns3_module_point_to_point.register_methods(root_module)
@@ -593,17 +659,6 @@
ns3_module_internet_stack__local.register_methods(root_module)
root_module.end_section('ns3_module_internet_stack')
- root_module.begin_section('ns3_module_tap_bridge')
- ns3_module_tap_bridge.register_methods(root_module)
-
- try:
- import ns3_module_tap_bridge__local
- except ImportError:
- pass
- else:
- ns3_module_tap_bridge__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_tap_bridge')
root_module.begin_section('ns3_module_csma')
ns3_module_csma.register_methods(root_module)
@@ -615,6 +670,28 @@
ns3_module_csma__local.register_methods(root_module)
root_module.end_section('ns3_module_csma')
+ root_module.begin_section('ns3_module_list_routing')
+ ns3_module_list_routing.register_methods(root_module)
+
+ try:
+ import ns3_module_list_routing__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_list_routing__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_list_routing')
+ root_module.begin_section('ns3_module_virtual_net_device')
+ ns3_module_virtual_net_device.register_methods(root_module)
+
+ try:
+ import ns3_module_virtual_net_device__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_virtual_net_device__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_virtual_net_device')
root_module.begin_section('ns3_module_wifi')
ns3_module_wifi.register_methods(root_module)
@@ -626,83 +703,6 @@
ns3_module_wifi__local.register_methods(root_module)
root_module.end_section('ns3_module_wifi')
- root_module.begin_section('ns3_module_static_routing')
- ns3_module_static_routing.register_methods(root_module)
-
- try:
- import ns3_module_static_routing__local
- except ImportError:
- pass
- else:
- ns3_module_static_routing__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_static_routing')
- root_module.begin_section('ns3_module_v4ping')
- ns3_module_v4ping.register_methods(root_module)
-
- try:
- import ns3_module_v4ping__local
- except ImportError:
- pass
- else:
- ns3_module_v4ping__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_v4ping')
- root_module.begin_section('ns3_module_virtual_net_device')
- ns3_module_virtual_net_device.register_methods(root_module)
-
- try:
- import ns3_module_virtual_net_device__local
- except ImportError:
- pass
- else:
- ns3_module_virtual_net_device__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_virtual_net_device')
- root_module.begin_section('ns3_module_packet_sink')
- ns3_module_packet_sink.register_methods(root_module)
-
- try:
- import ns3_module_packet_sink__local
- except ImportError:
- pass
- else:
- ns3_module_packet_sink__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_packet_sink')
- root_module.begin_section('ns3_module_global_routing')
- ns3_module_global_routing.register_methods(root_module)
-
- try:
- import ns3_module_global_routing__local
- except ImportError:
- pass
- else:
- ns3_module_global_routing__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_global_routing')
- root_module.begin_section('ns3_module_stats')
- ns3_module_stats.register_methods(root_module)
-
- try:
- import ns3_module_stats__local
- except ImportError:
- pass
- else:
- ns3_module_stats__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_stats')
- root_module.begin_section('ns3_module_list_routing')
- ns3_module_list_routing.register_methods(root_module)
-
- try:
- import ns3_module_list_routing__local
- except ImportError:
- pass
- else:
- ns3_module_list_routing__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_list_routing')
root_module.begin_section('ns3_module_emu')
ns3_module_emu.register_methods(root_module)
@@ -725,17 +725,17 @@
ns3_module_bridge__local.register_methods(root_module)
root_module.end_section('ns3_module_bridge')
- root_module.begin_section('ns3_module_onoff')
- ns3_module_onoff.register_methods(root_module)
+ root_module.begin_section('ns3_module_global_routing')
+ ns3_module_global_routing.register_methods(root_module)
try:
- import ns3_module_onoff__local
+ import ns3_module_global_routing__local
except ImportError:
pass
else:
- ns3_module_onoff__local.register_methods(root_module)
+ ns3_module_global_routing__local.register_methods(root_module)
- root_module.end_section('ns3_module_onoff')
+ root_module.end_section('ns3_module_global_routing')
root_module.begin_section('ns3_module_udp_echo')
ns3_module_udp_echo.register_methods(root_module)
@@ -747,17 +747,6 @@
ns3_module_udp_echo__local.register_methods(root_module)
root_module.end_section('ns3_module_udp_echo')
- root_module.begin_section('ns3_module_ping6')
- ns3_module_ping6.register_methods(root_module)
-
- try:
- import ns3_module_ping6__local
- except ImportError:
- pass
- else:
- ns3_module_ping6__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_nix_vector_routing')
ns3_module_nix_vector_routing.register_methods(root_module)
@@ -780,6 +769,28 @@
ns3_module_olsr__local.register_methods(root_module)
root_module.end_section('ns3_module_olsr')
+ root_module.begin_section('ns3_module_radvd')
+ ns3_module_radvd.register_methods(root_module)
+
+ try:
+ import ns3_module_radvd__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_radvd__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_radvd')
+ root_module.begin_section('ns3_module_ping6')
+ ns3_module_ping6.register_methods(root_module)
+
+ try:
+ import ns3_module_ping6__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_ping6__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_flow_monitor')
ns3_module_flow_monitor.register_methods(root_module)
@@ -791,17 +802,6 @@
ns3_module_flow_monitor__local.register_methods(root_module)
root_module.end_section('ns3_module_flow_monitor')
- root_module.begin_section('ns3_module_radvd')
- ns3_module_radvd.register_methods(root_module)
-
- try:
- import ns3_module_radvd__local
- except ImportError:
- pass
- else:
- ns3_module_radvd__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_radvd')
root_module.begin_section('ns3_module_mesh')
ns3_module_mesh.register_methods(root_module)
@@ -1039,6 +1039,17 @@
ns3_module_common__local.register_functions(root_module)
root_module.end_section('ns3_module_common')
+ root_module.begin_section('ns3_module_contrib')
+ ns3_module_contrib.register_functions(root_module)
+
+ try:
+ import ns3_module_contrib__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_contrib__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_contrib')
root_module.begin_section('ns3_module_node')
ns3_module_node.register_functions(root_module)
@@ -1050,17 +1061,72 @@
ns3_module_node__local.register_functions(root_module)
root_module.end_section('ns3_module_node')
- root_module.begin_section('ns3_module_contrib')
- ns3_module_contrib.register_functions(root_module)
+ root_module.begin_section('ns3_module_tap_bridge')
+ ns3_module_tap_bridge.register_functions(root_module)
try:
- import ns3_module_contrib__local
+ import ns3_module_tap_bridge__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_tap_bridge__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_tap_bridge')
+ root_module.begin_section('ns3_module_v4ping')
+ ns3_module_v4ping.register_functions(root_module)
+
+ try:
+ import ns3_module_v4ping__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_v4ping__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_v4ping')
+ root_module.begin_section('ns3_module_static_routing')
+ ns3_module_static_routing.register_functions(root_module)
+
+ try:
+ import ns3_module_static_routing__local
except ImportError:
pass
else:
- ns3_module_contrib__local.register_functions(root_module)
+ ns3_module_static_routing__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_static_routing')
+ root_module.begin_section('ns3_module_packet_sink')
+ ns3_module_packet_sink.register_functions(root_module)
+
+ try:
+ import ns3_module_packet_sink__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_packet_sink__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_packet_sink')
+ root_module.begin_section('ns3_module_stats')
+ ns3_module_stats.register_functions(root_module)
- root_module.end_section('ns3_module_contrib')
+ try:
+ import ns3_module_stats__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_stats__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_stats')
+ root_module.begin_section('ns3_module_onoff')
+ ns3_module_onoff.register_functions(root_module)
+
+ try:
+ import ns3_module_onoff__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_onoff__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_onoff')
root_module.begin_section('ns3_module_point_to_point')
ns3_module_point_to_point.register_functions(root_module)
@@ -1083,17 +1149,6 @@
ns3_module_internet_stack__local.register_functions(root_module)
root_module.end_section('ns3_module_internet_stack')
- root_module.begin_section('ns3_module_tap_bridge')
- ns3_module_tap_bridge.register_functions(root_module)
-
- try:
- import ns3_module_tap_bridge__local
- except ImportError:
- pass
- else:
- ns3_module_tap_bridge__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_tap_bridge')
root_module.begin_section('ns3_module_csma')
ns3_module_csma.register_functions(root_module)
@@ -1105,6 +1160,28 @@
ns3_module_csma__local.register_functions(root_module)
root_module.end_section('ns3_module_csma')
+ root_module.begin_section('ns3_module_list_routing')
+ ns3_module_list_routing.register_functions(root_module)
+
+ try:
+ import ns3_module_list_routing__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_list_routing__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_list_routing')
+ root_module.begin_section('ns3_module_virtual_net_device')
+ ns3_module_virtual_net_device.register_functions(root_module)
+
+ try:
+ import ns3_module_virtual_net_device__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_virtual_net_device__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_virtual_net_device')
root_module.begin_section('ns3_module_wifi')
ns3_module_wifi.register_functions(root_module)
@@ -1116,83 +1193,6 @@
ns3_module_wifi__local.register_functions(root_module)
root_module.end_section('ns3_module_wifi')
- root_module.begin_section('ns3_module_static_routing')
- ns3_module_static_routing.register_functions(root_module)
-
- try:
- import ns3_module_static_routing__local
- except ImportError:
- pass
- else:
- ns3_module_static_routing__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_static_routing')
- root_module.begin_section('ns3_module_v4ping')
- ns3_module_v4ping.register_functions(root_module)
-
- try:
- import ns3_module_v4ping__local
- except ImportError:
- pass
- else:
- ns3_module_v4ping__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_v4ping')
- root_module.begin_section('ns3_module_virtual_net_device')
- ns3_module_virtual_net_device.register_functions(root_module)
-
- try:
- import ns3_module_virtual_net_device__local
- except ImportError:
- pass
- else:
- ns3_module_virtual_net_device__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_virtual_net_device')
- root_module.begin_section('ns3_module_packet_sink')
- ns3_module_packet_sink.register_functions(root_module)
-
- try:
- import ns3_module_packet_sink__local
- except ImportError:
- pass
- else:
- ns3_module_packet_sink__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_packet_sink')
- root_module.begin_section('ns3_module_global_routing')
- ns3_module_global_routing.register_functions(root_module)
-
- try:
- import ns3_module_global_routing__local
- except ImportError:
- pass
- else:
- ns3_module_global_routing__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_global_routing')
- root_module.begin_section('ns3_module_stats')
- ns3_module_stats.register_functions(root_module)
-
- try:
- import ns3_module_stats__local
- except ImportError:
- pass
- else:
- ns3_module_stats__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_stats')
- root_module.begin_section('ns3_module_list_routing')
- ns3_module_list_routing.register_functions(root_module)
-
- try:
- import ns3_module_list_routing__local
- except ImportError:
- pass
- else:
- ns3_module_list_routing__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_list_routing')
root_module.begin_section('ns3_module_emu')
ns3_module_emu.register_functions(root_module)
@@ -1215,17 +1215,17 @@
ns3_module_bridge__local.register_functions(root_module)
root_module.end_section('ns3_module_bridge')
- root_module.begin_section('ns3_module_onoff')
- ns3_module_onoff.register_functions(root_module)
+ root_module.begin_section('ns3_module_global_routing')
+ ns3_module_global_routing.register_functions(root_module)
try:
- import ns3_module_onoff__local
+ import ns3_module_global_routing__local
except ImportError:
pass
else:
- ns3_module_onoff__local.register_functions(root_module)
+ ns3_module_global_routing__local.register_functions(root_module)
- root_module.end_section('ns3_module_onoff')
+ root_module.end_section('ns3_module_global_routing')
root_module.begin_section('ns3_module_udp_echo')
ns3_module_udp_echo.register_functions(root_module)
@@ -1237,17 +1237,6 @@
ns3_module_udp_echo__local.register_functions(root_module)
root_module.end_section('ns3_module_udp_echo')
- root_module.begin_section('ns3_module_ping6')
- ns3_module_ping6.register_functions(root_module)
-
- try:
- import ns3_module_ping6__local
- except ImportError:
- pass
- else:
- ns3_module_ping6__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_nix_vector_routing')
ns3_module_nix_vector_routing.register_functions(root_module)
@@ -1270,6 +1259,28 @@
ns3_module_olsr__local.register_functions(root_module)
root_module.end_section('ns3_module_olsr')
+ root_module.begin_section('ns3_module_radvd')
+ ns3_module_radvd.register_functions(root_module)
+
+ try:
+ import ns3_module_radvd__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_radvd__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_radvd')
+ root_module.begin_section('ns3_module_ping6')
+ ns3_module_ping6.register_functions(root_module)
+
+ try:
+ import ns3_module_ping6__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_ping6__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_flow_monitor')
ns3_module_flow_monitor.register_functions(root_module)
@@ -1281,17 +1292,6 @@
ns3_module_flow_monitor__local.register_functions(root_module)
root_module.end_section('ns3_module_flow_monitor')
- root_module.begin_section('ns3_module_radvd')
- ns3_module_radvd.register_functions(root_module)
-
- try:
- import ns3_module_radvd__local
- except ImportError:
- pass
- else:
- ns3_module_radvd__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_radvd')
root_module.begin_section('ns3_module_mesh')
ns3_module_mesh.register_functions(root_module)
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py Thu Nov 12 10:20:26 2009 +0100
@@ -903,6 +903,11 @@
cls.add_method('Close',
'void',
[])
+ ## pcap-file.h: static bool ns3::PcapFile::Diff(std::string const & f1, std::string const & f2, uint32_t & sec, uint32_t & usec, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT) [member function]
+ cls.add_method('Diff',
+ 'bool',
+ [param('std::string const &', 'f1'), param('std::string const &', 'f2'), param('uint32_t &', 'sec'), param('uint32_t &', 'usec'), param('uint32_t', 'snapLen', default_value='ns3::PcapFile::SNAPLEN_DEFAULT')],
+ is_static=True)
## pcap-file.h: uint32_t ns3::PcapFile::GetDataLinkType() [member function]
cls.add_method('GetDataLinkType',
'uint32_t',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py Thu Nov 12 10:20:26 2009 +0100
@@ -51,6 +51,8 @@
module.add_class('ObjectBase', allow_subclassing=True)
## object-factory.h: ns3::ObjectFactory [class]
module.add_class('ObjectFactory')
+ ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> [class]
+ module.add_class('ObjectRefCount', template_parameters=['ns3::Object', 'ns3::ObjectBase'], parent=root_module['ns3::ObjectBase'])
## random-variable.h: ns3::RandomVariable [class]
module.add_class('RandomVariable')
## ref-count-base.h: ns3::RefCountBase [class]
@@ -144,7 +146,7 @@
## random-variable.h: ns3::NormalVariable [class]
module.add_class('NormalVariable', parent=root_module['ns3::RandomVariable'])
## object.h: ns3::Object [class]
- module.add_class('Object', automatic_type_narrowing=True, parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
+ module.add_class('Object', automatic_type_narrowing=True, parent=root_module['ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase >'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## object.h: ns3::Object::AggregateIterator [class]
module.add_class('AggregateIterator', outer_class=root_module['ns3::Object'])
## object-factory.h: ns3::ObjectFactoryChecker [class]
@@ -304,6 +306,7 @@
register_Ns3Names_methods(root_module, root_module['ns3::Names'])
register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
+ register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase >'])
register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase'])
register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream'])
@@ -721,6 +724,43 @@
[param('std::string', 'tid')])
return
+def register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, cls):
+ ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount() [constructor]
+ cls.add_constructor([])
+ ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> const & o) [copy constructor]
+ cls.add_constructor([param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > const &', 'o')])
+ ## object-ref-count.h: int ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::GetReferenceCount() const [member function]
+ cls.add_method('GetReferenceCount',
+ 'int',
+ [],
+ is_const=True)
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Ref() const [member function]
+ cls.add_method('Ref',
+ 'void',
+ [],
+ is_const=True)
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Unref() const [member function]
+ cls.add_method('Unref',
+ 'void',
+ [],
+ is_const=True)
+ ## object-ref-count.h: int * ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::PeekCountPtr() const [member function]
+ cls.add_method('PeekCountPtr',
+ 'int *',
+ [],
+ is_const=True, visibility='protected')
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ShareCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> * other) [member function]
+ cls.add_method('ShareCount',
+ 'void',
+ [param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > *', 'other')],
+ visibility='protected')
+ ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::DoDelete() [member function]
+ cls.add_method('DoDelete',
+ 'void',
+ [],
+ is_pure_virtual=True, visibility='private', is_virtual=True)
+ return
+
def register_Ns3RandomVariable_methods(root_module, cls):
cls.add_output_stream_operator()
## random-variable.h: ns3::RandomVariable::RandomVariable() [constructor]
@@ -962,10 +1002,25 @@
cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')])
## system-wall-clock-ms.h: ns3::SystemWallClockMs::SystemWallClockMs() [constructor]
cls.add_constructor([])
- ## system-wall-clock-ms.h: long long unsigned int ns3::SystemWallClockMs::End() [member function]
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::End() [member function]
cls.add_method('End',
- 'long long unsigned int',
+ 'int64_t',
[])
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedReal() const [member function]
+ cls.add_method('GetElapsedReal',
+ 'int64_t',
+ [],
+ is_const=True)
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedSystem() const [member function]
+ cls.add_method('GetElapsedSystem',
+ 'int64_t',
+ [],
+ is_const=True)
+ ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedUser() const [member function]
+ cls.add_method('GetElapsedUser',
+ 'int64_t',
+ [],
+ is_const=True)
## system-wall-clock-ms.h: void ns3::SystemWallClockMs::Start() [member function]
cls.add_method('Start',
'void',
@@ -1003,6 +1058,14 @@
cls.add_method('GetBaseDir',
'std::string',
[])
+ ## test.h: void ns3::TestCase::SetTempDir(std::string dir) [member function]
+ cls.add_method('SetTempDir',
+ 'void',
+ [param('std::string', 'dir')])
+ ## test.h: std::string ns3::TestCase::GetTempDir() [member function]
+ cls.add_method('GetTempDir',
+ 'std::string',
+ [])
## test.h: std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
cls.add_method('GetSourceDir',
'std::string',
@@ -1162,6 +1225,14 @@
cls.add_method('GetBaseDir',
'std::string',
[])
+ ## test.h: void ns3::TestSuite::SetTempDir(std::string dir) [member function]
+ cls.add_method('SetTempDir',
+ 'void',
+ [param('std::string', 'dir')])
+ ## test.h: std::string ns3::TestSuite::GetTempDir() [member function]
+ cls.add_method('GetTempDir',
+ 'std::string',
+ [])
## test.h: void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
cls.add_method('SetStream',
'void',
@@ -2046,6 +2117,11 @@
'void',
[],
visibility='protected', is_virtual=True)
+ ## object.h: void ns3::Object::DoDelete() [member function]
+ cls.add_method('DoDelete',
+ 'void',
+ [],
+ visibility='private', is_virtual=True)
return
def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py Thu Nov 12 10:20:26 2009 +0100
@@ -9,6 +9,8 @@
module.add_class('Rectangle')
## rectangle.h: ns3::Rectangle::Side [enumeration]
module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle'])
+ ## waypoint.h: ns3::Waypoint [class]
+ module.add_class('Waypoint')
## position-allocator.h: ns3::PositionAllocator [class]
module.add_class('PositionAllocator', parent=root_module['ns3::Object'])
## position-allocator.h: ns3::RandomDiscPositionAllocator [class]
@@ -19,6 +21,10 @@
module.add_class('RectangleChecker', parent=root_module['ns3::AttributeChecker'])
## rectangle.h: ns3::RectangleValue [class]
module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue'])
+ ## waypoint.h: ns3::WaypointChecker [class]
+ module.add_class('WaypointChecker', parent=root_module['ns3::AttributeChecker'])
+ ## waypoint.h: ns3::WaypointValue [class]
+ module.add_class('WaypointValue', parent=root_module['ns3::AttributeValue'])
## position-allocator.h: ns3::GridPositionAllocator [class]
module.add_class('GridPositionAllocator', parent=root_module['ns3::PositionAllocator'])
## position-allocator.h: ns3::GridPositionAllocator::LayoutType [enumeration]
@@ -35,6 +41,8 @@
module.add_enum('Mode', ['MODE_DISTANCE', 'MODE_TIME'], outer_class=root_module['ns3::RandomWalk2dMobilityModel'])
## random-waypoint-mobility-model.h: ns3::RandomWaypointMobilityModel [class]
module.add_class('RandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
+ ## waypoint-mobility-model.h: ns3::WaypointMobilityModel [class]
+ module.add_class('WaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel [class]
module.add_class('ConstantAccelerationMobilityModel', parent=root_module['ns3::MobilityModel'])
## constant-position-mobility-model.h: ns3::ConstantPositionMobilityModel [class]
@@ -117,17 +125,21 @@
def register_methods(root_module):
register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
register_Ns3Rectangle_methods(root_module, root_module['ns3::Rectangle'])
+ register_Ns3Waypoint_methods(root_module, root_module['ns3::Waypoint'])
register_Ns3PositionAllocator_methods(root_module, root_module['ns3::PositionAllocator'])
register_Ns3RandomDiscPositionAllocator_methods(root_module, root_module['ns3::RandomDiscPositionAllocator'])
register_Ns3RandomRectanglePositionAllocator_methods(root_module, root_module['ns3::RandomRectanglePositionAllocator'])
register_Ns3RectangleChecker_methods(root_module, root_module['ns3::RectangleChecker'])
register_Ns3RectangleValue_methods(root_module, root_module['ns3::RectangleValue'])
+ register_Ns3WaypointChecker_methods(root_module, root_module['ns3::WaypointChecker'])
+ register_Ns3WaypointValue_methods(root_module, root_module['ns3::WaypointValue'])
register_Ns3GridPositionAllocator_methods(root_module, root_module['ns3::GridPositionAllocator'])
register_Ns3ListPositionAllocator_methods(root_module, root_module['ns3::ListPositionAllocator'])
register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
register_Ns3RandomDirection2dMobilityModel_methods(root_module, root_module['ns3::RandomDirection2dMobilityModel'])
register_Ns3RandomWalk2dMobilityModel_methods(root_module, root_module['ns3::RandomWalk2dMobilityModel'])
register_Ns3RandomWaypointMobilityModel_methods(root_module, root_module['ns3::RandomWaypointMobilityModel'])
+ register_Ns3WaypointMobilityModel_methods(root_module, root_module['ns3::WaypointMobilityModel'])
register_Ns3ConstantAccelerationMobilityModel_methods(root_module, root_module['ns3::ConstantAccelerationMobilityModel'])
register_Ns3ConstantPositionMobilityModel_methods(root_module, root_module['ns3::ConstantPositionMobilityModel'])
register_Ns3ConstantVelocityMobilityModel_methods(root_module, root_module['ns3::ConstantVelocityMobilityModel'])
@@ -214,6 +226,20 @@
cls.add_instance_attribute('yMin', 'double', is_const=False)
return
+def register_Ns3Waypoint_methods(root_module, cls):
+ cls.add_output_stream_operator()
+ ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Waypoint const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::Waypoint const &', 'arg0')])
+ ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Time const & waypointTime, ns3::Vector const & waypointPosition) [constructor]
+ cls.add_constructor([param('ns3::Time const &', 'waypointTime'), param('ns3::Vector const &', 'waypointPosition')])
+ ## waypoint.h: ns3::Waypoint::Waypoint() [constructor]
+ cls.add_constructor([])
+ ## waypoint.h: ns3::Waypoint::position [variable]
+ cls.add_instance_attribute('position', 'ns3::Vector', is_const=False)
+ ## waypoint.h: ns3::Waypoint::time [variable]
+ cls.add_instance_attribute('time', 'ns3::Time', is_const=False)
+ return
+
def register_Ns3PositionAllocator_methods(root_module, cls):
## position-allocator.h: ns3::PositionAllocator::PositionAllocator(ns3::PositionAllocator const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PositionAllocator const &', 'arg0')])
@@ -329,6 +355,46 @@
[param('ns3::Rectangle const &', 'value')])
return
+def register_Ns3WaypointChecker_methods(root_module, cls):
+ ## waypoint.h: ns3::WaypointChecker::WaypointChecker() [constructor]
+ cls.add_constructor([])
+ ## waypoint.h: ns3::WaypointChecker::WaypointChecker(ns3::WaypointChecker const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::WaypointChecker const &', 'arg0')])
+ return
+
+def register_Ns3WaypointValue_methods(root_module, cls):
+ ## waypoint.h: ns3::WaypointValue::WaypointValue() [constructor]
+ cls.add_constructor([])
+ ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::WaypointValue const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::WaypointValue const &', 'arg0')])
+ ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::Waypoint const & value) [constructor]
+ cls.add_constructor([param('ns3::Waypoint const &', 'value')])
+ ## waypoint.h: ns3::Ptr<ns3::AttributeValue> ns3::WaypointValue::Copy() const [member function]
+ cls.add_method('Copy',
+ 'ns3::Ptr< ns3::AttributeValue >',
+ [],
+ is_const=True, is_virtual=True)
+ ## waypoint.h: bool ns3::WaypointValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
+ cls.add_method('DeserializeFromString',
+ 'bool',
+ [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')],
+ is_virtual=True)
+ ## waypoint.h: ns3::Waypoint ns3::WaypointValue::Get() const [member function]
+ cls.add_method('Get',
+ 'ns3::Waypoint',
+ [],
+ is_const=True)
+ ## waypoint.h: std::string ns3::WaypointValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
+ cls.add_method('SerializeToString',
+ 'std::string',
+ [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')],
+ is_const=True, is_virtual=True)
+ ## waypoint.h: void ns3::WaypointValue::Set(ns3::Waypoint const & value) [member function]
+ cls.add_method('Set',
+ 'void',
+ [param('ns3::Waypoint const &', 'value')])
+ return
+
def register_Ns3GridPositionAllocator_methods(root_module, cls):
## position-allocator.h: ns3::GridPositionAllocator::GridPositionAllocator(ns3::GridPositionAllocator const & arg0) [copy constructor]
cls.add_constructor([param('ns3::GridPositionAllocator const &', 'arg0')])
@@ -563,6 +629,56 @@
visibility='private', is_virtual=True)
return
+def register_Ns3WaypointMobilityModel_methods(root_module, cls):
+ ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel(ns3::WaypointMobilityModel const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::WaypointMobilityModel const &', 'arg0')])
+ ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel() [constructor]
+ cls.add_constructor([])
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::AddWaypoint(ns3::Waypoint const & waypoint) [member function]
+ cls.add_method('AddWaypoint',
+ 'void',
+ [param('ns3::Waypoint const &', 'waypoint')])
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::EndMobility() [member function]
+ cls.add_method('EndMobility',
+ 'void',
+ [])
+ ## waypoint-mobility-model.h: ns3::Waypoint ns3::WaypointMobilityModel::GetNextWaypoint() const [member function]
+ cls.add_method('GetNextWaypoint',
+ 'ns3::Waypoint',
+ [],
+ is_const=True)
+ ## waypoint-mobility-model.h: static ns3::TypeId ns3::WaypointMobilityModel::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## waypoint-mobility-model.h: uint32_t ns3::WaypointMobilityModel::WaypointsLeft() const [member function]
+ cls.add_method('WaypointsLeft',
+ 'uint32_t',
+ [],
+ is_const=True)
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoDispose() [member function]
+ cls.add_method('DoDispose',
+ 'void',
+ [],
+ visibility='private', is_virtual=True)
+ ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetPosition() const [member function]
+ cls.add_method('DoGetPosition',
+ 'ns3::Vector',
+ [],
+ is_const=True, visibility='private', is_virtual=True)
+ ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetVelocity() const [member function]
+ cls.add_method('DoGetVelocity',
+ 'ns3::Vector',
+ [],
+ is_const=True, visibility='private', is_virtual=True)
+ ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
+ cls.add_method('DoSetPosition',
+ 'void',
+ [param('ns3::Vector const &', 'position')],
+ visibility='private', is_virtual=True)
+ return
+
def register_Ns3ConstantAccelerationMobilityModel_methods(root_module, cls):
## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel::ConstantAccelerationMobilityModel(ns3::ConstantAccelerationMobilityModel const & arg0) [copy constructor]
cls.add_constructor([param('ns3::ConstantAccelerationMobilityModel const &', 'arg0')])
@@ -703,6 +819,10 @@
module.add_function('MakeRectangleChecker',
'ns3::Ptr< ns3::AttributeChecker const >',
[])
+ ## waypoint.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeWaypointChecker() [free function]
+ module.add_function('MakeWaypointChecker',
+ 'ns3::Ptr< ns3::AttributeChecker const >',
+ [])
register_functions_ns3_Config(module.get_submodule('Config'), root_module)
register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py Thu Nov 12 10:20:26 2009 +0100
@@ -101,6 +101,10 @@
'ns3::TypeId',
[],
is_const=True, is_virtual=True)
+ ## ppp-header.h: uint16_t ns3::PppHeader::GetProtocol() [member function]
+ cls.add_method('GetProtocol',
+ 'uint16_t',
+ [])
## ppp-header.h: uint32_t ns3::PppHeader::GetSerializedSize() const [member function]
cls.add_method('GetSerializedSize',
'uint32_t',
@@ -121,6 +125,10 @@
'void',
[param('ns3::Buffer::Iterator', 'start')],
is_const=True, is_virtual=True)
+ ## ppp-header.h: void ns3::PppHeader::SetProtocol(uint16_t protocol) [member function]
+ cls.add_method('SetProtocol',
+ 'void',
+ [param('uint16_t', 'protocol')])
return
def register_Ns3PointToPointChannel_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py Thu Nov 12 10:20:26 2009 +0100
@@ -5,18 +5,16 @@
## data-output-interface.h: ns3::DataOutputCallback [class]
module.add_class('DataOutputCallback', allow_subclassing=True)
+ ## data-calculator.h: ns3::StatisticalSummary [class]
+ module.add_class('StatisticalSummary', allow_subclassing=True)
## data-calculator.h: ns3::DataCalculator [class]
module.add_class('DataCalculator', parent=root_module['ns3::Object'])
## data-collector.h: ns3::DataCollector [class]
module.add_class('DataCollector', parent=root_module['ns3::Object'])
## data-output-interface.h: ns3::DataOutputInterface [class]
module.add_class('DataOutputInterface', parent=root_module['ns3::Object'])
- ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int> [class]
- module.add_class('MinMaxAvgTotalCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
## omnet-data-output.h: ns3::OmnetDataOutput [class]
module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface'])
- ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class]
- module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
## sqlite-data-output.h: ns3::SqliteDataOutput [class]
module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface'])
## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class]
@@ -104,12 +102,11 @@
def register_methods(root_module):
register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback'])
+ register_Ns3StatisticalSummary_methods(root_module, root_module['ns3::StatisticalSummary'])
register_Ns3DataCalculator_methods(root_module, root_module['ns3::DataCalculator'])
register_Ns3DataCollector_methods(root_module, root_module['ns3::DataCollector'])
register_Ns3DataOutputInterface_methods(root_module, root_module['ns3::DataOutputInterface'])
- register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput'])
- register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator'])
register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput'])
register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator'])
register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >'])
@@ -146,6 +143,58 @@
'void',
[param('std::string', 'key'), param('std::string', 'variable'), param('ns3::Time', 'val')],
is_pure_virtual=True, is_virtual=True)
+ ## data-output-interface.h: void ns3::DataOutputCallback::OutputStatistic(std::string key, std::string variable, ns3::StatisticalSummary const * statSum) [member function]
+ cls.add_method('OutputStatistic',
+ 'void',
+ [param('std::string', 'key'), param('std::string', 'variable'), param('ns3::StatisticalSummary const *', 'statSum')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
+def register_Ns3StatisticalSummary_methods(root_module, cls):
+ ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary() [constructor]
+ cls.add_constructor([])
+ ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary(ns3::StatisticalSummary const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::StatisticalSummary const &', 'arg0')])
+ ## data-calculator.h: long int ns3::StatisticalSummary::getCount() const [member function]
+ cls.add_method('getCount',
+ 'long int',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getMax() const [member function]
+ cls.add_method('getMax',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getMean() const [member function]
+ cls.add_method('getMean',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getMin() const [member function]
+ cls.add_method('getMin',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getSqrSum() const [member function]
+ cls.add_method('getSqrSum',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getStddev() const [member function]
+ cls.add_method('getStddev',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getSum() const [member function]
+ cls.add_method('getSum',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: double ns3::StatisticalSummary::getVariance() const [member function]
+ cls.add_method('getVariance',
+ 'double',
+ [],
+ is_pure_virtual=True, is_const=True, is_virtual=True)
return
def register_Ns3DataCalculator_methods(root_module, cls):
@@ -161,6 +210,11 @@
cls.add_method('Enable',
'void',
[])
+ ## data-calculator.h: std::string ns3::DataCalculator::GetContext() const [member function]
+ cls.add_method('GetContext',
+ 'std::string',
+ [],
+ is_const=True)
## data-calculator.h: bool ns3::DataCalculator::GetEnabled() const [member function]
cls.add_method('GetEnabled',
'bool',
@@ -176,6 +230,10 @@
'void',
[param('ns3::DataOutputCallback &', 'callback')],
is_pure_virtual=True, is_const=True, is_virtual=True)
+ ## data-calculator.h: void ns3::DataCalculator::SetContext(std::string const context) [member function]
+ cls.add_method('SetContext',
+ 'void',
+ [param('std::string const', 'context')])
## data-calculator.h: void ns3::DataCalculator::SetKey(std::string const key) [member function]
cls.add_method('SetKey',
'void',
@@ -296,27 +354,6 @@
visibility='protected', is_virtual=True)
return
-def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls):
- ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<unsigned int> const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')])
- ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator() [constructor]
- cls.add_constructor([])
- ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
- cls.add_method('Output',
- 'void',
- [param('ns3::DataOutputCallback &', 'callback')],
- is_const=True, is_virtual=True)
- ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Update(unsigned int const i) [member function]
- cls.add_method('Update',
- 'void',
- [param('unsigned int const', 'i')])
- ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::DoDispose() [member function]
- cls.add_method('DoDispose',
- 'void',
- [],
- visibility='protected', is_virtual=True)
- return
-
def register_Ns3OmnetDataOutput_methods(root_module, cls):
## omnet-data-output.h: ns3::OmnetDataOutput::OmnetDataOutput(ns3::OmnetDataOutput const & arg0) [copy constructor]
cls.add_constructor([param('ns3::OmnetDataOutput const &', 'arg0')])
@@ -334,26 +371,6 @@
visibility='protected', is_virtual=True)
return
-def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls):
- ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator(ns3::PacketSizeMinMaxAvgTotalCalculator const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PacketSizeMinMaxAvgTotalCalculator const &', 'arg0')])
- ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator() [constructor]
- cls.add_constructor([])
- ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
- cls.add_method('FrameUpdate',
- 'void',
- [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
- ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
- cls.add_method('PacketUpdate',
- 'void',
- [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
- ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::DoDispose() [member function]
- cls.add_method('DoDispose',
- 'void',
- [],
- visibility='protected', is_virtual=True)
- return
-
def register_Ns3SqliteDataOutput_methods(root_module, cls):
## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor]
cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')])
@@ -444,6 +461,10 @@
def register_functions(root_module):
module = root_module
+ ## data-calculator.h: bool ns3::isNaN(double x) [free function]
+ module.add_function('isNaN',
+ 'bool',
+ [param('double', 'x')])
register_functions_ns3_Config(module.get_submodule('Config'), root_module)
register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
--- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py Wed Nov 11 16:21:18 2009 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py Thu Nov 12 10:20:26 2009 +0100
@@ -17,29 +17,29 @@
import ns3_module_test
import ns3_module_mobility
import ns3_module_common
+import ns3_module_contrib
import ns3_module_node
-import ns3_module_contrib
+import ns3_module_tap_bridge
+import ns3_module_v4ping
+import ns3_module_static_routing
+import ns3_module_packet_sink
+import ns3_module_stats
+import ns3_module_onoff
import ns3_module_point_to_point
import ns3_module_internet_stack
-import ns3_module_tap_bridge
import ns3_module_csma
+import ns3_module_list_routing
+import ns3_module_virtual_net_device
import ns3_module_wifi
-import ns3_module_static_routing
-import ns3_module_v4ping
-import ns3_module_virtual_net_device
-import ns3_module_packet_sink
-import ns3_module_global_routing
-import ns3_module_stats
-import ns3_module_list_routing
import ns3_module_emu
import ns3_module_bridge
-import ns3_module_onoff
+import ns3_module_global_routing
import ns3_module_udp_echo
-import ns3_module_ping6
import ns3_module_nix_vector_routing
import ns3_module_olsr
+import ns3_module_radvd
+import ns3_module_ping6
import ns3_module_flow_monitor
-import ns3_module_radvd
import ns3_module_mesh
import ns3_module_helper
import ns3_module_dot11s
@@ -107,6 +107,17 @@
ns3_module_common__local.register_types(module)
root_module.end_section('ns3_module_common')
+ root_module.begin_section('ns3_module_contrib')
+ ns3_module_contrib.register_types(module)
+
+ try:
+ import ns3_module_contrib__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_contrib__local.register_types(module)
+
+ root_module.end_section('ns3_module_contrib')
root_module.begin_section('ns3_module_node')
ns3_module_node.register_types(module)
@@ -118,17 +129,72 @@
ns3_module_node__local.register_types(module)
root_module.end_section('ns3_module_node')
- root_module.begin_section('ns3_module_contrib')
- ns3_module_contrib.register_types(module)
+ root_module.begin_section('ns3_module_tap_bridge')
+ ns3_module_tap_bridge.register_types(module)
try:
- import ns3_module_contrib__local
+ import ns3_module_tap_bridge__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_tap_bridge__local.register_types(module)
+
+ root_module.end_section('ns3_module_tap_bridge')
+ root_module.begin_section('ns3_module_v4ping')
+ ns3_module_v4ping.register_types(module)
+
+ try:
+ import ns3_module_v4ping__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_v4ping__local.register_types(module)
+
+ root_module.end_section('ns3_module_v4ping')
+ root_module.begin_section('ns3_module_static_routing')
+ ns3_module_static_routing.register_types(module)
+
+ try:
+ import ns3_module_static_routing__local
except ImportError:
pass
else:
- ns3_module_contrib__local.register_types(module)
+ ns3_module_static_routing__local.register_types(module)
+
+ root_module.end_section('ns3_module_static_routing')
+ root_module.begin_section('ns3_module_packet_sink')
+ ns3_module_packet_sink.register_types(module)
+
+ try:
+ import ns3_module_packet_sink__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_packet_sink__local.register_types(module)
+
+ root_module.end_section('ns3_module_packet_sink')
+ root_module.begin_section('ns3_module_stats')
+ ns3_module_stats.register_types(module)
- root_module.end_section('ns3_module_contrib')
+ try:
+ import ns3_module_stats__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_stats__local.register_types(module)
+
+ root_module.end_section('ns3_module_stats')
+ root_module.begin_section('ns3_module_onoff')
+ ns3_module_onoff.register_types(module)
+
+ try:
+ import ns3_module_onoff__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_onoff__local.register_types(module)
+
+ root_module.end_section('ns3_module_onoff')
root_module.begin_section('ns3_module_point_to_point')
ns3_module_point_to_point.register_types(module)
@@ -151,17 +217,6 @@
ns3_module_internet_stack__local.register_types(module)
root_module.end_section('ns3_module_internet_stack')
- root_module.begin_section('ns3_module_tap_bridge')
- ns3_module_tap_bridge.register_types(module)
-
- try:
- import ns3_module_tap_bridge__local
- except ImportError:
- pass
- else:
- ns3_module_tap_bridge__local.register_types(module)
-
- root_module.end_section('ns3_module_tap_bridge')
root_module.begin_section('ns3_module_csma')
ns3_module_csma.register_types(module)
@@ -173,6 +228,28 @@
ns3_module_csma__local.register_types(module)
root_module.end_section('ns3_module_csma')
+ root_module.begin_section('ns3_module_list_routing')
+ ns3_module_list_routing.register_types(module)
+
+ try:
+ import ns3_module_list_routing__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_list_routing__local.register_types(module)
+
+ root_module.end_section('ns3_module_list_routing')
+ root_module.begin_section('ns3_module_virtual_net_device')
+ ns3_module_virtual_net_device.register_types(module)
+
+ try:
+ import ns3_module_virtual_net_device__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_virtual_net_device__local.register_types(module)
+
+ root_module.end_section('ns3_module_virtual_net_device')
root_module.begin_section('ns3_module_wifi')
ns3_module_wifi.register_types(module)
@@ -184,83 +261,6 @@
ns3_module_wifi__local.register_types(module)
root_module.end_section('ns3_module_wifi')
- root_module.begin_section('ns3_module_static_routing')
- ns3_module_static_routing.register_types(module)
-
- try:
- import ns3_module_static_routing__local
- except ImportError:
- pass
- else:
- ns3_module_static_routing__local.register_types(module)
-
- root_module.end_section('ns3_module_static_routing')
- root_module.begin_section('ns3_module_v4ping')
- ns3_module_v4ping.register_types(module)
-
- try:
- import ns3_module_v4ping__local
- except ImportError:
- pass
- else:
- ns3_module_v4ping__local.register_types(module)
-
- root_module.end_section('ns3_module_v4ping')
- root_module.begin_section('ns3_module_virtual_net_device')
- ns3_module_virtual_net_device.register_types(module)
-
- try:
- import ns3_module_virtual_net_device__local
- except ImportError:
- pass
- else:
- ns3_module_virtual_net_device__local.register_types(module)
-
- root_module.end_section('ns3_module_virtual_net_device')
- root_module.begin_section('ns3_module_packet_sink')
- ns3_module_packet_sink.register_types(module)
-
- try:
- import ns3_module_packet_sink__local
- except ImportError:
- pass
- else:
- ns3_module_packet_sink__local.register_types(module)
-
- root_module.end_section('ns3_module_packet_sink')
- root_module.begin_section('ns3_module_global_routing')
- ns3_module_global_routing.register_types(module)
-
- try:
- import ns3_module_global_routing__local
- except ImportError:
- pass
- else:
- ns3_module_global_routing__local.register_types(module)
-
- root_module.end_section('ns3_module_global_routing')
- root_module.begin_section('ns3_module_stats')
- ns3_module_stats.register_types(module)
-
- try:
- import ns3_module_stats__local
- except ImportError:
- pass
- else:
- ns3_module_stats__local.register_types(module)
-
- root_module.end_section('ns3_module_stats')
- root_module.begin_section('ns3_module_list_routing')
- ns3_module_list_routing.register_types(module)
-
- try:
- import ns3_module_list_routing__local
- except ImportError:
- pass
- else:
- ns3_module_list_routing__local.register_types(module)
-
- root_module.end_section('ns3_module_list_routing')
root_module.begin_section('ns3_module_emu')
ns3_module_emu.register_types(module)
@@ -283,17 +283,17 @@
ns3_module_bridge__local.register_types(module)
root_module.end_section('ns3_module_bridge')
- root_module.begin_section('ns3_module_onoff')
- ns3_module_onoff.register_types(module)
+ root_module.begin_section('ns3_module_global_routing')
+ ns3_module_global_routing.register_types(module)
try:
- import ns3_module_onoff__local
+ import ns3_module_global_routing__local
except ImportError:
pass
else:
- ns3_module_onoff__local.register_types(module)
+ ns3_module_global_routing__local.register_types(module)
- root_module.end_section('ns3_module_onoff')
+ root_module.end_section('ns3_module_global_routing')
root_module.begin_section('ns3_module_udp_echo')
ns3_module_udp_echo.register_types(module)
@@ -305,17 +305,6 @@
ns3_module_udp_echo__local.register_types(module)
root_module.end_section('ns3_module_udp_echo')
- root_module.begin_section('ns3_module_ping6')
- ns3_module_ping6.register_types(module)
-
- try:
- import ns3_module_ping6__local
- except ImportError:
- pass
- else:
- ns3_module_ping6__local.register_types(module)
-
- root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_nix_vector_routing')
ns3_module_nix_vector_routing.register_types(module)
@@ -338,6 +327,28 @@
ns3_module_olsr__local.register_types(module)
root_module.end_section('ns3_module_olsr')
+ root_module.begin_section('ns3_module_radvd')
+ ns3_module_radvd.register_types(module)
+
+ try:
+ import ns3_module_radvd__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_radvd__local.register_types(module)
+
+ root_module.end_section('ns3_module_radvd')
+ root_module.begin_section('ns3_module_ping6')
+ ns3_module_ping6.register_types(module)
+
+ try:
+ import ns3_module_ping6__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_ping6__local.register_types(module)
+
+ root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_flow_monitor')
ns3_module_flow_monitor.register_types(module)
@@ -349,17 +360,6 @@
ns3_module_flow_monitor__local.register_types(module)
root_module.end_section('ns3_module_flow_monitor')
- root_module.begin_section('ns3_module_radvd')
- ns3_module_radvd.register_types(module)
-
- try:
- import ns3_module_radvd__local
- except ImportError:
- pass
- else:
- ns3_module_radvd__local.register_types(module)
-
- root_module.end_section('ns3_module_radvd')
root_module.begin_section('ns3_module_mesh')
ns3_module_mesh.register_types(module)
@@ -549,6 +549,17 @@
ns3_module_common__local.register_methods(root_module)
root_module.end_section('ns3_module_common')
+ root_module.begin_section('ns3_module_contrib')
+ ns3_module_contrib.register_methods(root_module)
+
+ try:
+ import ns3_module_contrib__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_contrib__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_contrib')
root_module.begin_section('ns3_module_node')
ns3_module_node.register_methods(root_module)
@@ -560,17 +571,72 @@
ns3_module_node__local.register_methods(root_module)
root_module.end_section('ns3_module_node')
- root_module.begin_section('ns3_module_contrib')
- ns3_module_contrib.register_methods(root_module)
+ root_module.begin_section('ns3_module_tap_bridge')
+ ns3_module_tap_bridge.register_methods(root_module)
try:
- import ns3_module_contrib__local
+ import ns3_module_tap_bridge__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_tap_bridge__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_tap_bridge')
+ root_module.begin_section('ns3_module_v4ping')
+ ns3_module_v4ping.register_methods(root_module)
+
+ try:
+ import ns3_module_v4ping__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_v4ping__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_v4ping')
+ root_module.begin_section('ns3_module_static_routing')
+ ns3_module_static_routing.register_methods(root_module)
+
+ try:
+ import ns3_module_static_routing__local
except ImportError:
pass
else:
- ns3_module_contrib__local.register_methods(root_module)
+ ns3_module_static_routing__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_static_routing')
+ root_module.begin_section('ns3_module_packet_sink')
+ ns3_module_packet_sink.register_methods(root_module)
+
+ try:
+ import ns3_module_packet_sink__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_packet_sink__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_packet_sink')
+ root_module.begin_section('ns3_module_stats')
+ ns3_module_stats.register_methods(root_module)
- root_module.end_section('ns3_module_contrib')
+ try:
+ import ns3_module_stats__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_stats__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_stats')
+ root_module.begin_section('ns3_module_onoff')
+ ns3_module_onoff.register_methods(root_module)
+
+ try:
+ import ns3_module_onoff__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_onoff__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_onoff')
root_module.begin_section('ns3_module_point_to_point')
ns3_module_point_to_point.register_methods(root_module)
@@ -593,17 +659,6 @@
ns3_module_internet_stack__local.register_methods(root_module)
root_module.end_section('ns3_module_internet_stack')
- root_module.begin_section('ns3_module_tap_bridge')
- ns3_module_tap_bridge.register_methods(root_module)
-
- try:
- import ns3_module_tap_bridge__local
- except ImportError:
- pass
- else:
- ns3_module_tap_bridge__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_tap_bridge')
root_module.begin_section('ns3_module_csma')
ns3_module_csma.register_methods(root_module)
@@ -615,6 +670,28 @@
ns3_module_csma__local.register_methods(root_module)
root_module.end_section('ns3_module_csma')
+ root_module.begin_section('ns3_module_list_routing')
+ ns3_module_list_routing.register_methods(root_module)
+
+ try:
+ import ns3_module_list_routing__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_list_routing__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_list_routing')
+ root_module.begin_section('ns3_module_virtual_net_device')
+ ns3_module_virtual_net_device.register_methods(root_module)
+
+ try:
+ import ns3_module_virtual_net_device__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_virtual_net_device__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_virtual_net_device')
root_module.begin_section('ns3_module_wifi')
ns3_module_wifi.register_methods(root_module)
@@ -626,83 +703,6 @@
ns3_module_wifi__local.register_methods(root_module)
root_module.end_section('ns3_module_wifi')
- root_module.begin_section('ns3_module_static_routing')
- ns3_module_static_routing.register_methods(root_module)
-
- try:
- import ns3_module_static_routing__local
- except ImportError:
- pass
- else:
- ns3_module_static_routing__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_static_routing')
- root_module.begin_section('ns3_module_v4ping')
- ns3_module_v4ping.register_methods(root_module)
-
- try:
- import ns3_module_v4ping__local
- except ImportError:
- pass
- else:
- ns3_module_v4ping__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_v4ping')
- root_module.begin_section('ns3_module_virtual_net_device')
- ns3_module_virtual_net_device.register_methods(root_module)
-
- try:
- import ns3_module_virtual_net_device__local
- except ImportError:
- pass
- else:
- ns3_module_virtual_net_device__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_virtual_net_device')
- root_module.begin_section('ns3_module_packet_sink')
- ns3_module_packet_sink.register_methods(root_module)
-
- try:
- import ns3_module_packet_sink__local
- except ImportError:
- pass
- else:
- ns3_module_packet_sink__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_packet_sink')
- root_module.begin_section('ns3_module_global_routing')
- ns3_module_global_routing.register_methods(root_module)
-
- try:
- import ns3_module_global_routing__local
- except ImportError:
- pass
- else:
- ns3_module_global_routing__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_global_routing')
- root_module.begin_section('ns3_module_stats')
- ns3_module_stats.register_methods(root_module)
-
- try:
- import ns3_module_stats__local
- except ImportError:
- pass
- else:
- ns3_module_stats__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_stats')
- root_module.begin_section('ns3_module_list_routing')
- ns3_module_list_routing.register_methods(root_module)
-
- try:
- import ns3_module_list_routing__local
- except ImportError:
- pass
- else:
- ns3_module_list_routing__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_list_routing')
root_module.begin_section('ns3_module_emu')
ns3_module_emu.register_methods(root_module)
@@ -725,17 +725,17 @@
ns3_module_bridge__local.register_methods(root_module)
root_module.end_section('ns3_module_bridge')
- root_module.begin_section('ns3_module_onoff')
- ns3_module_onoff.register_methods(root_module)
+ root_module.begin_section('ns3_module_global_routing')
+ ns3_module_global_routing.register_methods(root_module)
try:
- import ns3_module_onoff__local
+ import ns3_module_global_routing__local
except ImportError:
pass
else:
- ns3_module_onoff__local.register_methods(root_module)
+ ns3_module_global_routing__local.register_methods(root_module)
- root_module.end_section('ns3_module_onoff')
+ root_module.end_section('ns3_module_global_routing')
root_module.begin_section('ns3_module_udp_echo')
ns3_module_udp_echo.register_methods(root_module)
@@ -747,17 +747,6 @@
ns3_module_udp_echo__local.register_methods(root_module)
root_module.end_section('ns3_module_udp_echo')
- root_module.begin_section('ns3_module_ping6')
- ns3_module_ping6.register_methods(root_module)
-
- try:
- import ns3_module_ping6__local
- except ImportError:
- pass
- else:
- ns3_module_ping6__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_nix_vector_routing')
ns3_module_nix_vector_routing.register_methods(root_module)
@@ -780,6 +769,28 @@
ns3_module_olsr__local.register_methods(root_module)
root_module.end_section('ns3_module_olsr')
+ root_module.begin_section('ns3_module_radvd')
+ ns3_module_radvd.register_methods(root_module)
+
+ try:
+ import ns3_module_radvd__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_radvd__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_radvd')
+ root_module.begin_section('ns3_module_ping6')
+ ns3_module_ping6.register_methods(root_module)
+
+ try:
+ import ns3_module_ping6__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_ping6__local.register_methods(root_module)
+
+ root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_flow_monitor')
ns3_module_flow_monitor.register_methods(root_module)
@@ -791,17 +802,6 @@
ns3_module_flow_monitor__local.register_methods(root_module)
root_module.end_section('ns3_module_flow_monitor')
- root_module.begin_section('ns3_module_radvd')
- ns3_module_radvd.register_methods(root_module)
-
- try:
- import ns3_module_radvd__local
- except ImportError:
- pass
- else:
- ns3_module_radvd__local.register_methods(root_module)
-
- root_module.end_section('ns3_module_radvd')
root_module.begin_section('ns3_module_mesh')
ns3_module_mesh.register_methods(root_module)
@@ -1039,6 +1039,17 @@
ns3_module_common__local.register_functions(root_module)
root_module.end_section('ns3_module_common')
+ root_module.begin_section('ns3_module_contrib')
+ ns3_module_contrib.register_functions(root_module)
+
+ try:
+ import ns3_module_contrib__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_contrib__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_contrib')
root_module.begin_section('ns3_module_node')
ns3_module_node.register_functions(root_module)
@@ -1050,17 +1061,72 @@
ns3_module_node__local.register_functions(root_module)
root_module.end_section('ns3_module_node')
- root_module.begin_section('ns3_module_contrib')
- ns3_module_contrib.register_functions(root_module)
+ root_module.begin_section('ns3_module_tap_bridge')
+ ns3_module_tap_bridge.register_functions(root_module)
try:
- import ns3_module_contrib__local
+ import ns3_module_tap_bridge__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_tap_bridge__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_tap_bridge')
+ root_module.begin_section('ns3_module_v4ping')
+ ns3_module_v4ping.register_functions(root_module)
+
+ try:
+ import ns3_module_v4ping__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_v4ping__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_v4ping')
+ root_module.begin_section('ns3_module_static_routing')
+ ns3_module_static_routing.register_functions(root_module)
+
+ try:
+ import ns3_module_static_routing__local
except ImportError:
pass
else:
- ns3_module_contrib__local.register_functions(root_module)
+ ns3_module_static_routing__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_static_routing')
+ root_module.begin_section('ns3_module_packet_sink')
+ ns3_module_packet_sink.register_functions(root_module)
+
+ try:
+ import ns3_module_packet_sink__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_packet_sink__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_packet_sink')
+ root_module.begin_section('ns3_module_stats')
+ ns3_module_stats.register_functions(root_module)
- root_module.end_section('ns3_module_contrib')
+ try:
+ import ns3_module_stats__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_stats__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_stats')
+ root_module.begin_section('ns3_module_onoff')
+ ns3_module_onoff.register_functions(root_module)
+
+ try:
+ import ns3_module_onoff__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_onoff__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_onoff')
root_module.begin_section('ns3_module_point_to_point')
ns3_module_point_to_point.register_functions(root_module)
@@ -1083,17 +1149,6 @@
ns3_module_internet_stack__local.register_functions(root_module)
root_module.end_section('ns3_module_internet_stack')
- root_module.begin_section('ns3_module_tap_bridge')
- ns3_module_tap_bridge.register_functions(root_module)
-
- try:
- import ns3_module_tap_bridge__local
- except ImportError:
- pass
- else:
- ns3_module_tap_bridge__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_tap_bridge')
root_module.begin_section('ns3_module_csma')
ns3_module_csma.register_functions(root_module)
@@ -1105,6 +1160,28 @@
ns3_module_csma__local.register_functions(root_module)
root_module.end_section('ns3_module_csma')
+ root_module.begin_section('ns3_module_list_routing')
+ ns3_module_list_routing.register_functions(root_module)
+
+ try:
+ import ns3_module_list_routing__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_list_routing__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_list_routing')
+ root_module.begin_section('ns3_module_virtual_net_device')
+ ns3_module_virtual_net_device.register_functions(root_module)
+
+ try:
+ import ns3_module_virtual_net_device__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_virtual_net_device__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_virtual_net_device')
root_module.begin_section('ns3_module_wifi')
ns3_module_wifi.register_functions(root_module)
@@ -1116,83 +1193,6 @@
ns3_module_wifi__local.register_functions(root_module)
root_module.end_section('ns3_module_wifi')
- root_module.begin_section('ns3_module_static_routing')
- ns3_module_static_routing.register_functions(root_module)
-
- try:
- import ns3_module_static_routing__local
- except ImportError:
- pass
- else:
- ns3_module_static_routing__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_static_routing')
- root_module.begin_section('ns3_module_v4ping')
- ns3_module_v4ping.register_functions(root_module)
-
- try:
- import ns3_module_v4ping__local
- except ImportError:
- pass
- else:
- ns3_module_v4ping__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_v4ping')
- root_module.begin_section('ns3_module_virtual_net_device')
- ns3_module_virtual_net_device.register_functions(root_module)
-
- try:
- import ns3_module_virtual_net_device__local
- except ImportError:
- pass
- else:
- ns3_module_virtual_net_device__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_virtual_net_device')
- root_module.begin_section('ns3_module_packet_sink')
- ns3_module_packet_sink.register_functions(root_module)
-
- try:
- import ns3_module_packet_sink__local
- except ImportError:
- pass
- else:
- ns3_module_packet_sink__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_packet_sink')
- root_module.begin_section('ns3_module_global_routing')
- ns3_module_global_routing.register_functions(root_module)
-
- try:
- import ns3_module_global_routing__local
- except ImportError:
- pass
- else:
- ns3_module_global_routing__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_global_routing')
- root_module.begin_section('ns3_module_stats')
- ns3_module_stats.register_functions(root_module)
-
- try:
- import ns3_module_stats__local
- except ImportError:
- pass
- else:
- ns3_module_stats__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_stats')
- root_module.begin_section('ns3_module_list_routing')
- ns3_module_list_routing.register_functions(root_module)
-
- try:
- import ns3_module_list_routing__local
- except ImportError:
- pass
- else:
- ns3_module_list_routing__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_list_routing')
root_module.begin_section('ns3_module_emu')
ns3_module_emu.register_functions(root_module)
@@ -1215,17 +1215,17 @@
ns3_module_bridge__local.register_functions(root_module)
root_module.end_section('ns3_module_bridge')
- root_module.begin_section('ns3_module_onoff')
- ns3_module_onoff.register_functions(root_module)
+ root_module.begin_section('ns3_module_global_routing')
+ ns3_module_global_routing.register_functions(root_module)
try:
- import ns3_module_onoff__local
+ import ns3_module_global_routing__local
except ImportError:
pass
else:
- ns3_module_onoff__local.register_functions(root_module)
+ ns3_module_global_routing__local.register_functions(root_module)
- root_module.end_section('ns3_module_onoff')
+ root_module.end_section('ns3_module_global_routing')
root_module.begin_section('ns3_module_udp_echo')
ns3_module_udp_echo.register_functions(root_module)
@@ -1237,17 +1237,6 @@
ns3_module_udp_echo__local.register_functions(root_module)
root_module.end_section('ns3_module_udp_echo')
- root_module.begin_section('ns3_module_ping6')
- ns3_module_ping6.register_functions(root_module)
-
- try:
- import ns3_module_ping6__local
- except ImportError:
- pass
- else:
- ns3_module_ping6__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_nix_vector_routing')
ns3_module_nix_vector_routing.register_functions(root_module)
@@ -1270,6 +1259,28 @@
ns3_module_olsr__local.register_functions(root_module)
root_module.end_section('ns3_module_olsr')
+ root_module.begin_section('ns3_module_radvd')
+ ns3_module_radvd.register_functions(root_module)
+
+ try:
+ import ns3_module_radvd__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_radvd__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_radvd')
+ root_module.begin_section('ns3_module_ping6')
+ ns3_module_ping6.register_functions(root_module)
+
+ try:
+ import ns3_module_ping6__local
+ except ImportError:
+ pass
+ else:
+ ns3_module_ping6__local.register_functions(root_module)
+
+ root_module.end_section('ns3_module_ping6')
root_module.begin_section('ns3_module_flow_monitor')
ns3_module_flow_monitor.register_functions(root_module)
@@ -1281,17 +1292,6 @@
ns3_module_flow_monitor__local.register_functions(root_module)
root_module.end_section('ns3_module_flow_monitor')
- root_module.begin_section('ns3_module_radvd')
- ns3_module_radvd.register_functions(root_module)
-
- try:
- import ns3_module_radvd__local
- except ImportError:
- pass
- else:
- ns3_module_radvd__local.register_functions(root_module)
-
- root_module.end_section('ns3_module_radvd')
root_module.begin_section('ns3_module_mesh')
ns3_module_mesh.register_functions(root_module)