Python API rescan
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Mon Oct 26 10:15:22 2009 +0000 (3 months ago)
changeset 5502c2ebfa5f4e6d
parent 5501 7a340852b479
child 5503 8cb18165e22f
child 5856 d06e2b6e581e
Python API 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_mesh.py
bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py
bindings/python/apidefs/gcc-LP64/ns3_module_core.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_mesh.py
bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py
     1.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Fri Oct 23 15:54:35 2009 -0700
     1.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Mon Oct 26 10:15:22 2009 +0000
     1.3 @@ -273,6 +273,7 @@
     1.4      root_module = module.get_root()
     1.5      
     1.6      module.add_container('std::vector< ns3::Ptr< ns3::dot11s::IeBeaconTimingUnit > >', 'ns3::Ptr< ns3::dot11s::IeBeaconTimingUnit >', container_type='vector')
     1.7 +    module.add_container('std::vector< ns3::Ptr< ns3::dot11s::PeerLink > >', 'ns3::Ptr< ns3::dot11s::PeerLink >', container_type='vector')
     1.8  
     1.9  def register_types_ns3_flame(module):
    1.10      root_module = module.get_root()
     2.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py	Fri Oct 23 15:54:35 2009 -0700
     2.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_dot11s.py	Mon Oct 26 10:15:22 2009 +0000
     2.3 @@ -599,6 +599,11 @@
     2.4      cls.add_method('SetLocalAid', 
     2.5                     'void', 
     2.6                     [param('uint16_t', 'aid')])
     2.7 +    ## peer-link.h: uint16_t ns3::dot11s::PeerLink::GetPeerAid() const [member function]
     2.8 +    cls.add_method('GetPeerAid', 
     2.9 +                   'uint16_t', 
    2.10 +                   [], 
    2.11 +                   is_const=True)
    2.12      ## peer-link.h: void ns3::dot11s::PeerLink::SetBeaconTimingElement(ns3::dot11s::IeBeaconTiming beaconTiming) [member function]
    2.13      cls.add_method('SetBeaconTimingElement', 
    2.14                     'void', 
    2.15 @@ -675,14 +680,15 @@
    2.16      cls.add_method('FindPeerLink', 
    2.17                     'ns3::Ptr< ns3::dot11s::PeerLink >', 
    2.18                     [param('uint32_t', 'interface'), param('ns3::Mac48Address', 'peerAddress')])
    2.19 -    ## peer-management-protocol.h: std::vector<ns3::Mac48Address,std::allocator<ns3::Mac48Address> > ns3::dot11s::PeerManagementProtocol::GetActiveLinks(uint32_t interface) [member function]
    2.20 -    cls.add_method('GetActiveLinks', 
    2.21 -                   'std::vector< ns3::Mac48Address >', 
    2.22 -                   [param('uint32_t', 'interface')])
    2.23      ## peer-management-protocol.h: ns3::Mac48Address ns3::dot11s::PeerManagementProtocol::GetAddress() [member function]
    2.24      cls.add_method('GetAddress', 
    2.25                     'ns3::Mac48Address', 
    2.26                     [])
    2.27 +    ## peer-management-protocol.h: bool ns3::dot11s::PeerManagementProtocol::GetBeaconCollisionAvoidance() const [member function]
    2.28 +    cls.add_method('GetBeaconCollisionAvoidance', 
    2.29 +                   'bool', 
    2.30 +                   [], 
    2.31 +                   is_const=True)
    2.32      ## peer-management-protocol.h: ns3::Ptr<ns3::dot11s::IeBeaconTiming> ns3::dot11s::PeerManagementProtocol::GetBeaconTimingElement(uint32_t interface) [member function]
    2.33      cls.add_method('GetBeaconTimingElement', 
    2.34                     'ns3::Ptr< ns3::dot11s::IeBeaconTiming >', 
    2.35 @@ -696,6 +702,16 @@
    2.36      cls.add_method('GetNumberOfLinks', 
    2.37                     'uint8_t', 
    2.38                     [])
    2.39 +    ## peer-management-protocol.h: std::vector<ns3::Ptr<ns3::dot11s::PeerLink>,std::allocator<ns3::Ptr<ns3::dot11s::PeerLink> > > ns3::dot11s::PeerManagementProtocol::GetPeerLinks() const [member function]
    2.40 +    cls.add_method('GetPeerLinks', 
    2.41 +                   'std::vector< ns3::Ptr< ns3::dot11s::PeerLink > >', 
    2.42 +                   [], 
    2.43 +                   is_const=True)
    2.44 +    ## peer-management-protocol.h: std::vector<ns3::Mac48Address,std::allocator<ns3::Mac48Address> > ns3::dot11s::PeerManagementProtocol::GetPeers(uint32_t interface) const [member function]
    2.45 +    cls.add_method('GetPeers', 
    2.46 +                   'std::vector< ns3::Mac48Address >', 
    2.47 +                   [param('uint32_t', 'interface')], 
    2.48 +                   is_const=True)
    2.49      ## peer-management-protocol.h: static ns3::TypeId ns3::dot11s::PeerManagementProtocol::GetTypeId() [member function]
    2.50      cls.add_method('GetTypeId', 
    2.51                     'ns3::TypeId', 
    2.52 @@ -709,6 +725,14 @@
    2.53      cls.add_method('IsActiveLink', 
    2.54                     'bool', 
    2.55                     [param('uint32_t', 'interface'), param('ns3::Mac48Address', 'peerAddress')])
    2.56 +    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::NotifyBeaconSent(uint32_t interface, ns3::Time beaconInterval) [member function]
    2.57 +    cls.add_method('NotifyBeaconSent', 
    2.58 +                   'void', 
    2.59 +                   [param('uint32_t', 'interface'), param('ns3::Time', 'beaconInterval')])
    2.60 +    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::ReceiveBeacon(uint32_t interface, ns3::Mac48Address peerAddress, ns3::Time beaconInterval, ns3::Ptr<ns3::dot11s::IeBeaconTiming> beaconTiming) [member function]
    2.61 +    cls.add_method('ReceiveBeacon', 
    2.62 +                   'void', 
    2.63 +                   [param('uint32_t', 'interface'), param('ns3::Mac48Address', 'peerAddress'), param('ns3::Time', 'beaconInterval'), param('ns3::Ptr< ns3::dot11s::IeBeaconTiming >', 'beaconTiming')])
    2.64      ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::ReceivePeerLinkFrame(uint32_t interface, ns3::Mac48Address peerAddress, ns3::Mac48Address peerMeshPointAddress, uint16_t aid, ns3::dot11s::IePeerManagement peerManagementElement, ns3::dot11s::IeConfiguration meshConfig) [member function]
    2.65      cls.add_method('ReceivePeerLinkFrame', 
    2.66                     'void', 
    2.67 @@ -722,6 +746,10 @@
    2.68      cls.add_method('ResetStats', 
    2.69                     'void', 
    2.70                     [])
    2.71 +    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::SetBeaconCollisionAvoidance(bool enable) [member function]
    2.72 +    cls.add_method('SetBeaconCollisionAvoidance', 
    2.73 +                   'void', 
    2.74 +                   [param('bool', 'enable')])
    2.75      ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::SetMeshId(std::string s) [member function]
    2.76      cls.add_method('SetMeshId', 
    2.77                     'void', 
    2.78 @@ -738,10 +766,6 @@
    2.79      cls.add_method('TransmissionSuccess', 
    2.80                     'void', 
    2.81                     [param('uint32_t', 'interface'), param('ns3::Mac48Address const', 'peerAddress')])
    2.82 -    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::UpdatePeerBeaconTiming(uint32_t interface, bool meshBeacon, ns3::dot11s::IeBeaconTiming timingElement, ns3::Mac48Address peerAddress, ns3::Time receivingTime, ns3::Time beaconInterval) [member function]
    2.83 -    cls.add_method('UpdatePeerBeaconTiming', 
    2.84 -                   'void', 
    2.85 -                   [param('uint32_t', 'interface'), param('bool', 'meshBeacon'), param('ns3::dot11s::IeBeaconTiming', 'timingElement'), param('ns3::Mac48Address', 'peerAddress'), param('ns3::Time', 'receivingTime'), param('ns3::Time', 'beaconInterval')])
    2.86      return
    2.87  
    2.88  def register_functions(root_module):
     3.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py	Fri Oct 23 15:54:35 2009 -0700
     3.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py	Mon Oct 26 10:15:22 2009 +0000
     3.3 @@ -650,10 +650,10 @@
     3.4      cls.add_method('Add', 
     3.5                     'void', 
     3.6                     [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
     3.7 -    ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::pair<ns3::Ptr<ns3::Ipv4>,unsigned int> arg0) [member function]
     3.8 +    ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::pair<ns3::Ptr<ns3::Ipv4>,unsigned int> ipInterfacePair) [member function]
     3.9      cls.add_method('Add', 
    3.10                     'void', 
    3.11 -                   [param('std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int >', 'arg0')])
    3.12 +                   [param('std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int >', 'ipInterfacePair')])
    3.13      ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::string ipv4Name, uint32_t interface) [member function]
    3.14      cls.add_method('Add', 
    3.15                     'void', 
     4.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3_module_mesh.py	Fri Oct 23 15:54:35 2009 -0700
     4.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_mesh.py	Mon Oct 26 10:15:22 2009 +0000
     4.3 @@ -122,6 +122,11 @@
     4.4      cls.add_method('CreatePacket', 
     4.5                     'ns3::Ptr< ns3::Packet >', 
     4.6                     [])
     4.7 +    ## mesh-wifi-beacon.h: ns3::Time ns3::MeshWifiBeacon::GetBeaconInterval() const [member function]
     4.8 +    cls.add_method('GetBeaconInterval', 
     4.9 +                   'ns3::Time', 
    4.10 +                   [], 
    4.11 +                   is_const=True)
    4.12      return
    4.13  
    4.14  def register_Ns3WifiInformationElement_methods(root_module, cls):
     5.1 --- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Fri Oct 23 15:54:35 2009 -0700
     5.2 +++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Mon Oct 26 10:15:22 2009 +0000
     5.3 @@ -17,29 +17,29 @@
     5.4  import ns3_module_test
     5.5  import ns3_module_mobility
     5.6  import ns3_module_common
     5.7 +import ns3_module_node
     5.8  import ns3_module_contrib
     5.9 -import ns3_module_node
    5.10 -import ns3_module_tap_bridge
    5.11 -import ns3_module_v4ping
    5.12 -import ns3_module_static_routing
    5.13 -import ns3_module_packet_sink
    5.14 -import ns3_module_stats
    5.15 -import ns3_module_onoff
    5.16  import ns3_module_point_to_point
    5.17  import ns3_module_internet_stack
    5.18 +import ns3_module_tap_bridge
    5.19  import ns3_module_csma
    5.20 +import ns3_module_wifi
    5.21 +import ns3_module_static_routing
    5.22 +import ns3_module_v4ping
    5.23 +import ns3_module_virtual_net_device
    5.24 +import ns3_module_packet_sink
    5.25 +import ns3_module_global_routing
    5.26 +import ns3_module_stats
    5.27  import ns3_module_list_routing
    5.28 -import ns3_module_virtual_net_device
    5.29 -import ns3_module_wifi
    5.30  import ns3_module_emu
    5.31  import ns3_module_bridge
    5.32 -import ns3_module_global_routing
    5.33 +import ns3_module_onoff
    5.34  import ns3_module_udp_echo
    5.35 +import ns3_module_ping6
    5.36  import ns3_module_nix_vector_routing
    5.37  import ns3_module_olsr
    5.38 +import ns3_module_flow_monitor
    5.39  import ns3_module_radvd
    5.40 -import ns3_module_ping6
    5.41 -import ns3_module_flow_monitor
    5.42  import ns3_module_mesh
    5.43  import ns3_module_helper
    5.44  import ns3_module_dot11s
    5.45 @@ -107,6 +107,17 @@
    5.46          ns3_module_common__local.register_types(module)
    5.47      
    5.48      root_module.end_section('ns3_module_common')
    5.49 +    root_module.begin_section('ns3_module_node')
    5.50 +    ns3_module_node.register_types(module)
    5.51 +    
    5.52 +    try:
    5.53 +        import ns3_module_node__local
    5.54 +    except ImportError:
    5.55 +        pass
    5.56 +    else:
    5.57 +        ns3_module_node__local.register_types(module)
    5.58 +    
    5.59 +    root_module.end_section('ns3_module_node')
    5.60      root_module.begin_section('ns3_module_contrib')
    5.61      ns3_module_contrib.register_types(module)
    5.62      
    5.63 @@ -118,83 +129,6 @@
    5.64          ns3_module_contrib__local.register_types(module)
    5.65      
    5.66      root_module.end_section('ns3_module_contrib')
    5.67 -    root_module.begin_section('ns3_module_node')
    5.68 -    ns3_module_node.register_types(module)
    5.69 -    
    5.70 -    try:
    5.71 -        import ns3_module_node__local
    5.72 -    except ImportError:
    5.73 -        pass
    5.74 -    else:
    5.75 -        ns3_module_node__local.register_types(module)
    5.76 -    
    5.77 -    root_module.end_section('ns3_module_node')
    5.78 -    root_module.begin_section('ns3_module_tap_bridge')
    5.79 -    ns3_module_tap_bridge.register_types(module)
    5.80 -    
    5.81 -    try:
    5.82 -        import ns3_module_tap_bridge__local
    5.83 -    except ImportError:
    5.84 -        pass
    5.85 -    else:
    5.86 -        ns3_module_tap_bridge__local.register_types(module)
    5.87 -    
    5.88 -    root_module.end_section('ns3_module_tap_bridge')
    5.89 -    root_module.begin_section('ns3_module_v4ping')
    5.90 -    ns3_module_v4ping.register_types(module)
    5.91 -    
    5.92 -    try:
    5.93 -        import ns3_module_v4ping__local
    5.94 -    except ImportError:
    5.95 -        pass
    5.96 -    else:
    5.97 -        ns3_module_v4ping__local.register_types(module)
    5.98 -    
    5.99 -    root_module.end_section('ns3_module_v4ping')
   5.100 -    root_module.begin_section('ns3_module_static_routing')
   5.101 -    ns3_module_static_routing.register_types(module)
   5.102 -    
   5.103 -    try:
   5.104 -        import ns3_module_static_routing__local
   5.105 -    except ImportError:
   5.106 -        pass
   5.107 -    else:
   5.108 -        ns3_module_static_routing__local.register_types(module)
   5.109 -    
   5.110 -    root_module.end_section('ns3_module_static_routing')
   5.111 -    root_module.begin_section('ns3_module_packet_sink')
   5.112 -    ns3_module_packet_sink.register_types(module)
   5.113 -    
   5.114 -    try:
   5.115 -        import ns3_module_packet_sink__local
   5.116 -    except ImportError:
   5.117 -        pass
   5.118 -    else:
   5.119 -        ns3_module_packet_sink__local.register_types(module)
   5.120 -    
   5.121 -    root_module.end_section('ns3_module_packet_sink')
   5.122 -    root_module.begin_section('ns3_module_stats')
   5.123 -    ns3_module_stats.register_types(module)
   5.124 -    
   5.125 -    try:
   5.126 -        import ns3_module_stats__local
   5.127 -    except ImportError:
   5.128 -        pass
   5.129 -    else:
   5.130 -        ns3_module_stats__local.register_types(module)
   5.131 -    
   5.132 -    root_module.end_section('ns3_module_stats')
   5.133 -    root_module.begin_section('ns3_module_onoff')
   5.134 -    ns3_module_onoff.register_types(module)
   5.135 -    
   5.136 -    try:
   5.137 -        import ns3_module_onoff__local
   5.138 -    except ImportError:
   5.139 -        pass
   5.140 -    else:
   5.141 -        ns3_module_onoff__local.register_types(module)
   5.142 -    
   5.143 -    root_module.end_section('ns3_module_onoff')
   5.144      root_module.begin_section('ns3_module_point_to_point')
   5.145      ns3_module_point_to_point.register_types(module)
   5.146      
   5.147 @@ -217,6 +151,17 @@
   5.148          ns3_module_internet_stack__local.register_types(module)
   5.149      
   5.150      root_module.end_section('ns3_module_internet_stack')
   5.151 +    root_module.begin_section('ns3_module_tap_bridge')
   5.152 +    ns3_module_tap_bridge.register_types(module)
   5.153 +    
   5.154 +    try:
   5.155 +        import ns3_module_tap_bridge__local
   5.156 +    except ImportError:
   5.157 +        pass
   5.158 +    else:
   5.159 +        ns3_module_tap_bridge__local.register_types(module)
   5.160 +    
   5.161 +    root_module.end_section('ns3_module_tap_bridge')
   5.162      root_module.begin_section('ns3_module_csma')
   5.163      ns3_module_csma.register_types(module)
   5.164      
   5.165 @@ -228,6 +173,83 @@
   5.166          ns3_module_csma__local.register_types(module)
   5.167      
   5.168      root_module.end_section('ns3_module_csma')
   5.169 +    root_module.begin_section('ns3_module_wifi')
   5.170 +    ns3_module_wifi.register_types(module)
   5.171 +    
   5.172 +    try:
   5.173 +        import ns3_module_wifi__local
   5.174 +    except ImportError:
   5.175 +        pass
   5.176 +    else:
   5.177 +        ns3_module_wifi__local.register_types(module)
   5.178 +    
   5.179 +    root_module.end_section('ns3_module_wifi')
   5.180 +    root_module.begin_section('ns3_module_static_routing')
   5.181 +    ns3_module_static_routing.register_types(module)
   5.182 +    
   5.183 +    try:
   5.184 +        import ns3_module_static_routing__local
   5.185 +    except ImportError:
   5.186 +        pass
   5.187 +    else:
   5.188 +        ns3_module_static_routing__local.register_types(module)
   5.189 +    
   5.190 +    root_module.end_section('ns3_module_static_routing')
   5.191 +    root_module.begin_section('ns3_module_v4ping')
   5.192 +    ns3_module_v4ping.register_types(module)
   5.193 +    
   5.194 +    try:
   5.195 +        import ns3_module_v4ping__local
   5.196 +    except ImportError:
   5.197 +        pass
   5.198 +    else:
   5.199 +        ns3_module_v4ping__local.register_types(module)
   5.200 +    
   5.201 +    root_module.end_section('ns3_module_v4ping')
   5.202 +    root_module.begin_section('ns3_module_virtual_net_device')
   5.203 +    ns3_module_virtual_net_device.register_types(module)
   5.204 +    
   5.205 +    try:
   5.206 +        import ns3_module_virtual_net_device__local
   5.207 +    except ImportError:
   5.208 +        pass
   5.209 +    else:
   5.210 +        ns3_module_virtual_net_device__local.register_types(module)
   5.211 +    
   5.212 +    root_module.end_section('ns3_module_virtual_net_device')
   5.213 +    root_module.begin_section('ns3_module_packet_sink')
   5.214 +    ns3_module_packet_sink.register_types(module)
   5.215 +    
   5.216 +    try:
   5.217 +        import ns3_module_packet_sink__local
   5.218 +    except ImportError:
   5.219 +        pass
   5.220 +    else:
   5.221 +        ns3_module_packet_sink__local.register_types(module)
   5.222 +    
   5.223 +    root_module.end_section('ns3_module_packet_sink')
   5.224 +    root_module.begin_section('ns3_module_global_routing')
   5.225 +    ns3_module_global_routing.register_types(module)
   5.226 +    
   5.227 +    try:
   5.228 +        import ns3_module_global_routing__local
   5.229 +    except ImportError:
   5.230 +        pass
   5.231 +    else:
   5.232 +        ns3_module_global_routing__local.register_types(module)
   5.233 +    
   5.234 +    root_module.end_section('ns3_module_global_routing')
   5.235 +    root_module.begin_section('ns3_module_stats')
   5.236 +    ns3_module_stats.register_types(module)
   5.237 +    
   5.238 +    try:
   5.239 +        import ns3_module_stats__local
   5.240 +    except ImportError:
   5.241 +        pass
   5.242 +    else:
   5.243 +        ns3_module_stats__local.register_types(module)
   5.244 +    
   5.245 +    root_module.end_section('ns3_module_stats')
   5.246      root_module.begin_section('ns3_module_list_routing')
   5.247      ns3_module_list_routing.register_types(module)
   5.248      
   5.249 @@ -239,28 +261,6 @@
   5.250          ns3_module_list_routing__local.register_types(module)
   5.251      
   5.252      root_module.end_section('ns3_module_list_routing')
   5.253 -    root_module.begin_section('ns3_module_virtual_net_device')
   5.254 -    ns3_module_virtual_net_device.register_types(module)
   5.255 -    
   5.256 -    try:
   5.257 -        import ns3_module_virtual_net_device__local
   5.258 -    except ImportError:
   5.259 -        pass
   5.260 -    else:
   5.261 -        ns3_module_virtual_net_device__local.register_types(module)
   5.262 -    
   5.263 -    root_module.end_section('ns3_module_virtual_net_device')
   5.264 -    root_module.begin_section('ns3_module_wifi')
   5.265 -    ns3_module_wifi.register_types(module)
   5.266 -    
   5.267 -    try:
   5.268 -        import ns3_module_wifi__local
   5.269 -    except ImportError:
   5.270 -        pass
   5.271 -    else:
   5.272 -        ns3_module_wifi__local.register_types(module)
   5.273 -    
   5.274 -    root_module.end_section('ns3_module_wifi')
   5.275      root_module.begin_section('ns3_module_emu')
   5.276      ns3_module_emu.register_types(module)
   5.277      
   5.278 @@ -283,17 +283,17 @@
   5.279          ns3_module_bridge__local.register_types(module)
   5.280      
   5.281      root_module.end_section('ns3_module_bridge')
   5.282 -    root_module.begin_section('ns3_module_global_routing')
   5.283 -    ns3_module_global_routing.register_types(module)
   5.284 +    root_module.begin_section('ns3_module_onoff')
   5.285 +    ns3_module_onoff.register_types(module)
   5.286      
   5.287      try:
   5.288 -        import ns3_module_global_routing__local
   5.289 +        import ns3_module_onoff__local
   5.290      except ImportError:
   5.291          pass
   5.292      else:
   5.293 -        ns3_module_global_routing__local.register_types(module)
   5.294 +        ns3_module_onoff__local.register_types(module)
   5.295      
   5.296 -    root_module.end_section('ns3_module_global_routing')
   5.297 +    root_module.end_section('ns3_module_onoff')
   5.298      root_module.begin_section('ns3_module_udp_echo')
   5.299      ns3_module_udp_echo.register_types(module)
   5.300      
   5.301 @@ -305,6 +305,17 @@
   5.302          ns3_module_udp_echo__local.register_types(module)
   5.303      
   5.304      root_module.end_section('ns3_module_udp_echo')
   5.305 +    root_module.begin_section('ns3_module_ping6')
   5.306 +    ns3_module_ping6.register_types(module)
   5.307 +    
   5.308 +    try:
   5.309 +        import ns3_module_ping6__local
   5.310 +    except ImportError:
   5.311 +        pass
   5.312 +    else:
   5.313 +        ns3_module_ping6__local.register_types(module)
   5.314 +    
   5.315 +    root_module.end_section('ns3_module_ping6')
   5.316      root_module.begin_section('ns3_module_nix_vector_routing')
   5.317      ns3_module_nix_vector_routing.register_types(module)
   5.318      
   5.319 @@ -327,6 +338,17 @@
   5.320          ns3_module_olsr__local.register_types(module)
   5.321      
   5.322      root_module.end_section('ns3_module_olsr')
   5.323 +    root_module.begin_section('ns3_module_flow_monitor')
   5.324 +    ns3_module_flow_monitor.register_types(module)
   5.325 +    
   5.326 +    try:
   5.327 +        import ns3_module_flow_monitor__local
   5.328 +    except ImportError:
   5.329 +        pass
   5.330 +    else:
   5.331 +        ns3_module_flow_monitor__local.register_types(module)
   5.332 +    
   5.333 +    root_module.end_section('ns3_module_flow_monitor')
   5.334      root_module.begin_section('ns3_module_radvd')
   5.335      ns3_module_radvd.register_types(module)
   5.336      
   5.337 @@ -338,28 +360,6 @@
   5.338          ns3_module_radvd__local.register_types(module)
   5.339      
   5.340      root_module.end_section('ns3_module_radvd')
   5.341 -    root_module.begin_section('ns3_module_ping6')
   5.342 -    ns3_module_ping6.register_types(module)
   5.343 -    
   5.344 -    try:
   5.345 -        import ns3_module_ping6__local
   5.346 -    except ImportError:
   5.347 -        pass
   5.348 -    else:
   5.349 -        ns3_module_ping6__local.register_types(module)
   5.350 -    
   5.351 -    root_module.end_section('ns3_module_ping6')
   5.352 -    root_module.begin_section('ns3_module_flow_monitor')
   5.353 -    ns3_module_flow_monitor.register_types(module)
   5.354 -    
   5.355 -    try:
   5.356 -        import ns3_module_flow_monitor__local
   5.357 -    except ImportError:
   5.358 -        pass
   5.359 -    else:
   5.360 -        ns3_module_flow_monitor__local.register_types(module)
   5.361 -    
   5.362 -    root_module.end_section('ns3_module_flow_monitor')
   5.363      root_module.begin_section('ns3_module_mesh')
   5.364      ns3_module_mesh.register_types(module)
   5.365      
   5.366 @@ -549,6 +549,17 @@
   5.367          ns3_module_common__local.register_methods(root_module)
   5.368      
   5.369      root_module.end_section('ns3_module_common')
   5.370 +    root_module.begin_section('ns3_module_node')
   5.371 +    ns3_module_node.register_methods(root_module)
   5.372 +    
   5.373 +    try:
   5.374 +        import ns3_module_node__local
   5.375 +    except ImportError:
   5.376 +        pass
   5.377 +    else:
   5.378 +        ns3_module_node__local.register_methods(root_module)
   5.379 +    
   5.380 +    root_module.end_section('ns3_module_node')
   5.381      root_module.begin_section('ns3_module_contrib')
   5.382      ns3_module_contrib.register_methods(root_module)
   5.383      
   5.384 @@ -560,83 +571,6 @@
   5.385          ns3_module_contrib__local.register_methods(root_module)
   5.386      
   5.387      root_module.end_section('ns3_module_contrib')
   5.388 -    root_module.begin_section('ns3_module_node')
   5.389 -    ns3_module_node.register_methods(root_module)
   5.390 -    
   5.391 -    try:
   5.392 -        import ns3_module_node__local
   5.393 -    except ImportError:
   5.394 -        pass
   5.395 -    else:
   5.396 -        ns3_module_node__local.register_methods(root_module)
   5.397 -    
   5.398 -    root_module.end_section('ns3_module_node')
   5.399 -    root_module.begin_section('ns3_module_tap_bridge')
   5.400 -    ns3_module_tap_bridge.register_methods(root_module)
   5.401 -    
   5.402 -    try:
   5.403 -        import ns3_module_tap_bridge__local
   5.404 -    except ImportError:
   5.405 -        pass
   5.406 -    else:
   5.407 -        ns3_module_tap_bridge__local.register_methods(root_module)
   5.408 -    
   5.409 -    root_module.end_section('ns3_module_tap_bridge')
   5.410 -    root_module.begin_section('ns3_module_v4ping')
   5.411 -    ns3_module_v4ping.register_methods(root_module)
   5.412 -    
   5.413 -    try:
   5.414 -        import ns3_module_v4ping__local
   5.415 -    except ImportError:
   5.416 -        pass
   5.417 -    else:
   5.418 -        ns3_module_v4ping__local.register_methods(root_module)
   5.419 -    
   5.420 -    root_module.end_section('ns3_module_v4ping')
   5.421 -    root_module.begin_section('ns3_module_static_routing')
   5.422 -    ns3_module_static_routing.register_methods(root_module)
   5.423 -    
   5.424 -    try:
   5.425 -        import ns3_module_static_routing__local
   5.426 -    except ImportError:
   5.427 -        pass
   5.428 -    else:
   5.429 -        ns3_module_static_routing__local.register_methods(root_module)
   5.430 -    
   5.431 -    root_module.end_section('ns3_module_static_routing')
   5.432 -    root_module.begin_section('ns3_module_packet_sink')
   5.433 -    ns3_module_packet_sink.register_methods(root_module)
   5.434 -    
   5.435 -    try:
   5.436 -        import ns3_module_packet_sink__local
   5.437 -    except ImportError:
   5.438 -        pass
   5.439 -    else:
   5.440 -        ns3_module_packet_sink__local.register_methods(root_module)
   5.441 -    
   5.442 -    root_module.end_section('ns3_module_packet_sink')
   5.443 -    root_module.begin_section('ns3_module_stats')
   5.444 -    ns3_module_stats.register_methods(root_module)
   5.445 -    
   5.446 -    try:
   5.447 -        import ns3_module_stats__local
   5.448 -    except ImportError:
   5.449 -        pass
   5.450 -    else:
   5.451 -        ns3_module_stats__local.register_methods(root_module)
   5.452 -    
   5.453 -    root_module.end_section('ns3_module_stats')
   5.454 -    root_module.begin_section('ns3_module_onoff')
   5.455 -    ns3_module_onoff.register_methods(root_module)
   5.456 -    
   5.457 -    try:
   5.458 -        import ns3_module_onoff__local
   5.459 -    except ImportError:
   5.460 -        pass
   5.461 -    else:
   5.462 -        ns3_module_onoff__local.register_methods(root_module)
   5.463 -    
   5.464 -    root_module.end_section('ns3_module_onoff')
   5.465      root_module.begin_section('ns3_module_point_to_point')
   5.466      ns3_module_point_to_point.register_methods(root_module)
   5.467      
   5.468 @@ -659,6 +593,17 @@
   5.469          ns3_module_internet_stack__local.register_methods(root_module)
   5.470      
   5.471      root_module.end_section('ns3_module_internet_stack')
   5.472 +    root_module.begin_section('ns3_module_tap_bridge')
   5.473 +    ns3_module_tap_bridge.register_methods(root_module)
   5.474 +    
   5.475 +    try:
   5.476 +        import ns3_module_tap_bridge__local
   5.477 +    except ImportError:
   5.478 +        pass
   5.479 +    else:
   5.480 +        ns3_module_tap_bridge__local.register_methods(root_module)
   5.481 +    
   5.482 +    root_module.end_section('ns3_module_tap_bridge')
   5.483      root_module.begin_section('ns3_module_csma')
   5.484      ns3_module_csma.register_methods(root_module)
   5.485      
   5.486 @@ -670,6 +615,83 @@
   5.487          ns3_module_csma__local.register_methods(root_module)
   5.488      
   5.489      root_module.end_section('ns3_module_csma')
   5.490 +    root_module.begin_section('ns3_module_wifi')
   5.491 +    ns3_module_wifi.register_methods(root_module)
   5.492 +    
   5.493 +    try:
   5.494 +        import ns3_module_wifi__local
   5.495 +    except ImportError:
   5.496 +        pass
   5.497 +    else:
   5.498 +        ns3_module_wifi__local.register_methods(root_module)
   5.499 +    
   5.500 +    root_module.end_section('ns3_module_wifi')
   5.501 +    root_module.begin_section('ns3_module_static_routing')
   5.502 +    ns3_module_static_routing.register_methods(root_module)
   5.503 +    
   5.504 +    try:
   5.505 +        import ns3_module_static_routing__local
   5.506 +    except ImportError:
   5.507 +        pass
   5.508 +    else:
   5.509 +        ns3_module_static_routing__local.register_methods(root_module)
   5.510 +    
   5.511 +    root_module.end_section('ns3_module_static_routing')
   5.512 +    root_module.begin_section('ns3_module_v4ping')
   5.513 +    ns3_module_v4ping.register_methods(root_module)
   5.514 +    
   5.515 +    try:
   5.516 +        import ns3_module_v4ping__local
   5.517 +    except ImportError:
   5.518 +        pass
   5.519 +    else:
   5.520 +        ns3_module_v4ping__local.register_methods(root_module)
   5.521 +    
   5.522 +    root_module.end_section('ns3_module_v4ping')
   5.523 +    root_module.begin_section('ns3_module_virtual_net_device')
   5.524 +    ns3_module_virtual_net_device.register_methods(root_module)
   5.525 +    
   5.526 +    try:
   5.527 +        import ns3_module_virtual_net_device__local
   5.528 +    except ImportError:
   5.529 +        pass
   5.530 +    else:
   5.531 +        ns3_module_virtual_net_device__local.register_methods(root_module)
   5.532 +    
   5.533 +    root_module.end_section('ns3_module_virtual_net_device')
   5.534 +    root_module.begin_section('ns3_module_packet_sink')
   5.535 +    ns3_module_packet_sink.register_methods(root_module)
   5.536 +    
   5.537 +    try:
   5.538 +        import ns3_module_packet_sink__local
   5.539 +    except ImportError:
   5.540 +        pass
   5.541 +    else:
   5.542 +        ns3_module_packet_sink__local.register_methods(root_module)
   5.543 +    
   5.544 +    root_module.end_section('ns3_module_packet_sink')
   5.545 +    root_module.begin_section('ns3_module_global_routing')
   5.546 +    ns3_module_global_routing.register_methods(root_module)
   5.547 +    
   5.548 +    try:
   5.549 +        import ns3_module_global_routing__local
   5.550 +    except ImportError:
   5.551 +        pass
   5.552 +    else:
   5.553 +        ns3_module_global_routing__local.register_methods(root_module)
   5.554 +    
   5.555 +    root_module.end_section('ns3_module_global_routing')
   5.556 +    root_module.begin_section('ns3_module_stats')
   5.557 +    ns3_module_stats.register_methods(root_module)
   5.558 +    
   5.559 +    try:
   5.560 +        import ns3_module_stats__local
   5.561 +    except ImportError:
   5.562 +        pass
   5.563 +    else:
   5.564 +        ns3_module_stats__local.register_methods(root_module)
   5.565 +    
   5.566 +    root_module.end_section('ns3_module_stats')
   5.567      root_module.begin_section('ns3_module_list_routing')
   5.568      ns3_module_list_routing.register_methods(root_module)
   5.569      
   5.570 @@ -681,28 +703,6 @@
   5.571          ns3_module_list_routing__local.register_methods(root_module)
   5.572      
   5.573      root_module.end_section('ns3_module_list_routing')
   5.574 -    root_module.begin_section('ns3_module_virtual_net_device')
   5.575 -    ns3_module_virtual_net_device.register_methods(root_module)
   5.576 -    
   5.577 -    try:
   5.578 -        import ns3_module_virtual_net_device__local
   5.579 -    except ImportError:
   5.580 -        pass
   5.581 -    else:
   5.582 -        ns3_module_virtual_net_device__local.register_methods(root_module)
   5.583 -    
   5.584 -    root_module.end_section('ns3_module_virtual_net_device')
   5.585 -    root_module.begin_section('ns3_module_wifi')
   5.586 -    ns3_module_wifi.register_methods(root_module)
   5.587 -    
   5.588 -    try:
   5.589 -        import ns3_module_wifi__local
   5.590 -    except ImportError:
   5.591 -        pass
   5.592 -    else:
   5.593 -        ns3_module_wifi__local.register_methods(root_module)
   5.594 -    
   5.595 -    root_module.end_section('ns3_module_wifi')
   5.596      root_module.begin_section('ns3_module_emu')
   5.597      ns3_module_emu.register_methods(root_module)
   5.598      
   5.599 @@ -725,17 +725,17 @@
   5.600          ns3_module_bridge__local.register_methods(root_module)
   5.601      
   5.602      root_module.end_section('ns3_module_bridge')
   5.603 -    root_module.begin_section('ns3_module_global_routing')
   5.604 -    ns3_module_global_routing.register_methods(root_module)
   5.605 +    root_module.begin_section('ns3_module_onoff')
   5.606 +    ns3_module_onoff.register_methods(root_module)
   5.607      
   5.608      try:
   5.609 -        import ns3_module_global_routing__local
   5.610 +        import ns3_module_onoff__local
   5.611      except ImportError:
   5.612          pass
   5.613      else:
   5.614 -        ns3_module_global_routing__local.register_methods(root_module)
   5.615 +        ns3_module_onoff__local.register_methods(root_module)
   5.616      
   5.617 -    root_module.end_section('ns3_module_global_routing')
   5.618 +    root_module.end_section('ns3_module_onoff')
   5.619      root_module.begin_section('ns3_module_udp_echo')
   5.620      ns3_module_udp_echo.register_methods(root_module)
   5.621      
   5.622 @@ -747,6 +747,17 @@
   5.623          ns3_module_udp_echo__local.register_methods(root_module)
   5.624      
   5.625      root_module.end_section('ns3_module_udp_echo')
   5.626 +    root_module.begin_section('ns3_module_ping6')
   5.627 +    ns3_module_ping6.register_methods(root_module)
   5.628 +    
   5.629 +    try:
   5.630 +        import ns3_module_ping6__local
   5.631 +    except ImportError:
   5.632 +        pass
   5.633 +    else:
   5.634 +        ns3_module_ping6__local.register_methods(root_module)
   5.635 +    
   5.636 +    root_module.end_section('ns3_module_ping6')
   5.637      root_module.begin_section('ns3_module_nix_vector_routing')
   5.638      ns3_module_nix_vector_routing.register_methods(root_module)
   5.639      
   5.640 @@ -769,6 +780,17 @@
   5.641          ns3_module_olsr__local.register_methods(root_module)
   5.642      
   5.643      root_module.end_section('ns3_module_olsr')
   5.644 +    root_module.begin_section('ns3_module_flow_monitor')
   5.645 +    ns3_module_flow_monitor.register_methods(root_module)
   5.646 +    
   5.647 +    try:
   5.648 +        import ns3_module_flow_monitor__local
   5.649 +    except ImportError:
   5.650 +        pass
   5.651 +    else:
   5.652 +        ns3_module_flow_monitor__local.register_methods(root_module)
   5.653 +    
   5.654 +    root_module.end_section('ns3_module_flow_monitor')
   5.655      root_module.begin_section('ns3_module_radvd')
   5.656      ns3_module_radvd.register_methods(root_module)
   5.657      
   5.658 @@ -780,28 +802,6 @@
   5.659          ns3_module_radvd__local.register_methods(root_module)
   5.660      
   5.661      root_module.end_section('ns3_module_radvd')
   5.662 -    root_module.begin_section('ns3_module_ping6')
   5.663 -    ns3_module_ping6.register_methods(root_module)
   5.664 -    
   5.665 -    try:
   5.666 -        import ns3_module_ping6__local
   5.667 -    except ImportError:
   5.668 -        pass
   5.669 -    else:
   5.670 -        ns3_module_ping6__local.register_methods(root_module)
   5.671 -    
   5.672 -    root_module.end_section('ns3_module_ping6')
   5.673 -    root_module.begin_section('ns3_module_flow_monitor')
   5.674 -    ns3_module_flow_monitor.register_methods(root_module)
   5.675 -    
   5.676 -    try:
   5.677 -        import ns3_module_flow_monitor__local
   5.678 -    except ImportError:
   5.679 -        pass
   5.680 -    else:
   5.681 -        ns3_module_flow_monitor__local.register_methods(root_module)
   5.682 -    
   5.683 -    root_module.end_section('ns3_module_flow_monitor')
   5.684      root_module.begin_section('ns3_module_mesh')
   5.685      ns3_module_mesh.register_methods(root_module)
   5.686      
   5.687 @@ -1039,6 +1039,17 @@
   5.688          ns3_module_common__local.register_functions(root_module)
   5.689      
   5.690      root_module.end_section('ns3_module_common')
   5.691 +    root_module.begin_section('ns3_module_node')
   5.692 +    ns3_module_node.register_functions(root_module)
   5.693 +    
   5.694 +    try:
   5.695 +        import ns3_module_node__local
   5.696 +    except ImportError:
   5.697 +        pass
   5.698 +    else:
   5.699 +        ns3_module_node__local.register_functions(root_module)
   5.700 +    
   5.701 +    root_module.end_section('ns3_module_node')
   5.702      root_module.begin_section('ns3_module_contrib')
   5.703      ns3_module_contrib.register_functions(root_module)
   5.704      
   5.705 @@ -1050,83 +1061,6 @@
   5.706          ns3_module_contrib__local.register_functions(root_module)
   5.707      
   5.708      root_module.end_section('ns3_module_contrib')
   5.709 -    root_module.begin_section('ns3_module_node')
   5.710 -    ns3_module_node.register_functions(root_module)
   5.711 -    
   5.712 -    try:
   5.713 -        import ns3_module_node__local
   5.714 -    except ImportError:
   5.715 -        pass
   5.716 -    else:
   5.717 -        ns3_module_node__local.register_functions(root_module)
   5.718 -    
   5.719 -    root_module.end_section('ns3_module_node')
   5.720 -    root_module.begin_section('ns3_module_tap_bridge')
   5.721 -    ns3_module_tap_bridge.register_functions(root_module)
   5.722 -    
   5.723 -    try:
   5.724 -        import ns3_module_tap_bridge__local
   5.725 -    except ImportError:
   5.726 -        pass
   5.727 -    else:
   5.728 -        ns3_module_tap_bridge__local.register_functions(root_module)
   5.729 -    
   5.730 -    root_module.end_section('ns3_module_tap_bridge')
   5.731 -    root_module.begin_section('ns3_module_v4ping')
   5.732 -    ns3_module_v4ping.register_functions(root_module)
   5.733 -    
   5.734 -    try:
   5.735 -        import ns3_module_v4ping__local
   5.736 -    except ImportError:
   5.737 -        pass
   5.738 -    else:
   5.739 -        ns3_module_v4ping__local.register_functions(root_module)
   5.740 -    
   5.741 -    root_module.end_section('ns3_module_v4ping')
   5.742 -    root_module.begin_section('ns3_module_static_routing')
   5.743 -    ns3_module_static_routing.register_functions(root_module)
   5.744 -    
   5.745 -    try:
   5.746 -        import ns3_module_static_routing__local
   5.747 -    except ImportError:
   5.748 -        pass
   5.749 -    else:
   5.750 -        ns3_module_static_routing__local.register_functions(root_module)
   5.751 -    
   5.752 -    root_module.end_section('ns3_module_static_routing')
   5.753 -    root_module.begin_section('ns3_module_packet_sink')
   5.754 -    ns3_module_packet_sink.register_functions(root_module)
   5.755 -    
   5.756 -    try:
   5.757 -        import ns3_module_packet_sink__local
   5.758 -    except ImportError:
   5.759 -        pass
   5.760 -    else:
   5.761 -        ns3_module_packet_sink__local.register_functions(root_module)
   5.762 -    
   5.763 -    root_module.end_section('ns3_module_packet_sink')
   5.764 -    root_module.begin_section('ns3_module_stats')
   5.765 -    ns3_module_stats.register_functions(root_module)
   5.766 -    
   5.767 -    try:
   5.768 -        import ns3_module_stats__local
   5.769 -    except ImportError:
   5.770 -        pass
   5.771 -    else:
   5.772 -        ns3_module_stats__local.register_functions(root_module)
   5.773 -    
   5.774 -    root_module.end_section('ns3_module_stats')
   5.775 -    root_module.begin_section('ns3_module_onoff')
   5.776 -    ns3_module_onoff.register_functions(root_module)
   5.777 -    
   5.778 -    try:
   5.779 -        import ns3_module_onoff__local
   5.780 -    except ImportError:
   5.781 -        pass
   5.782 -    else:
   5.783 -        ns3_module_onoff__local.register_functions(root_module)
   5.784 -    
   5.785 -    root_module.end_section('ns3_module_onoff')
   5.786      root_module.begin_section('ns3_module_point_to_point')
   5.787      ns3_module_point_to_point.register_functions(root_module)
   5.788      
   5.789 @@ -1149,6 +1083,17 @@
   5.790          ns3_module_internet_stack__local.register_functions(root_module)
   5.791      
   5.792      root_module.end_section('ns3_module_internet_stack')
   5.793 +    root_module.begin_section('ns3_module_tap_bridge')
   5.794 +    ns3_module_tap_bridge.register_functions(root_module)
   5.795 +    
   5.796 +    try:
   5.797 +        import ns3_module_tap_bridge__local
   5.798 +    except ImportError:
   5.799 +        pass
   5.800 +    else:
   5.801 +        ns3_module_tap_bridge__local.register_functions(root_module)
   5.802 +    
   5.803 +    root_module.end_section('ns3_module_tap_bridge')
   5.804      root_module.begin_section('ns3_module_csma')
   5.805      ns3_module_csma.register_functions(root_module)
   5.806      
   5.807 @@ -1160,6 +1105,83 @@
   5.808          ns3_module_csma__local.register_functions(root_module)
   5.809      
   5.810      root_module.end_section('ns3_module_csma')
   5.811 +    root_module.begin_section('ns3_module_wifi')
   5.812 +    ns3_module_wifi.register_functions(root_module)
   5.813 +    
   5.814 +    try:
   5.815 +        import ns3_module_wifi__local
   5.816 +    except ImportError:
   5.817 +        pass
   5.818 +    else:
   5.819 +        ns3_module_wifi__local.register_functions(root_module)
   5.820 +    
   5.821 +    root_module.end_section('ns3_module_wifi')
   5.822 +    root_module.begin_section('ns3_module_static_routing')
   5.823 +    ns3_module_static_routing.register_functions(root_module)
   5.824 +    
   5.825 +    try:
   5.826 +        import ns3_module_static_routing__local
   5.827 +    except ImportError:
   5.828 +        pass
   5.829 +    else:
   5.830 +        ns3_module_static_routing__local.register_functions(root_module)
   5.831 +    
   5.832 +    root_module.end_section('ns3_module_static_routing')
   5.833 +    root_module.begin_section('ns3_module_v4ping')
   5.834 +    ns3_module_v4ping.register_functions(root_module)
   5.835 +    
   5.836 +    try:
   5.837 +        import ns3_module_v4ping__local
   5.838 +    except ImportError:
   5.839 +        pass
   5.840 +    else:
   5.841 +        ns3_module_v4ping__local.register_functions(root_module)
   5.842 +    
   5.843 +    root_module.end_section('ns3_module_v4ping')
   5.844 +    root_module.begin_section('ns3_module_virtual_net_device')
   5.845 +    ns3_module_virtual_net_device.register_functions(root_module)
   5.846 +    
   5.847 +    try:
   5.848 +        import ns3_module_virtual_net_device__local
   5.849 +    except ImportError:
   5.850 +        pass
   5.851 +    else:
   5.852 +        ns3_module_virtual_net_device__local.register_functions(root_module)
   5.853 +    
   5.854 +    root_module.end_section('ns3_module_virtual_net_device')
   5.855 +    root_module.begin_section('ns3_module_packet_sink')
   5.856 +    ns3_module_packet_sink.register_functions(root_module)
   5.857 +    
   5.858 +    try:
   5.859 +        import ns3_module_packet_sink__local
   5.860 +    except ImportError:
   5.861 +        pass
   5.862 +    else:
   5.863 +        ns3_module_packet_sink__local.register_functions(root_module)
   5.864 +    
   5.865 +    root_module.end_section('ns3_module_packet_sink')
   5.866 +    root_module.begin_section('ns3_module_global_routing')
   5.867 +    ns3_module_global_routing.register_functions(root_module)
   5.868 +    
   5.869 +    try:
   5.870 +        import ns3_module_global_routing__local
   5.871 +    except ImportError:
   5.872 +        pass
   5.873 +    else:
   5.874 +        ns3_module_global_routing__local.register_functions(root_module)
   5.875 +    
   5.876 +    root_module.end_section('ns3_module_global_routing')
   5.877 +    root_module.begin_section('ns3_module_stats')
   5.878 +    ns3_module_stats.register_functions(root_module)
   5.879 +    
   5.880 +    try:
   5.881 +        import ns3_module_stats__local
   5.882 +    except ImportError:
   5.883 +        pass
   5.884 +    else:
   5.885 +        ns3_module_stats__local.register_functions(root_module)
   5.886 +    
   5.887 +    root_module.end_section('ns3_module_stats')
   5.888      root_module.begin_section('ns3_module_list_routing')
   5.889      ns3_module_list_routing.register_functions(root_module)
   5.890      
   5.891 @@ -1171,28 +1193,6 @@
   5.892          ns3_module_list_routing__local.register_functions(root_module)
   5.893      
   5.894      root_module.end_section('ns3_module_list_routing')
   5.895 -    root_module.begin_section('ns3_module_virtual_net_device')
   5.896 -    ns3_module_virtual_net_device.register_functions(root_module)
   5.897 -    
   5.898 -    try:
   5.899 -        import ns3_module_virtual_net_device__local
   5.900 -    except ImportError:
   5.901 -        pass
   5.902 -    else:
   5.903 -        ns3_module_virtual_net_device__local.register_functions(root_module)
   5.904 -    
   5.905 -    root_module.end_section('ns3_module_virtual_net_device')
   5.906 -    root_module.begin_section('ns3_module_wifi')
   5.907 -    ns3_module_wifi.register_functions(root_module)
   5.908 -    
   5.909 -    try:
   5.910 -        import ns3_module_wifi__local
   5.911 -    except ImportError:
   5.912 -        pass
   5.913 -    else:
   5.914 -        ns3_module_wifi__local.register_functions(root_module)
   5.915 -    
   5.916 -    root_module.end_section('ns3_module_wifi')
   5.917      root_module.begin_section('ns3_module_emu')
   5.918      ns3_module_emu.register_functions(root_module)
   5.919      
   5.920 @@ -1215,17 +1215,17 @@
   5.921          ns3_module_bridge__local.register_functions(root_module)
   5.922      
   5.923      root_module.end_section('ns3_module_bridge')
   5.924 -    root_module.begin_section('ns3_module_global_routing')
   5.925 -    ns3_module_global_routing.register_functions(root_module)
   5.926 +    root_module.begin_section('ns3_module_onoff')
   5.927 +    ns3_module_onoff.register_functions(root_module)
   5.928      
   5.929      try:
   5.930 -        import ns3_module_global_routing__local
   5.931 +        import ns3_module_onoff__local
   5.932      except ImportError:
   5.933          pass
   5.934      else:
   5.935 -        ns3_module_global_routing__local.register_functions(root_module)
   5.936 +        ns3_module_onoff__local.register_functions(root_module)
   5.937      
   5.938 -    root_module.end_section('ns3_module_global_routing')
   5.939 +    root_module.end_section('ns3_module_onoff')
   5.940      root_module.begin_section('ns3_module_udp_echo')
   5.941      ns3_module_udp_echo.register_functions(root_module)
   5.942      
   5.943 @@ -1237,6 +1237,17 @@
   5.944          ns3_module_udp_echo__local.register_functions(root_module)
   5.945      
   5.946      root_module.end_section('ns3_module_udp_echo')
   5.947 +    root_module.begin_section('ns3_module_ping6')
   5.948 +    ns3_module_ping6.register_functions(root_module)
   5.949 +    
   5.950 +    try:
   5.951 +        import ns3_module_ping6__local
   5.952 +    except ImportError:
   5.953 +        pass
   5.954 +    else:
   5.955 +        ns3_module_ping6__local.register_functions(root_module)
   5.956 +    
   5.957 +    root_module.end_section('ns3_module_ping6')
   5.958      root_module.begin_section('ns3_module_nix_vector_routing')
   5.959      ns3_module_nix_vector_routing.register_functions(root_module)
   5.960      
   5.961 @@ -1259,6 +1270,17 @@
   5.962          ns3_module_olsr__local.register_functions(root_module)
   5.963      
   5.964      root_module.end_section('ns3_module_olsr')
   5.965 +    root_module.begin_section('ns3_module_flow_monitor')
   5.966 +    ns3_module_flow_monitor.register_functions(root_module)
   5.967 +    
   5.968 +    try:
   5.969 +        import ns3_module_flow_monitor__local
   5.970 +    except ImportError:
   5.971 +        pass
   5.972 +    else:
   5.973 +        ns3_module_flow_monitor__local.register_functions(root_module)
   5.974 +    
   5.975 +    root_module.end_section('ns3_module_flow_monitor')
   5.976      root_module.begin_section('ns3_module_radvd')
   5.977      ns3_module_radvd.register_functions(root_module)
   5.978      
   5.979 @@ -1270,28 +1292,6 @@
   5.980          ns3_module_radvd__local.register_functions(root_module)
   5.981      
   5.982      root_module.end_section('ns3_module_radvd')
   5.983 -    root_module.begin_section('ns3_module_ping6')
   5.984 -    ns3_module_ping6.register_functions(root_module)
   5.985 -    
   5.986 -    try:
   5.987 -        import ns3_module_ping6__local
   5.988 -    except ImportError:
   5.989 -        pass
   5.990 -    else:
   5.991 -        ns3_module_ping6__local.register_functions(root_module)
   5.992 -    
   5.993 -    root_module.end_section('ns3_module_ping6')
   5.994 -    root_module.begin_section('ns3_module_flow_monitor')
   5.995 -    ns3_module_flow_monitor.register_functions(root_module)
   5.996 -    
   5.997 -    try:
   5.998 -        import ns3_module_flow_monitor__local
   5.999 -    except ImportError:
  5.1000 -        pass
  5.1001 -    else:
  5.1002 -        ns3_module_flow_monitor__local.register_functions(root_module)
  5.1003 -    
  5.1004 -    root_module.end_section('ns3_module_flow_monitor')
  5.1005      root_module.begin_section('ns3_module_mesh')
  5.1006      ns3_module_mesh.register_functions(root_module)
  5.1007      
     6.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Fri Oct 23 15:54:35 2009 -0700
     6.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Mon Oct 26 10:15:22 2009 +0000
     6.3 @@ -273,6 +273,7 @@
     6.4      root_module = module.get_root()
     6.5      
     6.6      module.add_container('std::vector< ns3::Ptr< ns3::dot11s::IeBeaconTimingUnit > >', 'ns3::Ptr< ns3::dot11s::IeBeaconTimingUnit >', container_type='vector')
     6.7 +    module.add_container('std::vector< ns3::Ptr< ns3::dot11s::PeerLink > >', 'ns3::Ptr< ns3::dot11s::PeerLink >', container_type='vector')
     6.8  
     6.9  def register_types_ns3_flame(module):
    6.10      root_module = module.get_root()
     7.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py	Fri Oct 23 15:54:35 2009 -0700
     7.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_dot11s.py	Mon Oct 26 10:15:22 2009 +0000
     7.3 @@ -599,6 +599,11 @@
     7.4      cls.add_method('SetLocalAid', 
     7.5                     'void', 
     7.6                     [param('uint16_t', 'aid')])
     7.7 +    ## peer-link.h: uint16_t ns3::dot11s::PeerLink::GetPeerAid() const [member function]
     7.8 +    cls.add_method('GetPeerAid', 
     7.9 +                   'uint16_t', 
    7.10 +                   [], 
    7.11 +                   is_const=True)
    7.12      ## peer-link.h: void ns3::dot11s::PeerLink::SetBeaconTimingElement(ns3::dot11s::IeBeaconTiming beaconTiming) [member function]
    7.13      cls.add_method('SetBeaconTimingElement', 
    7.14                     'void', 
    7.15 @@ -675,14 +680,15 @@
    7.16      cls.add_method('FindPeerLink', 
    7.17                     'ns3::Ptr< ns3::dot11s::PeerLink >', 
    7.18                     [param('uint32_t', 'interface'), param('ns3::Mac48Address', 'peerAddress')])
    7.19 -    ## peer-management-protocol.h: std::vector<ns3::Mac48Address,std::allocator<ns3::Mac48Address> > ns3::dot11s::PeerManagementProtocol::GetActiveLinks(uint32_t interface) [member function]
    7.20 -    cls.add_method('GetActiveLinks', 
    7.21 -                   'std::vector< ns3::Mac48Address >', 
    7.22 -                   [param('uint32_t', 'interface')])
    7.23      ## peer-management-protocol.h: ns3::Mac48Address ns3::dot11s::PeerManagementProtocol::GetAddress() [member function]
    7.24      cls.add_method('GetAddress', 
    7.25                     'ns3::Mac48Address', 
    7.26                     [])
    7.27 +    ## peer-management-protocol.h: bool ns3::dot11s::PeerManagementProtocol::GetBeaconCollisionAvoidance() const [member function]
    7.28 +    cls.add_method('GetBeaconCollisionAvoidance', 
    7.29 +                   'bool', 
    7.30 +                   [], 
    7.31 +                   is_const=True)
    7.32      ## peer-management-protocol.h: ns3::Ptr<ns3::dot11s::IeBeaconTiming> ns3::dot11s::PeerManagementProtocol::GetBeaconTimingElement(uint32_t interface) [member function]
    7.33      cls.add_method('GetBeaconTimingElement', 
    7.34                     'ns3::Ptr< ns3::dot11s::IeBeaconTiming >', 
    7.35 @@ -696,6 +702,16 @@
    7.36      cls.add_method('GetNumberOfLinks', 
    7.37                     'uint8_t', 
    7.38                     [])
    7.39 +    ## peer-management-protocol.h: std::vector<ns3::Ptr<ns3::dot11s::PeerLink>,std::allocator<ns3::Ptr<ns3::dot11s::PeerLink> > > ns3::dot11s::PeerManagementProtocol::GetPeerLinks() const [member function]
    7.40 +    cls.add_method('GetPeerLinks', 
    7.41 +                   'std::vector< ns3::Ptr< ns3::dot11s::PeerLink > >', 
    7.42 +                   [], 
    7.43 +                   is_const=True)
    7.44 +    ## peer-management-protocol.h: std::vector<ns3::Mac48Address,std::allocator<ns3::Mac48Address> > ns3::dot11s::PeerManagementProtocol::GetPeers(uint32_t interface) const [member function]
    7.45 +    cls.add_method('GetPeers', 
    7.46 +                   'std::vector< ns3::Mac48Address >', 
    7.47 +                   [param('uint32_t', 'interface')], 
    7.48 +                   is_const=True)
    7.49      ## peer-management-protocol.h: static ns3::TypeId ns3::dot11s::PeerManagementProtocol::GetTypeId() [member function]
    7.50      cls.add_method('GetTypeId', 
    7.51                     'ns3::TypeId', 
    7.52 @@ -709,6 +725,14 @@
    7.53      cls.add_method('IsActiveLink', 
    7.54                     'bool', 
    7.55                     [param('uint32_t', 'interface'), param('ns3::Mac48Address', 'peerAddress')])
    7.56 +    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::NotifyBeaconSent(uint32_t interface, ns3::Time beaconInterval) [member function]
    7.57 +    cls.add_method('NotifyBeaconSent', 
    7.58 +                   'void', 
    7.59 +                   [param('uint32_t', 'interface'), param('ns3::Time', 'beaconInterval')])
    7.60 +    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::ReceiveBeacon(uint32_t interface, ns3::Mac48Address peerAddress, ns3::Time beaconInterval, ns3::Ptr<ns3::dot11s::IeBeaconTiming> beaconTiming) [member function]
    7.61 +    cls.add_method('ReceiveBeacon', 
    7.62 +                   'void', 
    7.63 +                   [param('uint32_t', 'interface'), param('ns3::Mac48Address', 'peerAddress'), param('ns3::Time', 'beaconInterval'), param('ns3::Ptr< ns3::dot11s::IeBeaconTiming >', 'beaconTiming')])
    7.64      ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::ReceivePeerLinkFrame(uint32_t interface, ns3::Mac48Address peerAddress, ns3::Mac48Address peerMeshPointAddress, uint16_t aid, ns3::dot11s::IePeerManagement peerManagementElement, ns3::dot11s::IeConfiguration meshConfig) [member function]
    7.65      cls.add_method('ReceivePeerLinkFrame', 
    7.66                     'void', 
    7.67 @@ -722,6 +746,10 @@
    7.68      cls.add_method('ResetStats', 
    7.69                     'void', 
    7.70                     [])
    7.71 +    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::SetBeaconCollisionAvoidance(bool enable) [member function]
    7.72 +    cls.add_method('SetBeaconCollisionAvoidance', 
    7.73 +                   'void', 
    7.74 +                   [param('bool', 'enable')])
    7.75      ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::SetMeshId(std::string s) [member function]
    7.76      cls.add_method('SetMeshId', 
    7.77                     'void', 
    7.78 @@ -738,10 +766,6 @@
    7.79      cls.add_method('TransmissionSuccess', 
    7.80                     'void', 
    7.81                     [param('uint32_t', 'interface'), param('ns3::Mac48Address const', 'peerAddress')])
    7.82 -    ## peer-management-protocol.h: void ns3::dot11s::PeerManagementProtocol::UpdatePeerBeaconTiming(uint32_t interface, bool meshBeacon, ns3::dot11s::IeBeaconTiming timingElement, ns3::Mac48Address peerAddress, ns3::Time receivingTime, ns3::Time beaconInterval) [member function]
    7.83 -    cls.add_method('UpdatePeerBeaconTiming', 
    7.84 -                   'void', 
    7.85 -                   [param('uint32_t', 'interface'), param('bool', 'meshBeacon'), param('ns3::dot11s::IeBeaconTiming', 'timingElement'), param('ns3::Mac48Address', 'peerAddress'), param('ns3::Time', 'receivingTime'), param('ns3::Time', 'beaconInterval')])
    7.86      return
    7.87  
    7.88  def register_functions(root_module):
     8.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py	Fri Oct 23 15:54:35 2009 -0700
     8.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py	Mon Oct 26 10:15:22 2009 +0000
     8.3 @@ -650,10 +650,10 @@
     8.4      cls.add_method('Add', 
     8.5                     'void', 
     8.6                     [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
     8.7 -    ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::pair<ns3::Ptr<ns3::Ipv4>,unsigned int> arg0) [member function]
     8.8 +    ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::pair<ns3::Ptr<ns3::Ipv4>,unsigned int> ipInterfacePair) [member function]
     8.9      cls.add_method('Add', 
    8.10                     'void', 
    8.11 -                   [param('std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int >', 'arg0')])
    8.12 +                   [param('std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int >', 'ipInterfacePair')])
    8.13      ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::string ipv4Name, uint32_t interface) [member function]
    8.14      cls.add_method('Add', 
    8.15                     'void', 
     9.1 --- a/bindings/python/apidefs/gcc-LP64/ns3_module_mesh.py	Fri Oct 23 15:54:35 2009 -0700
     9.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3_module_mesh.py	Mon Oct 26 10:15:22 2009 +0000
     9.3 @@ -122,6 +122,11 @@
     9.4      cls.add_method('CreatePacket', 
     9.5                     'ns3::Ptr< ns3::Packet >', 
     9.6                     [])
     9.7 +    ## mesh-wifi-beacon.h: ns3::Time ns3::MeshWifiBeacon::GetBeaconInterval() const [member function]
     9.8 +    cls.add_method('GetBeaconInterval', 
     9.9 +                   'ns3::Time', 
    9.10 +                   [], 
    9.11 +                   is_const=True)
    9.12      return
    9.13  
    9.14  def register_Ns3WifiInformationElement_methods(root_module, cls):
    10.1 --- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Fri Oct 23 15:54:35 2009 -0700
    10.2 +++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Mon Oct 26 10:15:22 2009 +0000
    10.3 @@ -17,29 +17,29 @@
    10.4  import ns3_module_test
    10.5  import ns3_module_mobility
    10.6  import ns3_module_common
    10.7 +import ns3_module_node
    10.8  import ns3_module_contrib
    10.9 -import ns3_module_node
   10.10 -import ns3_module_tap_bridge
   10.11 -import ns3_module_v4ping
   10.12 -import ns3_module_static_routing
   10.13 -import ns3_module_packet_sink
   10.14 -import ns3_module_stats
   10.15 -import ns3_module_onoff
   10.16  import ns3_module_point_to_point
   10.17  import ns3_module_internet_stack
   10.18 +import ns3_module_tap_bridge
   10.19  import ns3_module_csma
   10.20 +import ns3_module_wifi
   10.21 +import ns3_module_static_routing
   10.22 +import ns3_module_v4ping
   10.23 +import ns3_module_virtual_net_device
   10.24 +import ns3_module_packet_sink
   10.25 +import ns3_module_global_routing
   10.26 +import ns3_module_stats
   10.27  import ns3_module_list_routing
   10.28 -import ns3_module_virtual_net_device
   10.29 -import ns3_module_wifi
   10.30  import ns3_module_emu
   10.31  import ns3_module_bridge
   10.32 -import ns3_module_global_routing
   10.33 +import ns3_module_onoff
   10.34  import ns3_module_udp_echo
   10.35 +import ns3_module_ping6
   10.36  import ns3_module_nix_vector_routing
   10.37  import ns3_module_olsr
   10.38 +import ns3_module_flow_monitor
   10.39  import ns3_module_radvd
   10.40 -import ns3_module_ping6
   10.41 -import ns3_module_flow_monitor
   10.42  import ns3_module_mesh
   10.43  import ns3_module_helper
   10.44  import ns3_module_dot11s
   10.45 @@ -107,6 +107,17 @@
   10.46          ns3_module_common__local.register_types(module)
   10.47      
   10.48      root_module.end_section('ns3_module_common')
   10.49 +    root_module.begin_section('ns3_module_node')
   10.50 +    ns3_module_node.register_types(module)
   10.51 +    
   10.52 +    try:
   10.53 +        import ns3_module_node__local
   10.54 +    except ImportError:
   10.55 +        pass
   10.56 +    else:
   10.57 +        ns3_module_node__local.register_types(module)
   10.58 +    
   10.59 +    root_module.end_section('ns3_module_node')
   10.60      root_module.begin_section('ns3_module_contrib')
   10.61      ns3_module_contrib.register_types(module)
   10.62      
   10.63 @@ -118,83 +129,6 @@
   10.64          ns3_module_contrib__local.register_types(module)
   10.65      
   10.66      root_module.end_section('ns3_module_contrib')
   10.67 -    root_module.begin_section('ns3_module_node')
   10.68 -    ns3_module_node.register_types(module)
   10.69 -    
   10.70 -    try:
   10.71 -        import ns3_module_node__local
   10.72 -    except ImportError:
   10.73 -        pass
   10.74 -    else:
   10.75 -        ns3_module_node__local.register_types(module)
   10.76 -    
   10.77 -    root_module.end_section('ns3_module_node')
   10.78 -    root_module.begin_section('ns3_module_tap_bridge')
   10.79 -    ns3_module_tap_bridge.register_types(module)
   10.80 -    
   10.81 -    try:
   10.82 -        import ns3_module_tap_bridge__local
   10.83 -    except ImportError:
   10.84 -        pass
   10.85 -    else:
   10.86 -        ns3_module_tap_bridge__local.register_types(module)
   10.87 -    
   10.88 -    root_module.end_section('ns3_module_tap_bridge')
   10.89 -    root_module.begin_section('ns3_module_v4ping')
   10.90 -    ns3_module_v4ping.register_types(module)
   10.91 -    
   10.92 -    try:
   10.93 -        import ns3_module_v4ping__local
   10.94 -    except ImportError:
   10.95 -        pass
   10.96 -    else:
   10.97 -        ns3_module_v4ping__local.register_types(module)
   10.98 -    
   10.99 -    root_module.end_section('ns3_module_v4ping')
  10.100 -    root_module.begin_section('ns3_module_static_routing')
  10.101 -    ns3_module_static_routing.register_types(module)
  10.102 -    
  10.103 -    try:
  10.104 -        import ns3_module_static_routing__local
  10.105 -    except ImportError:
  10.106 -        pass
  10.107 -    else:
  10.108 -        ns3_module_static_routing__local.register_types(module)
  10.109 -    
  10.110 -    root_module.end_section('ns3_module_static_routing')
  10.111 -    root_module.begin_section('ns3_module_packet_sink')
  10.112 -    ns3_module_packet_sink.register_types(module)
  10.113 -    
  10.114 -    try:
  10.115 -        import ns3_module_packet_sink__local
  10.116 -    except ImportError:
  10.117 -        pass
  10.118 -    else:
  10.119 -        ns3_module_packet_sink__local.register_types(module)
  10.120 -    
  10.121 -    root_module.end_section('ns3_module_packet_sink')
  10.122 -    root_module.begin_section('ns3_module_stats')
  10.123 -    ns3_module_stats.register_types(module)
  10.124 -    
  10.125 -    try:
  10.126 -        import ns3_module_stats__local
  10.127 -    except ImportError:
  10.128 -        pass
  10.129 -    else:
  10.130 -        ns3_module_stats__local.register_types(module)
  10.131 -    
  10.132 -    root_module.end_section('ns3_module_stats')
  10.133 -    root_module.begin_section('ns3_module_onoff')
  10.134 -    ns3_module_onoff.register_types(module)
  10.135 -    
  10.136 -    try:
  10.137 -        import ns3_module_onoff__local
  10.138 -    except ImportError:
  10.139 -        pass
  10.140 -    else:
  10.141 -        ns3_module_onoff__local.register_types(module)
  10.142 -    
  10.143 -    root_module.end_section('ns3_module_onoff')
  10.144      root_module.begin_section('ns3_module_point_to_point')
  10.145      ns3_module_point_to_point.register_types(module)
  10.146      
  10.147 @@ -217,6 +151,17 @@
  10.148          ns3_module_internet_stack__local.register_types(module)
  10.149      
  10.150      root_module.end_section('ns3_module_internet_stack')
  10.151 +    root_module.begin_section('ns3_module_tap_bridge')
  10.152 +    ns3_module_tap_bridge.register_types(module)
  10.153 +    
  10.154 +    try:
  10.155 +        import ns3_module_tap_bridge__local
  10.156 +    except ImportError:
  10.157 +        pass
  10.158 +    else:
  10.159 +        ns3_module_tap_bridge__local.register_types(module)
  10.160 +    
  10.161 +    root_module.end_section('ns3_module_tap_bridge')
  10.162      root_module.begin_section('ns3_module_csma')
  10.163      ns3_module_csma.register_types(module)
  10.164      
  10.165 @@ -228,6 +173,83 @@
  10.166          ns3_module_csma__local.register_types(module)
  10.167      
  10.168      root_module.end_section('ns3_module_csma')
  10.169 +    root_module.begin_section('ns3_module_wifi')
  10.170 +    ns3_module_wifi.register_types(module)
  10.171 +    
  10.172 +    try:
  10.173 +        import ns3_module_wifi__local
  10.174 +    except ImportError:
  10.175 +        pass
  10.176 +    else:
  10.177 +        ns3_module_wifi__local.register_types(module)
  10.178 +    
  10.179 +    root_module.end_section('ns3_module_wifi')
  10.180 +    root_module.begin_section('ns3_module_static_routing')
  10.181 +    ns3_module_static_routing.register_types(module)
  10.182 +    
  10.183 +    try:
  10.184 +        import ns3_module_static_routing__local
  10.185 +    except ImportError:
  10.186 +        pass
  10.187 +    else:
  10.188 +        ns3_module_static_routing__local.register_types(module)
  10.189 +    
  10.190 +    root_module.end_section('ns3_module_static_routing')
  10.191 +    root_module.begin_section('ns3_module_v4ping')
  10.192 +    ns3_module_v4ping.register_types(module)
  10.193 +    
  10.194 +    try:
  10.195 +        import ns3_module_v4ping__local
  10.196 +    except ImportError:
  10.197 +        pass
  10.198 +    else:
  10.199 +        ns3_module_v4ping__local.register_types(module)
  10.200 +    
  10.201 +    root_module.end_section('ns3_module_v4ping')
  10.202 +    root_module.begin_section('ns3_module_virtual_net_device')
  10.203 +    ns3_module_virtual_net_device.register_types(module)
  10.204 +    
  10.205 +    try:
  10.206 +        import ns3_module_virtual_net_device__local
  10.207 +    except ImportError:
  10.208 +        pass
  10.209 +    else:
  10.210 +        ns3_module_virtual_net_device__local.register_types(module)
  10.211 +    
  10.212 +    root_module.end_section('ns3_module_virtual_net_device')
  10.213 +    root_module.begin_section('ns3_module_packet_sink')
  10.214 +    ns3_module_packet_sink.register_types(module)
  10.215 +    
  10.216 +    try:
  10.217 +        import ns3_module_packet_sink__local
  10.218 +    except ImportError:
  10.219 +        pass
  10.220 +    else:
  10.221 +        ns3_module_packet_sink__local.register_types(module)
  10.222 +    
  10.223 +    root_module.end_section('ns3_module_packet_sink')
  10.224 +    root_module.begin_section('ns3_module_global_routing')
  10.225 +    ns3_module_global_routing.register_types(module)
  10.226 +    
  10.227 +    try:
  10.228 +        import ns3_module_global_routing__local
  10.229 +    except ImportError:
  10.230 +        pass
  10.231 +    else:
  10.232 +        ns3_module_global_routing__local.register_types(module)
  10.233 +    
  10.234 +    root_module.end_section('ns3_module_global_routing')
  10.235 +    root_module.begin_section('ns3_module_stats')
  10.236 +    ns3_module_stats.register_types(module)
  10.237 +    
  10.238 +    try:
  10.239 +        import ns3_module_stats__local
  10.240 +    except ImportError:
  10.241 +        pass
  10.242 +    else:
  10.243 +        ns3_module_stats__local.register_types(module)
  10.244 +    
  10.245 +    root_module.end_section('ns3_module_stats')
  10.246      root_module.begin_section('ns3_module_list_routing')
  10.247      ns3_module_list_routing.register_types(module)
  10.248      
  10.249 @@ -239,28 +261,6 @@
  10.250          ns3_module_list_routing__local.register_types(module)
  10.251      
  10.252      root_module.end_section('ns3_module_list_routing')
  10.253 -    root_module.begin_section('ns3_module_virtual_net_device')
  10.254 -    ns3_module_virtual_net_device.register_types(module)
  10.255 -    
  10.256 -    try:
  10.257 -        import ns3_module_virtual_net_device__local
  10.258 -    except ImportError:
  10.259 -        pass
  10.260 -    else:
  10.261 -        ns3_module_virtual_net_device__local.register_types(module)
  10.262 -    
  10.263 -    root_module.end_section('ns3_module_virtual_net_device')
  10.264 -    root_module.begin_section('ns3_module_wifi')
  10.265 -    ns3_module_wifi.register_types(module)
  10.266 -    
  10.267 -    try:
  10.268 -        import ns3_module_wifi__local
  10.269 -    except ImportError:
  10.270 -        pass
  10.271 -    else:
  10.272 -        ns3_module_wifi__local.register_types(module)
  10.273 -    
  10.274 -    root_module.end_section('ns3_module_wifi')
  10.275      root_module.begin_section('ns3_module_emu')
  10.276      ns3_module_emu.register_types(module)
  10.277      
  10.278 @@ -283,17 +283,17 @@
  10.279          ns3_module_bridge__local.register_types(module)
  10.280      
  10.281      root_module.end_section('ns3_module_bridge')
  10.282 -    root_module.begin_section('ns3_module_global_routing')
  10.283 -    ns3_module_global_routing.register_types(module)
  10.284 +    root_module.begin_section('ns3_module_onoff')
  10.285 +    ns3_module_onoff.register_types(module)
  10.286      
  10.287      try:
  10.288 -        import ns3_module_global_routing__local
  10.289 +        import ns3_module_onoff__local
  10.290      except ImportError:
  10.291          pass
  10.292      else:
  10.293 -        ns3_module_global_routing__local.register_types(module)
  10.294 +        ns3_module_onoff__local.register_types(module)
  10.295      
  10.296 -    root_module.end_section('ns3_module_global_routing')
  10.297 +    root_module.end_section('ns3_module_onoff')
  10.298      root_module.begin_section('ns3_module_udp_echo')
  10.299      ns3_module_udp_echo.register_types(module)
  10.300      
  10.301 @@ -305,6 +305,17 @@
  10.302          ns3_module_udp_echo__local.register_types(module)
  10.303      
  10.304      root_module.end_section('ns3_module_udp_echo')
  10.305 +    root_module.begin_section('ns3_module_ping6')
  10.306 +    ns3_module_ping6.register_types(module)
  10.307 +    
  10.308 +    try:
  10.309 +        import ns3_module_ping6__local
  10.310 +    except ImportError:
  10.311 +        pass
  10.312 +    else:
  10.313 +        ns3_module_ping6__local.register_types(module)
  10.314 +    
  10.315 +    root_module.end_section('ns3_module_ping6')
  10.316      root_module.begin_section('ns3_module_nix_vector_routing')
  10.317      ns3_module_nix_vector_routing.register_types(module)
  10.318      
  10.319 @@ -327,6 +338,17 @@
  10.320          ns3_module_olsr__local.register_types(module)
  10.321      
  10.322      root_module.end_section('ns3_module_olsr')
  10.323 +    root_module.begin_section('ns3_module_flow_monitor')
  10.324 +    ns3_module_flow_monitor.register_types(module)
  10.325 +    
  10.326 +    try:
  10.327 +        import ns3_module_flow_monitor__local
  10.328 +    except ImportError:
  10.329 +        pass
  10.330 +    else:
  10.331 +        ns3_module_flow_monitor__local.register_types(module)
  10.332 +    
  10.333 +    root_module.end_section('ns3_module_flow_monitor')
  10.334      root_module.begin_section('ns3_module_radvd')
  10.335      ns3_module_radvd.register_types(module)
  10.336      
  10.337 @@ -338,28 +360,6 @@
  10.338          ns3_module_radvd__local.register_types(module)
  10.339      
  10.340      root_module.end_section('ns3_module_radvd')
  10.341 -    root_module.begin_section('ns3_module_ping6')
  10.342 -    ns3_module_ping6.register_types(module)
  10.343 -    
  10.344 -    try:
  10.345 -        import ns3_module_ping6__local
  10.346 -    except ImportError:
  10.347 -        pass
  10.348 -    else:
  10.349 -        ns3_module_ping6__local.register_types(module)
  10.350 -    
  10.351 -    root_module.end_section('ns3_module_ping6')
  10.352 -    root_module.begin_section('ns3_module_flow_monitor')
  10.353 -    ns3_module_flow_monitor.register_types(module)
  10.354 -    
  10.355 -    try:
  10.356 -        import ns3_module_flow_monitor__local
  10.357 -    except ImportError:
  10.358 -        pass
  10.359 -    else:
  10.360 -        ns3_module_flow_monitor__local.register_types(module)
  10.361 -    
  10.362 -    root_module.end_section('ns3_module_flow_monitor')
  10.363      root_module.begin_section('ns3_module_mesh')
  10.364      ns3_module_mesh.register_types(module)
  10.365      
  10.366 @@ -549,6 +549,17 @@
  10.367          ns3_module_common__local.register_methods(root_module)
  10.368      
  10.369      root_module.end_section('ns3_module_common')
  10.370 +    root_module.begin_section('ns3_module_node')
  10.371 +    ns3_module_node.register_methods(root_module)
  10.372 +    
  10.373 +    try:
  10.374 +        import ns3_module_node__local
  10.375 +    except ImportError:
  10.376 +        pass
  10.377 +    else:
  10.378 +        ns3_module_node__local.register_methods(root_module)
  10.379 +    
  10.380 +    root_module.end_section('ns3_module_node')
  10.381      root_module.begin_section('ns3_module_contrib')
  10.382      ns3_module_contrib.register_methods(root_module)
  10.383      
  10.384 @@ -560,83 +571,6 @@
  10.385          ns3_module_contrib__local.register_methods(root_module)
  10.386      
  10.387      root_module.end_section('ns3_module_contrib')
  10.388 -    root_module.begin_section('ns3_module_node')
  10.389 -    ns3_module_node.register_methods(root_module)
  10.390 -    
  10.391 -    try:
  10.392 -        import ns3_module_node__local
  10.393 -    except ImportError:
  10.394 -        pass
  10.395 -    else:
  10.396 -        ns3_module_node__local.register_methods(root_module)
  10.397 -    
  10.398 -    root_module.end_section('ns3_module_node')
  10.399 -    root_module.begin_section('ns3_module_tap_bridge')
  10.400 -    ns3_module_tap_bridge.register_methods(root_module)
  10.401 -    
  10.402 -    try:
  10.403 -        import ns3_module_tap_bridge__local
  10.404 -    except ImportError:
  10.405 -        pass
  10.406 -    else:
  10.407 -        ns3_module_tap_bridge__local.register_methods(root_module)
  10.408 -    
  10.409 -    root_module.end_section('ns3_module_tap_bridge')
  10.410 -    root_module.begin_section('ns3_module_v4ping')
  10.411 -    ns3_module_v4ping.register_methods(root_module)
  10.412 -    
  10.413 -    try:
  10.414 -        import ns3_module_v4ping__local
  10.415 -    except ImportError:
  10.416 -        pass
  10.417 -    else:
  10.418 -        ns3_module_v4ping__local.register_methods(root_module)
  10.419 -    
  10.420 -    root_module.end_section('ns3_module_v4ping')
  10.421 -    root_module.begin_section('ns3_module_static_routing')
  10.422 -    ns3_module_static_routing.register_methods(root_module)
  10.423 -    
  10.424 -    try:
  10.425 -        import ns3_module_static_routing__local
  10.426 -    except ImportError:
  10.427 -        pass
  10.428 -    else:
  10.429 -        ns3_module_static_routing__local.register_methods(root_module)
  10.430 -    
  10.431 -    root_module.end_section('ns3_module_static_routing')
  10.432 -    root_module.begin_section('ns3_module_packet_sink')
  10.433 -    ns3_module_packet_sink.register_methods(root_module)
  10.434 -    
  10.435 -    try:
  10.436 -        import ns3_module_packet_sink__local
  10.437 -    except ImportError:
  10.438 -        pass
  10.439 -    else:
  10.440 -        ns3_module_packet_sink__local.register_methods(root_module)
  10.441 -    
  10.442 -    root_module.end_section('ns3_module_packet_sink')
  10.443 -    root_module.begin_section('ns3_module_stats')
  10.444 -    ns3_module_stats.register_methods(root_module)
  10.445 -    
  10.446 -    try:
  10.447 -        import ns3_module_stats__local
  10.448 -    except ImportError:
  10.449 -        pass
  10.450 -    else:
  10.451 -        ns3_module_stats__local.register_methods(root_module)
  10.452 -    
  10.453 -    root_module.end_section('ns3_module_stats')
  10.454 -    root_module.begin_section('ns3_module_onoff')
  10.455 -    ns3_module_onoff.register_methods(root_module)
  10.456 -    
  10.457 -    try:
  10.458 -        import ns3_module_onoff__local
  10.459 -    except ImportError:
  10.460 -        pass
  10.461 -    else:
  10.462 -        ns3_module_onoff__local.register_methods(root_module)
  10.463 -    
  10.464 -    root_module.end_section('ns3_module_onoff')
  10.465      root_module.begin_section('ns3_module_point_to_point')
  10.466      ns3_module_point_to_point.register_methods(root_module)
  10.467      
  10.468 @@ -659,6 +593,17 @@
  10.469          ns3_module_internet_stack__local.register_methods(root_module)
  10.470      
  10.471      root_module.end_section('ns3_module_internet_stack')
  10.472 +    root_module.begin_section('ns3_module_tap_bridge')
  10.473 +    ns3_module_tap_bridge.register_methods(root_module)
  10.474 +    
  10.475 +    try:
  10.476 +        import ns3_module_tap_bridge__local
  10.477 +    except ImportError:
  10.478 +        pass
  10.479 +    else:
  10.480 +        ns3_module_tap_bridge__local.register_methods(root_module)
  10.481 +    
  10.482 +    root_module.end_section('ns3_module_tap_bridge')
  10.483      root_module.begin_section('ns3_module_csma')
  10.484      ns3_module_csma.register_methods(root_module)
  10.485      
  10.486 @@ -670,6 +615,83 @@
  10.487          ns3_module_csma__local.register_methods(root_module)
  10.488      
  10.489      root_module.end_section('ns3_module_csma')
  10.490 +    root_module.begin_section('ns3_module_wifi')
  10.491 +    ns3_module_wifi.register_methods(root_module)
  10.492 +    
  10.493 +    try:
  10.494 +        import ns3_module_wifi__local
  10.495 +    except ImportError:
  10.496 +        pass
  10.497 +    else:
  10.498 +        ns3_module_wifi__local.register_methods(root_module)
  10.499 +    
  10.500 +    root_module.end_section('ns3_module_wifi')
  10.501 +    root_module.begin_section('ns3_module_static_routing')
  10.502 +    ns3_module_static_routing.register_methods(root_module)
  10.503 +    
  10.504 +    try:
  10.505 +        import ns3_module_static_routing__local
  10.506 +    except ImportError:
  10.507 +        pass
  10.508 +    else:
  10.509 +        ns3_module_static_routing__local.register_methods(root_module)
  10.510 +    
  10.511 +    root_module.end_section('ns3_module_static_routing')
  10.512 +    root_module.begin_section('ns3_module_v4ping')
  10.513 +    ns3_module_v4ping.register_methods(root_module)
  10.514 +    
  10.515 +    try:
  10.516 +        import ns3_module_v4ping__local
  10.517 +    except ImportError:
  10.518 +        pass
  10.519 +    else:
  10.520 +        ns3_module_v4ping__local.register_methods(root_module)
  10.521 +    
  10.522 +    root_module.end_section('ns3_module_v4ping')
  10.523 +    root_module.begin_section('ns3_module_virtual_net_device')
  10.524 +    ns3_module_virtual_net_device.register_methods(root_module)
  10.525 +    
  10.526 +    try:
  10.527 +        import ns3_module_virtual_net_device__local
  10.528 +    except ImportError:
  10.529 +        pass
  10.530 +    else:
  10.531 +        ns3_module_virtual_net_device__local.register_methods(root_module)
  10.532 +    
  10.533 +    root_module.end_section('ns3_module_virtual_net_device')
  10.534 +    root_module.begin_section('ns3_module_packet_sink')
  10.535 +    ns3_module_packet_sink.register_methods(root_module)
  10.536 +    
  10.537 +    try:
  10.538 +        import ns3_module_packet_sink__local
  10.539 +    except ImportError:
  10.540 +        pass
  10.541 +    else:
  10.542 +        ns3_module_packet_sink__local.register_methods(root_module)
  10.543 +    
  10.544 +    root_module.end_section('ns3_module_packet_sink')
  10.545 +    root_module.begin_section('ns3_module_global_routing')
  10.546 +    ns3_module_global_routing.register_methods(root_module)
  10.547 +    
  10.548 +    try:
  10.549 +        import ns3_module_global_routing__local
  10.550 +    except ImportError:
  10.551 +        pass
  10.552 +    else:
  10.553 +        ns3_module_global_routing__local.register_methods(root_module)
  10.554 +    
  10.555 +    root_module.end_section('ns3_module_global_routing')
  10.556 +    root_module.begin_section('ns3_module_stats')
  10.557 +    ns3_module_stats.register_methods(root_module)
  10.558 +    
  10.559 +    try:
  10.560 +        import ns3_module_stats__local
  10.561 +    except ImportError:
  10.562 +        pass
  10.563 +    else:
  10.564 +        ns3_module_stats__local.register_methods(root_module)
  10.565 +    
  10.566 +    root_module.end_section('ns3_module_stats')
  10.567      root_module.begin_section('ns3_module_list_routing')
  10.568      ns3_module_list_routing.register_methods(root_module)
  10.569      
  10.570 @@ -681,28 +703,6 @@
  10.571          ns3_module_list_routing__local.register_methods(root_module)
  10.572      
  10.573      root_module.end_section('ns3_module_list_routing')
  10.574 -    root_module.begin_section('ns3_module_virtual_net_device')
  10.575 -    ns3_module_virtual_net_device.register_methods(root_module)
  10.576 -    
  10.577 -    try:
  10.578 -        import ns3_module_virtual_net_device__local
  10.579 -    except ImportError:
  10.580 -        pass
  10.581 -    else:
  10.582 -        ns3_module_virtual_net_device__local.register_methods(root_module)
  10.583 -    
  10.584 -    root_module.end_section('ns3_module_virtual_net_device')
  10.585 -    root_module.begin_section('ns3_module_wifi')
  10.586 -    ns3_module_wifi.register_methods(root_module)
  10.587 -    
  10.588 -    try:
  10.589 -        import ns3_module_wifi__local
  10.590 -    except ImportError:
  10.591 -        pass
  10.592 -    else:
  10.593 -        ns3_module_wifi__local.register_methods(root_module)
  10.594 -    
  10.595 -    root_module.end_section('ns3_module_wifi')
  10.596      root_module.begin_section('ns3_module_emu')
  10.597      ns3_module_emu.register_methods(root_module)
  10.598      
  10.599 @@ -725,17 +725,17 @@
  10.600          ns3_module_bridge__local.register_methods(root_module)
  10.601      
  10.602      root_module.end_section('ns3_module_bridge')
  10.603 -    root_module.begin_section('ns3_module_global_routing')
  10.604 -    ns3_module_global_routing.register_methods(root_module)
  10.605 +    root_module.begin_section('ns3_module_onoff')
  10.606 +    ns3_module_onoff.register_methods(root_module)
  10.607      
  10.608      try:
  10.609 -        import ns3_module_global_routing__local
  10.610 +        import ns3_module_onoff__local
  10.611      except ImportError:
  10.612          pass
  10.613      else:
  10.614 -        ns3_module_global_routing__local.register_methods(root_module)
  10.615 +        ns3_module_onoff__local.register_methods(root_module)
  10.616      
  10.617 -    root_module.end_section('ns3_module_global_routing')
  10.618 +    root_module.end_section('ns3_module_onoff')
  10.619      root_module.begin_section('ns3_module_udp_echo')
  10.620      ns3_module_udp_echo.register_methods(root_module)
  10.621      
  10.622 @@ -747,6 +747,17 @@
  10.623          ns3_module_udp_echo__local.register_methods(root_module)
  10.624      
  10.625      root_module.end_section('ns3_module_udp_echo')
  10.626 +    root_module.begin_section('ns3_module_ping6')
  10.627 +    ns3_module_ping6.register_methods(root_module)
  10.628 +    
  10.629 +    try:
  10.630 +        import ns3_module_ping6__local
  10.631 +    except ImportError:
  10.632 +        pass
  10.633 +    else:
  10.634 +        ns3_module_ping6__local.register_methods(root_module)
  10.635 +    
  10.636 +    root_module.end_section('ns3_module_ping6')
  10.637      root_module.begin_section('ns3_module_nix_vector_routing')
  10.638      ns3_module_nix_vector_routing.register_methods(root_module)
  10.639      
  10.640 @@ -769,6 +780,17 @@
  10.641          ns3_module_olsr__local.register_methods(root_module)
  10.642      
  10.643      root_module.end_section('ns3_module_olsr')
  10.644 +    root_module.begin_section('ns3_module_flow_monitor')
  10.645 +    ns3_module_flow_monitor.register_methods(root_module)
  10.646 +    
  10.647 +    try:
  10.648 +        import ns3_module_flow_monitor__local
  10.649 +    except ImportError:
  10.650 +        pass
  10.651 +    else:
  10.652 +        ns3_module_flow_monitor__local.register_methods(root_module)
  10.653 +    
  10.654 +    root_module.end_section('ns3_module_flow_monitor')
  10.655      root_module.begin_section('ns3_module_radvd')
  10.656      ns3_module_radvd.register_methods(root_module)
  10.657      
  10.658 @@ -780,28 +802,6 @@
  10.659          ns3_module_radvd__local.register_methods(root_module)
  10.660      
  10.661      root_module.end_section('ns3_module_radvd')
  10.662 -    root_module.begin_section('ns3_module_ping6')
  10.663 -    ns3_module_ping6.register_methods(root_module)
  10.664 -    
  10.665 -    try:
  10.666 -        import ns3_module_ping6__local
  10.667 -    except ImportError:
  10.668 -        pass
  10.669 -    else:
  10.670 -        ns3_module_ping6__local.register_methods(root_module)
  10.671 -    
  10.672 -    root_module.end_section('ns3_module_ping6')
  10.673 -    root_module.begin_section('ns3_module_flow_monitor')
  10.674 -    ns3_module_flow_monitor.register_methods(root_module)
  10.675 -    
  10.676 -    try:
  10.677 -        import ns3_module_flow_monitor__local
  10.678 -    except ImportError:
  10.679 -        pass
  10.680 -    else:
  10.681 -        ns3_module_flow_monitor__local.register_methods(root_module)
  10.682 -    
  10.683 -    root_module.end_section('ns3_module_flow_monitor')
  10.684      root_module.begin_section('ns3_module_mesh')
  10.685      ns3_module_mesh.register_methods(root_module)
  10.686      
  10.687 @@ -1039,6 +1039,17 @@
  10.688          ns3_module_common__local.register_functions(root_module)
  10.689      
  10.690      root_module.end_section('ns3_module_common')
  10.691 +    root_module.begin_section('ns3_module_node')
  10.692 +    ns3_module_node.register_functions(root_module)
  10.693 +    
  10.694 +    try:
  10.695 +        import ns3_module_node__local
  10.696 +    except ImportError:
  10.697 +        pass
  10.698 +    else:
  10.699 +        ns3_module_node__local.register_functions(root_module)
  10.700 +    
  10.701 +    root_module.end_section('ns3_module_node')
  10.702      root_module.begin_section('ns3_module_contrib')
  10.703      ns3_module_contrib.register_functions(root_module)
  10.704      
  10.705 @@ -1050,83 +1061,6 @@
  10.706          ns3_module_contrib__local.register_functions(root_module)
  10.707      
  10.708      root_module.end_section('ns3_module_contrib')
  10.709 -    root_module.begin_section('ns3_module_node')
  10.710 -    ns3_module_node.register_functions(root_module)
  10.711 -    
  10.712 -    try:
  10.713 -        import ns3_module_node__local
  10.714 -    except ImportError:
  10.715 -        pass
  10.716 -    else:
  10.717 -        ns3_module_node__local.register_functions(root_module)
  10.718 -    
  10.719 -    root_module.end_section('ns3_module_node')
  10.720 -    root_module.begin_section('ns3_module_tap_bridge')
  10.721 -    ns3_module_tap_bridge.register_functions(root_module)
  10.722 -    
  10.723 -    try:
  10.724 -        import ns3_module_tap_bridge__local
  10.725 -    except ImportError:
  10.726 -        pass
  10.727 -    else:
  10.728 -        ns3_module_tap_bridge__local.register_functions(root_module)
  10.729 -    
  10.730 -    root_module.end_section('ns3_module_tap_bridge')
  10.731 -    root_module.begin_section('ns3_module_v4ping')
  10.732 -    ns3_module_v4ping.register_functions(root_module)
  10.733 -    
  10.734 -    try:
  10.735 -        import ns3_module_v4ping__local
  10.736 -    except ImportError:
  10.737 -        pass
  10.738 -    else:
  10.739 -        ns3_module_v4ping__local.register_functions(root_module)
  10.740 -    
  10.741 -    root_module.end_section('ns3_module_v4ping')
  10.742 -    root_module.begin_section('ns3_module_static_routing')
  10.743 -    ns3_module_static_routing.register_functions(root_module)
  10.744 -    
  10.745 -    try:
  10.746 -        import ns3_module_static_routing__local
  10.747 -    except ImportError:
  10.748 -        pass
  10.749 -    else:
  10.750 -        ns3_module_static_routing__local.register_functions(root_module)
  10.751 -    
  10.752 -    root_module.end_section('ns3_module_static_routing')
  10.753 -    root_module.begin_section('ns3_module_packet_sink')
  10.754 -    ns3_module_packet_sink.register_functions(root_module)
  10.755 -    
  10.756 -    try:
  10.757 -        import ns3_module_packet_sink__local
  10.758 -    except ImportError:
  10.759 -        pass
  10.760 -    else:
  10.761 -        ns3_module_packet_sink__local.register_functions(root_module)
  10.762 -    
  10.763 -    root_module.end_section('ns3_module_packet_sink')
  10.764 -    root_module.begin_section('ns3_module_stats')
  10.765 -    ns3_module_stats.register_functions(root_module)
  10.766 -    
  10.767 -    try:
  10.768 -        import ns3_module_stats__local
  10.769 -    except ImportError:
  10.770 -        pass
  10.771 -    else:
  10.772 -        ns3_module_stats__local.register_functions(root_module)
  10.773 -    
  10.774 -    root_module.end_section('ns3_module_stats')
  10.775 -    root_module.begin_section('ns3_module_onoff')
  10.776 -    ns3_module_onoff.register_functions(root_module)
  10.777 -    
  10.778 -    try:
  10.779 -        import ns3_module_onoff__local
  10.780 -    except ImportError:
  10.781 -        pass
  10.782 -    else:
  10.783 -        ns3_module_onoff__local.register_functions(root_module)
  10.784 -    
  10.785 -    root_module.end_section('ns3_module_onoff')
  10.786      root_module.begin_section('ns3_module_point_to_point')
  10.787      ns3_module_point_to_point.register_functions(root_module)
  10.788      
  10.789 @@ -1149,6 +1083,17 @@
  10.790          ns3_module_internet_stack__local.register_functions(root_module)
  10.791      
  10.792      root_module.end_section('ns3_module_internet_stack')
  10.793 +    root_module.begin_section('ns3_module_tap_bridge')
  10.794 +    ns3_module_tap_bridge.register_functions(root_module)
  10.795 +    
  10.796 +    try:
  10.797 +        import ns3_module_tap_bridge__local
  10.798 +    except ImportError:
  10.799 +        pass
  10.800 +    else:
  10.801 +        ns3_module_tap_bridge__local.register_functions(root_module)
  10.802 +    
  10.803 +    root_module.end_section('ns3_module_tap_bridge')
  10.804      root_module.begin_section('ns3_module_csma')
  10.805      ns3_module_csma.register_functions(root_module)
  10.806      
  10.807 @@ -1160,6 +1105,83 @@
  10.808          ns3_module_csma__local.register_functions(root_module)
  10.809      
  10.810      root_module.end_section('ns3_module_csma')
  10.811 +    root_module.begin_section('ns3_module_wifi')
  10.812 +    ns3_module_wifi.register_functions(root_module)
  10.813 +    
  10.814 +    try:
  10.815 +        import ns3_module_wifi__local
  10.816 +    except ImportError:
  10.817 +        pass
  10.818 +    else:
  10.819 +        ns3_module_wifi__local.register_functions(root_module)
  10.820 +    
  10.821 +    root_module.end_section('ns3_module_wifi')
  10.822 +    root_module.begin_section('ns3_module_static_routing')
  10.823 +    ns3_module_static_routing.register_functions(root_module)
  10.824 +    
  10.825 +    try:
  10.826 +        import ns3_module_static_routing__local
  10.827 +    except ImportError:
  10.828 +        pass
  10.829 +    else:
  10.830 +        ns3_module_static_routing__local.register_functions(root_module)
  10.831 +    
  10.832 +    root_module.end_section('ns3_module_static_routing')
  10.833 +    root_module.begin_section('ns3_module_v4ping')
  10.834 +    ns3_module_v4ping.register_functions(root_module)
  10.835 +    
  10.836 +    try:
  10.837 +        import ns3_module_v4ping__local
  10.838 +    except ImportError:
  10.839 +        pass
  10.840 +    else:
  10.841 +        ns3_module_v4ping__local.register_functions(root_module)
  10.842 +    
  10.843 +    root_module.end_section('ns3_module_v4ping')
  10.844 +    root_module.begin_section('ns3_module_virtual_net_device')
  10.845 +    ns3_module_virtual_net_device.register_functions(root_module)
  10.846 +    
  10.847 +    try:
  10.848 +        import ns3_module_virtual_net_device__local
  10.849 +    except ImportError:
  10.850 +        pass
  10.851 +    else:
  10.852 +        ns3_module_virtual_net_device__local.register_functions(root_module)
  10.853 +    
  10.854 +    root_module.end_section('ns3_module_virtual_net_device')
  10.855 +    root_module.begin_section('ns3_module_packet_sink')
  10.856 +    ns3_module_packet_sink.register_functions(root_module)
  10.857 +    
  10.858 +    try:
  10.859 +        import ns3_module_packet_sink__local
  10.860 +    except ImportError:
  10.861 +        pass
  10.862 +    else:
  10.863 +        ns3_module_packet_sink__local.register_functions(root_module)
  10.864 +    
  10.865 +    root_module.end_section('ns3_module_packet_sink')
  10.866 +    root_module.begin_section('ns3_module_global_routing')
  10.867 +    ns3_module_global_routing.register_functions(root_module)
  10.868 +    
  10.869 +    try:
  10.870 +        import ns3_module_global_routing__local
  10.871 +    except ImportError:
  10.872 +        pass
  10.873 +    else:
  10.874 +        ns3_module_global_routing__local.register_functions(root_module)
  10.875 +    
  10.876 +    root_module.end_section('ns3_module_global_routing')
  10.877 +    root_module.begin_section('ns3_module_stats')
  10.878 +    ns3_module_stats.register_functions(root_module)
  10.879 +    
  10.880 +    try:
  10.881 +        import ns3_module_stats__local
  10.882 +    except ImportError:
  10.883 +        pass
  10.884 +    else:
  10.885 +        ns3_module_stats__local.register_functions(root_module)
  10.886 +    
  10.887 +    root_module.end_section('ns3_module_stats')
  10.888      root_module.begin_section('ns3_module_list_routing')
  10.889      ns3_module_list_routing.register_functions(root_module)
  10.890      
  10.891 @@ -1171,28 +1193,6 @@
  10.892          ns3_module_list_routing__local.register_functions(root_module)
  10.893      
  10.894      root_module.end_section('ns3_module_list_routing')
  10.895 -    root_module.begin_section('ns3_module_virtual_net_device')
  10.896 -    ns3_module_virtual_net_device.register_functions(root_module)
  10.897 -    
  10.898 -    try:
  10.899 -        import ns3_module_virtual_net_device__local
  10.900 -    except ImportError:
  10.901 -        pass
  10.902 -    else:
  10.903 -        ns3_module_virtual_net_device__local.register_functions(root_module)
  10.904 -    
  10.905 -    root_module.end_section('ns3_module_virtual_net_device')
  10.906 -    root_module.begin_section('ns3_module_wifi')
  10.907 -    ns3_module_wifi.register_functions(root_module)
  10.908 -    
  10.909 -    try:
  10.910 -        import ns3_module_wifi__local
  10.911 -    except ImportError:
  10.912 -        pass
  10.913 -    else:
  10.914 -        ns3_module_wifi__local.register_functions(root_module)
  10.915 -    
  10.916 -    root_module.end_section('ns3_module_wifi')
  10.917      root_module.begin_section('ns3_module_emu')
  10.918      ns3_module_emu.register_functions(root_module)
  10.919      
  10.920 @@ -1215,17 +1215,17 @@
  10.921          ns3_module_bridge__local.register_functions(root_module)
  10.922      
  10.923      root_module.end_section('ns3_module_bridge')
  10.924 -    root_module.begin_section('ns3_module_global_routing')
  10.925 -    ns3_module_global_routing.register_functions(root_module)
  10.926 +    root_module.begin_section('ns3_module_onoff')
  10.927 +    ns3_module_onoff.register_functions(root_module)
  10.928      
  10.929      try:
  10.930 -        import ns3_module_global_routing__local
  10.931 +        import ns3_module_onoff__local
  10.932      except ImportError:
  10.933          pass
  10.934      else:
  10.935 -        ns3_module_global_routing__local.register_functions(root_module)
  10.936 +        ns3_module_onoff__local.register_functions(root_module)
  10.937      
  10.938 -    root_module.end_section('ns3_module_global_routing')
  10.939 +    root_module.end_section('ns3_module_onoff')
  10.940      root_module.begin_section('ns3_module_udp_echo')
  10.941      ns3_module_udp_echo.register_functions(root_module)
  10.942      
  10.943 @@ -1237,6 +1237,17 @@
  10.944          ns3_module_udp_echo__local.register_functions(root_module)
  10.945      
  10.946      root_module.end_section('ns3_module_udp_echo')
  10.947 +    root_module.begin_section('ns3_module_ping6')
  10.948 +    ns3_module_ping6.register_functions(root_module)
  10.949 +    
  10.950 +    try:
  10.951 +        import ns3_module_ping6__local
  10.952 +    except ImportError:
  10.953 +        pass
  10.954 +    else:
  10.955 +        ns3_module_ping6__local.register_functions(root_module)
  10.956 +    
  10.957 +    root_module.end_section('ns3_module_ping6')
  10.958      root_module.begin_section('ns3_module_nix_vector_routing')
  10.959      ns3_module_nix_vector_routing.register_functions(root_module)
  10.960      
  10.961 @@ -1259,6 +1270,17 @@
  10.962          ns3_module_olsr__local.register_functions(root_module)
  10.963      
  10.964      root_module.end_section('ns3_module_olsr')
  10.965 +    root_module.begin_section('ns3_module_flow_monitor')
  10.966 +    ns3_module_flow_monitor.register_functions(root_module)
  10.967 +    
  10.968 +    try:
  10.969 +        import ns3_module_flow_monitor__local
  10.970 +    except ImportError:
  10.971 +        pass
  10.972 +    else:
  10.973 +        ns3_module_flow_monitor__local.register_functions(root_module)
  10.974 +    
  10.975 +    root_module.end_section('ns3_module_flow_monitor')
  10.976      root_module.begin_section('ns3_module_radvd')
  10.977      ns3_module_radvd.register_functions(root_module)
  10.978      
  10.979 @@ -1270,28 +1292,6 @@
  10.980          ns3_module_radvd__local.register_functions(root_module)
  10.981      
  10.982      root_module.end_section('ns3_module_radvd')
  10.983 -    root_module.begin_section('ns3_module_ping6')
  10.984 -    ns3_module_ping6.register_functions(root_module)
  10.985 -    
  10.986 -    try:
  10.987 -        import ns3_module_ping6__local
  10.988 -    except ImportError:
  10.989 -        pass
  10.990 -    else:
  10.991 -        ns3_module_ping6__local.register_functions(root_module)
  10.992 -    
  10.993 -    root_module.end_section('ns3_module_ping6')
  10.994 -    root_module.begin_section('ns3_module_flow_monitor')
  10.995 -    ns3_module_flow_monitor.register_functions(root_module)
  10.996 -    
  10.997 -    try:
  10.998 -        import ns3_module_flow_monitor__local
  10.999 -    except ImportError:
 10.1000 -        pass
 10.1001 -    else:
 10.1002 -        ns3_module_flow_monitor__local.register_functions(root_module)
 10.1003 -    
 10.1004 -    root_module.end_section('ns3_module_flow_monitor')
 10.1005      root_module.begin_section('ns3_module_mesh')
 10.1006      ns3_module_mesh.register_functions(root_module)
 10.1007