python apidefs rescan
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Wed, 25 Nov 2009 11:41:55 +0000
changeset 5779 6642920ad056
parent 5778 bb28b3985514
child 5780 1ae8031ed08f
child 5869 67fc4930b470
python apidefs rescan
bindings/python/apidefs/gcc-ILP32/ns3_module_core.py
bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py
bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py
bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py
bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py
bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py
bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py
bindings/python/apidefs/gcc-LP64/ns3_module_helper.py
bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py
bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py
bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Wed Nov 25 11:41:55 2009 +0000
@@ -3372,7 +3372,7 @@
     module.add_function('TypeNameGet', 
                         'std::string', 
                         [], 
-                        template_parameters=['long'])
+                        template_parameters=['long long'])
     ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
     module.add_function('TypeNameGet', 
                         'std::string', 
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py	Wed Nov 25 11:41:55 2009 +0000
@@ -79,12 +79,12 @@
     module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
     ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration]
     module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
+    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
+    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
+    ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
+    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
     ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration]
     module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
-    ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
-    module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
-    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
-    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
     ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class]
     module.add_class('Dot11sMeshCapability')
     ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class]
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py	Wed Nov 25 11:41:55 2009 +0000
@@ -3,6 +3,8 @@
 def register_types(module):
     root_module = module.get_root()
     
+    ## animation-interface.h: ns3::AnimationInterface [class]
+    module.add_class('AnimationInterface')
     ## application-container.h: ns3::ApplicationContainer [class]
     module.add_class('ApplicationContainer')
     ## athstats-helper.h: ns3::AthstatsHelper [class]
@@ -11,6 +13,8 @@
     module.add_class('BridgeHelper', allow_subclassing=False)
     ## csma-helper.h: ns3::CsmaHelper [class]
     module.add_class('CsmaHelper', allow_subclassing=False)
+    ## csma-star-helper.h: ns3::CsmaStarHelper [class]
+    module.add_class('CsmaStarHelper', allow_subclassing=False)
     ## emu-helper.h: ns3::EmuHelper [class]
     module.add_class('EmuHelper', allow_subclassing=False)
     ## flow-monitor-helper.h: ns3::FlowMonitorHelper [class]
@@ -55,8 +59,14 @@
     module.add_class('PacketSocketHelper', allow_subclassing=False)
     ## ping6-helper.h: ns3::Ping6Helper [class]
     module.add_class('Ping6Helper', allow_subclassing=False)
+    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper [class]
+    module.add_class('PointToPointDumbbellHelper', allow_subclassing=False)
+    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper [class]
+    module.add_class('PointToPointGridHelper', allow_subclassing=False)
     ## point-to-point-helper.h: ns3::PointToPointHelper [class]
     module.add_class('PointToPointHelper', allow_subclassing=False)
+    ## point-to-point-star-helper.h: ns3::PointToPointStarHelper [class]
+    module.add_class('PointToPointStarHelper', allow_subclassing=False)
     ## tap-bridge-helper.h: ns3::TapBridgeHelper [class]
     module.add_class('TapBridgeHelper', allow_subclassing=False)
     ## udp-echo-helper.h: ns3::UdpEchoClientHelper [class]
@@ -93,6 +103,8 @@
     module.add_class('QosWifiMacHelper', allow_subclassing=False, parent=root_module['ns3::WifiMacHelper'])
     ## athstats-helper.h: ns3::AthstatsWifiTraceSink [class]
     module.add_class('AthstatsWifiTraceSink', parent=root_module['ns3::Object'])
+    ## canvas-location.h: ns3::CanvasLocation [class]
+    module.add_class('CanvasLocation', parent=root_module['ns3::Object'])
     ## mesh-stack-installer.h: ns3::MeshStack [class]
     module.add_class('MeshStack', parent=root_module['ns3::Object'])
     ## dot11s-installer.h: ns3::Dot11sStack [class]
@@ -181,10 +193,12 @@
     
 
 def register_methods(root_module):
+    register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface'])
     register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
     register_Ns3AthstatsHelper_methods(root_module, root_module['ns3::AthstatsHelper'])
     register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
     register_Ns3CsmaHelper_methods(root_module, root_module['ns3::CsmaHelper'])
+    register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper'])
     register_Ns3EmuHelper_methods(root_module, root_module['ns3::EmuHelper'])
     register_Ns3FlowMonitorHelper_methods(root_module, root_module['ns3::FlowMonitorHelper'])
     register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])
@@ -206,7 +220,10 @@
     register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper'])
     register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper'])
     register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper'])
+    register_Ns3PointToPointDumbbellHelper_methods(root_module, root_module['ns3::PointToPointDumbbellHelper'])
+    register_Ns3PointToPointGridHelper_methods(root_module, root_module['ns3::PointToPointGridHelper'])
     register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper'])
+    register_Ns3PointToPointStarHelper_methods(root_module, root_module['ns3::PointToPointStarHelper'])
     register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper'])
     register_Ns3UdpEchoClientHelper_methods(root_module, root_module['ns3::UdpEchoClientHelper'])
     register_Ns3UdpEchoServerHelper_methods(root_module, root_module['ns3::UdpEchoServerHelper'])
@@ -224,11 +241,35 @@
     register_Ns3NqosWifiMacHelper_methods(root_module, root_module['ns3::NqosWifiMacHelper'])
     register_Ns3QosWifiMacHelper_methods(root_module, root_module['ns3::QosWifiMacHelper'])
     register_Ns3AthstatsWifiTraceSink_methods(root_module, root_module['ns3::AthstatsWifiTraceSink'])
+    register_Ns3CanvasLocation_methods(root_module, root_module['ns3::CanvasLocation'])
     register_Ns3MeshStack_methods(root_module, root_module['ns3::MeshStack'])
     register_Ns3Dot11sStack_methods(root_module, root_module['ns3::Dot11sStack'])
     register_Ns3FlameStack_methods(root_module, root_module['ns3::FlameStack'])
     return
 
