Rescan python bindings
authorFaker Moatamri <faker.moatamri@sophia.inria.fr>
Thu Nov 12 10:20:26 2009 +0100 (2 months ago)
changeset 55042cc780c07f5e
parent 5503 c305c6e122c9
child 5506 8a51fa38a4ee
Rescan python bindings
bindings/python/apidefs/gcc-ILP32/ns3_module_common.py
bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py
bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py
bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py
bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py
bindings/python/apidefs/gcc-LP64/ns3_module_common.py
bindings/python/apidefs/gcc-LP64/ns3_module_core.py
bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py
bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py
bindings/python/apidefs/gcc-LP64/ns3_module_stats.py
bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py
     1.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py	Wed Nov 11 16:21:18 2009 +0100
     1.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py	Thu Nov 12 10:20:26 2009 +0100
     1.3 @@ -903,6 +903,11 @@
     1.4      cls.add_method('Close', 
     1.5                     'void', 
     1.6                     [])
     1.7 +    ## 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]
     1.8 +    cls.add_method('Diff', 
     1.9 +                   'bool', 
    1.10 +                   [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')], 
    1.11 +                   is_static=True)
    1.12      ## pcap-file.h: uint32_t ns3::PcapFile::GetDataLinkType() [member function]
    1.13      cls.add_method('GetDataLinkType', 
    1.14                     'uint32_t', 
     2.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Wed Nov 11 16:21:18 2009 +0100
     2.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Thu Nov 12 10:20:26 2009 +0100
     2.3 @@ -51,6 +51,8 @@
     2.4      module.add_class('ObjectBase', allow_subclassing=True)
     2.5      ## object-factory.h: ns3::ObjectFactory [class]
     2.6      module.add_class('ObjectFactory')
     2.7 +    ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> [class]
     2.8 +    module.add_class('ObjectRefCount', template_parameters=['ns3::Object', 'ns3::ObjectBase'], parent=root_module['ns3::ObjectBase'])
     2.9      ## random-variable.h: ns3::RandomVariable [class]
    2.10      module.add_class('RandomVariable')
    2.11      ## ref-count-base.h: ns3::RefCountBase [class]
    2.12 @@ -144,7 +146,7 @@
    2.13      ## random-variable.h: ns3::NormalVariable [class]
    2.14      module.add_class('NormalVariable', parent=root_module['ns3::RandomVariable'])
    2.15      ## object.h: ns3::Object [class]
    2.16 -    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'))
    2.17 +    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'))
    2.18      ## object.h: ns3::Object::AggregateIterator [class]
    2.19      module.add_class('AggregateIterator', outer_class=root_module['ns3::Object'])
    2.20      ## object-factory.h: ns3::ObjectFactoryChecker [class]
    2.21 @@ -304,6 +306,7 @@
    2.22      register_Ns3Names_methods(root_module, root_module['ns3::Names'])
    2.23      register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
    2.24      register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
    2.25 +    register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase >'])
    2.26      register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
    2.27      register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase'])
    2.28      register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream'])
    2.29 @@ -721,6 +724,43 @@
    2.30                     [param('std::string', 'tid')])
    2.31      return
    2.32  
    2.33 +def register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, cls):
    2.34 +    ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount() [constructor]
    2.35 +    cls.add_constructor([])
    2.36 +    ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> const & o) [copy constructor]
    2.37 +    cls.add_constructor([param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > const &', 'o')])
    2.38 +    ## object-ref-count.h: int ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::GetReferenceCount() const [member function]
    2.39 +    cls.add_method('GetReferenceCount', 
    2.40 +                   'int', 
    2.41 +                   [], 
    2.42 +                   is_const=True)
    2.43 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Ref() const [member function]
    2.44 +    cls.add_method('Ref', 
    2.45 +                   'void', 
    2.46 +                   [], 
    2.47 +                   is_const=True)
    2.48 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Unref() const [member function]
    2.49 +    cls.add_method('Unref', 
    2.50 +                   'void', 
    2.51 +                   [], 
    2.52 +                   is_const=True)
    2.53 +    ## object-ref-count.h: int * ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::PeekCountPtr() const [member function]
    2.54 +    cls.add_method('PeekCountPtr', 
    2.55 +                   'int *', 
    2.56 +                   [], 
    2.57 +                   is_const=True, visibility='protected')
    2.58 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ShareCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> * other) [member function]
    2.59 +    cls.add_method('ShareCount', 
    2.60 +                   'void', 
    2.61 +                   [param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > *', 'other')], 
    2.62 +                   visibility='protected')
    2.63 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::DoDelete() [member function]
    2.64 +    cls.add_method('DoDelete', 
    2.65 +                   'void', 
    2.66 +                   [], 
    2.67 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
    2.68 +    return
    2.69 +
    2.70  def register_Ns3RandomVariable_methods(root_module, cls):
    2.71      cls.add_output_stream_operator()
    2.72      ## random-variable.h: ns3::RandomVariable::RandomVariable() [constructor]
    2.73 @@ -962,10 +1002,25 @@
    2.74      cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')])
    2.75      ## system-wall-clock-ms.h: ns3::SystemWallClockMs::SystemWallClockMs() [constructor]
    2.76      cls.add_constructor([])
    2.77 -    ## system-wall-clock-ms.h: long long unsigned int ns3::SystemWallClockMs::End() [member function]
    2.78 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::End() [member function]
    2.79      cls.add_method('End', 
    2.80 -                   'long long unsigned int', 
    2.81 +                   'int64_t', 
    2.82                     [])
    2.83 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedReal() const [member function]
    2.84 +    cls.add_method('GetElapsedReal', 
    2.85 +                   'int64_t', 
    2.86 +                   [], 
    2.87 +                   is_const=True)
    2.88 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedSystem() const [member function]
    2.89 +    cls.add_method('GetElapsedSystem', 
    2.90 +                   'int64_t', 
    2.91 +                   [], 
    2.92 +                   is_const=True)
    2.93 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedUser() const [member function]
    2.94 +    cls.add_method('GetElapsedUser', 
    2.95 +                   'int64_t', 
    2.96 +                   [], 
    2.97 +                   is_const=True)
    2.98      ## system-wall-clock-ms.h: void ns3::SystemWallClockMs::Start() [member function]
    2.99      cls.add_method('Start', 
   2.100                     'void', 
   2.101 @@ -1003,6 +1058,14 @@
   2.102      cls.add_method('GetBaseDir', 
   2.103                     'std::string', 
   2.104                     [])
   2.105 +    ## test.h: void ns3::TestCase::SetTempDir(std::string dir) [member function]
   2.106 +    cls.add_method('SetTempDir', 
   2.107 +                   'void', 
   2.108 +                   [param('std::string', 'dir')])
   2.109 +    ## test.h: std::string ns3::TestCase::GetTempDir() [member function]
   2.110 +    cls.add_method('GetTempDir', 
   2.111 +                   'std::string', 
   2.112 +                   [])
   2.113      ## test.h: std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
   2.114      cls.add_method('GetSourceDir', 
   2.115                     'std::string', 
   2.116 @@ -1162,6 +1225,14 @@
   2.117      cls.add_method('GetBaseDir', 
   2.118                     'std::string', 
   2.119                     [])
   2.120 +    ## test.h: void ns3::TestSuite::SetTempDir(std::string dir) [member function]
   2.121 +    cls.add_method('SetTempDir', 
   2.122 +                   'void', 
   2.123 +                   [param('std::string', 'dir')])
   2.124 +    ## test.h: std::string ns3::TestSuite::GetTempDir() [member function]
   2.125 +    cls.add_method('GetTempDir', 
   2.126 +                   'std::string', 
   2.127 +                   [])
   2.128      ## test.h: void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
   2.129      cls.add_method('SetStream', 
   2.130                     'void', 
   2.131 @@ -2046,6 +2117,11 @@
   2.132                     'void', 
   2.133                     [], 
   2.134                     visibility='protected', is_virtual=True)
   2.135 +    ## object.h: void ns3::Object::DoDelete() [member function]
   2.136 +    cls.add_method('DoDelete', 
   2.137 +                   'void', 
   2.138 +                   [], 
   2.139 +                   visibility='private', is_virtual=True)
   2.140      return
   2.141  
   2.142  def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
     3.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py	Wed Nov 11 16:21:18 2009 +0100
     3.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_mobility.py	Thu Nov 12 10:20:26 2009 +0100
     3.3 @@ -9,6 +9,8 @@
     3.4      module.add_class('Rectangle')
     3.5      ## rectangle.h: ns3::Rectangle::Side [enumeration]
     3.6      module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle'])
     3.7 +    ## waypoint.h: ns3::Waypoint [class]
     3.8 +    module.add_class('Waypoint')
     3.9      ## position-allocator.h: ns3::PositionAllocator [class]
    3.10      module.add_class('PositionAllocator', parent=root_module['ns3::Object'])
    3.11      ## position-allocator.h: ns3::RandomDiscPositionAllocator [class]
    3.12 @@ -19,6 +21,10 @@
    3.13      module.add_class('RectangleChecker', parent=root_module['ns3::AttributeChecker'])
    3.14      ## rectangle.h: ns3::RectangleValue [class]
    3.15      module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue'])
    3.16 +    ## waypoint.h: ns3::WaypointChecker [class]
    3.17 +    module.add_class('WaypointChecker', parent=root_module['ns3::AttributeChecker'])
    3.18 +    ## waypoint.h: ns3::WaypointValue [class]
    3.19 +    module.add_class('WaypointValue', parent=root_module['ns3::AttributeValue'])
    3.20      ## position-allocator.h: ns3::GridPositionAllocator [class]
    3.21      module.add_class('GridPositionAllocator', parent=root_module['ns3::PositionAllocator'])
    3.22      ## position-allocator.h: ns3::GridPositionAllocator::LayoutType [enumeration]
    3.23 @@ -35,6 +41,8 @@
    3.24      module.add_enum('Mode', ['MODE_DISTANCE', 'MODE_TIME'], outer_class=root_module['ns3::RandomWalk2dMobilityModel'])
    3.25      ## random-waypoint-mobility-model.h: ns3::RandomWaypointMobilityModel [class]
    3.26      module.add_class('RandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
    3.27 +    ## waypoint-mobility-model.h: ns3::WaypointMobilityModel [class]
    3.28 +    module.add_class('WaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
    3.29      ## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel [class]
    3.30      module.add_class('ConstantAccelerationMobilityModel', parent=root_module['ns3::MobilityModel'])
    3.31      ## constant-position-mobility-model.h: ns3::ConstantPositionMobilityModel [class]
    3.32 @@ -117,17 +125,21 @@
    3.33  def register_methods(root_module):
    3.34      register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
    3.35      register_Ns3Rectangle_methods(root_module, root_module['ns3::Rectangle'])
    3.36 +    register_Ns3Waypoint_methods(root_module, root_module['ns3::Waypoint'])
    3.37      register_Ns3PositionAllocator_methods(root_module, root_module['ns3::PositionAllocator'])
    3.38      register_Ns3RandomDiscPositionAllocator_methods(root_module, root_module['ns3::RandomDiscPositionAllocator'])
    3.39      register_Ns3RandomRectanglePositionAllocator_methods(root_module, root_module['ns3::RandomRectanglePositionAllocator'])
    3.40      register_Ns3RectangleChecker_methods(root_module, root_module['ns3::RectangleChecker'])
    3.41      register_Ns3RectangleValue_methods(root_module, root_module['ns3::RectangleValue'])
    3.42 +    register_Ns3WaypointChecker_methods(root_module, root_module['ns3::WaypointChecker'])
    3.43 +    register_Ns3WaypointValue_methods(root_module, root_module['ns3::WaypointValue'])
    3.44      register_Ns3GridPositionAllocator_methods(root_module, root_module['ns3::GridPositionAllocator'])
    3.45      register_Ns3ListPositionAllocator_methods(root_module, root_module['ns3::ListPositionAllocator'])
    3.46      register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
    3.47      register_Ns3RandomDirection2dMobilityModel_methods(root_module, root_module['ns3::RandomDirection2dMobilityModel'])
    3.48      register_Ns3RandomWalk2dMobilityModel_methods(root_module, root_module['ns3::RandomWalk2dMobilityModel'])
    3.49      register_Ns3RandomWaypointMobilityModel_methods(root_module, root_module['ns3::RandomWaypointMobilityModel'])
    3.50 +    register_Ns3WaypointMobilityModel_methods(root_module, root_module['ns3::WaypointMobilityModel'])
    3.51      register_Ns3ConstantAccelerationMobilityModel_methods(root_module, root_module['ns3::ConstantAccelerationMobilityModel'])
    3.52      register_Ns3ConstantPositionMobilityModel_methods(root_module, root_module['ns3::ConstantPositionMobilityModel'])
    3.53      register_Ns3ConstantVelocityMobilityModel_methods(root_module, root_module['ns3::ConstantVelocityMobilityModel'])
    3.54 @@ -214,6 +226,20 @@
    3.55      cls.add_instance_attribute('yMin', 'double', is_const=False)
    3.56      return
    3.57  
    3.58 +def register_Ns3Waypoint_methods(root_module, cls):
    3.59 +    cls.add_output_stream_operator()
    3.60 +    ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Waypoint const & arg0) [copy constructor]
    3.61 +    cls.add_constructor([param('ns3::Waypoint const &', 'arg0')])
    3.62 +    ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Time const & waypointTime, ns3::Vector const & waypointPosition) [constructor]
    3.63 +    cls.add_constructor([param('ns3::Time const &', 'waypointTime'), param('ns3::Vector const &', 'waypointPosition')])
    3.64 +    ## waypoint.h: ns3::Waypoint::Waypoint() [constructor]
    3.65 +    cls.add_constructor([])
    3.66 +    ## waypoint.h: ns3::Waypoint::position [variable]
    3.67 +    cls.add_instance_attribute('position', 'ns3::Vector', is_const=False)
    3.68 +    ## waypoint.h: ns3::Waypoint::time [variable]
    3.69 +    cls.add_instance_attribute('time', 'ns3::Time', is_const=False)
    3.70 +    return
    3.71 +
    3.72  def register_Ns3PositionAllocator_methods(root_module, cls):
    3.73      ## position-allocator.h: ns3::PositionAllocator::PositionAllocator(ns3::PositionAllocator const & arg0) [copy constructor]
    3.74      cls.add_constructor([param('ns3::PositionAllocator const &', 'arg0')])
    3.75 @@ -329,6 +355,46 @@
    3.76                     [param('ns3::Rectangle const &', 'value')])
    3.77      return
    3.78  
    3.79 +def register_Ns3WaypointChecker_methods(root_module, cls):
    3.80 +    ## waypoint.h: ns3::WaypointChecker::WaypointChecker() [constructor]
    3.81 +    cls.add_constructor([])
    3.82 +    ## waypoint.h: ns3::WaypointChecker::WaypointChecker(ns3::WaypointChecker const & arg0) [copy constructor]
    3.83 +    cls.add_constructor([param('ns3::WaypointChecker const &', 'arg0')])
    3.84 +    return
    3.85 +
    3.86 +def register_Ns3WaypointValue_methods(root_module, cls):
    3.87 +    ## waypoint.h: ns3::WaypointValue::WaypointValue() [constructor]
    3.88 +    cls.add_constructor([])
    3.89 +    ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::WaypointValue const & arg0) [copy constructor]
    3.90 +    cls.add_constructor([param('ns3::WaypointValue const &', 'arg0')])
    3.91 +    ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::Waypoint const & value) [constructor]
    3.92 +    cls.add_constructor([param('ns3::Waypoint const &', 'value')])
    3.93 +    ## waypoint.h: ns3::Ptr<ns3::AttributeValue> ns3::WaypointValue::Copy() const [member function]
    3.94 +    cls.add_method('Copy', 
    3.95 +                   'ns3::Ptr< ns3::AttributeValue >', 
    3.96 +                   [], 
    3.97 +                   is_const=True, is_virtual=True)
    3.98 +    ## waypoint.h: bool ns3::WaypointValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
    3.99 +    cls.add_method('DeserializeFromString', 
   3.100 +                   'bool', 
   3.101 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   3.102 +                   is_virtual=True)
   3.103 +    ## waypoint.h: ns3::Waypoint ns3::WaypointValue::Get() const [member function]
   3.104 +    cls.add_method('Get', 
   3.105 +                   'ns3::Waypoint', 
   3.106 +                   [], 
   3.107 +                   is_const=True)
   3.108 +    ## waypoint.h: std::string ns3::WaypointValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
   3.109 +    cls.add_method('SerializeToString', 
   3.110 +                   'std::string', 
   3.111 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   3.112 +                   is_const=True, is_virtual=True)
   3.113 +    ## waypoint.h: void ns3::WaypointValue::Set(ns3::Waypoint const & value) [member function]
   3.114 +    cls.add_method('Set', 
   3.115 +                   'void', 
   3.116 +                   [param('ns3::Waypoint const &', 'value')])
   3.117 +    return
   3.118 +
   3.119  def register_Ns3GridPositionAllocator_methods(root_module, cls):
   3.120      ## position-allocator.h: ns3::GridPositionAllocator::GridPositionAllocator(ns3::GridPositionAllocator const & arg0) [copy constructor]
   3.121      cls.add_constructor([param('ns3::GridPositionAllocator const &', 'arg0')])
   3.122 @@ -563,6 +629,56 @@
   3.123                     visibility='private', is_virtual=True)
   3.124      return
   3.125  
   3.126 +def register_Ns3WaypointMobilityModel_methods(root_module, cls):
   3.127 +    ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel(ns3::WaypointMobilityModel const & arg0) [copy constructor]
   3.128 +    cls.add_constructor([param('ns3::WaypointMobilityModel const &', 'arg0')])
   3.129 +    ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel() [constructor]
   3.130 +    cls.add_constructor([])
   3.131 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::AddWaypoint(ns3::Waypoint const & waypoint) [member function]
   3.132 +    cls.add_method('AddWaypoint', 
   3.133 +                   'void', 
   3.134 +                   [param('ns3::Waypoint const &', 'waypoint')])
   3.135 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::EndMobility() [member function]
   3.136 +    cls.add_method('EndMobility', 
   3.137 +                   'void', 
   3.138 +                   [])
   3.139 +    ## waypoint-mobility-model.h: ns3::Waypoint ns3::WaypointMobilityModel::GetNextWaypoint() const [member function]
   3.140 +    cls.add_method('GetNextWaypoint', 
   3.141 +                   'ns3::Waypoint', 
   3.142 +                   [], 
   3.143 +                   is_const=True)
   3.144 +    ## waypoint-mobility-model.h: static ns3::TypeId ns3::WaypointMobilityModel::GetTypeId() [member function]
   3.145 +    cls.add_method('GetTypeId', 
   3.146 +                   'ns3::TypeId', 
   3.147 +                   [], 
   3.148 +                   is_static=True)
   3.149 +    ## waypoint-mobility-model.h: uint32_t ns3::WaypointMobilityModel::WaypointsLeft() const [member function]
   3.150 +    cls.add_method('WaypointsLeft', 
   3.151 +                   'uint32_t', 
   3.152 +                   [], 
   3.153 +                   is_const=True)
   3.154 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoDispose() [member function]
   3.155 +    cls.add_method('DoDispose', 
   3.156 +                   'void', 
   3.157 +                   [], 
   3.158 +                   visibility='private', is_virtual=True)
   3.159 +    ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetPosition() const [member function]
   3.160 +    cls.add_method('DoGetPosition', 
   3.161 +                   'ns3::Vector', 
   3.162 +                   [], 
   3.163 +                   is_const=True, visibility='private', is_virtual=True)
   3.164 +    ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetVelocity() const [member function]
   3.165 +    cls.add_method('DoGetVelocity', 
   3.166 +                   'ns3::Vector', 
   3.167 +                   [], 
   3.168 +                   is_const=True, visibility='private', is_virtual=True)
   3.169 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   3.170 +    cls.add_method('DoSetPosition', 
   3.171 +                   'void', 
   3.172 +                   [param('ns3::Vector const &', 'position')], 
   3.173 +                   visibility='private', is_virtual=True)
   3.174 +    return
   3.175 +
   3.176  def register_Ns3ConstantAccelerationMobilityModel_methods(root_module, cls):
   3.177      ## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel::ConstantAccelerationMobilityModel(ns3::ConstantAccelerationMobilityModel const & arg0) [copy constructor]
   3.178      cls.add_constructor([param('ns3::ConstantAccelerationMobilityModel const &', 'arg0')])
   3.179 @@ -703,6 +819,10 @@
   3.180      module.add_function('MakeRectangleChecker', 
   3.181                          'ns3::Ptr< ns3::AttributeChecker const >', 
   3.182                          [])
   3.183 +    ## waypoint.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeWaypointChecker() [free function]
   3.184 +    module.add_function('MakeWaypointChecker', 
   3.185 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
   3.186 +                        [])
   3.187      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   3.188      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   3.189      register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
     4.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py	Wed Nov 11 16:21:18 2009 +0100
     4.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py	Thu Nov 12 10:20:26 2009 +0100
     4.3 @@ -101,6 +101,10 @@
     4.4                     'ns3::TypeId', 
     4.5                     [], 
     4.6                     is_const=True, is_virtual=True)
     4.7 +    ## ppp-header.h: uint16_t ns3::PppHeader::GetProtocol() [member function]
     4.8 +    cls.add_method('GetProtocol', 
     4.9 +                   'uint16_t', 
    4.10 +                   [])
    4.11      ## ppp-header.h: uint32_t ns3::PppHeader::GetSerializedSize() const [member function]
    4.12      cls.add_method('GetSerializedSize', 
    4.13                     'uint32_t', 
    4.14 @@ -121,6 +125,10 @@
    4.15                     'void', 
    4.16                     [param('ns3::Buffer::Iterator', 'start')], 
    4.17                     is_const=True, is_virtual=True)
    4.18 +    ## ppp-header.h: void ns3::PppHeader::SetProtocol(uint16_t protocol) [member function]
    4.19 +    cls.add_method('SetProtocol', 
    4.20 +                   'void', 
    4.21 +                   [param('uint16_t', 'protocol')])
    4.22      return
    4.23  
    4.24  def register_Ns3PointToPointChannel_methods(root_module, cls):
     5.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py	Wed Nov 11 16:21:18 2009 +0100
     5.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_stats.py	Thu Nov 12 10:20:26 2009 +0100
     5.3 @@ -5,18 +5,16 @@
     5.4      
     5.5      ## data-output-interface.h: ns3::DataOutputCallback [class]
     5.6      module.add_class('DataOutputCallback', allow_subclassing=True)
     5.7 +    ## data-calculator.h: ns3::StatisticalSummary [class]
     5.8 +    module.add_class('StatisticalSummary', allow_subclassing=True)
     5.9      ## data-calculator.h: ns3::DataCalculator [class]
    5.10      module.add_class('DataCalculator', parent=root_module['ns3::Object'])
    5.11      ## data-collector.h: ns3::DataCollector [class]
    5.12      module.add_class('DataCollector', parent=root_module['ns3::Object'])
    5.13      ## data-output-interface.h: ns3::DataOutputInterface [class]
    5.14      module.add_class('DataOutputInterface', parent=root_module['ns3::Object'])
    5.15 -    ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int> [class]
    5.16 -    module.add_class('MinMaxAvgTotalCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
    5.17      ## omnet-data-output.h: ns3::OmnetDataOutput [class]
    5.18      module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface'])
    5.19 -    ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class]
    5.20 -    module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
    5.21      ## sqlite-data-output.h: ns3::SqliteDataOutput [class]
    5.22      module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface'])
    5.23      ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class]
    5.24 @@ -104,12 +102,11 @@
    5.25  
    5.26  def register_methods(root_module):
    5.27      register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback'])
    5.28 +    register_Ns3StatisticalSummary_methods(root_module, root_module['ns3::StatisticalSummary'])
    5.29      register_Ns3DataCalculator_methods(root_module, root_module['ns3::DataCalculator'])
    5.30      register_Ns3DataCollector_methods(root_module, root_module['ns3::DataCollector'])
    5.31      register_Ns3DataOutputInterface_methods(root_module, root_module['ns3::DataOutputInterface'])
    5.32 -    register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
    5.33      register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput'])
    5.34 -    register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator'])
    5.35      register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput'])
    5.36      register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator'])
    5.37      register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >'])
    5.38 @@ -146,6 +143,58 @@
    5.39                     'void', 
    5.40                     [param('std::string', 'key'), param('std::string', 'variable'), param('ns3::Time', 'val')], 
    5.41                     is_pure_virtual=True, is_virtual=True)
    5.42 +    ## data-output-interface.h: void ns3::DataOutputCallback::OutputStatistic(std::string key, std::string variable, ns3::StatisticalSummary const * statSum) [member function]
    5.43 +    cls.add_method('OutputStatistic', 
    5.44 +                   'void', 
    5.45 +                   [param('std::string', 'key'), param('std::string', 'variable'), param('ns3::StatisticalSummary const *', 'statSum')], 
    5.46 +                   is_pure_virtual=True, is_virtual=True)
    5.47 +    return
    5.48 +
    5.49 +def register_Ns3StatisticalSummary_methods(root_module, cls):
    5.50 +    ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary() [constructor]
    5.51 +    cls.add_constructor([])
    5.52 +    ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary(ns3::StatisticalSummary const & arg0) [copy constructor]
    5.53 +    cls.add_constructor([param('ns3::StatisticalSummary const &', 'arg0')])
    5.54 +    ## data-calculator.h: long int ns3::StatisticalSummary::getCount() const [member function]
    5.55 +    cls.add_method('getCount', 
    5.56 +                   'long int', 
    5.57 +                   [], 
    5.58 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.59 +    ## data-calculator.h: double ns3::StatisticalSummary::getMax() const [member function]
    5.60 +    cls.add_method('getMax', 
    5.61 +                   'double', 
    5.62 +                   [], 
    5.63 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.64 +    ## data-calculator.h: double ns3::StatisticalSummary::getMean() const [member function]
    5.65 +    cls.add_method('getMean', 
    5.66 +                   'double', 
    5.67 +                   [], 
    5.68 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.69 +    ## data-calculator.h: double ns3::StatisticalSummary::getMin() const [member function]
    5.70 +    cls.add_method('getMin', 
    5.71 +                   'double', 
    5.72 +                   [], 
    5.73 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.74 +    ## data-calculator.h: double ns3::StatisticalSummary::getSqrSum() const [member function]
    5.75 +    cls.add_method('getSqrSum', 
    5.76 +                   'double', 
    5.77 +                   [], 
    5.78 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.79 +    ## data-calculator.h: double ns3::StatisticalSummary::getStddev() const [member function]
    5.80 +    cls.add_method('getStddev', 
    5.81 +                   'double', 
    5.82 +                   [], 
    5.83 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.84 +    ## data-calculator.h: double ns3::StatisticalSummary::getSum() const [member function]
    5.85 +    cls.add_method('getSum', 
    5.86 +                   'double', 
    5.87 +                   [], 
    5.88 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.89 +    ## data-calculator.h: double ns3::StatisticalSummary::getVariance() const [member function]
    5.90 +    cls.add_method('getVariance', 
    5.91 +                   'double', 
    5.92 +                   [], 
    5.93 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
    5.94      return
    5.95  
    5.96  def register_Ns3DataCalculator_methods(root_module, cls):
    5.97 @@ -161,6 +210,11 @@
    5.98      cls.add_method('Enable', 
    5.99                     'void', 
   5.100                     [])
   5.101 +    ## data-calculator.h: std::string ns3::DataCalculator::GetContext() const [member function]
   5.102 +    cls.add_method('GetContext', 
   5.103 +                   'std::string', 
   5.104 +                   [], 
   5.105 +                   is_const=True)
   5.106      ## data-calculator.h: bool ns3::DataCalculator::GetEnabled() const [member function]
   5.107      cls.add_method('GetEnabled', 
   5.108                     'bool', 
   5.109 @@ -176,6 +230,10 @@
   5.110                     'void', 
   5.111                     [param('ns3::DataOutputCallback &', 'callback')], 
   5.112                     is_pure_virtual=True, is_const=True, is_virtual=True)
   5.113 +    ## data-calculator.h: void ns3::DataCalculator::SetContext(std::string const context) [member function]
   5.114 +    cls.add_method('SetContext', 
   5.115 +                   'void', 
   5.116 +                   [param('std::string const', 'context')])
   5.117      ## data-calculator.h: void ns3::DataCalculator::SetKey(std::string const key) [member function]
   5.118      cls.add_method('SetKey', 
   5.119                     'void', 
   5.120 @@ -296,27 +354,6 @@
   5.121                     visibility='protected', is_virtual=True)
   5.122      return
   5.123  
   5.124 -def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls):
   5.125 -    ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<unsigned int> const & arg0) [copy constructor]
   5.126 -    cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')])
   5.127 -    ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator() [constructor]
   5.128 -    cls.add_constructor([])
   5.129 -    ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
   5.130 -    cls.add_method('Output', 
   5.131 -                   'void', 
   5.132 -                   [param('ns3::DataOutputCallback &', 'callback')], 
   5.133 -                   is_const=True, is_virtual=True)
   5.134 -    ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Update(unsigned int const i) [member function]
   5.135 -    cls.add_method('Update', 
   5.136 -                   'void', 
   5.137 -                   [param('unsigned int const', 'i')])
   5.138 -    ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::DoDispose() [member function]
   5.139 -    cls.add_method('DoDispose', 
   5.140 -                   'void', 
   5.141 -                   [], 
   5.142 -                   visibility='protected', is_virtual=True)
   5.143 -    return
   5.144 -
   5.145  def register_Ns3OmnetDataOutput_methods(root_module, cls):
   5.146      ## omnet-data-output.h: ns3::OmnetDataOutput::OmnetDataOutput(ns3::OmnetDataOutput const & arg0) [copy constructor]
   5.147      cls.add_constructor([param('ns3::OmnetDataOutput const &', 'arg0')])
   5.148 @@ -334,26 +371,6 @@
   5.149                     visibility='protected', is_virtual=True)
   5.150      return
   5.151  
   5.152 -def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls):
   5.153 -    ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator(ns3::PacketSizeMinMaxAvgTotalCalculator const & arg0) [copy constructor]
   5.154 -    cls.add_constructor([param('ns3::PacketSizeMinMaxAvgTotalCalculator const &', 'arg0')])
   5.155 -    ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator() [constructor]
   5.156 -    cls.add_constructor([])
   5.157 -    ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
   5.158 -    cls.add_method('FrameUpdate', 
   5.159 -                   'void', 
   5.160 -                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
   5.161 -    ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
   5.162 -    cls.add_method('PacketUpdate', 
   5.163 -                   'void', 
   5.164 -                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
   5.165 -    ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::DoDispose() [member function]
   5.166 -    cls.add_method('DoDispose', 
   5.167 -                   'void', 
   5.168 -                   [], 
   5.169 -                   visibility='protected', is_virtual=True)
   5.170 -    return
   5.171 -
   5.172  def register_Ns3SqliteDataOutput_methods(root_module, cls):
   5.173      ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor]
   5.174      cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')])
   5.175 @@ -444,6 +461,10 @@
   5.176  
   5.177  def register_functions(root_module):
   5.178      module = root_module
   5.179 +    ## data-calculator.h: bool ns3::isNaN(double x) [free function]
   5.180 +    module.add_function('isNaN', 
   5.181 +                        'bool', 
   5.182 +                        [param('double', 'x')])
   5.183      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   5.184      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   5.185      register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
     6.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Wed Nov 11 16:21:18 2009 +0100
     6.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Thu Nov 12 10:20:26 2009 +0100
     6.3 @@ -17,29 +17,29 @@
     6.4  import ns3_module_test
     6.5  import ns3_module_mobility
     6.6  import ns3_module_common
     6.7 +import ns3_module_contrib
     6.8  import ns3_module_node
     6.9 -import ns3_module_contrib
    6.10 +import ns3_module_tap_bridge
    6.11 +import ns3_module_v4ping
    6.12 +import ns3_module_static_routing
    6.13 +import ns3_module_packet_sink
    6.14 +import ns3_module_stats
    6.15 +import ns3_module_onoff
    6.16  import ns3_module_point_to_point
    6.17  import ns3_module_internet_stack
    6.18 -import ns3_module_tap_bridge
    6.19  import ns3_module_csma
    6.20 +import ns3_module_list_routing
    6.21 +import ns3_module_virtual_net_device
    6.22  import ns3_module_wifi
    6.23 -import ns3_module_static_routing
    6.24 -import ns3_module_v4ping
    6.25 -import ns3_module_virtual_net_device
    6.26 -import ns3_module_packet_sink
    6.27 -import ns3_module_global_routing
    6.28 -import ns3_module_stats
    6.29 -import ns3_module_list_routing
    6.30  import ns3_module_emu
    6.31  import ns3_module_bridge
    6.32 -import ns3_module_onoff
    6.33 +import ns3_module_global_routing
    6.34  import ns3_module_udp_echo
    6.35 -import ns3_module_ping6
    6.36  import ns3_module_nix_vector_routing
    6.37  import ns3_module_olsr
    6.38 +import ns3_module_radvd
    6.39 +import ns3_module_ping6
    6.40  import ns3_module_flow_monitor
    6.41 -import ns3_module_radvd
    6.42  import ns3_module_mesh
    6.43  import ns3_module_helper
    6.44  import ns3_module_dot11s
    6.45 @@ -107,6 +107,17 @@
    6.46          ns3_module_common__local.register_types(module)
    6.47      
    6.48      root_module.end_section('ns3_module_common')
    6.49 +    root_module.begin_section('ns3_module_contrib')
    6.50 +    ns3_module_contrib.register_types(module)
    6.51 +    
    6.52 +    try:
    6.53 +        import ns3_module_contrib__local
    6.54 +    except ImportError:
    6.55 +        pass
    6.56 +    else:
    6.57 +        ns3_module_contrib__local.register_types(module)
    6.58 +    
    6.59 +    root_module.end_section('ns3_module_contrib')
    6.60      root_module.begin_section('ns3_module_node')
    6.61      ns3_module_node.register_types(module)
    6.62      
    6.63 @@ -118,17 +129,72 @@
    6.64          ns3_module_node__local.register_types(module)
    6.65      
    6.66      root_module.end_section('ns3_module_node')
    6.67 -    root_module.begin_section('ns3_module_contrib')
    6.68 -    ns3_module_contrib.register_types(module)
    6.69 +    root_module.begin_section('ns3_module_tap_bridge')
    6.70 +    ns3_module_tap_bridge.register_types(module)
    6.71      
    6.72      try:
    6.73 -        import ns3_module_contrib__local
    6.74 +        import ns3_module_tap_bridge__local
    6.75      except ImportError:
    6.76          pass
    6.77      else:
    6.78 -        ns3_module_contrib__local.register_types(module)
    6.79 +        ns3_module_tap_bridge__local.register_types(module)
    6.80      
    6.81 -    root_module.end_section('ns3_module_contrib')
    6.82 +    root_module.end_section('ns3_module_tap_bridge')
    6.83 +    root_module.begin_section('ns3_module_v4ping')
    6.84 +    ns3_module_v4ping.register_types(module)
    6.85 +    
    6.86 +    try:
    6.87 +        import ns3_module_v4ping__local
    6.88 +    except ImportError:
    6.89 +        pass
    6.90 +    else:
    6.91 +        ns3_module_v4ping__local.register_types(module)
    6.92 +    
    6.93 +    root_module.end_section('ns3_module_v4ping')
    6.94 +    root_module.begin_section('ns3_module_static_routing')
    6.95 +    ns3_module_static_routing.register_types(module)
    6.96 +    
    6.97 +    try:
    6.98 +        import ns3_module_static_routing__local
    6.99 +    except ImportError:
   6.100 +        pass
   6.101 +    else:
   6.102 +        ns3_module_static_routing__local.register_types(module)
   6.103 +    
   6.104 +    root_module.end_section('ns3_module_static_routing')
   6.105 +    root_module.begin_section('ns3_module_packet_sink')
   6.106 +    ns3_module_packet_sink.register_types(module)
   6.107 +    
   6.108 +    try:
   6.109 +        import ns3_module_packet_sink__local
   6.110 +    except ImportError:
   6.111 +        pass
   6.112 +    else:
   6.113 +        ns3_module_packet_sink__local.register_types(module)
   6.114 +    
   6.115 +    root_module.end_section('ns3_module_packet_sink')
   6.116 +    root_module.begin_section('ns3_module_stats')
   6.117 +    ns3_module_stats.register_types(module)
   6.118 +    
   6.119 +    try:
   6.120 +        import ns3_module_stats__local
   6.121 +    except ImportError:
   6.122 +        pass
   6.123 +    else:
   6.124 +        ns3_module_stats__local.register_types(module)
   6.125 +    
   6.126 +    root_module.end_section('ns3_module_stats')
   6.127 +    root_module.begin_section('ns3_module_onoff')
   6.128 +    ns3_module_onoff.register_types(module)
   6.129 +    
   6.130 +    try:
   6.131 +        import ns3_module_onoff__local
   6.132 +    except ImportError:
   6.133 +        pass
   6.134 +    else:
   6.135 +        ns3_module_onoff__local.register_types(module)
   6.136 +    
   6.137 +    root_module.end_section('ns3_module_onoff')
   6.138      root_module.begin_section('ns3_module_point_to_point')
   6.139      ns3_module_point_to_point.register_types(module)
   6.140      
   6.141 @@ -151,17 +217,6 @@
   6.142          ns3_module_internet_stack__local.register_types(module)
   6.143      
   6.144      root_module.end_section('ns3_module_internet_stack')
   6.145 -    root_module.begin_section('ns3_module_tap_bridge')
   6.146 -    ns3_module_tap_bridge.register_types(module)
   6.147 -    
   6.148 -    try:
   6.149 -        import ns3_module_tap_bridge__local
   6.150 -    except ImportError:
   6.151 -        pass
   6.152 -    else:
   6.153 -        ns3_module_tap_bridge__local.register_types(module)
   6.154 -    
   6.155 -    root_module.end_section('ns3_module_tap_bridge')
   6.156      root_module.begin_section('ns3_module_csma')
   6.157      ns3_module_csma.register_types(module)
   6.158      
   6.159 @@ -173,6 +228,28 @@
   6.160          ns3_module_csma__local.register_types(module)
   6.161      
   6.162      root_module.end_section('ns3_module_csma')
   6.163 +    root_module.begin_section('ns3_module_list_routing')
   6.164 +    ns3_module_list_routing.register_types(module)
   6.165 +    
   6.166 +    try:
   6.167 +        import ns3_module_list_routing__local
   6.168 +    except ImportError:
   6.169 +        pass
   6.170 +    else:
   6.171 +        ns3_module_list_routing__local.register_types(module)
   6.172 +    
   6.173 +    root_module.end_section('ns3_module_list_routing')
   6.174 +    root_module.begin_section('ns3_module_virtual_net_device')
   6.175 +    ns3_module_virtual_net_device.register_types(module)
   6.176 +    
   6.177 +    try:
   6.178 +        import ns3_module_virtual_net_device__local
   6.179 +    except ImportError:
   6.180 +        pass
   6.181 +    else:
   6.182 +        ns3_module_virtual_net_device__local.register_types(module)
   6.183 +    
   6.184 +    root_module.end_section('ns3_module_virtual_net_device')
   6.185      root_module.begin_section('ns3_module_wifi')
   6.186      ns3_module_wifi.register_types(module)
   6.187      
   6.188 @@ -184,83 +261,6 @@
   6.189          ns3_module_wifi__local.register_types(module)
   6.190      
   6.191      root_module.end_section('ns3_module_wifi')
   6.192 -    root_module.begin_section('ns3_module_static_routing')
   6.193 -    ns3_module_static_routing.register_types(module)
   6.194 -    
   6.195 -    try:
   6.196 -        import ns3_module_static_routing__local
   6.197 -    except ImportError:
   6.198 -        pass
   6.199 -    else:
   6.200 -        ns3_module_static_routing__local.register_types(module)
   6.201 -    
   6.202 -    root_module.end_section('ns3_module_static_routing')
   6.203 -    root_module.begin_section('ns3_module_v4ping')
   6.204 -    ns3_module_v4ping.register_types(module)
   6.205 -    
   6.206 -    try:
   6.207 -        import ns3_module_v4ping__local
   6.208 -    except ImportError:
   6.209 -        pass
   6.210 -    else:
   6.211 -        ns3_module_v4ping__local.register_types(module)
   6.212 -    
   6.213 -    root_module.end_section('ns3_module_v4ping')
   6.214 -    root_module.begin_section('ns3_module_virtual_net_device')
   6.215 -    ns3_module_virtual_net_device.register_types(module)
   6.216 -    
   6.217 -    try:
   6.218 -        import ns3_module_virtual_net_device__local
   6.219 -    except ImportError:
   6.220 -        pass
   6.221 -    else:
   6.222 -        ns3_module_virtual_net_device__local.register_types(module)
   6.223 -    
   6.224 -    root_module.end_section('ns3_module_virtual_net_device')
   6.225 -    root_module.begin_section('ns3_module_packet_sink')
   6.226 -    ns3_module_packet_sink.register_types(module)
   6.227 -    
   6.228 -    try:
   6.229 -        import ns3_module_packet_sink__local
   6.230 -    except ImportError:
   6.231 -        pass
   6.232 -    else:
   6.233 -        ns3_module_packet_sink__local.register_types(module)
   6.234 -    
   6.235 -    root_module.end_section('ns3_module_packet_sink')
   6.236 -    root_module.begin_section('ns3_module_global_routing')
   6.237 -    ns3_module_global_routing.register_types(module)
   6.238 -    
   6.239 -    try:
   6.240 -        import ns3_module_global_routing__local
   6.241 -    except ImportError:
   6.242 -        pass
   6.243 -    else:
   6.244 -        ns3_module_global_routing__local.register_types(module)
   6.245 -    
   6.246 -    root_module.end_section('ns3_module_global_routing')
   6.247 -    root_module.begin_section('ns3_module_stats')
   6.248 -    ns3_module_stats.register_types(module)
   6.249 -    
   6.250 -    try:
   6.251 -        import ns3_module_stats__local
   6.252 -    except ImportError:
   6.253 -        pass
   6.254 -    else:
   6.255 -        ns3_module_stats__local.register_types(module)
   6.256 -    
   6.257 -    root_module.end_section('ns3_module_stats')
   6.258 -    root_module.begin_section('ns3_module_list_routing')
   6.259 -    ns3_module_list_routing.register_types(module)
   6.260 -    
   6.261 -    try:
   6.262 -        import ns3_module_list_routing__local
   6.263 -    except ImportError:
   6.264 -        pass
   6.265 -    else:
   6.266 -        ns3_module_list_routing__local.register_types(module)
   6.267 -    
   6.268 -    root_module.end_section('ns3_module_list_routing')
   6.269      root_module.begin_section('ns3_module_emu')
   6.270      ns3_module_emu.register_types(module)
   6.271      
   6.272 @@ -283,17 +283,17 @@
   6.273          ns3_module_bridge__local.register_types(module)
   6.274      
   6.275      root_module.end_section('ns3_module_bridge')
   6.276 -    root_module.begin_section('ns3_module_onoff')
   6.277 -    ns3_module_onoff.register_types(module)
   6.278 +    root_module.begin_section('ns3_module_global_routing')
   6.279 +    ns3_module_global_routing.register_types(module)
   6.280      
   6.281      try:
   6.282 -        import ns3_module_onoff__local
   6.283 +        import ns3_module_global_routing__local
   6.284      except ImportError:
   6.285          pass
   6.286      else:
   6.287 -        ns3_module_onoff__local.register_types(module)
   6.288 +        ns3_module_global_routing__local.register_types(module)
   6.289      
   6.290 -    root_module.end_section('ns3_module_onoff')
   6.291 +    root_module.end_section('ns3_module_global_routing')
   6.292      root_module.begin_section('ns3_module_udp_echo')
   6.293      ns3_module_udp_echo.register_types(module)
   6.294      
   6.295 @@ -305,17 +305,6 @@
   6.296          ns3_module_udp_echo__local.register_types(module)
   6.297      
   6.298      root_module.end_section('ns3_module_udp_echo')
   6.299 -    root_module.begin_section('ns3_module_ping6')
   6.300 -    ns3_module_ping6.register_types(module)
   6.301 -    
   6.302 -    try:
   6.303 -        import ns3_module_ping6__local
   6.304 -    except ImportError:
   6.305 -        pass
   6.306 -    else:
   6.307 -        ns3_module_ping6__local.register_types(module)
   6.308 -    
   6.309 -    root_module.end_section('ns3_module_ping6')
   6.310      root_module.begin_section('ns3_module_nix_vector_routing')
   6.311      ns3_module_nix_vector_routing.register_types(module)
   6.312      
   6.313 @@ -338,6 +327,28 @@
   6.314          ns3_module_olsr__local.register_types(module)
   6.315      
   6.316      root_module.end_section('ns3_module_olsr')
   6.317 +    root_module.begin_section('ns3_module_radvd')
   6.318 +    ns3_module_radvd.register_types(module)
   6.319 +    
   6.320 +    try:
   6.321 +        import ns3_module_radvd__local
   6.322 +    except ImportError:
   6.323 +        pass
   6.324 +    else:
   6.325 +        ns3_module_radvd__local.register_types(module)
   6.326 +    
   6.327 +    root_module.end_section('ns3_module_radvd')
   6.328 +    root_module.begin_section('ns3_module_ping6')
   6.329 +    ns3_module_ping6.register_types(module)
   6.330 +    
   6.331 +    try:
   6.332 +        import ns3_module_ping6__local
   6.333 +    except ImportError:
   6.334 +        pass
   6.335 +    else:
   6.336 +        ns3_module_ping6__local.register_types(module)
   6.337 +    
   6.338 +    root_module.end_section('ns3_module_ping6')
   6.339      root_module.begin_section('ns3_module_flow_monitor')
   6.340      ns3_module_flow_monitor.register_types(module)
   6.341      
   6.342 @@ -349,17 +360,6 @@
   6.343          ns3_module_flow_monitor__local.register_types(module)
   6.344      
   6.345      root_module.end_section('ns3_module_flow_monitor')
   6.346 -    root_module.begin_section('ns3_module_radvd')
   6.347 -    ns3_module_radvd.register_types(module)
   6.348 -    
   6.349 -    try:
   6.350 -        import ns3_module_radvd__local
   6.351 -    except ImportError:
   6.352 -        pass
   6.353 -    else:
   6.354 -        ns3_module_radvd__local.register_types(module)
   6.355 -    
   6.356 -    root_module.end_section('ns3_module_radvd')
   6.357      root_module.begin_section('ns3_module_mesh')
   6.358      ns3_module_mesh.register_types(module)
   6.359      
   6.360 @@ -549,6 +549,17 @@
   6.361          ns3_module_common__local.register_methods(root_module)
   6.362      
   6.363      root_module.end_section('ns3_module_common')
   6.364 +    root_module.begin_section('ns3_module_contrib')
   6.365 +    ns3_module_contrib.register_methods(root_module)
   6.366 +    
   6.367 +    try:
   6.368 +        import ns3_module_contrib__local
   6.369 +    except ImportError:
   6.370 +        pass
   6.371 +    else:
   6.372 +        ns3_module_contrib__local.register_methods(root_module)
   6.373 +    
   6.374 +    root_module.end_section('ns3_module_contrib')
   6.375      root_module.begin_section('ns3_module_node')
   6.376      ns3_module_node.register_methods(root_module)
   6.377      
   6.378 @@ -560,17 +571,72 @@
   6.379          ns3_module_node__local.register_methods(root_module)
   6.380      
   6.381      root_module.end_section('ns3_module_node')
   6.382 -    root_module.begin_section('ns3_module_contrib')
   6.383 -    ns3_module_contrib.register_methods(root_module)
   6.384 +    root_module.begin_section('ns3_module_tap_bridge')
   6.385 +    ns3_module_tap_bridge.register_methods(root_module)
   6.386      
   6.387      try:
   6.388 -        import ns3_module_contrib__local
   6.389 +        import ns3_module_tap_bridge__local
   6.390      except ImportError:
   6.391          pass
   6.392      else:
   6.393 -        ns3_module_contrib__local.register_methods(root_module)
   6.394 +        ns3_module_tap_bridge__local.register_methods(root_module)
   6.395      
   6.396 -    root_module.end_section('ns3_module_contrib')
   6.397 +    root_module.end_section('ns3_module_tap_bridge')
   6.398 +    root_module.begin_section('ns3_module_v4ping')
   6.399 +    ns3_module_v4ping.register_methods(root_module)
   6.400 +    
   6.401 +    try:
   6.402 +        import ns3_module_v4ping__local
   6.403 +    except ImportError:
   6.404 +        pass
   6.405 +    else:
   6.406 +        ns3_module_v4ping__local.register_methods(root_module)
   6.407 +    
   6.408 +    root_module.end_section('ns3_module_v4ping')
   6.409 +    root_module.begin_section('ns3_module_static_routing')
   6.410 +    ns3_module_static_routing.register_methods(root_module)
   6.411 +    
   6.412 +    try:
   6.413 +        import ns3_module_static_routing__local
   6.414 +    except ImportError:
   6.415 +        pass
   6.416 +    else:
   6.417 +        ns3_module_static_routing__local.register_methods(root_module)
   6.418 +    
   6.419 +    root_module.end_section('ns3_module_static_routing')
   6.420 +    root_module.begin_section('ns3_module_packet_sink')
   6.421 +    ns3_module_packet_sink.register_methods(root_module)
   6.422 +    
   6.423 +    try:
   6.424 +        import ns3_module_packet_sink__local
   6.425 +    except ImportError:
   6.426 +        pass
   6.427 +    else:
   6.428 +        ns3_module_packet_sink__local.register_methods(root_module)
   6.429 +    
   6.430 +    root_module.end_section('ns3_module_packet_sink')
   6.431 +    root_module.begin_section('ns3_module_stats')
   6.432 +    ns3_module_stats.register_methods(root_module)
   6.433 +    
   6.434 +    try:
   6.435 +        import ns3_module_stats__local
   6.436 +    except ImportError:
   6.437 +        pass
   6.438 +    else:
   6.439 +        ns3_module_stats__local.register_methods(root_module)
   6.440 +    
   6.441 +    root_module.end_section('ns3_module_stats')
   6.442 +    root_module.begin_section('ns3_module_onoff')
   6.443 +    ns3_module_onoff.register_methods(root_module)
   6.444 +    
   6.445 +    try:
   6.446 +        import ns3_module_onoff__local
   6.447 +    except ImportError:
   6.448 +        pass
   6.449 +    else:
   6.450 +        ns3_module_onoff__local.register_methods(root_module)
   6.451 +    
   6.452 +    root_module.end_section('ns3_module_onoff')
   6.453      root_module.begin_section('ns3_module_point_to_point')
   6.454      ns3_module_point_to_point.register_methods(root_module)
   6.455      
   6.456 @@ -593,17 +659,6 @@
   6.457          ns3_module_internet_stack__local.register_methods(root_module)
   6.458      
   6.459      root_module.end_section('ns3_module_internet_stack')
   6.460 -    root_module.begin_section('ns3_module_tap_bridge')
   6.461 -    ns3_module_tap_bridge.register_methods(root_module)
   6.462 -    
   6.463 -    try:
   6.464 -        import ns3_module_tap_bridge__local
   6.465 -    except ImportError:
   6.466 -        pass
   6.467 -    else:
   6.468 -        ns3_module_tap_bridge__local.register_methods(root_module)
   6.469 -    
   6.470 -    root_module.end_section('ns3_module_tap_bridge')
   6.471      root_module.begin_section('ns3_module_csma')
   6.472      ns3_module_csma.register_methods(root_module)
   6.473      
   6.474 @@ -615,6 +670,28 @@
   6.475          ns3_module_csma__local.register_methods(root_module)
   6.476      
   6.477      root_module.end_section('ns3_module_csma')
   6.478 +    root_module.begin_section('ns3_module_list_routing')
   6.479 +    ns3_module_list_routing.register_methods(root_module)
   6.480 +    
   6.481 +    try:
   6.482 +        import ns3_module_list_routing__local
   6.483 +    except ImportError:
   6.484 +        pass
   6.485 +    else:
   6.486 +        ns3_module_list_routing__local.register_methods(root_module)
   6.487 +    
   6.488 +    root_module.end_section('ns3_module_list_routing')
   6.489 +    root_module.begin_section('ns3_module_virtual_net_device')
   6.490 +    ns3_module_virtual_net_device.register_methods(root_module)
   6.491 +    
   6.492 +    try:
   6.493 +        import ns3_module_virtual_net_device__local
   6.494 +    except ImportError:
   6.495 +        pass
   6.496 +    else:
   6.497 +        ns3_module_virtual_net_device__local.register_methods(root_module)
   6.498 +    
   6.499 +    root_module.end_section('ns3_module_virtual_net_device')
   6.500      root_module.begin_section('ns3_module_wifi')
   6.501      ns3_module_wifi.register_methods(root_module)
   6.502      
   6.503 @@ -626,83 +703,6 @@
   6.504          ns3_module_wifi__local.register_methods(root_module)
   6.505      
   6.506      root_module.end_section('ns3_module_wifi')
   6.507 -    root_module.begin_section('ns3_module_static_routing')
   6.508 -    ns3_module_static_routing.register_methods(root_module)
   6.509 -    
   6.510 -    try:
   6.511 -        import ns3_module_static_routing__local
   6.512 -    except ImportError:
   6.513 -        pass
   6.514 -    else:
   6.515 -        ns3_module_static_routing__local.register_methods(root_module)
   6.516 -    
   6.517 -    root_module.end_section('ns3_module_static_routing')
   6.518 -    root_module.begin_section('ns3_module_v4ping')
   6.519 -    ns3_module_v4ping.register_methods(root_module)
   6.520 -    
   6.521 -    try:
   6.522 -        import ns3_module_v4ping__local
   6.523 -    except ImportError:
   6.524 -        pass
   6.525 -    else:
   6.526 -        ns3_module_v4ping__local.register_methods(root_module)
   6.527 -    
   6.528 -    root_module.end_section('ns3_module_v4ping')
   6.529 -    root_module.begin_section('ns3_module_virtual_net_device')
   6.530 -    ns3_module_virtual_net_device.register_methods(root_module)
   6.531 -    
   6.532 -    try:
   6.533 -        import ns3_module_virtual_net_device__local
   6.534 -    except ImportError:
   6.535 -        pass
   6.536 -    else:
   6.537 -        ns3_module_virtual_net_device__local.register_methods(root_module)
   6.538 -    
   6.539 -    root_module.end_section('ns3_module_virtual_net_device')
   6.540 -    root_module.begin_section('ns3_module_packet_sink')
   6.541 -    ns3_module_packet_sink.register_methods(root_module)
   6.542 -    
   6.543 -    try:
   6.544 -        import ns3_module_packet_sink__local
   6.545 -    except ImportError:
   6.546 -        pass
   6.547 -    else:
   6.548 -        ns3_module_packet_sink__local.register_methods(root_module)
   6.549 -    
   6.550 -    root_module.end_section('ns3_module_packet_sink')
   6.551 -    root_module.begin_section('ns3_module_global_routing')
   6.552 -    ns3_module_global_routing.register_methods(root_module)
   6.553 -    
   6.554 -    try:
   6.555 -        import ns3_module_global_routing__local
   6.556 -    except ImportError:
   6.557 -        pass
   6.558 -    else:
   6.559 -        ns3_module_global_routing__local.register_methods(root_module)
   6.560 -    
   6.561 -    root_module.end_section('ns3_module_global_routing')
   6.562 -    root_module.begin_section('ns3_module_stats')
   6.563 -    ns3_module_stats.register_methods(root_module)
   6.564 -    
   6.565 -    try:
   6.566 -        import ns3_module_stats__local
   6.567 -    except ImportError:
   6.568 -        pass
   6.569 -    else:
   6.570 -        ns3_module_stats__local.register_methods(root_module)
   6.571 -    
   6.572 -    root_module.end_section('ns3_module_stats')
   6.573 -    root_module.begin_section('ns3_module_list_routing')
   6.574 -    ns3_module_list_routing.register_methods(root_module)
   6.575 -    
   6.576 -    try:
   6.577 -        import ns3_module_list_routing__local
   6.578 -    except ImportError:
   6.579 -        pass
   6.580 -    else:
   6.581 -        ns3_module_list_routing__local.register_methods(root_module)
   6.582 -    
   6.583 -    root_module.end_section('ns3_module_list_routing')
   6.584      root_module.begin_section('ns3_module_emu')
   6.585      ns3_module_emu.register_methods(root_module)
   6.586      
   6.587 @@ -725,17 +725,17 @@
   6.588          ns3_module_bridge__local.register_methods(root_module)
   6.589      
   6.590      root_module.end_section('ns3_module_bridge')
   6.591 -    root_module.begin_section('ns3_module_onoff')
   6.592 -    ns3_module_onoff.register_methods(root_module)
   6.593 +    root_module.begin_section('ns3_module_global_routing')
   6.594 +    ns3_module_global_routing.register_methods(root_module)
   6.595      
   6.596      try:
   6.597 -        import ns3_module_onoff__local
   6.598 +        import ns3_module_global_routing__local
   6.599      except ImportError:
   6.600          pass
   6.601      else:
   6.602 -        ns3_module_onoff__local.register_methods(root_module)
   6.603 +        ns3_module_global_routing__local.register_methods(root_module)
   6.604      
   6.605 -    root_module.end_section('ns3_module_onoff')
   6.606 +    root_module.end_section('ns3_module_global_routing')
   6.607      root_module.begin_section('ns3_module_udp_echo')
   6.608      ns3_module_udp_echo.register_methods(root_module)
   6.609      
   6.610 @@ -747,17 +747,6 @@
   6.611          ns3_module_udp_echo__local.register_methods(root_module)
   6.612      
   6.613      root_module.end_section('ns3_module_udp_echo')
   6.614 -    root_module.begin_section('ns3_module_ping6')
   6.615 -    ns3_module_ping6.register_methods(root_module)
   6.616 -    
   6.617 -    try:
   6.618 -        import ns3_module_ping6__local
   6.619 -    except ImportError:
   6.620 -        pass
   6.621 -    else:
   6.622 -        ns3_module_ping6__local.register_methods(root_module)
   6.623 -    
   6.624 -    root_module.end_section('ns3_module_ping6')
   6.625      root_module.begin_section('ns3_module_nix_vector_routing')
   6.626      ns3_module_nix_vector_routing.register_methods(root_module)
   6.627      
   6.628 @@ -780,6 +769,28 @@
   6.629          ns3_module_olsr__local.register_methods(root_module)
   6.630      
   6.631      root_module.end_section('ns3_module_olsr')
   6.632 +    root_module.begin_section('ns3_module_radvd')
   6.633 +    ns3_module_radvd.register_methods(root_module)
   6.634 +    
   6.635 +    try:
   6.636 +        import ns3_module_radvd__local
   6.637 +    except ImportError:
   6.638 +        pass
   6.639 +    else:
   6.640 +        ns3_module_radvd__local.register_methods(root_module)
   6.641 +    
   6.642 +    root_module.end_section('ns3_module_radvd')
   6.643 +    root_module.begin_section('ns3_module_ping6')
   6.644 +    ns3_module_ping6.register_methods(root_module)
   6.645 +    
   6.646 +    try:
   6.647 +        import ns3_module_ping6__local
   6.648 +    except ImportError:
   6.649 +        pass
   6.650 +    else:
   6.651 +        ns3_module_ping6__local.register_methods(root_module)
   6.652 +    
   6.653 +    root_module.end_section('ns3_module_ping6')
   6.654      root_module.begin_section('ns3_module_flow_monitor')
   6.655      ns3_module_flow_monitor.register_methods(root_module)
   6.656      
   6.657 @@ -791,17 +802,6 @@
   6.658          ns3_module_flow_monitor__local.register_methods(root_module)
   6.659      
   6.660      root_module.end_section('ns3_module_flow_monitor')
   6.661 -    root_module.begin_section('ns3_module_radvd')
   6.662 -    ns3_module_radvd.register_methods(root_module)
   6.663 -    
   6.664 -    try:
   6.665 -        import ns3_module_radvd__local
   6.666 -    except ImportError:
   6.667 -        pass
   6.668 -    else:
   6.669 -        ns3_module_radvd__local.register_methods(root_module)
   6.670 -    
   6.671 -    root_module.end_section('ns3_module_radvd')
   6.672      root_module.begin_section('ns3_module_mesh')
   6.673      ns3_module_mesh.register_methods(root_module)
   6.674      
   6.675 @@ -1039,6 +1039,17 @@
   6.676          ns3_module_common__local.register_functions(root_module)
   6.677      
   6.678      root_module.end_section('ns3_module_common')
   6.679 +    root_module.begin_section('ns3_module_contrib')
   6.680 +    ns3_module_contrib.register_functions(root_module)
   6.681 +    
   6.682 +    try:
   6.683 +        import ns3_module_contrib__local
   6.684 +    except ImportError:
   6.685 +        pass
   6.686 +    else:
   6.687 +        ns3_module_contrib__local.register_functions(root_module)
   6.688 +    
   6.689 +    root_module.end_section('ns3_module_contrib')
   6.690      root_module.begin_section('ns3_module_node')
   6.691      ns3_module_node.register_functions(root_module)
   6.692      
   6.693 @@ -1050,17 +1061,72 @@
   6.694          ns3_module_node__local.register_functions(root_module)
   6.695      
   6.696      root_module.end_section('ns3_module_node')
   6.697 -    root_module.begin_section('ns3_module_contrib')
   6.698 -    ns3_module_contrib.register_functions(root_module)
   6.699 +    root_module.begin_section('ns3_module_tap_bridge')
   6.700 +    ns3_module_tap_bridge.register_functions(root_module)
   6.701      
   6.702      try:
   6.703 -        import ns3_module_contrib__local
   6.704 +        import ns3_module_tap_bridge__local
   6.705      except ImportError:
   6.706          pass
   6.707      else:
   6.708 -        ns3_module_contrib__local.register_functions(root_module)
   6.709 +        ns3_module_tap_bridge__local.register_functions(root_module)
   6.710      
   6.711 -    root_module.end_section('ns3_module_contrib')
   6.712 +    root_module.end_section('ns3_module_tap_bridge')
   6.713 +    root_module.begin_section('ns3_module_v4ping')
   6.714 +    ns3_module_v4ping.register_functions(root_module)
   6.715 +    
   6.716 +    try:
   6.717 +        import ns3_module_v4ping__local
   6.718 +    except ImportError:
   6.719 +        pass
   6.720 +    else:
   6.721 +        ns3_module_v4ping__local.register_functions(root_module)
   6.722 +    
   6.723 +    root_module.end_section('ns3_module_v4ping')
   6.724 +    root_module.begin_section('ns3_module_static_routing')
   6.725 +    ns3_module_static_routing.register_functions(root_module)
   6.726 +    
   6.727 +    try:
   6.728 +        import ns3_module_static_routing__local
   6.729 +    except ImportError:
   6.730 +        pass
   6.731 +    else:
   6.732 +        ns3_module_static_routing__local.register_functions(root_module)
   6.733 +    
   6.734 +    root_module.end_section('ns3_module_static_routing')
   6.735 +    root_module.begin_section('ns3_module_packet_sink')
   6.736 +    ns3_module_packet_sink.register_functions(root_module)
   6.737 +    
   6.738 +    try:
   6.739 +        import ns3_module_packet_sink__local
   6.740 +    except ImportError:
   6.741 +        pass
   6.742 +    else:
   6.743 +        ns3_module_packet_sink__local.register_functions(root_module)
   6.744 +    
   6.745 +    root_module.end_section('ns3_module_packet_sink')
   6.746 +    root_module.begin_section('ns3_module_stats')
   6.747 +    ns3_module_stats.register_functions(root_module)
   6.748 +    
   6.749 +    try:
   6.750 +        import ns3_module_stats__local
   6.751 +    except ImportError:
   6.752 +        pass
   6.753 +    else:
   6.754 +        ns3_module_stats__local.register_functions(root_module)
   6.755 +    
   6.756 +    root_module.end_section('ns3_module_stats')
   6.757 +    root_module.begin_section('ns3_module_onoff')
   6.758 +    ns3_module_onoff.register_functions(root_module)
   6.759 +    
   6.760 +    try:
   6.761 +        import ns3_module_onoff__local
   6.762 +    except ImportError:
   6.763 +        pass
   6.764 +    else:
   6.765 +        ns3_module_onoff__local.register_functions(root_module)
   6.766 +    
   6.767 +    root_module.end_section('ns3_module_onoff')
   6.768      root_module.begin_section('ns3_module_point_to_point')
   6.769      ns3_module_point_to_point.register_functions(root_module)
   6.770      
   6.771 @@ -1083,17 +1149,6 @@
   6.772          ns3_module_internet_stack__local.register_functions(root_module)
   6.773      
   6.774      root_module.end_section('ns3_module_internet_stack')
   6.775 -    root_module.begin_section('ns3_module_tap_bridge')
   6.776 -    ns3_module_tap_bridge.register_functions(root_module)
   6.777 -    
   6.778 -    try:
   6.779 -        import ns3_module_tap_bridge__local
   6.780 -    except ImportError:
   6.781 -        pass
   6.782 -    else:
   6.783 -        ns3_module_tap_bridge__local.register_functions(root_module)
   6.784 -    
   6.785 -    root_module.end_section('ns3_module_tap_bridge')
   6.786      root_module.begin_section('ns3_module_csma')
   6.787      ns3_module_csma.register_functions(root_module)
   6.788      
   6.789 @@ -1105,6 +1160,28 @@
   6.790          ns3_module_csma__local.register_functions(root_module)
   6.791      
   6.792      root_module.end_section('ns3_module_csma')
   6.793 +    root_module.begin_section('ns3_module_list_routing')
   6.794 +    ns3_module_list_routing.register_functions(root_module)
   6.795 +    
   6.796 +    try:
   6.797 +        import ns3_module_list_routing__local
   6.798 +    except ImportError:
   6.799 +        pass
   6.800 +    else:
   6.801 +        ns3_module_list_routing__local.register_functions(root_module)
   6.802 +    
   6.803 +    root_module.end_section('ns3_module_list_routing')
   6.804 +    root_module.begin_section('ns3_module_virtual_net_device')
   6.805 +    ns3_module_virtual_net_device.register_functions(root_module)
   6.806 +    
   6.807 +    try:
   6.808 +        import ns3_module_virtual_net_device__local
   6.809 +    except ImportError:
   6.810 +        pass
   6.811 +    else:
   6.812 +        ns3_module_virtual_net_device__local.register_functions(root_module)
   6.813 +    
   6.814 +    root_module.end_section('ns3_module_virtual_net_device')
   6.815      root_module.begin_section('ns3_module_wifi')
   6.816      ns3_module_wifi.register_functions(root_module)
   6.817      
   6.818 @@ -1116,83 +1193,6 @@
   6.819          ns3_module_wifi__local.register_functions(root_module)
   6.820      
   6.821      root_module.end_section('ns3_module_wifi')
   6.822 -    root_module.begin_section('ns3_module_static_routing')
   6.823 -    ns3_module_static_routing.register_functions(root_module)
   6.824 -    
   6.825 -    try:
   6.826 -        import ns3_module_static_routing__local
   6.827 -    except ImportError:
   6.828 -        pass
   6.829 -    else:
   6.830 -        ns3_module_static_routing__local.register_functions(root_module)
   6.831 -    
   6.832 -    root_module.end_section('ns3_module_static_routing')
   6.833 -    root_module.begin_section('ns3_module_v4ping')
   6.834 -    ns3_module_v4ping.register_functions(root_module)
   6.835 -    
   6.836 -    try:
   6.837 -        import ns3_module_v4ping__local
   6.838 -    except ImportError:
   6.839 -        pass
   6.840 -    else:
   6.841 -        ns3_module_v4ping__local.register_functions(root_module)
   6.842 -    
   6.843 -    root_module.end_section('ns3_module_v4ping')
   6.844 -    root_module.begin_section('ns3_module_virtual_net_device')
   6.845 -    ns3_module_virtual_net_device.register_functions(root_module)
   6.846 -    
   6.847 -    try:
   6.848 -        import ns3_module_virtual_net_device__local
   6.849 -    except ImportError:
   6.850 -        pass
   6.851 -    else:
   6.852 -        ns3_module_virtual_net_device__local.register_functions(root_module)
   6.853 -    
   6.854 -    root_module.end_section('ns3_module_virtual_net_device')
   6.855 -    root_module.begin_section('ns3_module_packet_sink')
   6.856 -    ns3_module_packet_sink.register_functions(root_module)
   6.857 -    
   6.858 -    try:
   6.859 -        import ns3_module_packet_sink__local
   6.860 -    except ImportError:
   6.861 -        pass
   6.862 -    else:
   6.863 -        ns3_module_packet_sink__local.register_functions(root_module)
   6.864 -    
   6.865 -    root_module.end_section('ns3_module_packet_sink')
   6.866 -    root_module.begin_section('ns3_module_global_routing')
   6.867 -    ns3_module_global_routing.register_functions(root_module)
   6.868 -    
   6.869 -    try:
   6.870 -        import ns3_module_global_routing__local
   6.871 -    except ImportError:
   6.872 -        pass
   6.873 -    else:
   6.874 -        ns3_module_global_routing__local.register_functions(root_module)
   6.875 -    
   6.876 -    root_module.end_section('ns3_module_global_routing')
   6.877 -    root_module.begin_section('ns3_module_stats')
   6.878 -    ns3_module_stats.register_functions(root_module)
   6.879 -    
   6.880 -    try:
   6.881 -        import ns3_module_stats__local
   6.882 -    except ImportError:
   6.883 -        pass
   6.884 -    else:
   6.885 -        ns3_module_stats__local.register_functions(root_module)
   6.886 -    
   6.887 -    root_module.end_section('ns3_module_stats')
   6.888 -    root_module.begin_section('ns3_module_list_routing')
   6.889 -    ns3_module_list_routing.register_functions(root_module)
   6.890 -    
   6.891 -    try:
   6.892 -        import ns3_module_list_routing__local
   6.893 -    except ImportError:
   6.894 -        pass
   6.895 -    else:
   6.896 -        ns3_module_list_routing__local.register_functions(root_module)
   6.897 -    
   6.898 -    root_module.end_section('ns3_module_list_routing')
   6.899      root_module.begin_section('ns3_module_emu')
   6.900      ns3_module_emu.register_functions(root_module)
   6.901      
   6.902 @@ -1215,17 +1215,17 @@
   6.903          ns3_module_bridge__local.register_functions(root_module)
   6.904      
   6.905      root_module.end_section('ns3_module_bridge')
   6.906 -    root_module.begin_section('ns3_module_onoff')
   6.907 -    ns3_module_onoff.register_functions(root_module)
   6.908 +    root_module.begin_section('ns3_module_global_routing')
   6.909 +    ns3_module_global_routing.register_functions(root_module)
   6.910      
   6.911      try:
   6.912 -        import ns3_module_onoff__local
   6.913 +        import ns3_module_global_routing__local
   6.914      except ImportError:
   6.915          pass
   6.916      else:
   6.917 -        ns3_module_onoff__local.register_functions(root_module)
   6.918 +        ns3_module_global_routing__local.register_functions(root_module)
   6.919      
   6.920 -    root_module.end_section('ns3_module_onoff')
   6.921 +    root_module.end_section('ns3_module_global_routing')
   6.922      root_module.begin_section('ns3_module_udp_echo')
   6.923      ns3_module_udp_echo.register_functions(root_module)
   6.924      
   6.925 @@ -1237,17 +1237,6 @@
   6.926          ns3_module_udp_echo__local.register_functions(root_module)
   6.927      
   6.928      root_module.end_section('ns3_module_udp_echo')
   6.929 -    root_module.begin_section('ns3_module_ping6')
   6.930 -    ns3_module_ping6.register_functions(root_module)
   6.931 -    
   6.932 -    try:
   6.933 -        import ns3_module_ping6__local
   6.934 -    except ImportError:
   6.935 -        pass
   6.936 -    else:
   6.937 -        ns3_module_ping6__local.register_functions(root_module)
   6.938 -    
   6.939 -    root_module.end_section('ns3_module_ping6')
   6.940      root_module.begin_section('ns3_module_nix_vector_routing')
   6.941      ns3_module_nix_vector_routing.register_functions(root_module)
   6.942      
   6.943 @@ -1270,6 +1259,28 @@
   6.944          ns3_module_olsr__local.register_functions(root_module)
   6.945      
   6.946      root_module.end_section('ns3_module_olsr')
   6.947 +    root_module.begin_section('ns3_module_radvd')
   6.948 +    ns3_module_radvd.register_functions(root_module)
   6.949 +    
   6.950 +    try:
   6.951 +        import ns3_module_radvd__local
   6.952 +    except ImportError:
   6.953 +        pass
   6.954 +    else:
   6.955 +        ns3_module_radvd__local.register_functions(root_module)
   6.956 +    
   6.957 +    root_module.end_section('ns3_module_radvd')
   6.958 +    root_module.begin_section('ns3_module_ping6')
   6.959 +    ns3_module_ping6.register_functions(root_module)
   6.960 +    
   6.961 +    try:
   6.962 +        import ns3_module_ping6__local
   6.963 +    except ImportError:
   6.964 +        pass
   6.965 +    else:
   6.966 +        ns3_module_ping6__local.register_functions(root_module)
   6.967 +    
   6.968 +    root_module.end_section('ns3_module_ping6')
   6.969      root_module.begin_section('ns3_module_flow_monitor')
   6.970      ns3_module_flow_monitor.register_functions(root_module)
   6.971      
   6.972 @@ -1281,17 +1292,6 @@
   6.973          ns3_module_flow_monitor__local.register_functions(root_module)
   6.974      
   6.975      root_module.end_section('ns3_module_flow_monitor')
   6.976 -    root_module.begin_section('ns3_module_radvd')
   6.977 -    ns3_module_radvd.register_functions(root_module)
   6.978 -    
   6.979 -    try:
   6.980 -        import ns3_module_radvd__local
   6.981 -    except ImportError:
   6.982 -        pass
   6.983 -    else:
   6.984 -        ns3_module_radvd__local.register_functions(root_module)
   6.985 -    
   6.986 -    root_module.end_section('ns3_module_radvd')
   6.987      root_module.begin_section('ns3_module_mesh')
   6.988      ns3_module_mesh.register_functions(root_module)
   6.989      
     7.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py	Wed Nov 11 16:21:18 2009 +0100
     7.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py	Thu Nov 12 10:20:26 2009 +0100
     7.3 @@ -903,6 +903,11 @@
     7.4      cls.add_method('Close', 
     7.5                     'void', 
     7.6                     [])
     7.7 +    ## 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]
     7.8 +    cls.add_method('Diff', 
     7.9 +                   'bool', 
    7.10 +                   [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')], 
    7.11 +                   is_static=True)
    7.12      ## pcap-file.h: uint32_t ns3::PcapFile::GetDataLinkType() [member function]
    7.13      cls.add_method('GetDataLinkType', 
    7.14                     'uint32_t', 
     8.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Wed Nov 11 16:21:18 2009 +0100
     8.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Thu Nov 12 10:20:26 2009 +0100
     8.3 @@ -51,6 +51,8 @@
     8.4      module.add_class('ObjectBase', allow_subclassing=True)
     8.5      ## object-factory.h: ns3::ObjectFactory [class]
     8.6      module.add_class('ObjectFactory')
     8.7 +    ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> [class]
     8.8 +    module.add_class('ObjectRefCount', template_parameters=['ns3::Object', 'ns3::ObjectBase'], parent=root_module['ns3::ObjectBase'])
     8.9      ## random-variable.h: ns3::RandomVariable [class]
    8.10      module.add_class('RandomVariable')
    8.11      ## ref-count-base.h: ns3::RefCountBase [class]
    8.12 @@ -144,7 +146,7 @@
    8.13      ## random-variable.h: ns3::NormalVariable [class]
    8.14      module.add_class('NormalVariable', parent=root_module['ns3::RandomVariable'])
    8.15      ## object.h: ns3::Object [class]
    8.16 -    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'))
    8.17 +    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'))
    8.18      ## object.h: ns3::Object::AggregateIterator [class]
    8.19      module.add_class('AggregateIterator', outer_class=root_module['ns3::Object'])
    8.20      ## object-factory.h: ns3::ObjectFactoryChecker [class]
    8.21 @@ -304,6 +306,7 @@
    8.22      register_Ns3Names_methods(root_module, root_module['ns3::Names'])
    8.23      register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
    8.24      register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
    8.25 +    register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase >'])
    8.26      register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
    8.27      register_Ns3RefCountBase_methods(root_module, root_module['ns3::RefCountBase'])
    8.28      register_Ns3RngStream_methods(root_module, root_module['ns3::RngStream'])
    8.29 @@ -721,6 +724,43 @@
    8.30                     [param('std::string', 'tid')])
    8.31      return
    8.32  
    8.33 +def register_Ns3ObjectRefCount__Ns3Object_Ns3ObjectBase_methods(root_module, cls):
    8.34 +    ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount() [constructor]
    8.35 +    cls.add_constructor([])
    8.36 +    ## object-ref-count.h: ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ObjectRefCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> const & o) [copy constructor]
    8.37 +    cls.add_constructor([param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > const &', 'o')])
    8.38 +    ## object-ref-count.h: int ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::GetReferenceCount() const [member function]
    8.39 +    cls.add_method('GetReferenceCount', 
    8.40 +                   'int', 
    8.41 +                   [], 
    8.42 +                   is_const=True)
    8.43 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Ref() const [member function]
    8.44 +    cls.add_method('Ref', 
    8.45 +                   'void', 
    8.46 +                   [], 
    8.47 +                   is_const=True)
    8.48 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::Unref() const [member function]
    8.49 +    cls.add_method('Unref', 
    8.50 +                   'void', 
    8.51 +                   [], 
    8.52 +                   is_const=True)
    8.53 +    ## object-ref-count.h: int * ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::PeekCountPtr() const [member function]
    8.54 +    cls.add_method('PeekCountPtr', 
    8.55 +                   'int *', 
    8.56 +                   [], 
    8.57 +                   is_const=True, visibility='protected')
    8.58 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::ShareCount(ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase> * other) [member function]
    8.59 +    cls.add_method('ShareCount', 
    8.60 +                   'void', 
    8.61 +                   [param('ns3::ObjectRefCount< ns3::Object, ns3::ObjectBase > *', 'other')], 
    8.62 +                   visibility='protected')
    8.63 +    ## object-ref-count.h: void ns3::ObjectRefCount<ns3::Object, ns3::ObjectBase>::DoDelete() [member function]
    8.64 +    cls.add_method('DoDelete', 
    8.65 +                   'void', 
    8.66 +                   [], 
    8.67 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
    8.68 +    return
    8.69 +
    8.70  def register_Ns3RandomVariable_methods(root_module, cls):
    8.71      cls.add_output_stream_operator()
    8.72      ## random-variable.h: ns3::RandomVariable::RandomVariable() [constructor]
    8.73 @@ -962,10 +1002,25 @@
    8.74      cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')])
    8.75      ## system-wall-clock-ms.h: ns3::SystemWallClockMs::SystemWallClockMs() [constructor]
    8.76      cls.add_constructor([])
    8.77 -    ## system-wall-clock-ms.h: long long unsigned int ns3::SystemWallClockMs::End() [member function]
    8.78 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::End() [member function]
    8.79      cls.add_method('End', 
    8.80 -                   'long long unsigned int', 
    8.81 +                   'int64_t', 
    8.82                     [])
    8.83 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedReal() const [member function]
    8.84 +    cls.add_method('GetElapsedReal', 
    8.85 +                   'int64_t', 
    8.86 +                   [], 
    8.87 +                   is_const=True)
    8.88 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedSystem() const [member function]
    8.89 +    cls.add_method('GetElapsedSystem', 
    8.90 +                   'int64_t', 
    8.91 +                   [], 
    8.92 +                   is_const=True)
    8.93 +    ## system-wall-clock-ms.h: int64_t ns3::SystemWallClockMs::GetElapsedUser() const [member function]
    8.94 +    cls.add_method('GetElapsedUser', 
    8.95 +                   'int64_t', 
    8.96 +                   [], 
    8.97 +                   is_const=True)
    8.98      ## system-wall-clock-ms.h: void ns3::SystemWallClockMs::Start() [member function]
    8.99      cls.add_method('Start', 
   8.100                     'void', 
   8.101 @@ -1003,6 +1058,14 @@
   8.102      cls.add_method('GetBaseDir', 
   8.103                     'std::string', 
   8.104                     [])
   8.105 +    ## test.h: void ns3::TestCase::SetTempDir(std::string dir) [member function]
   8.106 +    cls.add_method('SetTempDir', 
   8.107 +                   'void', 
   8.108 +                   [param('std::string', 'dir')])
   8.109 +    ## test.h: std::string ns3::TestCase::GetTempDir() [member function]
   8.110 +    cls.add_method('GetTempDir', 
   8.111 +                   'std::string', 
   8.112 +                   [])
   8.113      ## test.h: std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
   8.114      cls.add_method('GetSourceDir', 
   8.115                     'std::string', 
   8.116 @@ -1162,6 +1225,14 @@
   8.117      cls.add_method('GetBaseDir', 
   8.118                     'std::string', 
   8.119                     [])
   8.120 +    ## test.h: void ns3::TestSuite::SetTempDir(std::string dir) [member function]
   8.121 +    cls.add_method('SetTempDir', 
   8.122 +                   'void', 
   8.123 +                   [param('std::string', 'dir')])
   8.124 +    ## test.h: std::string ns3::TestSuite::GetTempDir() [member function]
   8.125 +    cls.add_method('GetTempDir', 
   8.126 +                   'std::string', 
   8.127 +                   [])
   8.128      ## test.h: void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
   8.129      cls.add_method('SetStream', 
   8.130                     'void', 
   8.131 @@ -2046,6 +2117,11 @@
   8.132                     'void', 
   8.133                     [], 
   8.134                     visibility='protected', is_virtual=True)
   8.135 +    ## object.h: void ns3::Object::DoDelete() [member function]
   8.136 +    cls.add_method('DoDelete', 
   8.137 +                   'void', 
   8.138 +                   [], 
   8.139 +                   visibility='private', is_virtual=True)
   8.140      return
   8.141  
   8.142  def register_Ns3ObjectAggregateIterator_methods(root_module, cls):
     9.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py	Wed Nov 11 16:21:18 2009 +0100
     9.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_mobility.py	Thu Nov 12 10:20:26 2009 +0100
     9.3 @@ -9,6 +9,8 @@
     9.4      module.add_class('Rectangle')
     9.5      ## rectangle.h: ns3::Rectangle::Side [enumeration]
     9.6      module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle'])
     9.7 +    ## waypoint.h: ns3::Waypoint [class]
     9.8 +    module.add_class('Waypoint')
     9.9      ## position-allocator.h: ns3::PositionAllocator [class]
    9.10      module.add_class('PositionAllocator', parent=root_module['ns3::Object'])
    9.11      ## position-allocator.h: ns3::RandomDiscPositionAllocator [class]
    9.12 @@ -19,6 +21,10 @@
    9.13      module.add_class('RectangleChecker', parent=root_module['ns3::AttributeChecker'])
    9.14      ## rectangle.h: ns3::RectangleValue [class]
    9.15      module.add_class('RectangleValue', parent=root_module['ns3::AttributeValue'])
    9.16 +    ## waypoint.h: ns3::WaypointChecker [class]
    9.17 +    module.add_class('WaypointChecker', parent=root_module['ns3::AttributeChecker'])
    9.18 +    ## waypoint.h: ns3::WaypointValue [class]
    9.19 +    module.add_class('WaypointValue', parent=root_module['ns3::AttributeValue'])
    9.20      ## position-allocator.h: ns3::GridPositionAllocator [class]
    9.21      module.add_class('GridPositionAllocator', parent=root_module['ns3::PositionAllocator'])
    9.22      ## position-allocator.h: ns3::GridPositionAllocator::LayoutType [enumeration]
    9.23 @@ -35,6 +41,8 @@
    9.24      module.add_enum('Mode', ['MODE_DISTANCE', 'MODE_TIME'], outer_class=root_module['ns3::RandomWalk2dMobilityModel'])
    9.25      ## random-waypoint-mobility-model.h: ns3::RandomWaypointMobilityModel [class]
    9.26      module.add_class('RandomWaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
    9.27 +    ## waypoint-mobility-model.h: ns3::WaypointMobilityModel [class]
    9.28 +    module.add_class('WaypointMobilityModel', parent=root_module['ns3::MobilityModel'])
    9.29      ## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel [class]
    9.30      module.add_class('ConstantAccelerationMobilityModel', parent=root_module['ns3::MobilityModel'])
    9.31      ## constant-position-mobility-model.h: ns3::ConstantPositionMobilityModel [class]
    9.32 @@ -117,17 +125,21 @@
    9.33  def register_methods(root_module):
    9.34      register_Ns3ConstantVelocityHelper_methods(root_module, root_module['ns3::ConstantVelocityHelper'])
    9.35      register_Ns3Rectangle_methods(root_module, root_module['ns3::Rectangle'])
    9.36 +    register_Ns3Waypoint_methods(root_module, root_module['ns3::Waypoint'])
    9.37      register_Ns3PositionAllocator_methods(root_module, root_module['ns3::PositionAllocator'])
    9.38      register_Ns3RandomDiscPositionAllocator_methods(root_module, root_module['ns3::RandomDiscPositionAllocator'])
    9.39      register_Ns3RandomRectanglePositionAllocator_methods(root_module, root_module['ns3::RandomRectanglePositionAllocator'])
    9.40      register_Ns3RectangleChecker_methods(root_module, root_module['ns3::RectangleChecker'])
    9.41      register_Ns3RectangleValue_methods(root_module, root_module['ns3::RectangleValue'])
    9.42 +    register_Ns3WaypointChecker_methods(root_module, root_module['ns3::WaypointChecker'])
    9.43 +    register_Ns3WaypointValue_methods(root_module, root_module['ns3::WaypointValue'])
    9.44      register_Ns3GridPositionAllocator_methods(root_module, root_module['ns3::GridPositionAllocator'])
    9.45      register_Ns3ListPositionAllocator_methods(root_module, root_module['ns3::ListPositionAllocator'])
    9.46      register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel'])
    9.47      register_Ns3RandomDirection2dMobilityModel_methods(root_module, root_module['ns3::RandomDirection2dMobilityModel'])
    9.48      register_Ns3RandomWalk2dMobilityModel_methods(root_module, root_module['ns3::RandomWalk2dMobilityModel'])
    9.49      register_Ns3RandomWaypointMobilityModel_methods(root_module, root_module['ns3::RandomWaypointMobilityModel'])
    9.50 +    register_Ns3WaypointMobilityModel_methods(root_module, root_module['ns3::WaypointMobilityModel'])
    9.51      register_Ns3ConstantAccelerationMobilityModel_methods(root_module, root_module['ns3::ConstantAccelerationMobilityModel'])
    9.52      register_Ns3ConstantPositionMobilityModel_methods(root_module, root_module['ns3::ConstantPositionMobilityModel'])
    9.53      register_Ns3ConstantVelocityMobilityModel_methods(root_module, root_module['ns3::ConstantVelocityMobilityModel'])
    9.54 @@ -214,6 +226,20 @@
    9.55      cls.add_instance_attribute('yMin', 'double', is_const=False)
    9.56      return
    9.57  
    9.58 +def register_Ns3Waypoint_methods(root_module, cls):
    9.59 +    cls.add_output_stream_operator()
    9.60 +    ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Waypoint const & arg0) [copy constructor]
    9.61 +    cls.add_constructor([param('ns3::Waypoint const &', 'arg0')])
    9.62 +    ## waypoint.h: ns3::Waypoint::Waypoint(ns3::Time const & waypointTime, ns3::Vector const & waypointPosition) [constructor]
    9.63 +    cls.add_constructor([param('ns3::Time const &', 'waypointTime'), param('ns3::Vector const &', 'waypointPosition')])
    9.64 +    ## waypoint.h: ns3::Waypoint::Waypoint() [constructor]
    9.65 +    cls.add_constructor([])
    9.66 +    ## waypoint.h: ns3::Waypoint::position [variable]
    9.67 +    cls.add_instance_attribute('position', 'ns3::Vector', is_const=False)
    9.68 +    ## waypoint.h: ns3::Waypoint::time [variable]
    9.69 +    cls.add_instance_attribute('time', 'ns3::Time', is_const=False)
    9.70 +    return
    9.71 +
    9.72  def register_Ns3PositionAllocator_methods(root_module, cls):
    9.73      ## position-allocator.h: ns3::PositionAllocator::PositionAllocator(ns3::PositionAllocator const & arg0) [copy constructor]
    9.74      cls.add_constructor([param('ns3::PositionAllocator const &', 'arg0')])
    9.75 @@ -329,6 +355,46 @@
    9.76                     [param('ns3::Rectangle const &', 'value')])
    9.77      return
    9.78  
    9.79 +def register_Ns3WaypointChecker_methods(root_module, cls):
    9.80 +    ## waypoint.h: ns3::WaypointChecker::WaypointChecker() [constructor]
    9.81 +    cls.add_constructor([])
    9.82 +    ## waypoint.h: ns3::WaypointChecker::WaypointChecker(ns3::WaypointChecker const & arg0) [copy constructor]
    9.83 +    cls.add_constructor([param('ns3::WaypointChecker const &', 'arg0')])
    9.84 +    return
    9.85 +
    9.86 +def register_Ns3WaypointValue_methods(root_module, cls):
    9.87 +    ## waypoint.h: ns3::WaypointValue::WaypointValue() [constructor]
    9.88 +    cls.add_constructor([])
    9.89 +    ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::WaypointValue const & arg0) [copy constructor]
    9.90 +    cls.add_constructor([param('ns3::WaypointValue const &', 'arg0')])
    9.91 +    ## waypoint.h: ns3::WaypointValue::WaypointValue(ns3::Waypoint const & value) [constructor]
    9.92 +    cls.add_constructor([param('ns3::Waypoint const &', 'value')])
    9.93 +    ## waypoint.h: ns3::Ptr<ns3::AttributeValue> ns3::WaypointValue::Copy() const [member function]
    9.94 +    cls.add_method('Copy', 
    9.95 +                   'ns3::Ptr< ns3::AttributeValue >', 
    9.96 +                   [], 
    9.97 +                   is_const=True, is_virtual=True)
    9.98 +    ## waypoint.h: bool ns3::WaypointValue::DeserializeFromString(std::string value, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]
    9.99 +    cls.add_method('DeserializeFromString', 
   9.100 +                   'bool', 
   9.101 +                   [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   9.102 +                   is_virtual=True)
   9.103 +    ## waypoint.h: ns3::Waypoint ns3::WaypointValue::Get() const [member function]
   9.104 +    cls.add_method('Get', 
   9.105 +                   'ns3::Waypoint', 
   9.106 +                   [], 
   9.107 +                   is_const=True)
   9.108 +    ## waypoint.h: std::string ns3::WaypointValue::SerializeToString(ns3::Ptr<ns3::AttributeChecker const> checker) const [member function]
   9.109 +    cls.add_method('SerializeToString', 
   9.110 +                   'std::string', 
   9.111 +                   [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], 
   9.112 +                   is_const=True, is_virtual=True)
   9.113 +    ## waypoint.h: void ns3::WaypointValue::Set(ns3::Waypoint const & value) [member function]
   9.114 +    cls.add_method('Set', 
   9.115 +                   'void', 
   9.116 +                   [param('ns3::Waypoint const &', 'value')])
   9.117 +    return
   9.118 +
   9.119  def register_Ns3GridPositionAllocator_methods(root_module, cls):
   9.120      ## position-allocator.h: ns3::GridPositionAllocator::GridPositionAllocator(ns3::GridPositionAllocator const & arg0) [copy constructor]
   9.121      cls.add_constructor([param('ns3::GridPositionAllocator const &', 'arg0')])
   9.122 @@ -563,6 +629,56 @@
   9.123                     visibility='private', is_virtual=True)
   9.124      return
   9.125  
   9.126 +def register_Ns3WaypointMobilityModel_methods(root_module, cls):
   9.127 +    ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel(ns3::WaypointMobilityModel const & arg0) [copy constructor]
   9.128 +    cls.add_constructor([param('ns3::WaypointMobilityModel const &', 'arg0')])
   9.129 +    ## waypoint-mobility-model.h: ns3::WaypointMobilityModel::WaypointMobilityModel() [constructor]
   9.130 +    cls.add_constructor([])
   9.131 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::AddWaypoint(ns3::Waypoint const & waypoint) [member function]
   9.132 +    cls.add_method('AddWaypoint', 
   9.133 +                   'void', 
   9.134 +                   [param('ns3::Waypoint const &', 'waypoint')])
   9.135 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::EndMobility() [member function]
   9.136 +    cls.add_method('EndMobility', 
   9.137 +                   'void', 
   9.138 +                   [])
   9.139 +    ## waypoint-mobility-model.h: ns3::Waypoint ns3::WaypointMobilityModel::GetNextWaypoint() const [member function]
   9.140 +    cls.add_method('GetNextWaypoint', 
   9.141 +                   'ns3::Waypoint', 
   9.142 +                   [], 
   9.143 +                   is_const=True)
   9.144 +    ## waypoint-mobility-model.h: static ns3::TypeId ns3::WaypointMobilityModel::GetTypeId() [member function]
   9.145 +    cls.add_method('GetTypeId', 
   9.146 +                   'ns3::TypeId', 
   9.147 +                   [], 
   9.148 +                   is_static=True)
   9.149 +    ## waypoint-mobility-model.h: uint32_t ns3::WaypointMobilityModel::WaypointsLeft() const [member function]
   9.150 +    cls.add_method('WaypointsLeft', 
   9.151 +                   'uint32_t', 
   9.152 +                   [], 
   9.153 +                   is_const=True)
   9.154 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoDispose() [member function]
   9.155 +    cls.add_method('DoDispose', 
   9.156 +                   'void', 
   9.157 +                   [], 
   9.158 +                   visibility='private', is_virtual=True)
   9.159 +    ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetPosition() const [member function]
   9.160 +    cls.add_method('DoGetPosition', 
   9.161 +                   'ns3::Vector', 
   9.162 +                   [], 
   9.163 +                   is_const=True, visibility='private', is_virtual=True)
   9.164 +    ## waypoint-mobility-model.h: ns3::Vector ns3::WaypointMobilityModel::DoGetVelocity() const [member function]
   9.165 +    cls.add_method('DoGetVelocity', 
   9.166 +                   'ns3::Vector', 
   9.167 +                   [], 
   9.168 +                   is_const=True, visibility='private', is_virtual=True)
   9.169 +    ## waypoint-mobility-model.h: void ns3::WaypointMobilityModel::DoSetPosition(ns3::Vector const & position) [member function]
   9.170 +    cls.add_method('DoSetPosition', 
   9.171 +                   'void', 
   9.172 +                   [param('ns3::Vector const &', 'position')], 
   9.173 +                   visibility='private', is_virtual=True)
   9.174 +    return
   9.175 +
   9.176  def register_Ns3ConstantAccelerationMobilityModel_methods(root_module, cls):
   9.177      ## constant-acceleration-mobility-model.h: ns3::ConstantAccelerationMobilityModel::ConstantAccelerationMobilityModel(ns3::ConstantAccelerationMobilityModel const & arg0) [copy constructor]
   9.178      cls.add_constructor([param('ns3::ConstantAccelerationMobilityModel const &', 'arg0')])
   9.179 @@ -703,6 +819,10 @@
   9.180      module.add_function('MakeRectangleChecker', 
   9.181                          'ns3::Ptr< ns3::AttributeChecker const >', 
   9.182                          [])
   9.183 +    ## waypoint.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeWaypointChecker() [free function]
   9.184 +    module.add_function('MakeWaypointChecker', 
   9.185 +                        'ns3::Ptr< ns3::AttributeChecker const >', 
   9.186 +                        [])
   9.187      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   9.188      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   9.189      register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    10.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py	Wed Nov 11 16:21:18 2009 +0100
    10.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py	Thu Nov 12 10:20:26 2009 +0100
    10.3 @@ -101,6 +101,10 @@
    10.4                     'ns3::TypeId', 
    10.5                     [], 
    10.6                     is_const=True, is_virtual=True)
    10.7 +    ## ppp-header.h: uint16_t ns3::PppHeader::GetProtocol() [member function]
    10.8 +    cls.add_method('GetProtocol', 
    10.9 +                   'uint16_t', 
   10.10 +                   [])
   10.11      ## ppp-header.h: uint32_t ns3::PppHeader::GetSerializedSize() const [member function]
   10.12      cls.add_method('GetSerializedSize', 
   10.13                     'uint32_t', 
   10.14 @@ -121,6 +125,10 @@
   10.15                     'void', 
   10.16                     [param('ns3::Buffer::Iterator', 'start')], 
   10.17                     is_const=True, is_virtual=True)
   10.18 +    ## ppp-header.h: void ns3::PppHeader::SetProtocol(uint16_t protocol) [member function]
   10.19 +    cls.add_method('SetProtocol', 
   10.20 +                   'void', 
   10.21 +                   [param('uint16_t', 'protocol')])
   10.22      return
   10.23  
   10.24  def register_Ns3PointToPointChannel_methods(root_module, cls):
    11.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py	Wed Nov 11 16:21:18 2009 +0100
    11.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_stats.py	Thu Nov 12 10:20:26 2009 +0100
    11.3 @@ -5,18 +5,16 @@
    11.4      
    11.5      ## data-output-interface.h: ns3::DataOutputCallback [class]
    11.6      module.add_class('DataOutputCallback', allow_subclassing=True)
    11.7 +    ## data-calculator.h: ns3::StatisticalSummary [class]
    11.8 +    module.add_class('StatisticalSummary', allow_subclassing=True)
    11.9      ## data-calculator.h: ns3::DataCalculator [class]
   11.10      module.add_class('DataCalculator', parent=root_module['ns3::Object'])
   11.11      ## data-collector.h: ns3::DataCollector [class]
   11.12      module.add_class('DataCollector', parent=root_module['ns3::Object'])
   11.13      ## data-output-interface.h: ns3::DataOutputInterface [class]
   11.14      module.add_class('DataOutputInterface', parent=root_module['ns3::Object'])
   11.15 -    ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int> [class]
   11.16 -    module.add_class('MinMaxAvgTotalCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
   11.17      ## omnet-data-output.h: ns3::OmnetDataOutput [class]
   11.18      module.add_class('OmnetDataOutput', parent=root_module['ns3::DataOutputInterface'])
   11.19 -    ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator [class]
   11.20 -    module.add_class('PacketSizeMinMaxAvgTotalCalculator', parent=root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
   11.21      ## sqlite-data-output.h: ns3::SqliteDataOutput [class]
   11.22      module.add_class('SqliteDataOutput', parent=root_module['ns3::DataOutputInterface'])
   11.23      ## time-data-calculators.h: ns3::TimeMinMaxAvgTotalCalculator [class]
   11.24 @@ -104,12 +102,11 @@
   11.25  
   11.26  def register_methods(root_module):
   11.27      register_Ns3DataOutputCallback_methods(root_module, root_module['ns3::DataOutputCallback'])
   11.28 +    register_Ns3StatisticalSummary_methods(root_module, root_module['ns3::StatisticalSummary'])
   11.29      register_Ns3DataCalculator_methods(root_module, root_module['ns3::DataCalculator'])
   11.30      register_Ns3DataCollector_methods(root_module, root_module['ns3::DataCollector'])
   11.31      register_Ns3DataOutputInterface_methods(root_module, root_module['ns3::DataOutputInterface'])
   11.32 -    register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, root_module['ns3::MinMaxAvgTotalCalculator< unsigned int >'])
   11.33      register_Ns3OmnetDataOutput_methods(root_module, root_module['ns3::OmnetDataOutput'])
   11.34 -    register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::PacketSizeMinMaxAvgTotalCalculator'])
   11.35      register_Ns3SqliteDataOutput_methods(root_module, root_module['ns3::SqliteDataOutput'])
   11.36      register_Ns3TimeMinMaxAvgTotalCalculator_methods(root_module, root_module['ns3::TimeMinMaxAvgTotalCalculator'])
   11.37      register_Ns3CounterCalculator__Unsigned_int_methods(root_module, root_module['ns3::CounterCalculator< unsigned int >'])
   11.38 @@ -146,6 +143,58 @@
   11.39                     'void', 
   11.40                     [param('std::string', 'key'), param('std::string', 'variable'), param('ns3::Time', 'val')], 
   11.41                     is_pure_virtual=True, is_virtual=True)
   11.42 +    ## data-output-interface.h: void ns3::DataOutputCallback::OutputStatistic(std::string key, std::string variable, ns3::StatisticalSummary const * statSum) [member function]
   11.43 +    cls.add_method('OutputStatistic', 
   11.44 +                   'void', 
   11.45 +                   [param('std::string', 'key'), param('std::string', 'variable'), param('ns3::StatisticalSummary const *', 'statSum')], 
   11.46 +                   is_pure_virtual=True, is_virtual=True)
   11.47 +    return
   11.48 +
   11.49 +def register_Ns3StatisticalSummary_methods(root_module, cls):
   11.50 +    ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary() [constructor]
   11.51 +    cls.add_constructor([])
   11.52 +    ## data-calculator.h: ns3::StatisticalSummary::StatisticalSummary(ns3::StatisticalSummary const & arg0) [copy constructor]
   11.53 +    cls.add_constructor([param('ns3::StatisticalSummary const &', 'arg0')])
   11.54 +    ## data-calculator.h: long int ns3::StatisticalSummary::getCount() const [member function]
   11.55 +    cls.add_method('getCount', 
   11.56 +                   'long int', 
   11.57 +                   [], 
   11.58 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.59 +    ## data-calculator.h: double ns3::StatisticalSummary::getMax() const [member function]
   11.60 +    cls.add_method('getMax', 
   11.61 +                   'double', 
   11.62 +                   [], 
   11.63 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.64 +    ## data-calculator.h: double ns3::StatisticalSummary::getMean() const [member function]
   11.65 +    cls.add_method('getMean', 
   11.66 +                   'double', 
   11.67 +                   [], 
   11.68 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.69 +    ## data-calculator.h: double ns3::StatisticalSummary::getMin() const [member function]
   11.70 +    cls.add_method('getMin', 
   11.71 +                   'double', 
   11.72 +                   [], 
   11.73 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.74 +    ## data-calculator.h: double ns3::StatisticalSummary::getSqrSum() const [member function]
   11.75 +    cls.add_method('getSqrSum', 
   11.76 +                   'double', 
   11.77 +                   [], 
   11.78 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.79 +    ## data-calculator.h: double ns3::StatisticalSummary::getStddev() const [member function]
   11.80 +    cls.add_method('getStddev', 
   11.81 +                   'double', 
   11.82 +                   [], 
   11.83 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.84 +    ## data-calculator.h: double ns3::StatisticalSummary::getSum() const [member function]
   11.85 +    cls.add_method('getSum', 
   11.86 +                   'double', 
   11.87 +                   [], 
   11.88 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.89 +    ## data-calculator.h: double ns3::StatisticalSummary::getVariance() const [member function]
   11.90 +    cls.add_method('getVariance', 
   11.91 +                   'double', 
   11.92 +                   [], 
   11.93 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
   11.94      return
   11.95  
   11.96  def register_Ns3DataCalculator_methods(root_module, cls):
   11.97 @@ -161,6 +210,11 @@
   11.98      cls.add_method('Enable', 
   11.99                     'void', 
  11.100                     [])
  11.101 +    ## data-calculator.h: std::string ns3::DataCalculator::GetContext() const [member function]
  11.102 +    cls.add_method('GetContext', 
  11.103 +                   'std::string', 
  11.104 +                   [], 
  11.105 +                   is_const=True)
  11.106      ## data-calculator.h: bool ns3::DataCalculator::GetEnabled() const [member function]
  11.107      cls.add_method('GetEnabled', 
  11.108                     'bool', 
  11.109 @@ -176,6 +230,10 @@
  11.110                     'void', 
  11.111                     [param('ns3::DataOutputCallback &', 'callback')], 
  11.112                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.113 +    ## data-calculator.h: void ns3::DataCalculator::SetContext(std::string const context) [member function]
  11.114 +    cls.add_method('SetContext', 
  11.115 +                   'void', 
  11.116 +                   [param('std::string const', 'context')])
  11.117      ## data-calculator.h: void ns3::DataCalculator::SetKey(std::string const key) [member function]
  11.118      cls.add_method('SetKey', 
  11.119                     'void', 
  11.120 @@ -296,27 +354,6 @@
  11.121                     visibility='protected', is_virtual=True)
  11.122      return
  11.123  
  11.124 -def register_Ns3MinMaxAvgTotalCalculator__Unsigned_int_methods(root_module, cls):
  11.125 -    ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator(ns3::MinMaxAvgTotalCalculator<unsigned int> const & arg0) [copy constructor]
  11.126 -    cls.add_constructor([param('ns3::MinMaxAvgTotalCalculator< unsigned int > const &', 'arg0')])
  11.127 -    ## basic-data-calculators.h: ns3::MinMaxAvgTotalCalculator<unsigned int>::MinMaxAvgTotalCalculator() [constructor]
  11.128 -    cls.add_constructor([])
  11.129 -    ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Output(ns3::DataOutputCallback & callback) const [member function]
  11.130 -    cls.add_method('Output', 
  11.131 -                   'void', 
  11.132 -                   [param('ns3::DataOutputCallback &', 'callback')], 
  11.133 -                   is_const=True, is_virtual=True)
  11.134 -    ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::Update(unsigned int const i) [member function]
  11.135 -    cls.add_method('Update', 
  11.136 -                   'void', 
  11.137 -                   [param('unsigned int const', 'i')])
  11.138 -    ## basic-data-calculators.h: void ns3::MinMaxAvgTotalCalculator<unsigned int>::DoDispose() [member function]
  11.139 -    cls.add_method('DoDispose', 
  11.140 -                   'void', 
  11.141 -                   [], 
  11.142 -                   visibility='protected', is_virtual=True)
  11.143 -    return
  11.144 -
  11.145  def register_Ns3OmnetDataOutput_methods(root_module, cls):
  11.146      ## omnet-data-output.h: ns3::OmnetDataOutput::OmnetDataOutput(ns3::OmnetDataOutput const & arg0) [copy constructor]
  11.147      cls.add_constructor([param('ns3::OmnetDataOutput const &', 'arg0')])
  11.148 @@ -334,26 +371,6 @@
  11.149                     visibility='protected', is_virtual=True)
  11.150      return
  11.151  
  11.152 -def register_Ns3PacketSizeMinMaxAvgTotalCalculator_methods(root_module, cls):
  11.153 -    ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator(ns3::PacketSizeMinMaxAvgTotalCalculator const & arg0) [copy constructor]
  11.154 -    cls.add_constructor([param('ns3::PacketSizeMinMaxAvgTotalCalculator const &', 'arg0')])
  11.155 -    ## packet-data-calculators.h: ns3::PacketSizeMinMaxAvgTotalCalculator::PacketSizeMinMaxAvgTotalCalculator() [constructor]
  11.156 -    cls.add_constructor([])
  11.157 -    ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::FrameUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet, ns3::Mac48Address realto) [member function]
  11.158 -    cls.add_method('FrameUpdate', 
  11.159 -                   'void', 
  11.160 -                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('ns3::Mac48Address', 'realto')])
  11.161 -    ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::PacketUpdate(std::string path, ns3::Ptr<ns3::Packet const> packet) [member function]
  11.162 -    cls.add_method('PacketUpdate', 
  11.163 -                   'void', 
  11.164 -                   [param('std::string', 'path'), param('ns3::Ptr< ns3::Packet const >', 'packet')])
  11.165 -    ## packet-data-calculators.h: void ns3::PacketSizeMinMaxAvgTotalCalculator::DoDispose() [member function]
  11.166 -    cls.add_method('DoDispose', 
  11.167 -                   'void', 
  11.168 -                   [], 
  11.169 -                   visibility='protected', is_virtual=True)
  11.170 -    return
  11.171 -
  11.172  def register_Ns3SqliteDataOutput_methods(root_module, cls):
  11.173      ## sqlite-data-output.h: ns3::SqliteDataOutput::SqliteDataOutput(ns3::SqliteDataOutput const & arg0) [copy constructor]
  11.174      cls.add_constructor([param('ns3::SqliteDataOutput const &', 'arg0')])
  11.175 @@ -444,6 +461,10 @@
  11.176  
  11.177  def register_functions(root_module):
  11.178      module = root_module
  11.179 +    ## data-calculator.h: bool ns3::isNaN(double x) [free function]
  11.180 +    module.add_function('isNaN', 
  11.181 +                        'bool', 
  11.182 +                        [param('double', 'x')])
  11.183      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
  11.184      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
  11.185      register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    12.1 --- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Wed Nov 11 16:21:18 2009 +0100
    12.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Thu Nov 12 10:20:26 2009 +0100
    12.3 @@ -17,29 +17,29 @@
    12.4  import ns3_module_test
    12.5  import ns3_module_mobility
    12.6  import ns3_module_common
    12.7 +import ns3_module_contrib
    12.8  import ns3_module_node
    12.9 -import ns3_module_contrib
   12.10 +import ns3_module_tap_bridge
   12.11 +import ns3_module_v4ping
   12.12 +import ns3_module_static_routing
   12.13 +import ns3_module_packet_sink
   12.14 +import ns3_module_stats
   12.15 +import ns3_module_onoff
   12.16  import ns3_module_point_to_point
   12.17  import ns3_module_internet_stack
   12.18 -import ns3_module_tap_bridge
   12.19  import ns3_module_csma
   12.20 +import ns3_module_list_routing
   12.21 +import ns3_module_virtual_net_device
   12.22  import ns3_module_wifi
   12.23 -import ns3_module_static_routing
   12.24 -import ns3_module_v4ping
   12.25 -import ns3_module_virtual_net_device
   12.26 -import ns3_module_packet_sink
   12.27 -import ns3_module_global_routing
   12.28 -import ns3_module_stats
   12.29 -import ns3_module_list_routing
   12.30  import ns3_module_emu
   12.31  import ns3_module_bridge
   12.32 -import ns3_module_onoff
   12.33 +import ns3_module_global_routing
   12.34  import ns3_module_udp_echo
   12.35 -import ns3_module_ping6
   12.36  import ns3_module_nix_vector_routing
   12.37  import ns3_module_olsr
   12.38 +import ns3_module_radvd
   12.39 +import ns3_module_ping6
   12.40  import ns3_module_flow_monitor
   12.41 -import ns3_module_radvd
   12.42  import ns3_module_mesh
   12.43  import ns3_module_helper
   12.44  import ns3_module_dot11s
   12.45 @@ -107,6 +107,17 @@
   12.46          ns3_module_common__local.register_types(module)
   12.47      
   12.48      root_module.end_section('ns3_module_common')
   12.49 +    root_module.begin_section('ns3_module_contrib')
   12.50 +    ns3_module_contrib.register_types(module)
   12.51 +    
   12.52 +    try:
   12.53 +        import ns3_module_contrib__local
   12.54 +    except ImportError:
   12.55 +        pass
   12.56 +    else:
   12.57 +        ns3_module_contrib__local.register_types(module)
   12.58 +    
   12.59 +    root_module.end_section('ns3_module_contrib')
   12.60      root_module.begin_section('ns3_module_node')
   12.61      ns3_module_node.register_types(module)
   12.62      
   12.63 @@ -118,17 +129,72 @@
   12.64          ns3_module_node__local.register_types(module)
   12.65      
   12.66      root_module.end_section('ns3_module_node')
   12.67 -    root_module.begin_section('ns3_module_contrib')
   12.68 -    ns3_module_contrib.register_types(module)
   12.69 +    root_module.begin_section('ns3_module_tap_bridge')
   12.70 +    ns3_module_tap_bridge.register_types(module)
   12.71      
   12.72      try:
   12.73 -        import ns3_module_contrib__local
   12.74 +        import ns3_module_tap_bridge__local
   12.75      except ImportError:
   12.76          pass
   12.77      else:
   12.78 -        ns3_module_contrib__local.register_types(module)
   12.79 +        ns3_module_tap_bridge__local.register_types(module)
   12.80      
   12.81 -    root_module.end_section('ns3_module_contrib')
   12.82 +    root_module.end_section('ns3_module_tap_bridge')
   12.83 +    root_module.begin_section('ns3_module_v4ping')
   12.84 +    ns3_module_v4ping.register_types(module)
   12.85 +    
   12.86 +    try:
   12.87 +        import ns3_module_v4ping__local
   12.88 +    except ImportError:
   12.89 +        pass
   12.90 +    else:
   12.91 +        ns3_module_v4ping__local.register_types(module)
   12.92 +    
   12.93 +    root_module.end_section('ns3_module_v4ping')
   12.94 +    root_module.begin_section('ns3_module_static_routing')
   12.95 +    ns3_module_static_routing.register_types(module)
   12.96 +    
   12.97 +    try:
   12.98 +        import ns3_module_static_routing__local
   12.99 +    except ImportError:
  12.100 +        pass
  12.101 +    else:
  12.102 +        ns3_module_static_routing__local.register_types(module)
  12.103 +    
  12.104 +    root_module.end_section('ns3_module_static_routing')
  12.105 +    root_module.begin_section('ns3_module_packet_sink')
  12.106 +    ns3_module_packet_sink.register_types(module)
  12.107 +    
  12.108 +    try:
  12.109 +        import ns3_module_packet_sink__local
  12.110 +    except ImportError:
  12.111 +        pass
  12.112 +    else:
  12.113 +        ns3_module_packet_sink__local.register_types(module)
  12.114 +    
  12.115 +    root_module.end_section('ns3_module_packet_sink')
  12.116 +    root_module.begin_section('ns3_module_stats')
  12.117 +    ns3_module_stats.register_types(module)
  12.118 +    
  12.119 +    try:
  12.120 +        import ns3_module_stats__local
  12.121 +    except ImportError:
  12.122 +        pass
  12.123 +    else:
  12.124 +        ns3_module_stats__local.register_types(module)
  12.125 +    
  12.126 +    root_module.end_section('ns3_module_stats')
  12.127 +    root_module.begin_section('ns3_module_onoff')
  12.128 +    ns3_module_onoff.register_types(module)
  12.129 +    
  12.130 +    try:
  12.131 +        import ns3_module_onoff__local
  12.132 +    except ImportError:
  12.133 +        pass
  12.134 +    else:
  12.135 +        ns3_module_onoff__local.register_types(module)
  12.136 +    
  12.137 +    root_module.end_section('ns3_module_onoff')
  12.138      root_module.begin_section('ns3_module_point_to_point')
  12.139      ns3_module_point_to_point.register_types(module)
  12.140      
  12.141 @@ -151,17 +217,6 @@
  12.142          ns3_module_internet_stack__local.register_types(module)
  12.143      
  12.144      root_module.end_section('ns3_module_internet_stack')
  12.145 -    root_module.begin_section('ns3_module_tap_bridge')
  12.146 -    ns3_module_tap_bridge.register_types(module)
  12.147 -    
  12.148 -    try:
  12.149 -        import ns3_module_tap_bridge__local
  12.150 -    except ImportError:
  12.151 -        pass
  12.152 -    else:
  12.153 -        ns3_module_tap_bridge__local.register_types(module)
  12.154 -    
  12.155 -    root_module.end_section('ns3_module_tap_bridge')
  12.156      root_module.begin_section('ns3_module_csma')
  12.157      ns3_module_csma.register_types(module)
  12.158      
  12.159 @@ -173,6 +228,28 @@
  12.160          ns3_module_csma__local.register_types(module)
  12.161      
  12.162      root_module.end_section('ns3_module_csma')
  12.163 +    root_module.begin_section('ns3_module_list_routing')
  12.164 +    ns3_module_list_routing.register_types(module)
  12.165 +    
  12.166 +    try:
  12.167 +        import ns3_module_list_routing__local
  12.168 +    except ImportError:
  12.169 +        pass
  12.170 +    else:
  12.171 +        ns3_module_list_routing__local.register_types(module)
  12.172 +    
  12.173 +    root_module.end_section('ns3_module_list_routing')
  12.174 +    root_module.begin_section('ns3_module_virtual_net_device')
  12.175 +    ns3_module_virtual_net_device.register_types(module)
  12.176 +    
  12.177 +    try:
  12.178 +        import ns3_module_virtual_net_device__local
  12.179 +    except ImportError:
  12.180 +        pass
  12.181 +    else:
  12.182 +        ns3_module_virtual_net_device__local.register_types(module)
  12.183 +    
  12.184 +    root_module.end_section('ns3_module_virtual_net_device')
  12.185      root_module.begin_section('ns3_module_wifi')
  12.186      ns3_module_wifi.register_types(module)
  12.187      
  12.188 @@ -184,83 +261,6 @@
  12.189          ns3_module_wifi__local.register_types(module)
  12.190      
  12.191      root_module.end_section('ns3_module_wifi')
  12.192 -    root_module.begin_section('ns3_module_static_routing')
  12.193 -    ns3_module_static_routing.register_types(module)
  12.194 -    
  12.195 -    try:
  12.196 -        import ns3_module_static_routing__local
  12.197 -    except ImportError:
  12.198 -        pass
  12.199 -    else:
  12.200 -        ns3_module_static_routing__local.register_types(module)
  12.201 -    
  12.202 -    root_module.end_section('ns3_module_static_routing')
  12.203 -    root_module.begin_section('ns3_module_v4ping')
  12.204 -    ns3_module_v4ping.register_types(module)
  12.205 -    
  12.206 -    try:
  12.207 -        import ns3_module_v4ping__local
  12.208 -    except ImportError:
  12.209 -        pass
  12.210 -    else:
  12.211 -        ns3_module_v4ping__local.register_types(module)
  12.212 -    
  12.213 -    root_module.end_section('ns3_module_v4ping')
  12.214 -    root_module.begin_section('ns3_module_virtual_net_device')
  12.215 -    ns3_module_virtual_net_device.register_types(module)
  12.216 -    
  12.217 -    try:
  12.218 -        import ns3_module_virtual_net_device__local
  12.219 -    except ImportError:
  12.220 -        pass
  12.221 -    else:
  12.222 -        ns3_module_virtual_net_device__local.register_types(module)
  12.223 -    
  12.224 -    root_module.end_section('ns3_module_virtual_net_device')
  12.225 -    root_module.begin_section('ns3_module_packet_sink')
  12.226 -    ns3_module_packet_sink.register_types(module)
  12.227 -    
  12.228 -    try:
  12.229 -        import ns3_module_packet_sink__local
  12.230 -    except ImportError:
  12.231 -        pass
  12.232 -    else:
  12.233 -        ns3_module_packet_sink__local.register_types(module)
  12.234 -    
  12.235 -    root_module.end_section('ns3_module_packet_sink')
  12.236 -    root_module.begin_section('ns3_module_global_routing')
  12.237 -    ns3_module_global_routing.register_types(module)
  12.238 -    
  12.239 -    try:
  12.240 -        import ns3_module_global_routing__local
  12.241 -    except ImportError:
  12.242 -        pass
  12.243 -    else:
  12.244 -        ns3_module_global_routing__local.register_types(module)
  12.245 -    
  12.246 -    root_module.end_section('ns3_module_global_routing')
  12.247 -    root_module.begin_section('ns3_module_stats')
  12.248 -    ns3_module_stats.register_types(module)
  12.249 -    
  12.250 -    try:
  12.251 -        import ns3_module_stats__local
  12.252 -    except ImportError:
  12.253 -        pass
  12.254 -    else:
  12.255 -        ns3_module_stats__local.register_types(module)
  12.256 -    
  12.257 -    root_module.end_section('ns3_module_stats')
  12.258 -    root_module.begin_section('ns3_module_list_routing')
  12.259 -    ns3_module_list_routing.register_types(module)
  12.260 -    
  12.261 -    try:
  12.262 -        import ns3_module_list_routing__local
  12.263 -    except ImportError:
  12.264 -        pass
  12.265 -    else:
  12.266 -        ns3_module_list_routing__local.register_types(module)
  12.267 -    
  12.268 -    root_module.end_section('ns3_module_list_routing')
  12.269      root_module.begin_section('ns3_module_emu')
  12.270      ns3_module_emu.register_types(module)
  12.271      
  12.272 @@ -283,17 +283,17 @@
  12.273          ns3_module_bridge__local.register_types(module)
  12.274      
  12.275      root_module.end_section('ns3_module_bridge')
  12.276 -    root_module.begin_section('ns3_module_onoff')
  12.277 -    ns3_module_onoff.register_types(module)
  12.278 +    root_module.begin_section('ns3_module_global_routing')
  12.279 +    ns3_module_global_routing.register_types(module)
  12.280      
  12.281      try:
  12.282 -        import ns3_module_onoff__local
  12.283 +        import ns3_module_global_routing__local
  12.284      except ImportError:
  12.285          pass
  12.286      else:
  12.287 -        ns3_module_onoff__local.register_types(module)
  12.288 +        ns3_module_global_routing__local.register_types(module)
  12.289      
  12.290 -    root_module.end_section('ns3_module_onoff')
  12.291 +    root_module.end_section('ns3_module_global_routing')
  12.292      root_module.begin_section('ns3_module_udp_echo')
  12.293      ns3_module_udp_echo.register_types(module)
  12.294      
  12.295 @@ -305,17 +305,6 @@
  12.296          ns3_module_udp_echo__local.register_types(module)
  12.297      
  12.298      root_module.end_section('ns3_module_udp_echo')
  12.299 -    root_module.begin_section('ns3_module_ping6')
  12.300 -    ns3_module_ping6.register_types(module)
  12.301 -    
  12.302 -    try:
  12.303 -        import ns3_module_ping6__local
  12.304 -    except ImportError:
  12.305 -        pass
  12.306 -    else:
  12.307 -        ns3_module_ping6__local.register_types(module)
  12.308 -    
  12.309 -    root_module.end_section('ns3_module_ping6')
  12.310      root_module.begin_section('ns3_module_nix_vector_routing')
  12.311      ns3_module_nix_vector_routing.register_types(module)
  12.312      
  12.313 @@ -338,6 +327,28 @@
  12.314          ns3_module_olsr__local.register_types(module)
  12.315      
  12.316      root_module.end_section('ns3_module_olsr')
  12.317 +    root_module.begin_section('ns3_module_radvd')
  12.318 +    ns3_module_radvd.register_types(module)
  12.319 +    
  12.320 +    try:
  12.321 +        import ns3_module_radvd__local
  12.322 +    except ImportError:
  12.323 +        pass
  12.324 +    else:
  12.325 +        ns3_module_radvd__local.register_types(module)
  12.326 +    
  12.327 +    root_module.end_section('ns3_module_radvd')
  12.328 +    root_module.begin_section('ns3_module_ping6')
  12.329 +    ns3_module_ping6.register_types(module)
  12.330 +    
  12.331 +    try:
  12.332 +        import ns3_module_ping6__local
  12.333 +    except ImportError:
  12.334 +        pass
  12.335 +    else:
  12.336 +        ns3_module_ping6__local.register_types(module)
  12.337 +    
  12.338 +    root_module.end_section('ns3_module_ping6')
  12.339      root_module.begin_section('ns3_module_flow_monitor')
  12.340      ns3_module_flow_monitor.register_types(module)
  12.341      
  12.342 @@ -349,17 +360,6 @@
  12.343          ns3_module_flow_monitor__local.register_types(module)
  12.344      
  12.345      root_module.end_section('ns3_module_flow_monitor')
  12.346 -    root_module.begin_section('ns3_module_radvd')
  12.347 -    ns3_module_radvd.register_types(module)
  12.348 -    
  12.349 -    try:
  12.350 -        import ns3_module_radvd__local
  12.351 -    except ImportError:
  12.352 -        pass
  12.353 -    else:
  12.354 -        ns3_module_radvd__local.register_types(module)
  12.355 -    
  12.356 -    root_module.end_section('ns3_module_radvd')
  12.357      root_module.begin_section('ns3_module_mesh')
  12.358      ns3_module_mesh.register_types(module)
  12.359      
  12.360 @@ -549,6 +549,17 @@
  12.361          ns3_module_common__local.register_methods(root_module)
  12.362      
  12.363      root_module.end_section('ns3_module_common')
  12.364 +    root_module.begin_section('ns3_module_contrib')
  12.365 +    ns3_module_contrib.register_methods(root_module)
  12.366 +    
  12.367 +    try:
  12.368 +        import ns3_module_contrib__local
  12.369 +    except ImportError:
  12.370 +        pass
  12.371 +    else:
  12.372 +        ns3_module_contrib__local.register_methods(root_module)
  12.373 +    
  12.374 +    root_module.end_section('ns3_module_contrib')
  12.375      root_module.begin_section('ns3_module_node')
  12.376      ns3_module_node.register_methods(root_module)
  12.377      
  12.378 @@ -560,17 +571,72 @@
  12.379          ns3_module_node__local.register_methods(root_module)
  12.380      
  12.381      root_module.end_section('ns3_module_node')
  12.382 -    root_module.begin_section('ns3_module_contrib')
  12.383 -    ns3_module_contrib.register_methods(root_module)
  12.384 +    root_module.begin_section('ns3_module_tap_bridge')
  12.385 +    ns3_module_tap_bridge.register_methods(root_module)
  12.386      
  12.387      try:
  12.388 -        import ns3_module_contrib__local
  12.389 +        import ns3_module_tap_bridge__local
  12.390      except ImportError:
  12.391          pass
  12.392      else:
  12.393 -        ns3_module_contrib__local.register_methods(root_module)
  12.394 +        ns3_module_tap_bridge__local.register_methods(root_module)
  12.395      
  12.396 -    root_module.end_section('ns3_module_contrib')
  12.397 +    root_module.end_section('ns3_module_tap_bridge')
  12.398 +    root_module.begin_section('ns3_module_v4ping')
  12.399 +    ns3_module_v4ping.register_methods(root_module)
  12.400 +    
  12.401 +    try:
  12.402 +        import ns3_module_v4ping__local
  12.403 +    except ImportError:
  12.404 +        pass
  12.405 +    else:
  12.406 +        ns3_module_v4ping__local.register_methods(root_module)
  12.407 +    
  12.408 +    root_module.end_section('ns3_module_v4ping')
  12.409 +    root_module.begin_section('ns3_module_static_routing')
  12.410 +    ns3_module_static_routing.register_methods(root_module)
  12.411 +    
  12.412 +    try:
  12.413 +        import ns3_module_static_routing__local
  12.414 +    except ImportError:
  12.415 +        pass
  12.416 +    else:
  12.417 +        ns3_module_static_routing__local.register_methods(root_module)
  12.418 +    
  12.419 +    root_module.end_section('ns3_module_static_routing')
  12.420 +    root_module.begin_section('ns3_module_packet_sink')
  12.421 +    ns3_module_packet_sink.register_methods(root_module)
  12.422 +    
  12.423 +    try:
  12.424 +        import ns3_module_packet_sink__local
  12.425 +    except ImportError:
  12.426 +        pass
  12.427 +    else:
  12.428 +        ns3_module_packet_sink__local.register_methods(root_module)
  12.429 +    
  12.430 +    root_module.end_section('ns3_module_packet_sink')
  12.431 +    root_module.begin_section('ns3_module_stats')
  12.432 +    ns3_module_stats.register_methods(root_module)
  12.433 +    
  12.434 +    try:
  12.435 +        import ns3_module_stats__local
  12.436 +    except ImportError:
  12.437 +        pass
  12.438 +    else:
  12.439 +        ns3_module_stats__local.register_methods(root_module)
  12.440 +    
  12.441 +    root_module.end_section('ns3_module_stats')
  12.442 +    root_module.begin_section('ns3_module_onoff')
  12.443 +    ns3_module_onoff.register_methods(root_module)
  12.444 +    
  12.445 +    try:
  12.446 +        import ns3_module_onoff__local
  12.447 +    except ImportError:
  12.448 +        pass
  12.449 +    else:
  12.450 +        ns3_module_onoff__local.register_methods(root_module)
  12.451 +    
  12.452 +    root_module.end_section('ns3_module_onoff')
  12.453      root_module.begin_section('ns3_module_point_to_point')
  12.454      ns3_module_point_to_point.register_methods(root_module)
  12.455      
  12.456 @@ -593,17 +659,6 @@
  12.457          ns3_module_internet_stack__local.register_methods(root_module)
  12.458      
  12.459      root_module.end_section('ns3_module_internet_stack')
  12.460 -    root_module.begin_section('ns3_module_tap_bridge')
  12.461 -    ns3_module_tap_bridge.register_methods(root_module)
  12.462 -    
  12.463 -    try:
  12.464 -        import ns3_module_tap_bridge__local
  12.465 -    except ImportError:
  12.466 -        pass
  12.467 -    else:
  12.468 -        ns3_module_tap_bridge__local.register_methods(root_module)
  12.469 -    
  12.470 -    root_module.end_section('ns3_module_tap_bridge')
  12.471      root_module.begin_section('ns3_module_csma')
  12.472      ns3_module_csma.register_methods(root_module)
  12.473      
  12.474 @@ -615,6 +670,28 @@
  12.475          ns3_module_csma__local.register_methods(root_module)
  12.476      
  12.477      root_module.end_section('ns3_module_csma')
  12.478 +    root_module.begin_section('ns3_module_list_routing')
  12.479 +    ns3_module_list_routing.register_methods(root_module)
  12.480 +    
  12.481 +    try:
  12.482 +        import ns3_module_list_routing__local
  12.483 +    except ImportError:
  12.484 +        pass
  12.485 +    else:
  12.486 +        ns3_module_list_routing__local.register_methods(root_module)
  12.487 +    
  12.488 +    root_module.end_section('ns3_module_list_routing')
  12.489 +    root_module.begin_section('ns3_module_virtual_net_device')
  12.490 +    ns3_module_virtual_net_device.register_methods(root_module)
  12.491 +    
  12.492 +    try:
  12.493 +        import ns3_module_virtual_net_device__local
  12.494 +    except ImportError:
  12.495 +        pass
  12.496 +    else:
  12.497 +        ns3_module_virtual_net_device__local.register_methods(root_module)
  12.498 +    
  12.499 +    root_module.end_section('ns3_module_virtual_net_device')
  12.500      root_module.begin_section('ns3_module_wifi')
  12.501      ns3_module_wifi.register_methods(root_module)
  12.502      
  12.503 @@ -626,83 +703,6 @@
  12.504          ns3_module_wifi__local.register_methods(root_module)
  12.505      
  12.506      root_module.end_section('ns3_module_wifi')
  12.507 -    root_module.begin_section('ns3_module_static_routing')
  12.508 -    ns3_module_static_routing.register_methods(root_module)
  12.509 -    
  12.510 -    try:
  12.511 -        import ns3_module_static_routing__local
  12.512 -    except ImportError:
  12.513 -        pass
  12.514 -    else:
  12.515 -        ns3_module_static_routing__local.register_methods(root_module)
  12.516 -    
  12.517 -    root_module.end_section('ns3_module_static_routing')
  12.518 -    root_module.begin_section('ns3_module_v4ping')
  12.519 -    ns3_module_v4ping.register_methods(root_module)
  12.520 -    
  12.521 -    try:
  12.522 -        import ns3_module_v4ping__local
  12.523 -    except ImportError:
  12.524 -        pass
  12.525 -    else:
  12.526 -        ns3_module_v4ping__local.register_methods(root_module)
  12.527 -    
  12.528 -    root_module.end_section('ns3_module_v4ping')
  12.529 -    root_module.begin_section('ns3_module_virtual_net_device')
  12.530 -    ns3_module_virtual_net_device.register_methods(root_module)
  12.531 -    
  12.532 -    try:
  12.533 -        import ns3_module_virtual_net_device__local
  12.534 -    except ImportError:
  12.535 -        pass
  12.536 -    else:
  12.537 -        ns3_module_virtual_net_device__local.register_methods(root_module)
  12.538 -    
  12.539 -    root_module.end_section('ns3_module_virtual_net_device')
  12.540 -    root_module.begin_section('ns3_module_packet_sink')
  12.541 -    ns3_module_packet_sink.register_methods(root_module)
  12.542 -    
  12.543 -    try:
  12.544 -        import ns3_module_packet_sink__local
  12.545 -    except ImportError:
  12.546 -        pass
  12.547 -    else:
  12.548 -        ns3_module_packet_sink__local.register_methods(root_module)
  12.549 -    
  12.550 -    root_module.end_section('ns3_module_packet_sink')
  12.551 -    root_module.begin_section('ns3_module_global_routing')
  12.552 -    ns3_module_global_routing.register_methods(root_module)
  12.553 -    
  12.554 -    try:
  12.555 -        import ns3_module_global_routing__local
  12.556 -    except ImportError:
  12.557 -        pass
  12.558 -    else:
  12.559 -        ns3_module_global_routing__local.register_methods(root_module)
  12.560 -    
  12.561 -    root_module.end_section('ns3_module_global_routing')
  12.562 -    root_module.begin_section('ns3_module_stats')
  12.563 -    ns3_module_stats.register_methods(root_module)
  12.564 -    
  12.565 -    try:
  12.566 -        import ns3_module_stats__local
  12.567 -    except ImportError:
  12.568 -        pass
  12.569 -    else:
  12.570 -        ns3_module_stats__local.register_methods(root_module)
  12.571 -    
  12.572 -    root_module.end_section('ns3_module_stats')
  12.573 -    root_module.begin_section('ns3_module_list_routing')
  12.574 -    ns3_module_list_routing.register_methods(root_module)
  12.575 -    
  12.576 -    try:
  12.577 -        import ns3_module_list_routing__local
  12.578 -    except ImportError:
  12.579 -        pass
  12.580 -    else:
  12.581 -        ns3_module_list_routing__local.register_methods(root_module)
  12.582 -    
  12.583 -    root_module.end_section('ns3_module_list_routing')
  12.584      root_module.begin_section('ns3_module_emu')
  12.585      ns3_module_emu.register_methods(root_module)
  12.586      
  12.587 @@ -725,17 +725,17 @@
  12.588          ns3_module_bridge__local.register_methods(root_module)
  12.589      
  12.590      root_module.end_section('ns3_module_bridge')
  12.591 -    root_module.begin_section('ns3_module_onoff')
  12.592 -    ns3_module_onoff.register_methods(root_module)
  12.593 +    root_module.begin_section('ns3_module_global_routing')
  12.594 +    ns3_module_global_routing.register_methods(root_module)
  12.595      
  12.596      try:
  12.597 -        import ns3_module_onoff__local
  12.598 +        import ns3_module_global_routing__local
  12.599      except ImportError:
  12.600          pass
  12.601      else:
  12.602 -        ns3_module_onoff__local.register_methods(root_module)
  12.603 +        ns3_module_global_routing__local.register_methods(root_module)
  12.604      
  12.605 -    root_module.end_section('ns3_module_onoff')
  12.606 +    root_module.end_section('ns3_module_global_routing')
  12.607      root_module.begin_section('ns3_module_udp_echo')
  12.608      ns3_module_udp_echo.register_methods(root_module)
  12.609      
  12.610 @@ -747,17 +747,6 @@
  12.611          ns3_module_udp_echo__local.register_methods(root_module)
  12.612      
  12.613      root_module.end_section('ns3_module_udp_echo')
  12.614 -    root_module.begin_section('ns3_module_ping6')
  12.615 -    ns3_module_ping6.register_methods(root_module)
  12.616 -    
  12.617 -    try:
  12.618 -        import ns3_module_ping6__local
  12.619 -    except ImportError:
  12.620 -        pass
  12.621 -    else:
  12.622 -        ns3_module_ping6__local.register_methods(root_module)
  12.623 -    
  12.624 -    root_module.end_section('ns3_module_ping6')
  12.625      root_module.begin_section('ns3_module_nix_vector_routing')
  12.626      ns3_module_nix_vector_routing.register_methods(root_module)
  12.627      
  12.628 @@ -780,6 +769,28 @@
  12.629          ns3_module_olsr__local.register_methods(root_module)
  12.630      
  12.631      root_module.end_section('ns3_module_olsr')
  12.632 +    root_module.begin_section('ns3_module_radvd')
  12.633 +    ns3_module_radvd.register_methods(root_module)
  12.634 +    
  12.635 +    try:
  12.636 +        import ns3_module_radvd__local
  12.637 +    except ImportError:
  12.638 +        pass
  12.639 +    else:
  12.640 +        ns3_module_radvd__local.register_methods(root_module)
  12.641 +    
  12.642 +    root_module.end_section('ns3_module_radvd')
  12.643 +    root_module.begin_section('ns3_module_ping6')
  12.644 +    ns3_module_ping6.register_methods(root_module)
  12.645 +    
  12.646 +    try:
  12.647 +        import ns3_module_ping6__local
  12.648 +    except ImportError:
  12.649 +        pass
  12.650 +    else:
  12.651 +        ns3_module_ping6__local.register_methods(root_module)
  12.652 +    
  12.653 +    root_module.end_section('ns3_module_ping6')
  12.654      root_module.begin_section('ns3_module_flow_monitor')
  12.655      ns3_module_flow_monitor.register_methods(root_module)
  12.656      
  12.657 @@ -791,17 +802,6 @@
  12.658          ns3_module_flow_monitor__local.register_methods(root_module)
  12.659      
  12.660      root_module.end_section('ns3_module_flow_monitor')
  12.661 -    root_module.begin_section('ns3_module_radvd')
  12.662 -    ns3_module_radvd.register_methods(root_module)
  12.663 -    
  12.664 -    try:
  12.665 -        import ns3_module_radvd__local
  12.666 -    except ImportError:
  12.667 -        pass
  12.668 -    else:
  12.669 -        ns3_module_radvd__local.register_methods(root_module)
  12.670 -    
  12.671 -    root_module.end_section('ns3_module_radvd')
  12.672      root_module.begin_section('ns3_module_mesh')
  12.673      ns3_module_mesh.register_methods(root_module)
  12.674      
  12.675 @@ -1039,6 +1039,17 @@
  12.676          ns3_module_common__local.register_functions(root_module)
  12.677      
  12.678      root_module.end_section('ns3_module_common')
  12.679 +    root_module.begin_section('ns3_module_contrib')
  12.680 +    ns3_module_contrib.register_functions(root_module)
  12.681 +    
  12.682 +    try:
  12.683 +        import ns3_module_contrib__local
  12.684 +    except ImportError:
  12.685 +        pass
  12.686 +    else:
  12.687 +        ns3_module_contrib__local.register_functions(root_module)
  12.688 +    
  12.689 +    root_module.end_section('ns3_module_contrib')
  12.690      root_module.begin_section('ns3_module_node')
  12.691      ns3_module_node.register_functions(root_module)
  12.692      
  12.693 @@ -1050,17 +1061,72 @@
  12.694          ns3_module_node__local.register_functions(root_module)
  12.695      
  12.696      root_module.end_section('ns3_module_node')
  12.697 -    root_module.begin_section('ns3_module_contrib')
  12.698 -    ns3_module_contrib.register_functions(root_module)
  12.699 +    root_module.begin_section('ns3_module_tap_bridge')
  12.700 +    ns3_module_tap_bridge.register_functions(root_module)
  12.701      
  12.702      try:
  12.703 -        import ns3_module_contrib__local
  12.704 +        import ns3_module_tap_bridge__local
  12.705      except ImportError:
  12.706          pass
  12.707      else:
  12.708 -        ns3_module_contrib__local.register_functions(root_module)
  12.709 +        ns3_module_tap_bridge__local.register_functions(root_module)
  12.710      
  12.711 -    root_module.end_section('ns3_module_contrib')
  12.712 +    root_module.end_section('ns3_module_tap_bridge')
  12.713 +    root_module.begin_section('ns3_module_v4ping')
  12.714 +    ns3_module_v4ping.register_functions(root_module)
  12.715 +    
  12.716 +    try:
  12.717 +        import ns3_module_v4ping__local
  12.718 +    except ImportError:
  12.719 +        pass
  12.720 +    else:
  12.721 +        ns3_module_v4ping__local.register_functions(root_module)
  12.722 +    
  12.723 +    root_module.end_section('ns3_module_v4ping')
  12.724 +    root_module.begin_section('ns3_module_static_routing')
  12.725 +    ns3_module_static_routing.register_functions(root_module)
  12.726 +    
  12.727 +    try:
  12.728 +        import ns3_module_static_routing__local
  12.729 +    except ImportError:
  12.730 +        pass
  12.731 +    else:
  12.732 +        ns3_module_static_routing__local.register_functions(root_module)
  12.733 +    
  12.734 +    root_module.end_section('ns3_module_static_routing')
  12.735 +    root_module.begin_section('ns3_module_packet_sink')
  12.736 +    ns3_module_packet_sink.register_functions(root_module)
  12.737 +    
  12.738 +    try:
  12.739 +        import ns3_module_packet_sink__local
  12.740 +    except ImportError:
  12.741 +        pass
  12.742 +    else:
  12.743 +        ns3_module_packet_sink__local.register_functions(root_module)
  12.744 +    
  12.745 +    root_module.end_section('ns3_module_packet_sink')
  12.746 +    root_module.begin_section('ns3_module_stats')
  12.747 +    ns3_module_stats.register_functions(root_module)
  12.748 +    
  12.749 +    try:
  12.750 +        import ns3_module_stats__local
  12.751 +    except ImportError:
  12.752 +        pass
  12.753 +    else:
  12.754 +        ns3_module_stats__local.register_functions(root_module)
  12.755 +    
  12.756 +    root_module.end_section('ns3_module_stats')
  12.757 +    root_module.begin_section('ns3_module_onoff')
  12.758 +    ns3_module_onoff.register_functions(root_module)
  12.759 +    
  12.760 +    try:
  12.761 +        import ns3_module_onoff__local
  12.762 +    except ImportError:
  12.763 +        pass
  12.764 +    else:
  12.765 +        ns3_module_onoff__local.register_functions(root_module)
  12.766 +    
  12.767 +    root_module.end_section('ns3_module_onoff')
  12.768      root_module.begin_section('ns3_module_point_to_point')
  12.769      ns3_module_point_to_point.register_functions(root_module)
  12.770      
  12.771 @@ -1083,17 +1149,6 @@
  12.772          ns3_module_internet_stack__local.register_functions(root_module)
  12.773      
  12.774      root_module.end_section('ns3_module_internet_stack')
  12.775 -    root_module.begin_section('ns3_module_tap_bridge')
  12.776 -    ns3_module_tap_bridge.register_functions(root_module)
  12.777 -    
  12.778 -    try:
  12.779 -        import ns3_module_tap_bridge__local
  12.780 -    except ImportError:
  12.781 -        pass
  12.782 -    else:
  12.783 -        ns3_module_tap_bridge__local.register_functions(root_module)
  12.784 -    
  12.785 -    root_module.end_section('ns3_module_tap_bridge')
  12.786      root_module.begin_section('ns3_module_csma')
  12.787      ns3_module_csma.register_functions(root_module)
  12.788      
  12.789 @@ -1105,6 +1160,28 @@
  12.790          ns3_module_csma__local.register_functions(root_module)
  12.791      
  12.792      root_module.end_section('ns3_module_csma')
  12.793 +    root_module.begin_section('ns3_module_list_routing')
  12.794 +    ns3_module_list_routing.register_functions(root_module)
  12.795 +    
  12.796 +    try:
  12.797 +        import ns3_module_list_routing__local
  12.798 +    except ImportError:
  12.799 +        pass
  12.800 +    else:
  12.801 +        ns3_module_list_routing__local.register_functions(root_module)
  12.802 +    
  12.803 +    root_module.end_section('ns3_module_list_routing')
  12.804 +    root_module.begin_section('ns3_module_virtual_net_device')
  12.805 +    ns3_module_virtual_net_device.register_functions(root_module)
  12.806 +    
  12.807 +    try:
  12.808 +        import ns3_module_virtual_net_device__local
  12.809 +    except ImportError:
  12.810 +        pass
  12.811 +    else:
  12.812 +        ns3_module_virtual_net_device__local.register_functions(root_module)
  12.813 +    
  12.814 +    root_module.end_section('ns3_module_virtual_net_device')
  12.815      root_module.begin_section('ns3_module_wifi')
  12.816      ns3_module_wifi.register_functions(root_module)
  12.817      
  12.818 @@ -1116,83 +1193,6 @@
  12.819          ns3_module_wifi__local.register_functions(root_module)
  12.820      
  12.821      root_module.end_section('ns3_module_wifi')
  12.822 -    root_module.begin_section('ns3_module_static_routing')
  12.823 -    ns3_module_static_routing.register_functions(root_module)
  12.824 -    
  12.825 -    try:
  12.826 -        import ns3_module_static_routing__local
  12.827 -    except ImportError:
  12.828 -        pass
  12.829 -    else:
  12.830 -        ns3_module_static_routing__local.register_functions(root_module)
  12.831 -    
  12.832 -    root_module.end_section('ns3_module_static_routing')
  12.833 -    root_module.begin_section('ns3_module_v4ping')
  12.834 -    ns3_module_v4ping.register_functions(root_module)
  12.835 -    
  12.836 -    try:
  12.837 -        import ns3_module_v4ping__local
  12.838 -    except ImportError:
  12.839 -        pass
  12.840 -    else:
  12.841 -        ns3_module_v4ping__local.register_functions(root_module)
  12.842 -    
  12.843 -    root_module.end_section('ns3_module_v4ping')
  12.844 -    root_module.begin_section('ns3_module_virtual_net_device')
  12.845 -    ns3_module_virtual_net_device.register_functions(root_module)
  12.846 -    
  12.847 -    try:
  12.848 -        import ns3_module_virtual_net_device__local
  12.849 -    except ImportError:
  12.850 -        pass
  12.851 -    else:
  12.852 -        ns3_module_virtual_net_device__local.register_functions(root_module)
  12.853 -    
  12.854 -    root_module.end_section('ns3_module_virtual_net_device')
  12.855 -    root_module.begin_section('ns3_module_packet_sink')
  12.856 -    ns3_module_packet_sink.register_functions(root_module)
  12.857 -    
  12.858 -    try:
  12.859 -        import ns3_module_packet_sink__local
  12.860 -    except ImportError:
  12.861 -        pass
  12.862 -    else:
  12.863 -        ns3_module_packet_sink__local.register_functions(root_module)
  12.864 -    
  12.865 -    root_module.end_section('ns3_module_packet_sink')
  12.866 -    root_module.begin_section('ns3_module_global_routing')
  12.867 -    ns3_module_global_routing.register_functions(root_module)
  12.868 -    
  12.869 -    try:
  12.870 -        import ns3_module_global_routing__local
  12.871 -    except ImportError:
  12.872 -        pass
  12.873 -    else:
  12.874 -        ns3_module_global_routing__local.register_functions(root_module)
  12.875 -    
  12.876 -    root_module.end_section('ns3_module_global_routing')
  12.877 -    root_module.begin_section('ns3_module_stats')
  12.878 -    ns3_module_stats.register_functions(root_module)
  12.879 -    
  12.880 -    try:
  12.881 -        import ns3_module_stats__local
  12.882 -    except ImportError:
  12.883 -        pass
  12.884 -    else:
  12.885 -        ns3_module_stats__local.register_functions(root_module)
  12.886 -    
  12.887 -    root_module.end_section('ns3_module_stats')
  12.888 -    root_module.begin_section('ns3_module_list_routing')
  12.889 -    ns3_module_list_routing.register_functions(root_module)
  12.890 -    
  12.891 -    try:
  12.892 -        import ns3_module_list_routing__local
  12.893 -    except ImportError:
  12.894 -        pass
  12.895 -    else:
  12.896 -        ns3_module_list_routing__local.register_functions(root_module)
  12.897 -    
  12.898 -    root_module.end_section('ns3_module_list_routing')
  12.899      root_module.begin_section('ns3_module_emu')
  12.900      ns3_module_emu.register_functions(root_module)
  12.901      
  12.902 @@ -1215,17 +1215,17 @@
  12.903          ns3_module_bridge__local.register_functions(root_module)
  12.904      
  12.905      root_module.end_section('ns3_module_bridge')
  12.906 -    root_module.begin_section('ns3_module_onoff')
  12.907 -    ns3_module_onoff.register_functions(root_module)
  12.908 +    root_module.begin_section('ns3_module_global_routing')
  12.909 +    ns3_module_global_routing.register_functions(root_module)
  12.910      
  12.911      try:
  12.912 -        import ns3_module_onoff__local
  12.913 +        import ns3_module_global_routing__local
  12.914      except ImportError:
  12.915          pass
  12.916      else:
  12.917 -        ns3_module_onoff__local.register_functions(root_module)
  12.918 +        ns3_module_global_routing__local.register_functions(root_module)
  12.919      
  12.920 -    root_module.end_section('ns3_module_onoff')
  12.921 +    root_module.end_section('ns3_module_global_routing')
  12.922      root_module.begin_section('ns3_module_udp_echo')
  12.923      ns3_module_udp_echo.register_functions(root_module)
  12.924      
  12.925 @@ -1237,17 +1237,6 @@
  12.926          ns3_module_udp_echo__local.register_functions(root_module)
  12.927      
  12.928      root_module.end_section('ns3_module_udp_echo')
  12.929 -    root_module.begin_section('ns3_module_ping6')
  12.930 -    ns3_module_ping6.register_functions(root_module)
  12.931 -    
  12.932 -    try:
  12.933 -        import ns3_module_ping6__local
  12.934 -    except ImportError:
  12.935 -        pass
  12.936 -    else:
  12.937 -        ns3_module_ping6__local.register_functions(root_module)
  12.938 -    
  12.939 -    root_module.end_section('ns3_module_ping6')
  12.940      root_module.begin_section('ns3_module_nix_vector_routing')
  12.941      ns3_module_nix_vector_routing.register_functions(root_module)
  12.942      
  12.943 @@ -1270,6 +1259,28 @@
  12.944          ns3_module_olsr__local.register_functions(root_module)
  12.945      
  12.946      root_module.end_section('ns3_module_olsr')
  12.947 +    root_module.begin_section('ns3_module_radvd')
  12.948 +    ns3_module_radvd.register_functions(root_module)
  12.949 +    
  12.950 +    try:
  12.951 +        import ns3_module_radvd__local
  12.952 +    except ImportError:
  12.953 +        pass
  12.954 +    else:
  12.955 +        ns3_module_radvd__local.register_functions(root_module)
  12.956 +    
  12.957 +    root_module.end_section('ns3_module_radvd')
  12.958 +    root_module.begin_section('ns3_module_ping6')
  12.959 +    ns3_module_ping6.register_functions(root_module)
  12.960 +    
  12.961 +    try:
  12.962 +        import ns3_module_ping6__local
  12.963 +    except ImportError:
  12.964 +        pass
  12.965 +    else:
  12.966 +        ns3_module_ping6__local.register_functions(root_module)
  12.967 +    
  12.968 +    root_module.end_section('ns3_module_ping6')
  12.969      root_module.begin_section('ns3_module_flow_monitor')
  12.970      ns3_module_flow_monitor.register_functions(root_module)
  12.971      
  12.972 @@ -1281,17 +1292,6 @@
  12.973          ns3_module_flow_monitor__local.register_functions(root_module)
  12.974      
  12.975      root_module.end_section('ns3_module_flow_monitor')
  12.976 -    root_module.begin_section('ns3_module_radvd')
  12.977 -    ns3_module_radvd.register_functions(root_module)
  12.978 -    
  12.979 -    try:
  12.980 -        import ns3_module_radvd__local
  12.981 -    except ImportError:
  12.982 -        pass
  12.983 -    else:
  12.984 -        ns3_module_radvd__local.register_functions(root_module)
  12.985 -    
  12.986 -    root_module.end_section('ns3_module_radvd')
  12.987      root_module.begin_section('ns3_module_mesh')
  12.988      ns3_module_mesh.register_functions(root_module)
  12.989