+def register_Ns3AnimationInterface_methods(root_module, cls):
+    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface(ns3::AnimationInterface const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AnimationInterface const &', 'arg0')])
+    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface() [constructor]
+    cls.add_constructor([])
+    ## animation-interface.h: bool ns3::AnimationInterface::SetOutputFile(std::string const & fn) [member function]
+    cls.add_method('SetOutputFile', 
+                   'bool', 
+                   [param('std::string const &', 'fn')])
+    ## animation-interface.h: bool ns3::AnimationInterface::SetServerPort(uint16_t port) [member function]
+    cls.add_method('SetServerPort', 
+                   'bool', 
+                   [param('uint16_t', 'port')])
+    ## animation-interface.h: void ns3::AnimationInterface::StartAnimation() [member function]
+    cls.add_method('StartAnimation', 
+                   'void', 
+                   [])
+    ## animation-interface.h: void ns3::AnimationInterface::StopAnimation() [member function]
+    cls.add_method('StopAnimation', 
+                   'void', 
+                   [])
+    return
+
 def register_Ns3ApplicationContainer_methods(root_module, cls):
     ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(ns3::ApplicationContainer const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::ApplicationContainer const &', 'arg0')])
@@ -422,14 +463,6 @@
                    'ns3::NetDeviceContainer', 
                    [param('ns3::NodeContainer const &', 'c'), param('std::string', 'channelName')], 
                    is_const=True)
-    ## csma-helper.h: void ns3::CsmaHelper::InstallStar(ns3::Ptr<ns3::Node> hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
-    ## csma-helper.h: void ns3::CsmaHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
     ## csma-helper.h: void ns3::CsmaHelper::SetChannelAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
     cls.add_method('SetChannelAttribute', 
                    'void', 
@@ -444,6 +477,56 @@
                    [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
     return
 
+def register_Ns3CsmaStarHelper_methods(root_module, cls):
+    ## csma-star-helper.h: ns3::CsmaStarHelper::CsmaStarHelper(ns3::CsmaStarHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CsmaStarHelper const &', 'arg0')])
+    ## csma-star-helper.h: ns3::CsmaStarHelper::CsmaStarHelper(uint32_t numSpokes, ns3::CsmaHelper csmaHelper) [constructor]
+    cls.add_constructor([param('uint32_t', 'numSpokes'), param('ns3::CsmaHelper', 'csmaHelper')])
+    ## csma-star-helper.h: void ns3::CsmaStarHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper address) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'address')])
+    ## csma-star-helper.h: ns3::Ptr<ns3::Node> ns3::CsmaStarHelper::GetHub() const [member function]
+    cls.add_method('GetHub', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::NetDeviceContainer ns3::CsmaStarHelper::GetHubDevices() const [member function]
+    cls.add_method('GetHubDevices', 
+                   'ns3::NetDeviceContainer', 
+                   [], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::Ipv4Address ns3::CsmaStarHelper::GetHubIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetHubIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::Ptr<ns3::Node> ns3::CsmaStarHelper::GetSpoke(uint32_t arg0) const [member function]
+    cls.add_method('GetSpoke', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::NetDeviceContainer ns3::CsmaStarHelper::GetSpokeDevices() const [member function]
+    cls.add_method('GetSpokeDevices', 
+                   'ns3::NetDeviceContainer', 
+                   [], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::Ipv4Address ns3::CsmaStarHelper::GetSpokeIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetSpokeIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## csma-star-helper.h: void ns3::CsmaStarHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    ## csma-star-helper.h: uint32_t ns3::CsmaStarHelper::SpokeCount() const [member function]
+    cls.add_method('SpokeCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3EmuHelper_methods(root_module, cls):
     ## emu-helper.h: ns3::EmuHelper::EmuHelper(ns3::EmuHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EmuHelper const &', 'arg0')])
@@ -1245,6 +1328,92 @@
                    [param('ns3::Ipv6Address', 'ip')])
     return
 
+def register_Ns3PointToPointDumbbellHelper_methods(root_module, cls):
+    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(ns3::PointToPointDumbbellHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointDumbbellHelper const &', 'arg0')])
+    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(uint32_t nLeftLeaf, ns3::PointToPointHelper leftHelper, uint32_t nRightLeaf, ns3::PointToPointHelper rightHelper, ns3::PointToPointHelper bottleneckHelper) [constructor]
+    cls.add_constructor([param('uint32_t', 'nLeftLeaf'), param('ns3::PointToPointHelper', 'leftHelper'), param('uint32_t', 'nRightLeaf'), param('ns3::PointToPointHelper', 'rightHelper'), param('ns3::PointToPointHelper', 'bottleneckHelper')])
+    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper leftIp, ns3::Ipv4AddressHelper rightIp, ns3::Ipv4AddressHelper routerIp) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'leftIp'), param('ns3::Ipv4AddressHelper', 'rightIp'), param('ns3::Ipv4AddressHelper', 'routerIp')])
+    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function]
+    cls.add_method('BoundingBox', 
+                   'void', 
+                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')])
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft() const [member function]
+    cls.add_method('GetLeft', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft(uint32_t arg0) const [member function]
+    cls.add_method('GetLeft', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetLeftIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetLeftIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight() const [member function]
+    cls.add_method('GetRight', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight(uint32_t arg0) const [member function]
+    cls.add_method('GetRight', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetRightIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetRightIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::LeftCount() const [member function]
+    cls.add_method('LeftCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::RightCount() const [member function]
+    cls.add_method('RightCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3PointToPointGridHelper_methods(root_module, cls):
+    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(ns3::PointToPointGridHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointGridHelper const &', 'arg0')])
+    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(uint32_t nRows, uint32_t nCols, ns3::PointToPointHelper pointToPoint) [constructor]
+    cls.add_constructor([param('uint32_t', 'nRows'), param('uint32_t', 'nCols'), param('ns3::PointToPointHelper', 'pointToPoint')])
+    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper rowIp, ns3::Ipv4AddressHelper colIp) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'rowIp'), param('ns3::Ipv4AddressHelper', 'colIp')])
+    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::BoundingBox(double ulx, double uly, double lrx, double lry) [member function]
+    cls.add_method('BoundingBox', 
+                   'void', 
+                   [param('double', 'ulx'), param('double', 'uly'), param('double', 'lrx'), param('double', 'lry')])
+    ## point-to-point-grid-helper.h: ns3::Ipv4Address ns3::PointToPointGridHelper::GetIpv4Address(uint32_t row, uint32_t col) [member function]
+    cls.add_method('GetIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
+    ## point-to-point-grid-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointGridHelper::GetNode(uint32_t row, uint32_t col) [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
+    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    return
+
 def register_Ns3PointToPointHelper_methods(root_module, cls):
     ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper(ns3::PointToPointHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::PointToPointHelper const &', 'arg0')])
@@ -1320,14 +1489,6 @@
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('std::string', 'aNode'), param('std::string', 'bNode')])
-    ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(ns3::Ptr<ns3::Node> hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
-    ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
     ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelAttribute(std::string name, ns3::AttributeValue const & value) [member function]
     cls.add_method('SetChannelAttribute', 
                    'void', 
@@ -1342,6 +1503,50 @@
                    [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
     return
 
+def register_Ns3PointToPointStarHelper_methods(root_module, cls):
+    ## point-to-point-star-helper.h: ns3::PointToPointStarHelper::PointToPointStarHelper(ns3::PointToPointStarHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointStarHelper const &', 'arg0')])
+    ## point-to-point-star-helper.h: ns3::PointToPointStarHelper::PointToPointStarHelper(uint32_t numSpokes, ns3::PointToPointHelper p2pHelper) [constructor]
+    cls.add_constructor([param('uint32_t', 'numSpokes'), param('ns3::PointToPointHelper', 'p2pHelper')])
+    ## point-to-point-star-helper.h: void ns3::PointToPointStarHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper address) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'address')])
+    ## point-to-point-star-helper.h: void ns3::PointToPointStarHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function]
+    cls.add_method('BoundingBox', 
+                   'void', 
+                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')])
+    ## point-to-point-star-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointStarHelper::GetHub() const [member function]
+    cls.add_method('GetHub', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: ns3::Ipv4Address ns3::PointToPointStarHelper::GetHubIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetHubIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointStarHelper::GetSpoke(uint32_t arg0) const [member function]
+    cls.add_method('GetSpoke', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: ns3::Ipv4Address ns3::PointToPointStarHelper::GetSpokeIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetSpokeIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: void ns3::PointToPointStarHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    ## point-to-point-star-helper.h: uint32_t ns3::PointToPointStarHelper::SpokeCount() const [member function]
+    cls.add_method('SpokeCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3TapBridgeHelper_methods(root_module, cls):
     ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::TapBridgeHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TapBridgeHelper const &', 'arg0')])
@@ -1844,6 +2049,27 @@
                    [param('std::string', 'context'), param('ns3::Mac48Address', 'address')])
     return
 
+def register_Ns3CanvasLocation_methods(root_module, cls):
+    ## canvas-location.h: ns3::CanvasLocation::CanvasLocation(ns3::CanvasLocation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CanvasLocation const &', 'arg0')])
+    ## canvas-location.h: ns3::CanvasLocation::CanvasLocation() [constructor]
+    cls.add_constructor([])
+    ## canvas-location.h: ns3::Vector ns3::CanvasLocation::GetLocation() const [member function]
+    cls.add_method('GetLocation', 
+                   'ns3::Vector', 
+                   [], 
+                   is_const=True)
+    ## canvas-location.h: static ns3::TypeId ns3::CanvasLocation::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## canvas-location.h: void ns3::CanvasLocation::SetLocation(ns3::Vector const & location) [member function]
+    cls.add_method('SetLocation', 
+                   'void', 
+                   [param('ns3::Vector const &', 'location')])
+    return
+
 def register_Ns3MeshStack_methods(root_module, cls):
     ## mesh-stack-installer.h: ns3::MeshStack::MeshStack() [constructor]
     cls.add_constructor([])
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_simulator.py	Wed Nov 25 11:41:55 2009 +0000
@@ -1574,7 +1574,7 @@
     module.add_function('MakeTimeChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
                         [])
-    ## high-precision.h: extern ns3::HighPrecision ns3::Max(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
+    ## high-precision.h: ns3::HighPrecision ns3::Max(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
     module.add_function('Max', 
                         'ns3::HighPrecision', 
                         [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')])
@@ -1586,7 +1586,7 @@
     module.add_function('MilliSeconds', 
                         'ns3::Time', 
                         [param('uint64_t', 'ms')])
-    ## high-precision.h: extern ns3::HighPrecision ns3::Min(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
+    ## high-precision.h: ns3::HighPrecision ns3::Min(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
     module.add_function('Min', 
                         'ns3::HighPrecision', 
                         [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')])
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py	Wed Nov 25 11:41:55 2009 +0000
@@ -9,6 +9,8 @@
     module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'])
     ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration]
     module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_UNKNOWN'])
+    ## qos-tag.h: ns3::UserPriority [enumeration]
+    module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
     ## qos-utils.h: ns3::AccessClass [enumeration]
     module.add_enum('AccessClass', ['AC_VO', 'AC_VI', 'AC_BE', 'AC_BK', 'AC_BE_NQOS', 'AC_UNDEF'])
     ## edca-txop-n.h: ns3::TypeOfStation [enumeration]
@@ -1994,11 +1996,6 @@
                    'void', 
                    [param('ns3::TagBuffer', 'i')], 
                    is_virtual=True)
-    ## qos-tag.h: uint8_t ns3::QosTag::Get() const [member function]
-    cls.add_method('Get', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True)
     ## qos-tag.h: ns3::TypeId ns3::QosTag::GetInstanceTypeId() const [member function]
     cls.add_method('GetInstanceTypeId', 
                    'ns3::TypeId', 
@@ -2009,6 +2006,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## qos-tag.h: uint8_t ns3::QosTag::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## qos-tag.h: static ns3::TypeId ns3::QosTag::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -2024,10 +2026,14 @@
                    'void', 
                    [param('ns3::TagBuffer', 'i')], 
                    is_const=True, is_virtual=True)
-    ## qos-tag.h: void ns3::QosTag::Set(uint8_t tid) [member function]
-    cls.add_method('Set', 
+    ## qos-tag.h: void ns3::QosTag::SetTid(uint8_t tid) [member function]
+    cls.add_method('SetTid', 
                    'void', 
                    [param('uint8_t', 'tid')])
+    ## qos-tag.h: void ns3::QosTag::SetUserPriority(ns3::UserPriority up) [member function]
+    cls.add_method('SetUserPriority', 
+                   'void', 
+                   [param('ns3::UserPriority', 'up')])
     return
 
 def register_Ns3RandomPropagationDelayModel_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Wed Nov 25 11:41:55 2009 +0000
@@ -15,32 +15,32 @@
 import ns3_module_core
 import ns3_module_simulator
 import ns3_module_test
+import ns3_module_common
 import ns3_module_mobility
-import ns3_module_common
 import ns3_module_contrib
 import ns3_module_node
+import ns3_module_bridge
+import ns3_module_csma
+import ns3_module_emu
+import ns3_module_global_routing
+import ns3_module_internet_stack
+import ns3_module_list_routing
+import ns3_module_onoff
+import ns3_module_packet_sink
+import ns3_module_point_to_point
+import ns3_module_static_routing
+import ns3_module_stats
 import ns3_module_tap_bridge
 import ns3_module_v4ping
-import ns3_module_static_routing
-import ns3_module_packet_sink
-import ns3_module_stats
-import ns3_module_onoff
-import ns3_module_point_to_point
-import ns3_module_internet_stack
-import ns3_module_csma
-import ns3_module_list_routing
 import ns3_module_virtual_net_device
 import ns3_module_wifi
-import ns3_module_emu
-import ns3_module_bridge
-import ns3_module_global_routing
-import ns3_module_udp_echo
+import ns3_module_aodv
+import ns3_module_flow_monitor
 import ns3_module_nix_vector_routing
 import ns3_module_olsr
-import ns3_module_aodv
+import ns3_module_ping6
 import ns3_module_radvd
-import ns3_module_ping6
-import ns3_module_flow_monitor
+import ns3_module_udp_echo
 import ns3_module_mesh
 import ns3_module_helper
 import ns3_module_dot11s
@@ -86,6 +86,17 @@
         ns3_module_test__local.register_types(module)
     
     root_module.end_section('ns3_module_test')
+    root_module.begin_section('ns3_module_common')
+    ns3_module_common.register_types(module)
+    
+    try:
+        import ns3_module_common__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_common__local.register_types(module)
+    
+    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_mobility')
     ns3_module_mobility.register_types(module)
     
@@ -97,17 +108,6 @@
         ns3_module_mobility__local.register_types(module)
     
     root_module.end_section('ns3_module_mobility')
-    root_module.begin_section('ns3_module_common')
-    ns3_module_common.register_types(module)
-    
-    try:
-        import ns3_module_common__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_common__local.register_types(module)
-    
-    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_contrib')
     ns3_module_contrib.register_types(module)
     
@@ -130,6 +130,127 @@
         ns3_module_node__local.register_types(module)
     
     root_module.end_section('ns3_module_node')
+    root_module.begin_section('ns3_module_bridge')
+    ns3_module_bridge.register_types(module)
+    
+    try:
+        import ns3_module_bridge__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_bridge__local.register_types(module)
+    
+    root_module.end_section('ns3_module_bridge')
+    root_module.begin_section('ns3_module_csma')
+    ns3_module_csma.register_types(module)
+    
+    try:
+        import ns3_module_csma__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_csma__local.register_types(module)
+    
+    root_module.end_section('ns3_module_csma')
+    root_module.begin_section('ns3_module_emu')
+    ns3_module_emu.register_types(module)
+    
+    try:
+        import ns3_module_emu__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_emu__local.register_types(module)
+    
+    root_module.end_section('ns3_module_emu')
+    root_module.begin_section('ns3_module_global_routing')
+    ns3_module_global_routing.register_types(module)
+    
+    try:
+        import ns3_module_global_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_global_routing__local.register_types(module)
+    
+    root_module.end_section('ns3_module_global_routing')
+    root_module.begin_section('ns3_module_internet_stack')
+    ns3_module_internet_stack.register_types(module)
+    
+    try:
+        import ns3_module_internet_stack__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_internet_stack__local.register_types(module)
+    
+    root_module.end_section('ns3_module_internet_stack')
+    root_module.begin_section('ns3_module_list_routing')
+    ns3_module_list_routing.register_types(module)
+    
+    try:
+        import ns3_module_list_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_list_routing__local.register_types(module)
+    
+    root_module.end_section('ns3_module_list_routing')
+    root_module.begin_section('ns3_module_onoff')
+    ns3_module_onoff.register_types(module)
+    
+    try:
+        import ns3_module_onoff__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_onoff__local.register_types(module)
+    
+    root_module.end_section('ns3_module_onoff')
+    root_module.begin_section('ns3_module_packet_sink')
+    ns3_module_packet_sink.register_types(module)
+    
+    try:
+        import ns3_module_packet_sink__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_packet_sink__local.register_types(module)
+    
+    root_module.end_section('ns3_module_packet_sink')
+    root_module.begin_section('ns3_module_point_to_point')
+    ns3_module_point_to_point.register_types(module)
+    
+    try:
+        import ns3_module_point_to_point__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_point_to_point__local.register_types(module)
+    
+    root_module.end_section('ns3_module_point_to_point')
+    root_module.begin_section('ns3_module_static_routing')
+    ns3_module_static_routing.register_types(module)
+    
+    try:
+        import ns3_module_static_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_static_routing__local.register_types(module)
+    
+    root_module.end_section('ns3_module_static_routing')
+    root_module.begin_section('ns3_module_stats')
+    ns3_module_stats.register_types(module)
+    
+    try:
+        import ns3_module_stats__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_stats__local.register_types(module)
+    
+    root_module.end_section('ns3_module_stats')
     root_module.begin_section('ns3_module_tap_bridge')
     ns3_module_tap_bridge.register_types(module)
     
@@ -152,94 +273,6 @@
         ns3_module_v4ping__local.register_types(module)
     
     root_module.end_section('ns3_module_v4ping')
-    root_module.begin_section('ns3_module_static_routing')
-    ns3_module_static_routing.register_types(module)
-    
-    try:
-        import ns3_module_static_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_static_routing__local.register_types(module)
-    
-    root_module.end_section('ns3_module_static_routing')
-    root_module.begin_section('ns3_module_packet_sink')
-    ns3_module_packet_sink.register_types(module)
-    
-    try:
-        import ns3_module_packet_sink__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_packet_sink__local.register_types(module)
-    
-    root_module.end_section('ns3_module_packet_sink')
-    root_module.begin_section('ns3_module_stats')
-    ns3_module_stats.register_types(module)
-    
-    try:
-        import ns3_module_stats__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_stats__local.register_types(module)
-    
-    root_module.end_section('ns3_module_stats')
-    root_module.begin_section('ns3_module_onoff')
-    ns3_module_onoff.register_types(module)
-    
-    try:
-        import ns3_module_onoff__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_onoff__local.register_types(module)
-    
-    root_module.end_section('ns3_module_onoff')
-    root_module.begin_section('ns3_module_point_to_point')
-    ns3_module_point_to_point.register_types(module)
-    
-    try:
-        import ns3_module_point_to_point__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_point_to_point__local.register_types(module)
-    
-    root_module.end_section('ns3_module_point_to_point')
-    root_module.begin_section('ns3_module_internet_stack')
-    ns3_module_internet_stack.register_types(module)
-    
-    try:
-        import ns3_module_internet_stack__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_internet_stack__local.register_types(module)
-    
-    root_module.end_section('ns3_module_internet_stack')
-    root_module.begin_section('ns3_module_csma')
-    ns3_module_csma.register_types(module)
-    
-    try:
-        import ns3_module_csma__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_csma__local.register_types(module)
-    
-    root_module.end_section('ns3_module_csma')
-    root_module.begin_section('ns3_module_list_routing')
-    ns3_module_list_routing.register_types(module)
-    
-    try:
-        import ns3_module_list_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_list_routing__local.register_types(module)
-    
-    root_module.end_section('ns3_module_list_routing')
     root_module.begin_section('ns3_module_virtual_net_device')
     ns3_module_virtual_net_device.register_types(module)
     
@@ -262,50 +295,28 @@
         ns3_module_wifi__local.register_types(module)
     
     root_module.end_section('ns3_module_wifi')
-    root_module.begin_section('ns3_module_emu')
-    ns3_module_emu.register_types(module)
+    root_module.begin_section('ns3_module_aodv')
+    ns3_module_aodv.register_types(module)
     
     try:
-        import ns3_module_emu__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_emu__local.register_types(module)
-    
-    root_module.end_section('ns3_module_emu')
-    root_module.begin_section('ns3_module_bridge')
-    ns3_module_bridge.register_types(module)
-    
-    try:
-        import ns3_module_bridge__local
+        import ns3_module_aodv__local
     except ImportError:
         pass
     else:
-        ns3_module_bridge__local.register_types(module)
+        ns3_module_aodv__local.register_types(module)
     
-    root_module.end_section('ns3_module_bridge')
-    root_module.begin_section('ns3_module_global_routing')
-    ns3_module_global_routing.register_types(module)
+    root_module.end_section('ns3_module_aodv')
+    root_module.begin_section('ns3_module_flow_monitor')
+    ns3_module_flow_monitor.register_types(module)
     
     try:
-        import ns3_module_global_routing__local
+        import ns3_module_flow_monitor__local
     except ImportError:
         pass
     else:
-        ns3_module_global_routing__local.register_types(module)
-    
-    root_module.end_section('ns3_module_global_routing')
-    root_module.begin_section('ns3_module_udp_echo')
-    ns3_module_udp_echo.register_types(module)
+        ns3_module_flow_monitor__local.register_types(module)
     
-    try:
-        import ns3_module_udp_echo__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_udp_echo__local.register_types(module)
-    
-    root_module.end_section('ns3_module_udp_echo')
+    root_module.end_section('ns3_module_flow_monitor')
     root_module.begin_section('ns3_module_nix_vector_routing')
     ns3_module_nix_vector_routing.register_types(module)
     
@@ -328,17 +339,17 @@
         ns3_module_olsr__local.register_types(module)
     
     root_module.end_section('ns3_module_olsr')
-    root_module.begin_section('ns3_module_aodv')
-    ns3_module_aodv.register_types(module)
+    root_module.begin_section('ns3_module_ping6')
+    ns3_module_ping6.register_types(module)
     
     try:
-        import ns3_module_aodv__local
+        import ns3_module_ping6__local
     except ImportError:
         pass
     else:
-        ns3_module_aodv__local.register_types(module)
+        ns3_module_ping6__local.register_types(module)
     
-    root_module.end_section('ns3_module_aodv')
+    root_module.end_section('ns3_module_ping6')
     root_module.begin_section('ns3_module_radvd')
     ns3_module_radvd.register_types(module)
     
@@ -350,28 +361,17 @@
         ns3_module_radvd__local.register_types(module)
     
     root_module.end_section('ns3_module_radvd')
-    root_module.begin_section('ns3_module_ping6')
-    ns3_module_ping6.register_types(module)
+    root_module.begin_section('ns3_module_udp_echo')
+    ns3_module_udp_echo.register_types(module)
     
     try:
-        import ns3_module_ping6__local
+        import ns3_module_udp_echo__local
     except ImportError:
         pass
     else:
-        ns3_module_ping6__local.register_types(module)
-    
-    root_module.end_section('ns3_module_ping6')
-    root_module.begin_section('ns3_module_flow_monitor')
-    ns3_module_flow_monitor.register_types(module)
+        ns3_module_udp_echo__local.register_types(module)
     
-    try:
-        import ns3_module_flow_monitor__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_flow_monitor__local.register_types(module)
-    
-    root_module.end_section('ns3_module_flow_monitor')
+    root_module.end_section('ns3_module_udp_echo')
     root_module.begin_section('ns3_module_mesh')
     ns3_module_mesh.register_types(module)
     
@@ -416,14 +416,6 @@
         ns3_module_flame__local.register_types(module)
     
     root_module.end_section('ns3_module_flame')
-    ## animation-interface.h: ns3::AnimationInterface [class]
-    module.add_class('AnimationInterface')
-    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper [class]
-    module.add_class('PointToPointDumbbellHelper', allow_subclassing=False)
-    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper [class]
-    module.add_class('PointToPointGridHelper', allow_subclassing=False)
-    ## node-location.h: ns3::NodeLocation [class]
-    module.add_class('NodeLocation', parent=root_module['ns3::Object'])
     module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector')
     module.add_container('std::vector< bool >', 'bool', container_type='vector')
     module.add_container('std::vector< unsigned long long >', 'long long unsigned int', container_type='vector')
@@ -513,10 +505,6 @@
     
 
 def register_methods(root_module):
-    register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface'])
-    register_Ns3PointToPointDumbbellHelper_methods(root_module, root_module['ns3::PointToPointDumbbellHelper'])
-    register_Ns3PointToPointGridHelper_methods(root_module, root_module['ns3::PointToPointGridHelper'])
-    register_Ns3NodeLocation_methods(root_module, root_module['ns3::NodeLocation'])
     root_module.begin_section('ns3_module_core')
     ns3_module_core.register_methods(root_module)
     
@@ -550,6 +538,17 @@
         ns3_module_test__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_test')
+    root_module.begin_section('ns3_module_common')
+    ns3_module_common.register_methods(root_module)
+    
+    try:
+        import ns3_module_common__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_common__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_mobility')
     ns3_module_mobility.register_methods(root_module)
     
@@ -561,17 +560,6 @@
         ns3_module_mobility__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_mobility')
-    root_module.begin_section('ns3_module_common')
-    ns3_module_common.register_methods(root_module)
-    
-    try:
-        import ns3_module_common__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_common__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_contrib')
     ns3_module_contrib.register_methods(root_module)
     
@@ -594,6 +582,127 @@
         ns3_module_node__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_node')
+    root_module.begin_section('ns3_module_bridge')
+    ns3_module_bridge.register_methods(root_module)
+    
+    try:
+        import ns3_module_bridge__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_bridge__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_bridge')
+    root_module.begin_section('ns3_module_csma')
+    ns3_module_csma.register_methods(root_module)
+    
+    try:
+        import ns3_module_csma__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_csma__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_csma')
+    root_module.begin_section('ns3_module_emu')
+    ns3_module_emu.register_methods(root_module)
+    
+    try:
+        import ns3_module_emu__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_emu__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_emu')
+    root_module.begin_section('ns3_module_global_routing')
+    ns3_module_global_routing.register_methods(root_module)
+    
+    try:
+        import ns3_module_global_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_global_routing__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_global_routing')
+    root_module.begin_section('ns3_module_internet_stack')
+    ns3_module_internet_stack.register_methods(root_module)
+    
+    try:
+        import ns3_module_internet_stack__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_internet_stack__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_internet_stack')
+    root_module.begin_section('ns3_module_list_routing')
+    ns3_module_list_routing.register_methods(root_module)
+    
+    try:
+        import ns3_module_list_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_list_routing__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_list_routing')
+    root_module.begin_section('ns3_module_onoff')
+    ns3_module_onoff.register_methods(root_module)
+    
+    try:
+        import ns3_module_onoff__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_onoff__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_onoff')
+    root_module.begin_section('ns3_module_packet_sink')
+    ns3_module_packet_sink.register_methods(root_module)
+    
+    try:
+        import ns3_module_packet_sink__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_packet_sink__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_packet_sink')
+    root_module.begin_section('ns3_module_point_to_point')
+    ns3_module_point_to_point.register_methods(root_module)
+    
+    try:
+        import ns3_module_point_to_point__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_point_to_point__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_point_to_point')
+    root_module.begin_section('ns3_module_static_routing')
+    ns3_module_static_routing.register_methods(root_module)
+    
+    try:
+        import ns3_module_static_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_static_routing__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_static_routing')
+    root_module.begin_section('ns3_module_stats')
+    ns3_module_stats.register_methods(root_module)
+    
+    try:
+        import ns3_module_stats__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_stats__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_stats')
     root_module.begin_section('ns3_module_tap_bridge')
     ns3_module_tap_bridge.register_methods(root_module)
     
@@ -616,94 +725,6 @@
         ns3_module_v4ping__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_v4ping')
-    root_module.begin_section('ns3_module_static_routing')
-    ns3_module_static_routing.register_methods(root_module)
-    
-    try:
-        import ns3_module_static_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_static_routing__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_static_routing')
-    root_module.begin_section('ns3_module_packet_sink')
-    ns3_module_packet_sink.register_methods(root_module)
-    
-    try:
-        import ns3_module_packet_sink__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_packet_sink__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_packet_sink')
-    root_module.begin_section('ns3_module_stats')
-    ns3_module_stats.register_methods(root_module)
-    
-    try:
-        import ns3_module_stats__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_stats__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_stats')
-    root_module.begin_section('ns3_module_onoff')
-    ns3_module_onoff.register_methods(root_module)
-    
-    try:
-        import ns3_module_onoff__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_onoff__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_onoff')
-    root_module.begin_section('ns3_module_point_to_point')
-    ns3_module_point_to_point.register_methods(root_module)
-    
-    try:
-        import ns3_module_point_to_point__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_point_to_point__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_point_to_point')
-    root_module.begin_section('ns3_module_internet_stack')
-    ns3_module_internet_stack.register_methods(root_module)
-    
-    try:
-        import ns3_module_internet_stack__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_internet_stack__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_internet_stack')
-    root_module.begin_section('ns3_module_csma')
-    ns3_module_csma.register_methods(root_module)
-    
-    try:
-        import ns3_module_csma__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_csma__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_csma')
-    root_module.begin_section('ns3_module_list_routing')
-    ns3_module_list_routing.register_methods(root_module)
-    
-    try:
-        import ns3_module_list_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_list_routing__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_list_routing')
     root_module.begin_section('ns3_module_virtual_net_device')
     ns3_module_virtual_net_device.register_methods(root_module)
     
@@ -726,50 +747,28 @@
         ns3_module_wifi__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_wifi')
-    root_module.begin_section('ns3_module_emu')
-    ns3_module_emu.register_methods(root_module)
+    root_module.begin_section('ns3_module_aodv')
+    ns3_module_aodv.register_methods(root_module)
     
     try:
-        import ns3_module_emu__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_emu__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_emu')
-    root_module.begin_section('ns3_module_bridge')
-    ns3_module_bridge.register_methods(root_module)
-    
-    try:
-        import ns3_module_bridge__local
+        import ns3_module_aodv__local
     except ImportError:
         pass
     else:
-        ns3_module_bridge__local.register_methods(root_module)
+        ns3_module_aodv__local.register_methods(root_module)
     
-    root_module.end_section('ns3_module_bridge')
-    root_module.begin_section('ns3_module_global_routing')
-    ns3_module_global_routing.register_methods(root_module)
+    root_module.end_section('ns3_module_aodv')
+    root_module.begin_section('ns3_module_flow_monitor')
+    ns3_module_flow_monitor.register_methods(root_module)
     
     try:
-        import ns3_module_global_routing__local
+        import ns3_module_flow_monitor__local
     except ImportError:
         pass
     else:
-        ns3_module_global_routing__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_global_routing')
-    root_module.begin_section('ns3_module_udp_echo')
-    ns3_module_udp_echo.register_methods(root_module)
+        ns3_module_flow_monitor__local.register_methods(root_module)
     
-    try:
-        import ns3_module_udp_echo__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_udp_echo__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_udp_echo')
+    root_module.end_section('ns3_module_flow_monitor')
     root_module.begin_section('ns3_module_nix_vector_routing')
     ns3_module_nix_vector_routing.register_methods(root_module)
     
@@ -792,17 +791,17 @@
         ns3_module_olsr__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_olsr')
-    root_module.begin_section('ns3_module_aodv')
-    ns3_module_aodv.register_methods(root_module)
+    root_module.begin_section('ns3_module_ping6')
+    ns3_module_ping6.register_methods(root_module)
     
     try:
-        import ns3_module_aodv__local
+        import ns3_module_ping6__local
     except ImportError:
         pass
     else:
-        ns3_module_aodv__local.register_methods(root_module)
+        ns3_module_ping6__local.register_methods(root_module)
     
-    root_module.end_section('ns3_module_aodv')
+    root_module.end_section('ns3_module_ping6')
     root_module.begin_section('ns3_module_radvd')
     ns3_module_radvd.register_methods(root_module)
     
@@ -814,28 +813,17 @@
         ns3_module_radvd__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_radvd')
-    root_module.begin_section('ns3_module_ping6')
-    ns3_module_ping6.register_methods(root_module)
+    root_module.begin_section('ns3_module_udp_echo')
+    ns3_module_udp_echo.register_methods(root_module)
     
     try:
-        import ns3_module_ping6__local
+        import ns3_module_udp_echo__local
     except ImportError:
         pass
     else:
-        ns3_module_ping6__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_ping6')
-    root_module.begin_section('ns3_module_flow_monitor')
-    ns3_module_flow_monitor.register_methods(root_module)
+        ns3_module_udp_echo__local.register_methods(root_module)
     
-    try:
-        import ns3_module_flow_monitor__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_flow_monitor__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_flow_monitor')
+    root_module.end_section('ns3_module_udp_echo')
     root_module.begin_section('ns3_module_mesh')
     ns3_module_mesh.register_methods(root_module)
     
@@ -882,140 +870,6 @@
     root_module.end_section('ns3_module_flame')
     return
 
-def register_Ns3AnimationInterface_methods(root_module, cls):
-    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface(ns3::AnimationInterface const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::AnimationInterface const &', 'arg0')])
-    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface() [constructor]
-    cls.add_constructor([])
-    ## animation-interface.h: bool ns3::AnimationInterface::SetInternalAnimation() [member function]
-    cls.add_method('SetInternalAnimation', 
-                   'bool', 
-                   [])
-    ## animation-interface.h: bool ns3::AnimationInterface::SetOutputFile(std::string const & fn) [member function]
-    cls.add_method('SetOutputFile', 
-                   'bool', 
-                   [param('std::string const &', 'fn')])
-    ## animation-interface.h: bool ns3::AnimationInterface::SetServerPort(uint16_t port) [member function]
-    cls.add_method('SetServerPort', 
-                   'bool', 
-                   [param('uint16_t', 'port')])
-    ## animation-interface.h: void ns3::AnimationInterface::StartAnimation() [member function]
-    cls.add_method('StartAnimation', 
-                   'void', 
-                   [])
-    ## animation-interface.h: void ns3::AnimationInterface::StopAnimation() [member function]
-    cls.add_method('StopAnimation', 
-                   'void', 
-                   [])
-    return
-
-def register_Ns3PointToPointDumbbellHelper_methods(root_module, cls):
-    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(ns3::PointToPointDumbbellHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PointToPointDumbbellHelper const &', 'arg0')])
-    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(uint32_t nLeftLeaf, ns3::PointToPointHelper & leftHelper, uint32_t nRightLeaf, ns3::PointToPointHelper & rightHelper, ns3::PointToPointHelper & bottleneckHelper) [constructor]
-    cls.add_constructor([param('uint32_t', 'nLeftLeaf'), param('ns3::PointToPointHelper &', 'leftHelper'), param('uint32_t', 'nRightLeaf'), param('ns3::PointToPointHelper &', 'rightHelper'), param('ns3::PointToPointHelper &', 'bottleneckHelper')])
-    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::AssignAddresses(ns3::Ipv4AddressHelper leftIp, ns3::Ipv4AddressHelper rightIp, ns3::Ipv4AddressHelper routerIp) [member function]
-    cls.add_method('AssignAddresses', 
-                   'void', 
-                   [param('ns3::Ipv4AddressHelper', 'leftIp'), param('ns3::Ipv4AddressHelper', 'rightIp'), param('ns3::Ipv4AddressHelper', 'routerIp')])
-    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function]
-    cls.add_method('BoundingBox', 
-                   'void', 
-                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')])
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft() const [member function]
-    cls.add_method('GetLeft', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft(uint32_t arg0) const [member function]
-    cls.add_method('GetLeft', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetLeftAddress(uint32_t arg0) const [member function]
-    cls.add_method('GetLeftAddress', 
-                   'ns3::Ipv4Address', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight() const [member function]
-    cls.add_method('GetRight', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight(uint32_t arg0) const [member function]
-    cls.add_method('GetRight', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetRightAddress(uint32_t arg0) const [member function]
-    cls.add_method('GetRightAddress', 
-                   'ns3::Ipv4Address', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
-    cls.add_method('InstallStack', 
-                   'void', 
-                   [param('ns3::InternetStackHelper', 'stack')])
-    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::LeftCount() const [member function]
-    cls.add_method('LeftCount', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::RightCount() const [member function]
-    cls.add_method('RightCount', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    return
-
-def register_Ns3PointToPointGridHelper_methods(root_module, cls):
-    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(ns3::PointToPointGridHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PointToPointGridHelper const &', 'arg0')])
-    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(uint32_t nRows, uint32_t nCols, ns3::PointToPointHelper pointToPoint) [constructor]
-    cls.add_constructor([param('uint32_t', 'nRows'), param('uint32_t', 'nCols'), param('ns3::PointToPointHelper', 'pointToPoint')])
-    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::AssignAddresses(ns3::Ipv4AddressHelper rowIp, ns3::Ipv4AddressHelper colIp) [member function]
-    cls.add_method('AssignAddresses', 
-                   'void', 
-                   [param('ns3::Ipv4AddressHelper', 'rowIp'), param('ns3::Ipv4AddressHelper', 'colIp')])
-    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::BoundingBox(double ulx, double uly, double lrx, double lry) [member function]
-    cls.add_method('BoundingBox', 
-                   'void', 
-                   [param('double', 'ulx'), param('double', 'uly'), param('double', 'lrx'), param('double', 'lry')])
-    ## point-to-point-grid-helper.h: ns3::Ipv4Address ns3::PointToPointGridHelper::GetAddress(uint32_t row, uint32_t col) [member function]
-    cls.add_method('GetAddress', 
-                   'ns3::Ipv4Address', 
-                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
-    ## point-to-point-grid-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointGridHelper::GetNode(uint32_t row, uint32_t col) [member function]
-    cls.add_method('GetNode', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
-    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
-    cls.add_method('InstallStack', 
-                   'void', 
-                   [param('ns3::InternetStackHelper', 'stack')])
-    return
-
-def register_Ns3NodeLocation_methods(root_module, cls):
-    ## node-location.h: ns3::NodeLocation::NodeLocation(ns3::NodeLocation const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::NodeLocation const &', 'arg0')])
-    ## node-location.h: ns3::NodeLocation::NodeLocation() [constructor]
-    cls.add_constructor([])
-    ## node-location.h: ns3::Vector ns3::NodeLocation::GetLocation() const [member function]
-    cls.add_method('GetLocation', 
-                   'ns3::Vector', 
-                   [], 
-                   is_const=True)
-    ## node-location.h: static ns3::TypeId ns3::NodeLocation::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## node-location.h: void ns3::NodeLocation::SetLocation(ns3::Vector const & location) [member function]
-    cls.add_method('SetLocation', 
-                   'void', 
-                   [param('ns3::Vector const &', 'location')])
-    return
-
 def register_functions(root_module):
     module = root_module
     root_module.begin_section('ns3_module_core')
@@ -1051,6 +905,17 @@
         ns3_module_test__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_test')
+    root_module.begin_section('ns3_module_common')
+    ns3_module_common.register_functions(root_module)
+    
+    try:
+        import ns3_module_common__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_common__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_mobility')
     ns3_module_mobility.register_functions(root_module)
     
@@ -1062,17 +927,6 @@
         ns3_module_mobility__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_mobility')
-    root_module.begin_section('ns3_module_common')
-    ns3_module_common.register_functions(root_module)
-    
-    try:
-        import ns3_module_common__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_common__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_contrib')
     ns3_module_contrib.register_functions(root_module)
     
@@ -1095,6 +949,127 @@
         ns3_module_node__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_node')
+    root_module.begin_section('ns3_module_bridge')
+    ns3_module_bridge.register_functions(root_module)
+    
+    try:
+        import ns3_module_bridge__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_bridge__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_bridge')
+    root_module.begin_section('ns3_module_csma')
+    ns3_module_csma.register_functions(root_module)
+    
+    try:
+        import ns3_module_csma__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_csma__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_csma')
+    root_module.begin_section('ns3_module_emu')
+    ns3_module_emu.register_functions(root_module)
+    
+    try:
+        import ns3_module_emu__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_emu__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_emu')
+    root_module.begin_section('ns3_module_global_routing')
+    ns3_module_global_routing.register_functions(root_module)
+    
+    try:
+        import ns3_module_global_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_global_routing__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_global_routing')
+    root_module.begin_section('ns3_module_internet_stack')
+    ns3_module_internet_stack.register_functions(root_module)
+    
+    try:
+        import ns3_module_internet_stack__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_internet_stack__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_internet_stack')
+    root_module.begin_section('ns3_module_list_routing')
+    ns3_module_list_routing.register_functions(root_module)
+    
+    try:
+        import ns3_module_list_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_list_routing__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_list_routing')
+    root_module.begin_section('ns3_module_onoff')
+    ns3_module_onoff.register_functions(root_module)
+    
+    try:
+        import ns3_module_onoff__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_onoff__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_onoff')
+    root_module.begin_section('ns3_module_packet_sink')
+    ns3_module_packet_sink.register_functions(root_module)
+    
+    try:
+        import ns3_module_packet_sink__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_packet_sink__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_packet_sink')
+    root_module.begin_section('ns3_module_point_to_point')
+    ns3_module_point_to_point.register_functions(root_module)
+    
+    try:
+        import ns3_module_point_to_point__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_point_to_point__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_point_to_point')
+    root_module.begin_section('ns3_module_static_routing')
+    ns3_module_static_routing.register_functions(root_module)
+    
+    try:
+        import ns3_module_static_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_static_routing__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_static_routing')
+    root_module.begin_section('ns3_module_stats')
+    ns3_module_stats.register_functions(root_module)
+    
+    try:
+        import ns3_module_stats__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_stats__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_stats')
     root_module.begin_section('ns3_module_tap_bridge')
     ns3_module_tap_bridge.register_functions(root_module)
     
@@ -1117,94 +1092,6 @@
         ns3_module_v4ping__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_v4ping')
-    root_module.begin_section('ns3_module_static_routing')
-    ns3_module_static_routing.register_functions(root_module)
-    
-    try:
-        import ns3_module_static_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_static_routing__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_static_routing')
-    root_module.begin_section('ns3_module_packet_sink')
-    ns3_module_packet_sink.register_functions(root_module)
-    
-    try:
-        import ns3_module_packet_sink__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_packet_sink__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_packet_sink')
-    root_module.begin_section('ns3_module_stats')
-    ns3_module_stats.register_functions(root_module)
-    
-    try:
-        import ns3_module_stats__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_stats__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_stats')
-    root_module.begin_section('ns3_module_onoff')
-    ns3_module_onoff.register_functions(root_module)
-    
-    try:
-        import ns3_module_onoff__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_onoff__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_onoff')
-    root_module.begin_section('ns3_module_point_to_point')
-    ns3_module_point_to_point.register_functions(root_module)
-    
-    try:
-        import ns3_module_point_to_point__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_point_to_point__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_point_to_point')
-    root_module.begin_section('ns3_module_internet_stack')
-    ns3_module_internet_stack.register_functions(root_module)
-    
-    try:
-        import ns3_module_internet_stack__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_internet_stack__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_internet_stack')
-    root_module.begin_section('ns3_module_csma')
-    ns3_module_csma.register_functions(root_module)
-    
-    try:
-        import ns3_module_csma__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_csma__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_csma')
-    root_module.begin_section('ns3_module_list_routing')
-    ns3_module_list_routing.register_functions(root_module)
-    
-    try:
-        import ns3_module_list_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_list_routing__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_list_routing')
     root_module.begin_section('ns3_module_virtual_net_device')
     ns3_module_virtual_net_device.register_functions(root_module)
     
@@ -1227,50 +1114,28 @@
         ns3_module_wifi__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_wifi')
-    root_module.begin_section('ns3_module_emu')
-    ns3_module_emu.register_functions(root_module)
+    root_module.begin_section('ns3_module_aodv')
+    ns3_module_aodv.register_functions(root_module)
     
     try:
-        import ns3_module_emu__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_emu__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_emu')
-    root_module.begin_section('ns3_module_bridge')
-    ns3_module_bridge.register_functions(root_module)
-    
-    try:
-        import ns3_module_bridge__local
+        import ns3_module_aodv__local
     except ImportError:
         pass
     else:
-        ns3_module_bridge__local.register_functions(root_module)
+        ns3_module_aodv__local.register_functions(root_module)
     
-    root_module.end_section('ns3_module_bridge')
-    root_module.begin_section('ns3_module_global_routing')
-    ns3_module_global_routing.register_functions(root_module)
+    root_module.end_section('ns3_module_aodv')
+    root_module.begin_section('ns3_module_flow_monitor')
+    ns3_module_flow_monitor.register_functions(root_module)
     
     try:
-        import ns3_module_global_routing__local
+        import ns3_module_flow_monitor__local
     except ImportError:
         pass
     else:
-        ns3_module_global_routing__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_global_routing')
-    root_module.begin_section('ns3_module_udp_echo')
-    ns3_module_udp_echo.register_functions(root_module)
+        ns3_module_flow_monitor__local.register_functions(root_module)
     
-    try:
-        import ns3_module_udp_echo__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_udp_echo__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_udp_echo')
+    root_module.end_section('ns3_module_flow_monitor')
     root_module.begin_section('ns3_module_nix_vector_routing')
     ns3_module_nix_vector_routing.register_functions(root_module)
     
@@ -1293,17 +1158,17 @@
         ns3_module_olsr__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_olsr')
-    root_module.begin_section('ns3_module_aodv')
-    ns3_module_aodv.register_functions(root_module)
+    root_module.begin_section('ns3_module_ping6')
+    ns3_module_ping6.register_functions(root_module)
     
     try:
-        import ns3_module_aodv__local
+        import ns3_module_ping6__local
     except ImportError:
         pass
     else:
-        ns3_module_aodv__local.register_functions(root_module)
+        ns3_module_ping6__local.register_functions(root_module)
     
-    root_module.end_section('ns3_module_aodv')
+    root_module.end_section('ns3_module_ping6')
     root_module.begin_section('ns3_module_radvd')
     ns3_module_radvd.register_functions(root_module)
     
@@ -1315,28 +1180,17 @@
         ns3_module_radvd__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_radvd')
-    root_module.begin_section('ns3_module_ping6')
-    ns3_module_ping6.register_functions(root_module)
+    root_module.begin_section('ns3_module_udp_echo')
+    ns3_module_udp_echo.register_functions(root_module)
     
     try:
-        import ns3_module_ping6__local
+        import ns3_module_udp_echo__local
     except ImportError:
         pass
     else:
-        ns3_module_ping6__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_ping6')
-    root_module.begin_section('ns3_module_flow_monitor')
-    ns3_module_flow_monitor.register_functions(root_module)
+        ns3_module_udp_echo__local.register_functions(root_module)
     
-    try:
-        import ns3_module_flow_monitor__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_flow_monitor__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_flow_monitor')
+    root_module.end_section('ns3_module_udp_echo')
     root_module.begin_section('ns3_module_mesh')
     ns3_module_mesh.register_functions(root_module)
     
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py	Wed Nov 25 11:41:55 2009 +0000
@@ -77,14 +77,14 @@
     module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
     ## ie-dot11s-configuration.h: ns3::dot11s::dot11sCongestionControlMode [enumeration]
     module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
-    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration]
-    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
+    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
+    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
     ## ie-dot11s-peer-management.h: ns3::dot11s::PmpReasonCode [enumeration]
     module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
+    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionMetric [enumeration]
+    module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
     ## ie-dot11s-configuration.h: ns3::dot11s::dot11sPathSelectionProtocol [enumeration]
     module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP'])
-    ## ie-dot11s-configuration.h: ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
-    module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
     ## ie-dot11s-configuration.h: ns3::dot11s::Dot11sMeshCapability [class]
     module.add_class('Dot11sMeshCapability')
     ## hwmp-protocol.h: ns3::dot11s::HwmpProtocol [class]
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py	Wed Nov 25 11:41:55 2009 +0000
@@ -3,6 +3,8 @@
 def register_types(module):
     root_module = module.get_root()
     
+    ## animation-interface.h: ns3::AnimationInterface [class]
+    module.add_class('AnimationInterface')
     ## application-container.h: ns3::ApplicationContainer [class]
     module.add_class('ApplicationContainer')
     ## athstats-helper.h: ns3::AthstatsHelper [class]
@@ -11,6 +13,8 @@
     module.add_class('BridgeHelper', allow_subclassing=False)
     ## csma-helper.h: ns3::CsmaHelper [class]
     module.add_class('CsmaHelper', allow_subclassing=False)
+    ## csma-star-helper.h: ns3::CsmaStarHelper [class]
+    module.add_class('CsmaStarHelper', allow_subclassing=False)
     ## emu-helper.h: ns3::EmuHelper [class]
     module.add_class('EmuHelper', allow_subclassing=False)
     ## flow-monitor-helper.h: ns3::FlowMonitorHelper [class]
@@ -55,8 +59,14 @@
     module.add_class('PacketSocketHelper', allow_subclassing=False)
     ## ping6-helper.h: ns3::Ping6Helper [class]
     module.add_class('Ping6Helper', allow_subclassing=False)
+    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper [class]
+    module.add_class('PointToPointDumbbellHelper', allow_subclassing=False)
+    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper [class]
+    module.add_class('PointToPointGridHelper', allow_subclassing=False)
     ## point-to-point-helper.h: ns3::PointToPointHelper [class]
     module.add_class('PointToPointHelper', allow_subclassing=False)
+    ## point-to-point-star-helper.h: ns3::PointToPointStarHelper [class]
+    module.add_class('PointToPointStarHelper', allow_subclassing=False)
     ## tap-bridge-helper.h: ns3::TapBridgeHelper [class]
     module.add_class('TapBridgeHelper', allow_subclassing=False)
     ## udp-echo-helper.h: ns3::UdpEchoClientHelper [class]
@@ -93,6 +103,8 @@
     module.add_class('QosWifiMacHelper', allow_subclassing=False, parent=root_module['ns3::WifiMacHelper'])
     ## athstats-helper.h: ns3::AthstatsWifiTraceSink [class]
     module.add_class('AthstatsWifiTraceSink', parent=root_module['ns3::Object'])
+    ## canvas-location.h: ns3::CanvasLocation [class]
+    module.add_class('CanvasLocation', parent=root_module['ns3::Object'])
     ## mesh-stack-installer.h: ns3::MeshStack [class]
     module.add_class('MeshStack', parent=root_module['ns3::Object'])
     ## dot11s-installer.h: ns3::Dot11sStack [class]
@@ -181,10 +193,12 @@
     
 
 def register_methods(root_module):
+    register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface'])
     register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
     register_Ns3AthstatsHelper_methods(root_module, root_module['ns3::AthstatsHelper'])
     register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
     register_Ns3CsmaHelper_methods(root_module, root_module['ns3::CsmaHelper'])
+    register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper'])
     register_Ns3EmuHelper_methods(root_module, root_module['ns3::EmuHelper'])
     register_Ns3FlowMonitorHelper_methods(root_module, root_module['ns3::FlowMonitorHelper'])
     register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])
@@ -206,7 +220,10 @@
     register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper'])
     register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper'])
     register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper'])
+    register_Ns3PointToPointDumbbellHelper_methods(root_module, root_module['ns3::PointToPointDumbbellHelper'])
+    register_Ns3PointToPointGridHelper_methods(root_module, root_module['ns3::PointToPointGridHelper'])
     register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper'])
+    register_Ns3PointToPointStarHelper_methods(root_module, root_module['ns3::PointToPointStarHelper'])
     register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper'])
     register_Ns3UdpEchoClientHelper_methods(root_module, root_module['ns3::UdpEchoClientHelper'])
     register_Ns3UdpEchoServerHelper_methods(root_module, root_module['ns3::UdpEchoServerHelper'])
@@ -224,11 +241,35 @@
     register_Ns3NqosWifiMacHelper_methods(root_module, root_module['ns3::NqosWifiMacHelper'])
     register_Ns3QosWifiMacHelper_methods(root_module, root_module['ns3::QosWifiMacHelper'])
     register_Ns3AthstatsWifiTraceSink_methods(root_module, root_module['ns3::AthstatsWifiTraceSink'])
+    register_Ns3CanvasLocation_methods(root_module, root_module['ns3::CanvasLocation'])
     register_Ns3MeshStack_methods(root_module, root_module['ns3::MeshStack'])
     register_Ns3Dot11sStack_methods(root_module, root_module['ns3::Dot11sStack'])
     register_Ns3FlameStack_methods(root_module, root_module['ns3::FlameStack'])
     return
 
+def register_Ns3AnimationInterface_methods(root_module, cls):
+    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface(ns3::AnimationInterface const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::AnimationInterface const &', 'arg0')])
+    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface() [constructor]
+    cls.add_constructor([])
+    ## animation-interface.h: bool ns3::AnimationInterface::SetOutputFile(std::string const & fn) [member function]
+    cls.add_method('SetOutputFile', 
+                   'bool', 
+                   [param('std::string const &', 'fn')])
+    ## animation-interface.h: bool ns3::AnimationInterface::SetServerPort(uint16_t port) [member function]
+    cls.add_method('SetServerPort', 
+                   'bool', 
+                   [param('uint16_t', 'port')])
+    ## animation-interface.h: void ns3::AnimationInterface::StartAnimation() [member function]
+    cls.add_method('StartAnimation', 
+                   'void', 
+                   [])
+    ## animation-interface.h: void ns3::AnimationInterface::StopAnimation() [member function]
+    cls.add_method('StopAnimation', 
+                   'void', 
+                   [])
+    return
+
 def register_Ns3ApplicationContainer_methods(root_module, cls):
     ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(ns3::ApplicationContainer const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::ApplicationContainer const &', 'arg0')])
@@ -422,14 +463,6 @@
                    'ns3::NetDeviceContainer', 
                    [param('ns3::NodeContainer const &', 'c'), param('std::string', 'channelName')], 
                    is_const=True)
-    ## csma-helper.h: void ns3::CsmaHelper::InstallStar(ns3::Ptr<ns3::Node> hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
-    ## csma-helper.h: void ns3::CsmaHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
     ## csma-helper.h: void ns3::CsmaHelper::SetChannelAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
     cls.add_method('SetChannelAttribute', 
                    'void', 
@@ -444,6 +477,56 @@
                    [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
     return
 
+def register_Ns3CsmaStarHelper_methods(root_module, cls):
+    ## csma-star-helper.h: ns3::CsmaStarHelper::CsmaStarHelper(ns3::CsmaStarHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CsmaStarHelper const &', 'arg0')])
+    ## csma-star-helper.h: ns3::CsmaStarHelper::CsmaStarHelper(uint32_t numSpokes, ns3::CsmaHelper csmaHelper) [constructor]
+    cls.add_constructor([param('uint32_t', 'numSpokes'), param('ns3::CsmaHelper', 'csmaHelper')])
+    ## csma-star-helper.h: void ns3::CsmaStarHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper address) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'address')])
+    ## csma-star-helper.h: ns3::Ptr<ns3::Node> ns3::CsmaStarHelper::GetHub() const [member function]
+    cls.add_method('GetHub', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::NetDeviceContainer ns3::CsmaStarHelper::GetHubDevices() const [member function]
+    cls.add_method('GetHubDevices', 
+                   'ns3::NetDeviceContainer', 
+                   [], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::Ipv4Address ns3::CsmaStarHelper::GetHubIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetHubIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::Ptr<ns3::Node> ns3::CsmaStarHelper::GetSpoke(uint32_t arg0) const [member function]
+    cls.add_method('GetSpoke', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::NetDeviceContainer ns3::CsmaStarHelper::GetSpokeDevices() const [member function]
+    cls.add_method('GetSpokeDevices', 
+                   'ns3::NetDeviceContainer', 
+                   [], 
+                   is_const=True)
+    ## csma-star-helper.h: ns3::Ipv4Address ns3::CsmaStarHelper::GetSpokeIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetSpokeIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## csma-star-helper.h: void ns3::CsmaStarHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    ## csma-star-helper.h: uint32_t ns3::CsmaStarHelper::SpokeCount() const [member function]
+    cls.add_method('SpokeCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3EmuHelper_methods(root_module, cls):
     ## emu-helper.h: ns3::EmuHelper::EmuHelper(ns3::EmuHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::EmuHelper const &', 'arg0')])
@@ -1245,6 +1328,92 @@
                    [param('ns3::Ipv6Address', 'ip')])
     return
 
+def register_Ns3PointToPointDumbbellHelper_methods(root_module, cls):
+    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(ns3::PointToPointDumbbellHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointDumbbellHelper const &', 'arg0')])
+    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(uint32_t nLeftLeaf, ns3::PointToPointHelper leftHelper, uint32_t nRightLeaf, ns3::PointToPointHelper rightHelper, ns3::PointToPointHelper bottleneckHelper) [constructor]
+    cls.add_constructor([param('uint32_t', 'nLeftLeaf'), param('ns3::PointToPointHelper', 'leftHelper'), param('uint32_t', 'nRightLeaf'), param('ns3::PointToPointHelper', 'rightHelper'), param('ns3::PointToPointHelper', 'bottleneckHelper')])
+    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper leftIp, ns3::Ipv4AddressHelper rightIp, ns3::Ipv4AddressHelper routerIp) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'leftIp'), param('ns3::Ipv4AddressHelper', 'rightIp'), param('ns3::Ipv4AddressHelper', 'routerIp')])
+    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function]
+    cls.add_method('BoundingBox', 
+                   'void', 
+                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')])
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft() const [member function]
+    cls.add_method('GetLeft', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft(uint32_t arg0) const [member function]
+    cls.add_method('GetLeft', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetLeftIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetLeftIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight() const [member function]
+    cls.add_method('GetRight', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight(uint32_t arg0) const [member function]
+    cls.add_method('GetRight', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetRightIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetRightIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::LeftCount() const [member function]
+    cls.add_method('LeftCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::RightCount() const [member function]
+    cls.add_method('RightCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
+def register_Ns3PointToPointGridHelper_methods(root_module, cls):
+    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(ns3::PointToPointGridHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointGridHelper const &', 'arg0')])
+    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(uint32_t nRows, uint32_t nCols, ns3::PointToPointHelper pointToPoint) [constructor]
+    cls.add_constructor([param('uint32_t', 'nRows'), param('uint32_t', 'nCols'), param('ns3::PointToPointHelper', 'pointToPoint')])
+    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper rowIp, ns3::Ipv4AddressHelper colIp) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'rowIp'), param('ns3::Ipv4AddressHelper', 'colIp')])
+    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::BoundingBox(double ulx, double uly, double lrx, double lry) [member function]
+    cls.add_method('BoundingBox', 
+                   'void', 
+                   [param('double', 'ulx'), param('double', 'uly'), param('double', 'lrx'), param('double', 'lry')])
+    ## point-to-point-grid-helper.h: ns3::Ipv4Address ns3::PointToPointGridHelper::GetIpv4Address(uint32_t row, uint32_t col) [member function]
+    cls.add_method('GetIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
+    ## point-to-point-grid-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointGridHelper::GetNode(uint32_t row, uint32_t col) [member function]
+    cls.add_method('GetNode', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
+    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    return
+
 def register_Ns3PointToPointHelper_methods(root_module, cls):
     ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper(ns3::PointToPointHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::PointToPointHelper const &', 'arg0')])
@@ -1320,14 +1489,6 @@
     cls.add_method('Install', 
                    'ns3::NetDeviceContainer', 
                    [param('std::string', 'aNode'), param('std::string', 'bNode')])
-    ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(ns3::Ptr<ns3::Node> hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
-    ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
-    cls.add_method('InstallStar', 
-                   'void', 
-                   [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
     ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelAttribute(std::string name, ns3::AttributeValue const & value) [member function]
     cls.add_method('SetChannelAttribute', 
                    'void', 
@@ -1342,6 +1503,50 @@
                    [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
     return
 
+def register_Ns3PointToPointStarHelper_methods(root_module, cls):
+    ## point-to-point-star-helper.h: ns3::PointToPointStarHelper::PointToPointStarHelper(ns3::PointToPointStarHelper const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::PointToPointStarHelper const &', 'arg0')])
+    ## point-to-point-star-helper.h: ns3::PointToPointStarHelper::PointToPointStarHelper(uint32_t numSpokes, ns3::PointToPointHelper p2pHelper) [constructor]
+    cls.add_constructor([param('uint32_t', 'numSpokes'), param('ns3::PointToPointHelper', 'p2pHelper')])
+    ## point-to-point-star-helper.h: void ns3::PointToPointStarHelper::AssignIpv4Addresses(ns3::Ipv4AddressHelper address) [member function]
+    cls.add_method('AssignIpv4Addresses', 
+                   'void', 
+                   [param('ns3::Ipv4AddressHelper', 'address')])
+    ## point-to-point-star-helper.h: void ns3::PointToPointStarHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function]
+    cls.add_method('BoundingBox', 
+                   'void', 
+                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')])
+    ## point-to-point-star-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointStarHelper::GetHub() const [member function]
+    cls.add_method('GetHub', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: ns3::Ipv4Address ns3::PointToPointStarHelper::GetHubIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetHubIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointStarHelper::GetSpoke(uint32_t arg0) const [member function]
+    cls.add_method('GetSpoke', 
+                   'ns3::Ptr< ns3::Node >', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: ns3::Ipv4Address ns3::PointToPointStarHelper::GetSpokeIpv4Address(uint32_t arg0) const [member function]
+    cls.add_method('GetSpokeIpv4Address', 
+                   'ns3::Ipv4Address', 
+                   [param('uint32_t', 'arg0')], 
+                   is_const=True)
+    ## point-to-point-star-helper.h: void ns3::PointToPointStarHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
+    cls.add_method('InstallStack', 
+                   'void', 
+                   [param('ns3::InternetStackHelper', 'stack')])
+    ## point-to-point-star-helper.h: uint32_t ns3::PointToPointStarHelper::SpokeCount() const [member function]
+    cls.add_method('SpokeCount', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3TapBridgeHelper_methods(root_module, cls):
     ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::TapBridgeHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TapBridgeHelper const &', 'arg0')])
@@ -1844,6 +2049,27 @@
                    [param('std::string', 'context'), param('ns3::Mac48Address', 'address')])
     return
 
+def register_Ns3CanvasLocation_methods(root_module, cls):
+    ## canvas-location.h: ns3::CanvasLocation::CanvasLocation(ns3::CanvasLocation const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::CanvasLocation const &', 'arg0')])
+    ## canvas-location.h: ns3::CanvasLocation::CanvasLocation() [constructor]
+    cls.add_constructor([])
+    ## canvas-location.h: ns3::Vector ns3::CanvasLocation::GetLocation() const [member function]
+    cls.add_method('GetLocation', 
+                   'ns3::Vector', 
+                   [], 
+                   is_const=True)
+    ## canvas-location.h: static ns3::TypeId ns3::CanvasLocation::GetTypeId() [member function]
+    cls.add_method('GetTypeId', 
+                   'ns3::TypeId', 
+                   [], 
+                   is_static=True)
+    ## canvas-location.h: void ns3::CanvasLocation::SetLocation(ns3::Vector const & location) [member function]
+    cls.add_method('SetLocation', 
+                   'void', 
+                   [param('ns3::Vector const &', 'location')])
+    return
+
 def register_Ns3MeshStack_methods(root_module, cls):
     ## mesh-stack-installer.h: ns3::MeshStack::MeshStack() [constructor]
     cls.add_constructor([])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_simulator.py	Wed Nov 25 11:41:55 2009 +0000
@@ -1574,7 +1574,7 @@
     module.add_function('MakeTimeChecker', 
                         'ns3::Ptr< ns3::AttributeChecker const >', 
                         [])
-    ## high-precision.h: extern ns3::HighPrecision ns3::Max(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
+    ## high-precision.h: ns3::HighPrecision ns3::Max(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
     module.add_function('Max', 
                         'ns3::HighPrecision', 
                         [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')])
@@ -1586,7 +1586,7 @@
     module.add_function('MilliSeconds', 
                         'ns3::Time', 
                         [param('uint64_t', 'ms')])
-    ## high-precision.h: extern ns3::HighPrecision ns3::Min(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
+    ## high-precision.h: ns3::HighPrecision ns3::Min(ns3::HighPrecision const & a, ns3::HighPrecision const & b) [free function]
     module.add_function('Min', 
                         'ns3::HighPrecision', 
                         [param('ns3::HighPrecision const &', 'a'), param('ns3::HighPrecision const &', 'b')])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py	Wed Nov 25 11:41:55 2009 +0000
@@ -9,6 +9,8 @@
     module.add_enum('WifiPreamble', ['WIFI_PREAMBLE_LONG', 'WIFI_PREAMBLE_SHORT'])
     ## wifi-phy-standard.h: ns3::WifiPhyStandard [enumeration]
     module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211_10Mhz', 'WIFI_PHY_STANDARD_80211_5Mhz', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_UNKNOWN'])
+    ## qos-tag.h: ns3::UserPriority [enumeration]
+    module.add_enum('UserPriority', ['UP_BK', 'UP_BE', 'UP_EE', 'UP_CL', 'UP_VI', 'UP_VO', 'UP_NC'])
     ## qos-utils.h: ns3::AccessClass [enumeration]
     module.add_enum('AccessClass', ['AC_VO', 'AC_VI', 'AC_BE', 'AC_BK', 'AC_BE_NQOS', 'AC_UNDEF'])
     ## edca-txop-n.h: ns3::TypeOfStation [enumeration]
@@ -1994,11 +1996,6 @@
                    'void', 
                    [param('ns3::TagBuffer', 'i')], 
                    is_virtual=True)
-    ## qos-tag.h: uint8_t ns3::QosTag::Get() const [member function]
-    cls.add_method('Get', 
-                   'uint8_t', 
-                   [], 
-                   is_const=True)
     ## qos-tag.h: ns3::TypeId ns3::QosTag::GetInstanceTypeId() const [member function]
     cls.add_method('GetInstanceTypeId', 
                    'ns3::TypeId', 
@@ -2009,6 +2006,11 @@
                    'uint32_t', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## qos-tag.h: uint8_t ns3::QosTag::GetTid() const [member function]
+    cls.add_method('GetTid', 
+                   'uint8_t', 
+                   [], 
+                   is_const=True)
     ## qos-tag.h: static ns3::TypeId ns3::QosTag::GetTypeId() [member function]
     cls.add_method('GetTypeId', 
                    'ns3::TypeId', 
@@ -2024,10 +2026,14 @@
                    'void', 
                    [param('ns3::TagBuffer', 'i')], 
                    is_const=True, is_virtual=True)
-    ## qos-tag.h: void ns3::QosTag::Set(uint8_t tid) [member function]
-    cls.add_method('Set', 
+    ## qos-tag.h: void ns3::QosTag::SetTid(uint8_t tid) [member function]
+    cls.add_method('SetTid', 
                    'void', 
                    [param('uint8_t', 'tid')])
+    ## qos-tag.h: void ns3::QosTag::SetUserPriority(ns3::UserPriority up) [member function]
+    cls.add_method('SetUserPriority', 
+                   'void', 
+                   [param('ns3::UserPriority', 'up')])
     return
 
 def register_Ns3RandomPropagationDelayModel_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Wed Nov 25 11:41:46 2009 +0000
+++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Wed Nov 25 11:41:55 2009 +0000
@@ -15,32 +15,32 @@
 import ns3_module_core
 import ns3_module_simulator
 import ns3_module_test
+import ns3_module_common
 import ns3_module_mobility
-import ns3_module_common
 import ns3_module_contrib
 import ns3_module_node
+import ns3_module_bridge
+import ns3_module_csma
+import ns3_module_emu
+import ns3_module_global_routing
+import ns3_module_internet_stack
+import ns3_module_list_routing
+import ns3_module_onoff
+import ns3_module_packet_sink
+import ns3_module_point_to_point
+import ns3_module_static_routing
+import ns3_module_stats
 import ns3_module_tap_bridge
 import ns3_module_v4ping
-import ns3_module_static_routing
-import ns3_module_packet_sink
-import ns3_module_stats
-import ns3_module_onoff
-import ns3_module_point_to_point
-import ns3_module_internet_stack
-import ns3_module_csma
-import ns3_module_list_routing
 import ns3_module_virtual_net_device
 import ns3_module_wifi
-import ns3_module_emu
-import ns3_module_bridge
-import ns3_module_global_routing
-import ns3_module_udp_echo
+import ns3_module_aodv
+import ns3_module_flow_monitor
 import ns3_module_nix_vector_routing
 import ns3_module_olsr
-import ns3_module_aodv
+import ns3_module_ping6
 import ns3_module_radvd
-import ns3_module_ping6
-import ns3_module_flow_monitor
+import ns3_module_udp_echo
 import ns3_module_mesh
 import ns3_module_helper
 import ns3_module_dot11s
@@ -86,6 +86,17 @@
         ns3_module_test__local.register_types(module)
     
     root_module.end_section('ns3_module_test')
+    root_module.begin_section('ns3_module_common')
+    ns3_module_common.register_types(module)
+    
+    try:
+        import ns3_module_common__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_common__local.register_types(module)
+    
+    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_mobility')
     ns3_module_mobility.register_types(module)
     
@@ -97,17 +108,6 @@
         ns3_module_mobility__local.register_types(module)
     
     root_module.end_section('ns3_module_mobility')
-    root_module.begin_section('ns3_module_common')
-    ns3_module_common.register_types(module)
-    
-    try:
-        import ns3_module_common__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_common__local.register_types(module)
-    
-    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_contrib')
     ns3_module_contrib.register_types(module)
     
@@ -130,6 +130,127 @@
         ns3_module_node__local.register_types(module)
     
     root_module.end_section('ns3_module_node')
+    root_module.begin_section('ns3_module_bridge')
+    ns3_module_bridge.register_types(module)
+    
+    try:
+        import ns3_module_bridge__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_bridge__local.register_types(module)
+    
+    root_module.end_section('ns3_module_bridge')
+    root_module.begin_section('ns3_module_csma')
+    ns3_module_csma.register_types(module)
+    
+    try:
+        import ns3_module_csma__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_csma__local.register_types(module)
+    
+    root_module.end_section('ns3_module_csma')
+    root_module.begin_section('ns3_module_emu')
+    ns3_module_emu.register_types(module)
+    
+    try:
+        import ns3_module_emu__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_emu__local.register_types(module)
+    
+    root_module.end_section('ns3_module_emu')
+    root_module.begin_section('ns3_module_global_routing')
+    ns3_module_global_routing.register_types(module)
+    
+    try:
+        import ns3_module_global_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_global_routing__local.register_types(module)
+    
+    root_module.end_section('ns3_module_global_routing')
+    root_module.begin_section('ns3_module_internet_stack')
+    ns3_module_internet_stack.register_types(module)
+    
+    try:
+        import ns3_module_internet_stack__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_internet_stack__local.register_types(module)
+    
+    root_module.end_section('ns3_module_internet_stack')
+    root_module.begin_section('ns3_module_list_routing')
+    ns3_module_list_routing.register_types(module)
+    
+    try:
+        import ns3_module_list_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_list_routing__local.register_types(module)
+    
+    root_module.end_section('ns3_module_list_routing')
+    root_module.begin_section('ns3_module_onoff')
+    ns3_module_onoff.register_types(module)
+    
+    try:
+        import ns3_module_onoff__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_onoff__local.register_types(module)
+    
+    root_module.end_section('ns3_module_onoff')
+    root_module.begin_section('ns3_module_packet_sink')
+    ns3_module_packet_sink.register_types(module)
+    
+    try:
+        import ns3_module_packet_sink__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_packet_sink__local.register_types(module)
+    
+    root_module.end_section('ns3_module_packet_sink')
+    root_module.begin_section('ns3_module_point_to_point')
+    ns3_module_point_to_point.register_types(module)
+    
+    try:
+        import ns3_module_point_to_point__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_point_to_point__local.register_types(module)
+    
+    root_module.end_section('ns3_module_point_to_point')
+    root_module.begin_section('ns3_module_static_routing')
+    ns3_module_static_routing.register_types(module)
+    
+    try:
+        import ns3_module_static_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_static_routing__local.register_types(module)
+    
+    root_module.end_section('ns3_module_static_routing')
+    root_module.begin_section('ns3_module_stats')
+    ns3_module_stats.register_types(module)
+    
+    try:
+        import ns3_module_stats__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_stats__local.register_types(module)
+    
+    root_module.end_section('ns3_module_stats')
     root_module.begin_section('ns3_module_tap_bridge')
     ns3_module_tap_bridge.register_types(module)
     
@@ -152,94 +273,6 @@
         ns3_module_v4ping__local.register_types(module)
     
     root_module.end_section('ns3_module_v4ping')
-    root_module.begin_section('ns3_module_static_routing')
-    ns3_module_static_routing.register_types(module)
-    
-    try:
-        import ns3_module_static_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_static_routing__local.register_types(module)
-    
-    root_module.end_section('ns3_module_static_routing')
-    root_module.begin_section('ns3_module_packet_sink')
-    ns3_module_packet_sink.register_types(module)
-    
-    try:
-        import ns3_module_packet_sink__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_packet_sink__local.register_types(module)
-    
-    root_module.end_section('ns3_module_packet_sink')
-    root_module.begin_section('ns3_module_stats')
-    ns3_module_stats.register_types(module)
-    
-    try:
-        import ns3_module_stats__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_stats__local.register_types(module)
-    
-    root_module.end_section('ns3_module_stats')
-    root_module.begin_section('ns3_module_onoff')
-    ns3_module_onoff.register_types(module)
-    
-    try:
-        import ns3_module_onoff__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_onoff__local.register_types(module)
-    
-    root_module.end_section('ns3_module_onoff')
-    root_module.begin_section('ns3_module_point_to_point')
-    ns3_module_point_to_point.register_types(module)
-    
-    try:
-        import ns3_module_point_to_point__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_point_to_point__local.register_types(module)
-    
-    root_module.end_section('ns3_module_point_to_point')
-    root_module.begin_section('ns3_module_internet_stack')
-    ns3_module_internet_stack.register_types(module)
-    
-    try:
-        import ns3_module_internet_stack__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_internet_stack__local.register_types(module)
-    
-    root_module.end_section('ns3_module_internet_stack')
-    root_module.begin_section('ns3_module_csma')
-    ns3_module_csma.register_types(module)
-    
-    try:
-        import ns3_module_csma__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_csma__local.register_types(module)
-    
-    root_module.end_section('ns3_module_csma')
-    root_module.begin_section('ns3_module_list_routing')
-    ns3_module_list_routing.register_types(module)
-    
-    try:
-        import ns3_module_list_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_list_routing__local.register_types(module)
-    
-    root_module.end_section('ns3_module_list_routing')
     root_module.begin_section('ns3_module_virtual_net_device')
     ns3_module_virtual_net_device.register_types(module)
     
@@ -262,50 +295,28 @@
         ns3_module_wifi__local.register_types(module)
     
     root_module.end_section('ns3_module_wifi')
-    root_module.begin_section('ns3_module_emu')
-    ns3_module_emu.register_types(module)
+    root_module.begin_section('ns3_module_aodv')
+    ns3_module_aodv.register_types(module)
     
     try:
-        import ns3_module_emu__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_emu__local.register_types(module)
-    
-    root_module.end_section('ns3_module_emu')
-    root_module.begin_section('ns3_module_bridge')
-    ns3_module_bridge.register_types(module)
-    
-    try:
-        import ns3_module_bridge__local
+        import ns3_module_aodv__local
     except ImportError:
         pass
     else:
-        ns3_module_bridge__local.register_types(module)
+        ns3_module_aodv__local.register_types(module)
     
-    root_module.end_section('ns3_module_bridge')
-    root_module.begin_section('ns3_module_global_routing')
-    ns3_module_global_routing.register_types(module)
+    root_module.end_section('ns3_module_aodv')
+    root_module.begin_section('ns3_module_flow_monitor')
+    ns3_module_flow_monitor.register_types(module)
     
     try:
-        import ns3_module_global_routing__local
+        import ns3_module_flow_monitor__local
     except ImportError:
         pass
     else:
-        ns3_module_global_routing__local.register_types(module)
-    
-    root_module.end_section('ns3_module_global_routing')
-    root_module.begin_section('ns3_module_udp_echo')
-    ns3_module_udp_echo.register_types(module)
+        ns3_module_flow_monitor__local.register_types(module)
     
-    try:
-        import ns3_module_udp_echo__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_udp_echo__local.register_types(module)
-    
-    root_module.end_section('ns3_module_udp_echo')
+    root_module.end_section('ns3_module_flow_monitor')
     root_module.begin_section('ns3_module_nix_vector_routing')
     ns3_module_nix_vector_routing.register_types(module)
     
@@ -328,17 +339,17 @@
         ns3_module_olsr__local.register_types(module)
     
     root_module.end_section('ns3_module_olsr')
-    root_module.begin_section('ns3_module_aodv')
-    ns3_module_aodv.register_types(module)
+    root_module.begin_section('ns3_module_ping6')
+    ns3_module_ping6.register_types(module)
     
     try:
-        import ns3_module_aodv__local
+        import ns3_module_ping6__local
     except ImportError:
         pass
     else:
-        ns3_module_aodv__local.register_types(module)
+        ns3_module_ping6__local.register_types(module)
     
-    root_module.end_section('ns3_module_aodv')
+    root_module.end_section('ns3_module_ping6')
     root_module.begin_section('ns3_module_radvd')
     ns3_module_radvd.register_types(module)
     
@@ -350,28 +361,17 @@
         ns3_module_radvd__local.register_types(module)
     
     root_module.end_section('ns3_module_radvd')
-    root_module.begin_section('ns3_module_ping6')
-    ns3_module_ping6.register_types(module)
+    root_module.begin_section('ns3_module_udp_echo')
+    ns3_module_udp_echo.register_types(module)
     
     try:
-        import ns3_module_ping6__local
+        import ns3_module_udp_echo__local
     except ImportError:
         pass
     else:
-        ns3_module_ping6__local.register_types(module)
-    
-    root_module.end_section('ns3_module_ping6')
-    root_module.begin_section('ns3_module_flow_monitor')
-    ns3_module_flow_monitor.register_types(module)
+        ns3_module_udp_echo__local.register_types(module)
     
-    try:
-        import ns3_module_flow_monitor__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_flow_monitor__local.register_types(module)
-    
-    root_module.end_section('ns3_module_flow_monitor')
+    root_module.end_section('ns3_module_udp_echo')
     root_module.begin_section('ns3_module_mesh')
     ns3_module_mesh.register_types(module)
     
@@ -416,14 +416,6 @@
         ns3_module_flame__local.register_types(module)
     
     root_module.end_section('ns3_module_flame')
-    ## animation-interface.h: ns3::AnimationInterface [class]
-    module.add_class('AnimationInterface')
-    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper [class]
-    module.add_class('PointToPointDumbbellHelper', allow_subclassing=False)
-    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper [class]
-    module.add_class('PointToPointGridHelper', allow_subclassing=False)
-    ## node-location.h: ns3::NodeLocation [class]
-    module.add_class('NodeLocation', parent=root_module['ns3::Object'])
     module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector')
     module.add_container('std::vector< bool >', 'bool', container_type='vector')
     module.add_container('std::vector< unsigned long >', 'long unsigned int', container_type='vector')
@@ -513,10 +505,6 @@
     
 
 def register_methods(root_module):
-    register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface'])
-    register_Ns3PointToPointDumbbellHelper_methods(root_module, root_module['ns3::PointToPointDumbbellHelper'])
-    register_Ns3PointToPointGridHelper_methods(root_module, root_module['ns3::PointToPointGridHelper'])
-    register_Ns3NodeLocation_methods(root_module, root_module['ns3::NodeLocation'])
     root_module.begin_section('ns3_module_core')
     ns3_module_core.register_methods(root_module)
     
@@ -550,6 +538,17 @@
         ns3_module_test__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_test')
+    root_module.begin_section('ns3_module_common')
+    ns3_module_common.register_methods(root_module)
+    
+    try:
+        import ns3_module_common__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_common__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_mobility')
     ns3_module_mobility.register_methods(root_module)
     
@@ -561,17 +560,6 @@
         ns3_module_mobility__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_mobility')
-    root_module.begin_section('ns3_module_common')
-    ns3_module_common.register_methods(root_module)
-    
-    try:
-        import ns3_module_common__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_common__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_contrib')
     ns3_module_contrib.register_methods(root_module)
     
@@ -594,6 +582,127 @@
         ns3_module_node__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_node')
+    root_module.begin_section('ns3_module_bridge')
+    ns3_module_bridge.register_methods(root_module)
+    
+    try:
+        import ns3_module_bridge__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_bridge__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_bridge')
+    root_module.begin_section('ns3_module_csma')
+    ns3_module_csma.register_methods(root_module)
+    
+    try:
+        import ns3_module_csma__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_csma__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_csma')
+    root_module.begin_section('ns3_module_emu')
+    ns3_module_emu.register_methods(root_module)
+    
+    try:
+        import ns3_module_emu__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_emu__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_emu')
+    root_module.begin_section('ns3_module_global_routing')
+    ns3_module_global_routing.register_methods(root_module)
+    
+    try:
+        import ns3_module_global_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_global_routing__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_global_routing')
+    root_module.begin_section('ns3_module_internet_stack')
+    ns3_module_internet_stack.register_methods(root_module)
+    
+    try:
+        import ns3_module_internet_stack__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_internet_stack__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_internet_stack')
+    root_module.begin_section('ns3_module_list_routing')
+    ns3_module_list_routing.register_methods(root_module)
+    
+    try:
+        import ns3_module_list_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_list_routing__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_list_routing')
+    root_module.begin_section('ns3_module_onoff')
+    ns3_module_onoff.register_methods(root_module)
+    
+    try:
+        import ns3_module_onoff__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_onoff__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_onoff')
+    root_module.begin_section('ns3_module_packet_sink')
+    ns3_module_packet_sink.register_methods(root_module)
+    
+    try:
+        import ns3_module_packet_sink__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_packet_sink__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_packet_sink')
+    root_module.begin_section('ns3_module_point_to_point')
+    ns3_module_point_to_point.register_methods(root_module)
+    
+    try:
+        import ns3_module_point_to_point__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_point_to_point__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_point_to_point')
+    root_module.begin_section('ns3_module_static_routing')
+    ns3_module_static_routing.register_methods(root_module)
+    
+    try:
+        import ns3_module_static_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_static_routing__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_static_routing')
+    root_module.begin_section('ns3_module_stats')
+    ns3_module_stats.register_methods(root_module)
+    
+    try:
+        import ns3_module_stats__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_stats__local.register_methods(root_module)
+    
+    root_module.end_section('ns3_module_stats')
     root_module.begin_section('ns3_module_tap_bridge')
     ns3_module_tap_bridge.register_methods(root_module)
     
@@ -616,94 +725,6 @@
         ns3_module_v4ping__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_v4ping')
-    root_module.begin_section('ns3_module_static_routing')
-    ns3_module_static_routing.register_methods(root_module)
-    
-    try:
-        import ns3_module_static_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_static_routing__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_static_routing')
-    root_module.begin_section('ns3_module_packet_sink')
-    ns3_module_packet_sink.register_methods(root_module)
-    
-    try:
-        import ns3_module_packet_sink__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_packet_sink__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_packet_sink')
-    root_module.begin_section('ns3_module_stats')
-    ns3_module_stats.register_methods(root_module)
-    
-    try:
-        import ns3_module_stats__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_stats__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_stats')
-    root_module.begin_section('ns3_module_onoff')
-    ns3_module_onoff.register_methods(root_module)
-    
-    try:
-        import ns3_module_onoff__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_onoff__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_onoff')
-    root_module.begin_section('ns3_module_point_to_point')
-    ns3_module_point_to_point.register_methods(root_module)
-    
-    try:
-        import ns3_module_point_to_point__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_point_to_point__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_point_to_point')
-    root_module.begin_section('ns3_module_internet_stack')
-    ns3_module_internet_stack.register_methods(root_module)
-    
-    try:
-        import ns3_module_internet_stack__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_internet_stack__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_internet_stack')
-    root_module.begin_section('ns3_module_csma')
-    ns3_module_csma.register_methods(root_module)
-    
-    try:
-        import ns3_module_csma__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_csma__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_csma')
-    root_module.begin_section('ns3_module_list_routing')
-    ns3_module_list_routing.register_methods(root_module)
-    
-    try:
-        import ns3_module_list_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_list_routing__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_list_routing')
     root_module.begin_section('ns3_module_virtual_net_device')
     ns3_module_virtual_net_device.register_methods(root_module)
     
@@ -726,50 +747,28 @@
         ns3_module_wifi__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_wifi')
-    root_module.begin_section('ns3_module_emu')
-    ns3_module_emu.register_methods(root_module)
+    root_module.begin_section('ns3_module_aodv')
+    ns3_module_aodv.register_methods(root_module)
     
     try:
-        import ns3_module_emu__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_emu__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_emu')
-    root_module.begin_section('ns3_module_bridge')
-    ns3_module_bridge.register_methods(root_module)
-    
-    try:
-        import ns3_module_bridge__local
+        import ns3_module_aodv__local
     except ImportError:
         pass
     else:
-        ns3_module_bridge__local.register_methods(root_module)
+        ns3_module_aodv__local.register_methods(root_module)
     
-    root_module.end_section('ns3_module_bridge')
-    root_module.begin_section('ns3_module_global_routing')
-    ns3_module_global_routing.register_methods(root_module)
+    root_module.end_section('ns3_module_aodv')
+    root_module.begin_section('ns3_module_flow_monitor')
+    ns3_module_flow_monitor.register_methods(root_module)
     
     try:
-        import ns3_module_global_routing__local
+        import ns3_module_flow_monitor__local
     except ImportError:
         pass
     else:
-        ns3_module_global_routing__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_global_routing')
-    root_module.begin_section('ns3_module_udp_echo')
-    ns3_module_udp_echo.register_methods(root_module)
+        ns3_module_flow_monitor__local.register_methods(root_module)
     
-    try:
-        import ns3_module_udp_echo__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_udp_echo__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_udp_echo')
+    root_module.end_section('ns3_module_flow_monitor')
     root_module.begin_section('ns3_module_nix_vector_routing')
     ns3_module_nix_vector_routing.register_methods(root_module)
     
@@ -792,17 +791,17 @@
         ns3_module_olsr__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_olsr')
-    root_module.begin_section('ns3_module_aodv')
-    ns3_module_aodv.register_methods(root_module)
+    root_module.begin_section('ns3_module_ping6')
+    ns3_module_ping6.register_methods(root_module)
     
     try:
-        import ns3_module_aodv__local
+        import ns3_module_ping6__local
     except ImportError:
         pass
     else:
-        ns3_module_aodv__local.register_methods(root_module)
+        ns3_module_ping6__local.register_methods(root_module)
     
-    root_module.end_section('ns3_module_aodv')
+    root_module.end_section('ns3_module_ping6')
     root_module.begin_section('ns3_module_radvd')
     ns3_module_radvd.register_methods(root_module)
     
@@ -814,28 +813,17 @@
         ns3_module_radvd__local.register_methods(root_module)
     
     root_module.end_section('ns3_module_radvd')
-    root_module.begin_section('ns3_module_ping6')
-    ns3_module_ping6.register_methods(root_module)
+    root_module.begin_section('ns3_module_udp_echo')
+    ns3_module_udp_echo.register_methods(root_module)
     
     try:
-        import ns3_module_ping6__local
+        import ns3_module_udp_echo__local
     except ImportError:
         pass
     else:
-        ns3_module_ping6__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_ping6')
-    root_module.begin_section('ns3_module_flow_monitor')
-    ns3_module_flow_monitor.register_methods(root_module)
+        ns3_module_udp_echo__local.register_methods(root_module)
     
-    try:
-        import ns3_module_flow_monitor__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_flow_monitor__local.register_methods(root_module)
-    
-    root_module.end_section('ns3_module_flow_monitor')
+    root_module.end_section('ns3_module_udp_echo')
     root_module.begin_section('ns3_module_mesh')
     ns3_module_mesh.register_methods(root_module)
     
@@ -882,140 +870,6 @@
     root_module.end_section('ns3_module_flame')
     return
 
-def register_Ns3AnimationInterface_methods(root_module, cls):
-    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface(ns3::AnimationInterface const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::AnimationInterface const &', 'arg0')])
-    ## animation-interface.h: ns3::AnimationInterface::AnimationInterface() [constructor]
-    cls.add_constructor([])
-    ## animation-interface.h: bool ns3::AnimationInterface::SetInternalAnimation() [member function]
-    cls.add_method('SetInternalAnimation', 
-                   'bool', 
-                   [])
-    ## animation-interface.h: bool ns3::AnimationInterface::SetOutputFile(std::string const & fn) [member function]
-    cls.add_method('SetOutputFile', 
-                   'bool', 
-                   [param('std::string const &', 'fn')])
-    ## animation-interface.h: bool ns3::AnimationInterface::SetServerPort(uint16_t port) [member function]
-    cls.add_method('SetServerPort', 
-                   'bool', 
-                   [param('uint16_t', 'port')])
-    ## animation-interface.h: void ns3::AnimationInterface::StartAnimation() [member function]
-    cls.add_method('StartAnimation', 
-                   'void', 
-                   [])
-    ## animation-interface.h: void ns3::AnimationInterface::StopAnimation() [member function]
-    cls.add_method('StopAnimation', 
-                   'void', 
-                   [])
-    return
-
-def register_Ns3PointToPointDumbbellHelper_methods(root_module, cls):
-    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(ns3::PointToPointDumbbellHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PointToPointDumbbellHelper const &', 'arg0')])
-    ## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper::PointToPointDumbbellHelper(uint32_t nLeftLeaf, ns3::PointToPointHelper & leftHelper, uint32_t nRightLeaf, ns3::PointToPointHelper & rightHelper, ns3::PointToPointHelper & bottleneckHelper) [constructor]
-    cls.add_constructor([param('uint32_t', 'nLeftLeaf'), param('ns3::PointToPointHelper &', 'leftHelper'), param('uint32_t', 'nRightLeaf'), param('ns3::PointToPointHelper &', 'rightHelper'), param('ns3::PointToPointHelper &', 'bottleneckHelper')])
-    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::AssignAddresses(ns3::Ipv4AddressHelper leftIp, ns3::Ipv4AddressHelper rightIp, ns3::Ipv4AddressHelper routerIp) [member function]
-    cls.add_method('AssignAddresses', 
-                   'void', 
-                   [param('ns3::Ipv4AddressHelper', 'leftIp'), param('ns3::Ipv4AddressHelper', 'rightIp'), param('ns3::Ipv4AddressHelper', 'routerIp')])
-    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::BoundingBox(double arg0, double arg1, double arg2, double arg3) [member function]
-    cls.add_method('BoundingBox', 
-                   'void', 
-                   [param('double', 'arg0'), param('double', 'arg1'), param('double', 'arg2'), param('double', 'arg3')])
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft() const [member function]
-    cls.add_method('GetLeft', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetLeft(uint32_t arg0) const [member function]
-    cls.add_method('GetLeft', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetLeftAddress(uint32_t arg0) const [member function]
-    cls.add_method('GetLeftAddress', 
-                   'ns3::Ipv4Address', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight() const [member function]
-    cls.add_method('GetRight', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointDumbbellHelper::GetRight(uint32_t arg0) const [member function]
-    cls.add_method('GetRight', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: ns3::Ipv4Address ns3::PointToPointDumbbellHelper::GetRightAddress(uint32_t arg0) const [member function]
-    cls.add_method('GetRightAddress', 
-                   'ns3::Ipv4Address', 
-                   [param('uint32_t', 'arg0')], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: void ns3::PointToPointDumbbellHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
-    cls.add_method('InstallStack', 
-                   'void', 
-                   [param('ns3::InternetStackHelper', 'stack')])
-    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::LeftCount() const [member function]
-    cls.add_method('LeftCount', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    ## point-to-point-dumbbell-helper.h: uint32_t ns3::PointToPointDumbbellHelper::RightCount() const [member function]
-    cls.add_method('RightCount', 
-                   'uint32_t', 
-                   [], 
-                   is_const=True)
-    return
-
-def register_Ns3PointToPointGridHelper_methods(root_module, cls):
-    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(ns3::PointToPointGridHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PointToPointGridHelper const &', 'arg0')])
-    ## point-to-point-grid-helper.h: ns3::PointToPointGridHelper::PointToPointGridHelper(uint32_t nRows, uint32_t nCols, ns3::PointToPointHelper pointToPoint) [constructor]
-    cls.add_constructor([param('uint32_t', 'nRows'), param('uint32_t', 'nCols'), param('ns3::PointToPointHelper', 'pointToPoint')])
-    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::AssignAddresses(ns3::Ipv4AddressHelper rowIp, ns3::Ipv4AddressHelper colIp) [member function]
-    cls.add_method('AssignAddresses', 
-                   'void', 
-                   [param('ns3::Ipv4AddressHelper', 'rowIp'), param('ns3::Ipv4AddressHelper', 'colIp')])
-    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::BoundingBox(double ulx, double uly, double lrx, double lry) [member function]
-    cls.add_method('BoundingBox', 
-                   'void', 
-                   [param('double', 'ulx'), param('double', 'uly'), param('double', 'lrx'), param('double', 'lry')])
-    ## point-to-point-grid-helper.h: ns3::Ipv4Address ns3::PointToPointGridHelper::GetAddress(uint32_t row, uint32_t col) [member function]
-    cls.add_method('GetAddress', 
-                   'ns3::Ipv4Address', 
-                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
-    ## point-to-point-grid-helper.h: ns3::Ptr<ns3::Node> ns3::PointToPointGridHelper::GetNode(uint32_t row, uint32_t col) [member function]
-    cls.add_method('GetNode', 
-                   'ns3::Ptr< ns3::Node >', 
-                   [param('uint32_t', 'row'), param('uint32_t', 'col')])
-    ## point-to-point-grid-helper.h: void ns3::PointToPointGridHelper::InstallStack(ns3::InternetStackHelper stack) [member function]
-    cls.add_method('InstallStack', 
-                   'void', 
-                   [param('ns3::InternetStackHelper', 'stack')])
-    return
-
-def register_Ns3NodeLocation_methods(root_module, cls):
-    ## node-location.h: ns3::NodeLocation::NodeLocation(ns3::NodeLocation const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::NodeLocation const &', 'arg0')])
-    ## node-location.h: ns3::NodeLocation::NodeLocation() [constructor]
-    cls.add_constructor([])
-    ## node-location.h: ns3::Vector ns3::NodeLocation::GetLocation() const [member function]
-    cls.add_method('GetLocation', 
-                   'ns3::Vector', 
-                   [], 
-                   is_const=True)
-    ## node-location.h: static ns3::TypeId ns3::NodeLocation::GetTypeId() [member function]
-    cls.add_method('GetTypeId', 
-                   'ns3::TypeId', 
-                   [], 
-                   is_static=True)
-    ## node-location.h: void ns3::NodeLocation::SetLocation(ns3::Vector const & location) [member function]
-    cls.add_method('SetLocation', 
-                   'void', 
-                   [param('ns3::Vector const &', 'location')])
-    return
-
 def register_functions(root_module):
     module = root_module
     root_module.begin_section('ns3_module_core')
@@ -1051,6 +905,17 @@
         ns3_module_test__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_test')
+    root_module.begin_section('ns3_module_common')
+    ns3_module_common.register_functions(root_module)
+    
+    try:
+        import ns3_module_common__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_common__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_mobility')
     ns3_module_mobility.register_functions(root_module)
     
@@ -1062,17 +927,6 @@
         ns3_module_mobility__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_mobility')
-    root_module.begin_section('ns3_module_common')
-    ns3_module_common.register_functions(root_module)
-    
-    try:
-        import ns3_module_common__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_common__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_common')
     root_module.begin_section('ns3_module_contrib')
     ns3_module_contrib.register_functions(root_module)
     
@@ -1095,6 +949,127 @@
         ns3_module_node__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_node')
+    root_module.begin_section('ns3_module_bridge')
+    ns3_module_bridge.register_functions(root_module)
+    
+    try:
+        import ns3_module_bridge__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_bridge__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_bridge')
+    root_module.begin_section('ns3_module_csma')
+    ns3_module_csma.register_functions(root_module)
+    
+    try:
+        import ns3_module_csma__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_csma__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_csma')
+    root_module.begin_section('ns3_module_emu')
+    ns3_module_emu.register_functions(root_module)
+    
+    try:
+        import ns3_module_emu__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_emu__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_emu')
+    root_module.begin_section('ns3_module_global_routing')
+    ns3_module_global_routing.register_functions(root_module)
+    
+    try:
+        import ns3_module_global_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_global_routing__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_global_routing')
+    root_module.begin_section('ns3_module_internet_stack')
+    ns3_module_internet_stack.register_functions(root_module)
+    
+    try:
+        import ns3_module_internet_stack__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_internet_stack__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_internet_stack')
+    root_module.begin_section('ns3_module_list_routing')
+    ns3_module_list_routing.register_functions(root_module)
+    
+    try:
+        import ns3_module_list_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_list_routing__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_list_routing')
+    root_module.begin_section('ns3_module_onoff')
+    ns3_module_onoff.register_functions(root_module)
+    
+    try:
+        import ns3_module_onoff__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_onoff__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_onoff')
+    root_module.begin_section('ns3_module_packet_sink')
+    ns3_module_packet_sink.register_functions(root_module)
+    
+    try:
+        import ns3_module_packet_sink__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_packet_sink__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_packet_sink')
+    root_module.begin_section('ns3_module_point_to_point')
+    ns3_module_point_to_point.register_functions(root_module)
+    
+    try:
+        import ns3_module_point_to_point__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_point_to_point__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_point_to_point')
+    root_module.begin_section('ns3_module_static_routing')
+    ns3_module_static_routing.register_functions(root_module)
+    
+    try:
+        import ns3_module_static_routing__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_static_routing__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_static_routing')
+    root_module.begin_section('ns3_module_stats')
+    ns3_module_stats.register_functions(root_module)
+    
+    try:
+        import ns3_module_stats__local
+    except ImportError:
+        pass
+    else:
+        ns3_module_stats__local.register_functions(root_module)
+    
+    root_module.end_section('ns3_module_stats')
     root_module.begin_section('ns3_module_tap_bridge')
     ns3_module_tap_bridge.register_functions(root_module)
     
@@ -1117,94 +1092,6 @@
         ns3_module_v4ping__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_v4ping')
-    root_module.begin_section('ns3_module_static_routing')
-    ns3_module_static_routing.register_functions(root_module)
-    
-    try:
-        import ns3_module_static_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_static_routing__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_static_routing')
-    root_module.begin_section('ns3_module_packet_sink')
-    ns3_module_packet_sink.register_functions(root_module)
-    
-    try:
-        import ns3_module_packet_sink__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_packet_sink__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_packet_sink')
-    root_module.begin_section('ns3_module_stats')
-    ns3_module_stats.register_functions(root_module)
-    
-    try:
-        import ns3_module_stats__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_stats__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_stats')
-    root_module.begin_section('ns3_module_onoff')
-    ns3_module_onoff.register_functions(root_module)
-    
-    try:
-        import ns3_module_onoff__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_onoff__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_onoff')
-    root_module.begin_section('ns3_module_point_to_point')
-    ns3_module_point_to_point.register_functions(root_module)
-    
-    try:
-        import ns3_module_point_to_point__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_point_to_point__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_point_to_point')
-    root_module.begin_section('ns3_module_internet_stack')
-    ns3_module_internet_stack.register_functions(root_module)
-    
-    try:
-        import ns3_module_internet_stack__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_internet_stack__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_internet_stack')
-    root_module.begin_section('ns3_module_csma')
-    ns3_module_csma.register_functions(root_module)
-    
-    try:
-        import ns3_module_csma__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_csma__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_csma')
-    root_module.begin_section('ns3_module_list_routing')
-    ns3_module_list_routing.register_functions(root_module)
-    
-    try:
-        import ns3_module_list_routing__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_list_routing__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_list_routing')
     root_module.begin_section('ns3_module_virtual_net_device')
     ns3_module_virtual_net_device.register_functions(root_module)
     
@@ -1227,50 +1114,28 @@
         ns3_module_wifi__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_wifi')
-    root_module.begin_section('ns3_module_emu')
-    ns3_module_emu.register_functions(root_module)
+    root_module.begin_section('ns3_module_aodv')
+    ns3_module_aodv.register_functions(root_module)
     
     try:
-        import ns3_module_emu__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_emu__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_emu')
-    root_module.begin_section('ns3_module_bridge')
-    ns3_module_bridge.register_functions(root_module)
-    
-    try:
-        import ns3_module_bridge__local
+        import ns3_module_aodv__local
     except ImportError:
         pass
     else:
-        ns3_module_bridge__local.register_functions(root_module)
+        ns3_module_aodv__local.register_functions(root_module)
     
-    root_module.end_section('ns3_module_bridge')
-    root_module.begin_section('ns3_module_global_routing')
-    ns3_module_global_routing.register_functions(root_module)
+    root_module.end_section('ns3_module_aodv')
+    root_module.begin_section('ns3_module_flow_monitor')
+    ns3_module_flow_monitor.register_functions(root_module)
     
     try:
-        import ns3_module_global_routing__local
+        import ns3_module_flow_monitor__local
     except ImportError:
         pass
     else:
-        ns3_module_global_routing__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_global_routing')
-    root_module.begin_section('ns3_module_udp_echo')
-    ns3_module_udp_echo.register_functions(root_module)
+        ns3_module_flow_monitor__local.register_functions(root_module)
     
-    try:
-        import ns3_module_udp_echo__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_udp_echo__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_udp_echo')
+    root_module.end_section('ns3_module_flow_monitor')
     root_module.begin_section('ns3_module_nix_vector_routing')
     ns3_module_nix_vector_routing.register_functions(root_module)
     
@@ -1293,17 +1158,17 @@
         ns3_module_olsr__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_olsr')
-    root_module.begin_section('ns3_module_aodv')
-    ns3_module_aodv.register_functions(root_module)
+    root_module.begin_section('ns3_module_ping6')
+    ns3_module_ping6.register_functions(root_module)
     
     try:
-        import ns3_module_aodv__local
+        import ns3_module_ping6__local
     except ImportError:
         pass
     else:
-        ns3_module_aodv__local.register_functions(root_module)
+        ns3_module_ping6__local.register_functions(root_module)
     
-    root_module.end_section('ns3_module_aodv')
+    root_module.end_section('ns3_module_ping6')
     root_module.begin_section('ns3_module_radvd')
     ns3_module_radvd.register_functions(root_module)
     
@@ -1315,28 +1180,17 @@
         ns3_module_radvd__local.register_functions(root_module)
     
     root_module.end_section('ns3_module_radvd')
-    root_module.begin_section('ns3_module_ping6')
-    ns3_module_ping6.register_functions(root_module)
+    root_module.begin_section('ns3_module_udp_echo')
+    ns3_module_udp_echo.register_functions(root_module)
     
     try:
-        import ns3_module_ping6__local
+        import ns3_module_udp_echo__local
     except ImportError:
         pass
     else:
-        ns3_module_ping6__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_ping6')
-    root_module.begin_section('ns3_module_flow_monitor')
-    ns3_module_flow_monitor.register_functions(root_module)
+        ns3_module_udp_echo__local.register_functions(root_module)
     
-    try:
-        import ns3_module_flow_monitor__local
-    except ImportError:
-        pass
-    else:
-        ns3_module_flow_monitor__local.register_functions(root_module)
-    
-    root_module.end_section('ns3_module_flow_monitor')
+    root_module.end_section('ns3_module_udp_echo')
     root_module.begin_section('ns3_module_mesh')
     ns3_module_mesh.register_functions(root_module)