Rescan python bindings.
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Sat, 21 Feb 2009 23:19:18 +0000
changeset 42041b2a20c85856
parent 4203 53a87941480f
child 4205 751691462d36
Rescan python bindings.
bindings/python/ns3_module_core.py
bindings/python/ns3_module_helper.py
bindings/python/ns3_module_node.py
bindings/python/ns3_module_simulator.py
bindings/python/ns3_module_tap_bridge.py
bindings/python/ns3modulegen_generated.py
     1.1 --- a/bindings/python/ns3_module_core.py	Sat Feb 21 22:50:53 2009 +0000
     1.2 +++ b/bindings/python/ns3_module_core.py	Sat Feb 21 23:19:18 2009 +0000
     1.3 @@ -45,6 +45,8 @@
     1.4      module.add_class('IntToType', template_parameters=['6'])
     1.5      ## int-to-type.h: ns3::IntToType<6>::v_e [enumeration]
     1.6      module.add_enum('v_e', ['value'], outer_class=root_module['ns3::IntToType< 6 >'])
     1.7 +    ## names.h: ns3::Names [class]
     1.8 +    module.add_class('Names')
     1.9      ## object-base.h: ns3::ObjectBase [class]
    1.10      module.add_class('ObjectBase', allow_subclassing=True)
    1.11      ## object-factory.h: ns3::ObjectFactory [class]
    1.12 @@ -223,6 +225,7 @@
    1.13      register_Ns3IntToType__4_methods(root_module, root_module['ns3::IntToType< 4 >'])
    1.14      register_Ns3IntToType__5_methods(root_module, root_module['ns3::IntToType< 5 >'])
    1.15      register_Ns3IntToType__6_methods(root_module, root_module['ns3::IntToType< 6 >'])
    1.16 +    register_Ns3Names_methods(root_module, root_module['ns3::Names'])
    1.17      register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase'])
    1.18      register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory'])
    1.19      register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable'])
    1.20 @@ -463,6 +466,58 @@
    1.21      cls.add_constructor([])
    1.22      return
    1.23  
    1.24 +def register_Ns3Names_methods(root_module, cls):
    1.25 +    ## names.h: ns3::Names::Names(ns3::Names const & arg0) [copy constructor]
    1.26 +    cls.add_constructor([param('ns3::Names const &', 'arg0')])
    1.27 +    ## names.h: ns3::Names::Names() [constructor]
    1.28 +    cls.add_constructor([])
    1.29 +    ## names.h: static bool ns3::Names::Add(std::string name, ns3::Ptr<ns3::Object> obj) [member function]
    1.30 +    cls.add_method('Add', 
    1.31 +                   'bool', 
    1.32 +                   [param('std::string', 'name'), param('ns3::Ptr< ns3::Object >', 'obj')], 
    1.33 +                   is_static=True)
    1.34 +    ## names.h: static bool ns3::Names::Add(std::string path, std::string name, ns3::Ptr<ns3::Object> object) [member function]
    1.35 +    cls.add_method('Add', 
    1.36 +                   'bool', 
    1.37 +                   [param('std::string', 'path'), param('std::string', 'name'), param('ns3::Ptr< ns3::Object >', 'object')], 
    1.38 +                   is_static=True)
    1.39 +    ## names.h: static bool ns3::Names::Add(ns3::Ptr<ns3::Object> context, std::string name, ns3::Ptr<ns3::Object> object) [member function]
    1.40 +    cls.add_method('Add', 
    1.41 +                   'bool', 
    1.42 +                   [param('ns3::Ptr< ns3::Object >', 'context'), param('std::string', 'name'), param('ns3::Ptr< ns3::Object >', 'object')], 
    1.43 +                   is_static=True)
    1.44 +    ## names.h: static bool ns3::Names::Rename(std::string oldpath, std::string newname) [member function]
    1.45 +    cls.add_method('Rename', 
    1.46 +                   'bool', 
    1.47 +                   [param('std::string', 'oldpath'), param('std::string', 'newname')], 
    1.48 +                   is_static=True)
    1.49 +    ## names.h: static bool ns3::Names::Rename(std::string path, std::string oldname, std::string newname) [member function]
    1.50 +    cls.add_method('Rename', 
    1.51 +                   'bool', 
    1.52 +                   [param('std::string', 'path'), param('std::string', 'oldname'), param('std::string', 'newname')], 
    1.53 +                   is_static=True)
    1.54 +    ## names.h: static bool ns3::Names::Rename(ns3::Ptr<ns3::Object> context, std::string oldname, std::string newname) [member function]
    1.55 +    cls.add_method('Rename', 
    1.56 +                   'bool', 
    1.57 +                   [param('ns3::Ptr< ns3::Object >', 'context'), param('std::string', 'oldname'), param('std::string', 'newname')], 
    1.58 +                   is_static=True)
    1.59 +    ## names.h: static std::string ns3::Names::FindName(ns3::Ptr<ns3::Object> object) [member function]
    1.60 +    cls.add_method('FindName', 
    1.61 +                   'std::string', 
    1.62 +                   [param('ns3::Ptr< ns3::Object >', 'object')], 
    1.63 +                   is_static=True)
    1.64 +    ## names.h: static std::string ns3::Names::FindPath(ns3::Ptr<ns3::Object> object) [member function]
    1.65 +    cls.add_method('FindPath', 
    1.66 +                   'std::string', 
    1.67 +                   [param('ns3::Ptr< ns3::Object >', 'object')], 
    1.68 +                   is_static=True)
    1.69 +    ## names.h: static void ns3::Names::Delete() [member function]
    1.70 +    cls.add_method('Delete', 
    1.71 +                   'void', 
    1.72 +                   [], 
    1.73 +                   is_static=True)
    1.74 +    return
    1.75 +
    1.76  def register_Ns3ObjectBase_methods(root_module, cls):
    1.77      ## object-base.h: ns3::ObjectBase::ObjectBase(ns3::ObjectBase const & arg0) [copy constructor]
    1.78      cls.add_constructor([param('ns3::ObjectBase const &', 'arg0')])
    1.79 @@ -2062,7 +2117,7 @@
    1.80      module.add_function('TypeNameGet', 
    1.81                          'std::string', 
    1.82                          [], 
    1.83 -                        template_parameters=['long long'])
    1.84 +                        template_parameters=['long'])
    1.85      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    1.86      module.add_function('TypeNameGet', 
    1.87                          'std::string', 
    1.88 @@ -2082,7 +2137,7 @@
    1.89      module.add_function('TypeNameGet', 
    1.90                          'std::string', 
    1.91                          [], 
    1.92 -                        template_parameters=['unsigned long long'])
    1.93 +                        template_parameters=['unsigned long'])
    1.94      ## type-name.h: extern std::string ns3::TypeNameGet() [free function]
    1.95      module.add_function('TypeNameGet', 
    1.96                          'std::string', 
     2.1 --- a/bindings/python/ns3_module_helper.py	Sat Feb 21 22:50:53 2009 +0000
     2.2 +++ b/bindings/python/ns3_module_helper.py	Sat Feb 21 23:19:18 2009 +0000
     2.3 @@ -37,6 +37,8 @@
     2.4      module.add_class('PointToPointHelper', allow_subclassing=False)
     2.5      ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper [class]
     2.6      module.add_class('StaticMulticastRouteHelper', allow_subclassing=False)
     2.7 +    ## tap-bridge-helper.h: ns3::TapBridgeHelper [class]
     2.8 +    module.add_class('TapBridgeHelper', allow_subclassing=False)
     2.9      ## udp-echo-helper.h: ns3::UdpEchoClientHelper [class]
    2.10      module.add_class('UdpEchoClientHelper', allow_subclassing=False)
    2.11      ## udp-echo-helper.h: ns3::UdpEchoServerHelper [class]
    2.12 @@ -110,6 +112,7 @@
    2.13      register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper'])
    2.14      register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper'])
    2.15      register_Ns3StaticMulticastRouteHelper_methods(root_module, root_module['ns3::StaticMulticastRouteHelper'])
    2.16 +    register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper'])
    2.17      register_Ns3UdpEchoClientHelper_methods(root_module, root_module['ns3::UdpEchoClientHelper'])
    2.18      register_Ns3UdpEchoServerHelper_methods(root_module, root_module['ns3::UdpEchoServerHelper'])
    2.19      register_Ns3V4PingHelper_methods(root_module, root_module['ns3::V4PingHelper'])
    2.20 @@ -126,6 +129,8 @@
    2.21      cls.add_constructor([])
    2.22      ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(ns3::Ptr<ns3::Application> application) [constructor]
    2.23      cls.add_constructor([param('ns3::Ptr< ns3::Application >', 'application')])
    2.24 +    ## application-container.h: ns3::ApplicationContainer::ApplicationContainer(std::string name) [constructor]
    2.25 +    cls.add_constructor([param('std::string', 'name')])
    2.26      ## application-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::Application>*,std::vector<ns3::Ptr<ns3::Application>, std::allocator<ns3::Ptr<ns3::Application> > > > ns3::ApplicationContainer::Begin() const [member function]
    2.27      cls.add_method('Begin', 
    2.28                     '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Application > const, std::vector< ns3::Ptr< ns3::Application > > >', 
    2.29 @@ -154,6 +159,10 @@
    2.30      cls.add_method('Add', 
    2.31                     'void', 
    2.32                     [param('ns3::Ptr< ns3::Application >', 'application')])
    2.33 +    ## application-container.h: void ns3::ApplicationContainer::Add(std::string name) [member function]
    2.34 +    cls.add_method('Add', 
    2.35 +                   'void', 
    2.36 +                   [param('std::string', 'name')])
    2.37      ## application-container.h: void ns3::ApplicationContainer::Start(ns3::Time start) [member function]
    2.38      cls.add_method('Start', 
    2.39                     'void', 
    2.40 @@ -177,6 +186,10 @@
    2.41      cls.add_method('Install', 
    2.42                     'ns3::NetDeviceContainer', 
    2.43                     [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::NetDeviceContainer', 'c')])
    2.44 +    ## bridge-helper.h: ns3::NetDeviceContainer ns3::BridgeHelper::Install(std::string nodeName, ns3::NetDeviceContainer c) [member function]
    2.45 +    cls.add_method('Install', 
    2.46 +                   'ns3::NetDeviceContainer', 
    2.47 +                   [param('std::string', 'nodeName'), param('ns3::NetDeviceContainer', 'c')])
    2.48      return
    2.49  
    2.50  def register_Ns3CsmaHelper_methods(root_module, cls):
    2.51 @@ -251,11 +264,31 @@
    2.52                     'ns3::NetDeviceContainer', 
    2.53                     [param('ns3::Ptr< ns3::Node >', 'node')], 
    2.54                     is_const=True)
    2.55 +    ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string name) const [member function]
    2.56 +    cls.add_method('Install', 
    2.57 +                   'ns3::NetDeviceContainer', 
    2.58 +                   [param('std::string', 'name')], 
    2.59 +                   is_const=True)
    2.60      ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
    2.61      cls.add_method('Install', 
    2.62                     'ns3::NetDeviceContainer', 
    2.63                     [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], 
    2.64                     is_const=True)
    2.65 +    ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node, std::string channelName) const [member function]
    2.66 +    cls.add_method('Install', 
    2.67 +                   'ns3::NetDeviceContainer', 
    2.68 +                   [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string', 'channelName')], 
    2.69 +                   is_const=True)
    2.70 +    ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
    2.71 +    cls.add_method('Install', 
    2.72 +                   'ns3::NetDeviceContainer', 
    2.73 +                   [param('std::string', 'nodeName'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], 
    2.74 +                   is_const=True)
    2.75 +    ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, std::string channelName) const [member function]
    2.76 +    cls.add_method('Install', 
    2.77 +                   'ns3::NetDeviceContainer', 
    2.78 +                   [param('std::string', 'nodeName'), param('std::string', 'channelName')], 
    2.79 +                   is_const=True)
    2.80      ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) const [member function]
    2.81      cls.add_method('Install', 
    2.82                     'ns3::NetDeviceContainer', 
    2.83 @@ -266,10 +299,19 @@
    2.84                     'ns3::NetDeviceContainer', 
    2.85                     [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')], 
    2.86                     is_const=True)
    2.87 +    ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, std::string channelName) const [member function]
    2.88 +    cls.add_method('Install', 
    2.89 +                   'ns3::NetDeviceContainer', 
    2.90 +                   [param('ns3::NodeContainer const &', 'c'), param('std::string', 'channelName')], 
    2.91 +                   is_const=True)
    2.92      ## csma-helper.h: void ns3::CsmaHelper::InstallStar(ns3::Ptr<ns3::Node> hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
    2.93      cls.add_method('InstallStar', 
    2.94                     'void', 
    2.95                     [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
    2.96 +    ## csma-helper.h: void ns3::CsmaHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
    2.97 +    cls.add_method('InstallStar', 
    2.98 +                   'void', 
    2.99 +                   [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
   2.100      return
   2.101  
   2.102  def register_Ns3EmuHelper_methods(root_module, cls):
   2.103 @@ -330,6 +372,11 @@
   2.104                     'ns3::NetDeviceContainer', 
   2.105                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.106                     is_const=True)
   2.107 +    ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(std::string nodeName) const [member function]
   2.108 +    cls.add_method('Install', 
   2.109 +                   'ns3::NetDeviceContainer', 
   2.110 +                   [param('std::string', 'nodeName')], 
   2.111 +                   is_const=True)
   2.112      ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::NodeContainer const & c) const [member function]
   2.113      cls.add_method('Install', 
   2.114                     'ns3::NetDeviceContainer', 
   2.115 @@ -342,6 +389,11 @@
   2.116      cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')])
   2.117      ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor]
   2.118      cls.add_constructor([])
   2.119 +    ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(std::string nodeName) const [member function]
   2.120 +    cls.add_method('Install', 
   2.121 +                   'void', 
   2.122 +                   [param('std::string', 'nodeName')], 
   2.123 +                   is_const=True)
   2.124      ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
   2.125      cls.add_method('Install', 
   2.126                     'void', 
   2.127 @@ -423,6 +475,10 @@
   2.128      cls.add_method('Add', 
   2.129                     'void', 
   2.130                     [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
   2.131 +    ## ipv4-interface-container.h: void ns3::Ipv4InterfaceContainer::Add(std::string ipv4Name, uint32_t interface) [member function]
   2.132 +    cls.add_method('Add', 
   2.133 +                   'void', 
   2.134 +                   [param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
   2.135      return
   2.136  
   2.137  def register_Ns3MobilityHelper_methods(root_module, cls):
   2.138 @@ -446,6 +502,10 @@
   2.139      cls.add_method('PushReferenceMobilityModel', 
   2.140                     'void', 
   2.141                     [param('ns3::Ptr< ns3::Object >', 'reference')])
   2.142 +    ## mobility-helper.h: void ns3::MobilityHelper::PushReferenceMobilityModel(std::string referenceName) [member function]
   2.143 +    cls.add_method('PushReferenceMobilityModel', 
   2.144 +                   'void', 
   2.145 +                   [param('std::string', 'referenceName')])
   2.146      ## mobility-helper.h: void ns3::MobilityHelper::PopReferenceMobilityModel() [member function]
   2.147      cls.add_method('PopReferenceMobilityModel', 
   2.148                     'void', 
   2.149 @@ -460,6 +520,11 @@
   2.150                     'void', 
   2.151                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.152                     is_const=True)
   2.153 +    ## mobility-helper.h: void ns3::MobilityHelper::Install(std::string nodeName) const [member function]
   2.154 +    cls.add_method('Install', 
   2.155 +                   'void', 
   2.156 +                   [param('std::string', 'nodeName')], 
   2.157 +                   is_const=True)
   2.158      ## mobility-helper.h: void ns3::MobilityHelper::Install(ns3::NodeContainer container) const [member function]
   2.159      cls.add_method('Install', 
   2.160                     'void', 
   2.161 @@ -493,6 +558,8 @@
   2.162      cls.add_constructor([])
   2.163      ## net-device-container.h: ns3::NetDeviceContainer::NetDeviceContainer(ns3::Ptr<ns3::NetDevice> dev) [constructor]
   2.164      cls.add_constructor([param('ns3::Ptr< ns3::NetDevice >', 'dev')])
   2.165 +    ## net-device-container.h: ns3::NetDeviceContainer::NetDeviceContainer(std::string devName) [constructor]
   2.166 +    cls.add_constructor([param('std::string', 'devName')])
   2.167      ## net-device-container.h: ns3::NetDeviceContainer::NetDeviceContainer(ns3::NetDeviceContainer const & a, ns3::NetDeviceContainer const & b) [constructor]
   2.168      cls.add_constructor([param('ns3::NetDeviceContainer const &', 'a'), param('ns3::NetDeviceContainer const &', 'b')])
   2.169      ## net-device-container.h: __gnu_cxx::__normal_iterator<const ns3::Ptr<ns3::NetDevice>*,std::vector<ns3::Ptr<ns3::NetDevice>, std::allocator<ns3::Ptr<ns3::NetDevice> > > > ns3::NetDeviceContainer::Begin() const [member function]
   2.170 @@ -523,6 +590,10 @@
   2.171      cls.add_method('Add', 
   2.172                     'void', 
   2.173                     [param('ns3::Ptr< ns3::NetDevice >', 'device')])
   2.174 +    ## net-device-container.h: void ns3::NetDeviceContainer::Add(std::string deviceName) [member function]
   2.175 +    cls.add_method('Add', 
   2.176 +                   'void', 
   2.177 +                   [param('std::string', 'deviceName')])
   2.178      return
   2.179  
   2.180  def register_Ns3NodeContainer_methods(root_module, cls):
   2.181 @@ -532,6 +603,8 @@
   2.182      cls.add_constructor([])
   2.183      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::Ptr<ns3::Node> node) [constructor]
   2.184      cls.add_constructor([param('ns3::Ptr< ns3::Node >', 'node')])
   2.185 +    ## node-container.h: ns3::NodeContainer::NodeContainer(std::string nodeName) [constructor]
   2.186 +    cls.add_constructor([param('std::string', 'nodeName')])
   2.187      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b) [constructor]
   2.188      cls.add_constructor([param('ns3::NodeContainer const &', 'a'), param('ns3::NodeContainer const &', 'b')])
   2.189      ## node-container.h: ns3::NodeContainer::NodeContainer(ns3::NodeContainer const & a, ns3::NodeContainer const & b, ns3::NodeContainer const & c) [constructor]
   2.190 @@ -572,6 +645,10 @@
   2.191      cls.add_method('Add', 
   2.192                     'void', 
   2.193                     [param('ns3::Ptr< ns3::Node >', 'node')])
   2.194 +    ## node-container.h: void ns3::NodeContainer::Add(std::string nodeName) [member function]
   2.195 +    cls.add_method('Add', 
   2.196 +                   'void', 
   2.197 +                   [param('std::string', 'nodeName')])
   2.198      ## node-container.h: static ns3::NodeContainer ns3::NodeContainer::GetGlobal() [member function]
   2.199      cls.add_method('GetGlobal', 
   2.200                     'ns3::NodeContainer', 
   2.201 @@ -608,6 +685,10 @@
   2.202      cls.add_method('Install', 
   2.203                     'void', 
   2.204                     [param('ns3::Ptr< ns3::Node >', 'node')])
   2.205 +    ## olsr-helper.h: void ns3::OlsrHelper::Install(std::string nodeName) [member function]
   2.206 +    cls.add_method('Install', 
   2.207 +                   'void', 
   2.208 +                   [param('std::string', 'nodeName')])
   2.209      ## olsr-helper.h: void ns3::OlsrHelper::InstallAll() [member function]
   2.210      cls.add_method('InstallAll', 
   2.211                     'void', 
   2.212 @@ -633,6 +714,11 @@
   2.213                     'ns3::ApplicationContainer', 
   2.214                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.215                     is_const=True)
   2.216 +    ## on-off-helper.h: ns3::ApplicationContainer ns3::OnOffHelper::Install(std::string nodeName) const [member function]
   2.217 +    cls.add_method('Install', 
   2.218 +                   'ns3::ApplicationContainer', 
   2.219 +                   [param('std::string', 'nodeName')], 
   2.220 +                   is_const=True)
   2.221      return
   2.222  
   2.223  def register_Ns3PacketSinkHelper_methods(root_module, cls):
   2.224 @@ -654,6 +740,11 @@
   2.225                     'ns3::ApplicationContainer', 
   2.226                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.227                     is_const=True)
   2.228 +    ## packet-sink-helper.h: ns3::ApplicationContainer ns3::PacketSinkHelper::Install(std::string nodeName) const [member function]
   2.229 +    cls.add_method('Install', 
   2.230 +                   'ns3::ApplicationContainer', 
   2.231 +                   [param('std::string', 'nodeName')], 
   2.232 +                   is_const=True)
   2.233      return
   2.234  
   2.235  def register_Ns3PacketSocketHelper_methods(root_module, cls):
   2.236 @@ -666,6 +757,11 @@
   2.237                     'void', 
   2.238                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.239                     is_const=True)
   2.240 +    ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(std::string nodeName) const [member function]
   2.241 +    cls.add_method('Install', 
   2.242 +                   'void', 
   2.243 +                   [param('std::string', 'nodeName')], 
   2.244 +                   is_const=True)
   2.245      ## packet-socket-helper.h: void ns3::PacketSocketHelper::Install(ns3::NodeContainer c) const [member function]
   2.246      cls.add_method('Install', 
   2.247                     'void', 
   2.248 @@ -748,10 +844,26 @@
   2.249      cls.add_method('Install', 
   2.250                     'ns3::NetDeviceContainer', 
   2.251                     [param('ns3::Ptr< ns3::Node >', 'a'), param('ns3::Ptr< ns3::Node >', 'b')])
   2.252 +    ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr<ns3::Node> a, std::string bName) [member function]
   2.253 +    cls.add_method('Install', 
   2.254 +                   'ns3::NetDeviceContainer', 
   2.255 +                   [param('ns3::Ptr< ns3::Node >', 'a'), param('std::string', 'bName')])
   2.256 +    ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aName, ns3::Ptr<ns3::Node> b) [member function]
   2.257 +    cls.add_method('Install', 
   2.258 +                   'ns3::NetDeviceContainer', 
   2.259 +                   [param('std::string', 'aName'), param('ns3::Ptr< ns3::Node >', 'b')])
   2.260 +    ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aNode, std::string bNode) [member function]
   2.261 +    cls.add_method('Install', 
   2.262 +                   'ns3::NetDeviceContainer', 
   2.263 +                   [param('std::string', 'aNode'), param('std::string', 'bNode')])
   2.264      ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(ns3::Ptr<ns3::Node> hub, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
   2.265      cls.add_method('InstallStar', 
   2.266                     'void', 
   2.267                     [param('ns3::Ptr< ns3::Node >', 'hub'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
   2.268 +    ## point-to-point-helper.h: void ns3::PointToPointHelper::InstallStar(std::string hubName, ns3::NodeContainer spokes, ns3::NetDeviceContainer & hubDevices, ns3::NetDeviceContainer & spokeDevices) [member function]
   2.269 +    cls.add_method('InstallStar', 
   2.270 +                   'void', 
   2.271 +                   [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
   2.272      return
   2.273  
   2.274  def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls):
   2.275 @@ -759,18 +871,73 @@
   2.276      cls.add_constructor([param('ns3::StaticMulticastRouteHelper const &', 'arg0')])
   2.277      ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper::StaticMulticastRouteHelper() [constructor]
   2.278      cls.add_constructor([])
   2.279 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(ns3::Ptr<ns3::Node> arg0, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr<ns3::NetDevice> input, ns3::NetDeviceContainer output) [member function]
   2.280 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr<ns3::NetDevice> input, ns3::NetDeviceContainer output) [member function]
   2.281      cls.add_method('AddMulticastRoute', 
   2.282                     'void', 
   2.283 -                   [param('ns3::Ptr< ns3::Node >', 'arg0'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   2.284 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   2.285 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(std::string n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr<ns3::NetDevice> input, ns3::NetDeviceContainer output) [member function]
   2.286 +    cls.add_method('AddMulticastRoute', 
   2.287 +                   'void', 
   2.288 +                   [param('std::string', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   2.289 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function]
   2.290 +    cls.add_method('AddMulticastRoute', 
   2.291 +                   'void', 
   2.292 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')])
   2.293 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::AddMulticastRoute(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function]
   2.294 +    cls.add_method('AddMulticastRoute', 
   2.295 +                   'void', 
   2.296 +                   [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')])
   2.297      ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ptr<ns3::NetDevice> nd) [member function]
   2.298      cls.add_method('SetDefaultMulticastRoute', 
   2.299                     'void', 
   2.300                     [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   2.301 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, std::string ndName) [member function]
   2.302 +    cls.add_method('SetDefaultMulticastRoute', 
   2.303 +                   'void', 
   2.304 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('std::string', 'ndName')])
   2.305 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(std::string nName, ns3::Ptr<ns3::NetDevice> nd) [member function]
   2.306 +    cls.add_method('SetDefaultMulticastRoute', 
   2.307 +                   'void', 
   2.308 +                   [param('std::string', 'nName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   2.309 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(std::string nName, std::string ndName) [member function]
   2.310 +    cls.add_method('SetDefaultMulticastRoute', 
   2.311 +                   'void', 
   2.312 +                   [param('std::string', 'nName'), param('std::string', 'ndName')])
   2.313      ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function]
   2.314      cls.add_method('JoinMulticastGroup', 
   2.315                     'void', 
   2.316                     [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')])
   2.317 +    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function]
   2.318 +    cls.add_method('JoinMulticastGroup', 
   2.319 +                   'void', 
   2.320 +                   [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')])
   2.321 +    return
   2.322 +
   2.323 +def register_Ns3TapBridgeHelper_methods(root_module, cls):
   2.324 +    ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::TapBridgeHelper const & arg0) [copy constructor]
   2.325 +    cls.add_constructor([param('ns3::TapBridgeHelper const &', 'arg0')])
   2.326 +    ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::Ipv4Address gateway) [constructor]
   2.327 +    cls.add_constructor([param('ns3::Ipv4Address', 'gateway')])
   2.328 +    ## tap-bridge-helper.h: void ns3::TapBridgeHelper::SetAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
   2.329 +    cls.add_method('SetAttribute', 
   2.330 +                   'void', 
   2.331 +                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
   2.332 +    ## tap-bridge-helper.h: ns3::Ptr<ns3::NetDevice> ns3::TapBridgeHelper::Install(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::NetDevice> nd) [member function]
   2.333 +    cls.add_method('Install', 
   2.334 +                   'ns3::Ptr< ns3::NetDevice >', 
   2.335 +                   [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   2.336 +    ## tap-bridge-helper.h: ns3::Ptr<ns3::NetDevice> ns3::TapBridgeHelper::Install(std::string nodeName, ns3::Ptr<ns3::NetDevice> nd) [member function]
   2.337 +    cls.add_method('Install', 
   2.338 +                   'ns3::Ptr< ns3::NetDevice >', 
   2.339 +                   [param('std::string', 'nodeName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   2.340 +    ## tap-bridge-helper.h: ns3::Ptr<ns3::NetDevice> ns3::TapBridgeHelper::Install(ns3::Ptr<ns3::Node> node, std::string ndName) [member function]
   2.341 +    cls.add_method('Install', 
   2.342 +                   'ns3::Ptr< ns3::NetDevice >', 
   2.343 +                   [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string', 'ndName')])
   2.344 +    ## tap-bridge-helper.h: ns3::Ptr<ns3::NetDevice> ns3::TapBridgeHelper::Install(std::string nodeName, std::string ndName) [member function]
   2.345 +    cls.add_method('Install', 
   2.346 +                   'ns3::Ptr< ns3::NetDevice >', 
   2.347 +                   [param('std::string', 'nodeName'), param('std::string', 'ndName')])
   2.348      return
   2.349  
   2.350  def register_Ns3UdpEchoClientHelper_methods(root_module, cls):
   2.351 @@ -787,6 +954,11 @@
   2.352                     'ns3::ApplicationContainer', 
   2.353                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.354                     is_const=True)
   2.355 +    ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(std::string nodeName) const [member function]
   2.356 +    cls.add_method('Install', 
   2.357 +                   'ns3::ApplicationContainer', 
   2.358 +                   [param('std::string', 'nodeName')], 
   2.359 +                   is_const=True)
   2.360      ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::NodeContainer c) const [member function]
   2.361      cls.add_method('Install', 
   2.362                     'ns3::ApplicationContainer', 
   2.363 @@ -808,6 +980,11 @@
   2.364                     'ns3::ApplicationContainer', 
   2.365                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.366                     is_const=True)
   2.367 +    ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(std::string nodeName) const [member function]
   2.368 +    cls.add_method('Install', 
   2.369 +                   'ns3::ApplicationContainer', 
   2.370 +                   [param('std::string', 'nodeName')], 
   2.371 +                   is_const=True)
   2.372      ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoServerHelper::Install(ns3::NodeContainer c) const [member function]
   2.373      cls.add_method('Install', 
   2.374                     'ns3::ApplicationContainer', 
   2.375 @@ -834,6 +1011,11 @@
   2.376                     'ns3::ApplicationContainer', 
   2.377                     [param('ns3::Ptr< ns3::Node >', 'node')], 
   2.378                     is_const=True)
   2.379 +    ## v4ping-helper.h: ns3::ApplicationContainer ns3::V4PingHelper::Install(std::string nodeName) const [member function]
   2.380 +    cls.add_method('Install', 
   2.381 +                   'ns3::ApplicationContainer', 
   2.382 +                   [param('std::string', 'nodeName')], 
   2.383 +                   is_const=True)
   2.384      return
   2.385  
   2.386  def register_Ns3WifiHelper_methods(root_module, cls):
   2.387 @@ -864,6 +1046,11 @@
   2.388                     'ns3::NetDeviceContainer', 
   2.389                     [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::Ptr< ns3::Node >', 'node')], 
   2.390                     is_const=True)
   2.391 +    ## wifi-helper.h: ns3::NetDeviceContainer ns3::WifiHelper::Install(ns3::WifiPhyHelper const & phy, std::string nodeName) const [member function]
   2.392 +    cls.add_method('Install', 
   2.393 +                   'ns3::NetDeviceContainer', 
   2.394 +                   [param('ns3::WifiPhyHelper const &', 'phy'), param('std::string', 'nodeName')], 
   2.395 +                   is_const=True)
   2.396      return
   2.397  
   2.398  def register_Ns3WifiPhyHelper_methods(root_module, cls):
   2.399 @@ -917,6 +1104,10 @@
   2.400      cls.add_method('SetChannel', 
   2.401                     'void', 
   2.402                     [param('ns3::Ptr< ns3::YansWifiChannel >', 'channel')])
   2.403 +    ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::SetChannel(std::string channelName) [member function]
   2.404 +    cls.add_method('SetChannel', 
   2.405 +                   'void', 
   2.406 +                   [param('std::string', 'channelName')])
   2.407      ## yans-wifi-helper.h: void ns3::YansWifiPhyHelper::Set(std::string name, ns3::AttributeValue const & v) [member function]
   2.408      cls.add_method('Set', 
   2.409                     'void', 
     3.1 --- a/bindings/python/ns3_module_node.py	Sat Feb 21 22:50:53 2009 +0000
     3.2 +++ b/bindings/python/ns3_module_node.py	Sat Feb 21 23:19:18 2009 +0000
     3.3 @@ -109,6 +109,8 @@
     3.4      module.add_class('Channel', parent=root_module['ns3::Object'])
     3.5      ## drop-tail-queue.h: ns3::DropTailQueue [class]
     3.6      module.add_class('DropTailQueue', parent=root_module['ns3::Queue'])
     3.7 +    ## drop-tail-queue.h: ns3::DropTailQueue::Mode [enumeration]
     3.8 +    module.add_enum('Mode', ['ILLEGAL', 'PACKETS', 'BYTES'], outer_class=root_module['ns3::DropTailQueue'])
     3.9      ## ethernet-header.h: ns3::EthernetHeader [class]
    3.10      module.add_class('EthernetHeader', parent=root_module['ns3::Header'])
    3.11      ## ethernet-trailer.h: ns3::EthernetTrailer [class]
    3.12 @@ -2340,6 +2342,14 @@
    3.13                     is_static=True)
    3.14      ## drop-tail-queue.h: ns3::DropTailQueue::DropTailQueue() [constructor]
    3.15      cls.add_constructor([])
    3.16 +    ## drop-tail-queue.h: void ns3::DropTailQueue::SetMode(ns3::DropTailQueue::Mode mode) [member function]
    3.17 +    cls.add_method('SetMode', 
    3.18 +                   'void', 
    3.19 +                   [param('ns3::DropTailQueue::Mode', 'mode')])
    3.20 +    ## drop-tail-queue.h: ns3::DropTailQueue::Mode ns3::DropTailQueue::GetMode() [member function]
    3.21 +    cls.add_method('GetMode', 
    3.22 +                   'ns3::DropTailQueue::Mode', 
    3.23 +                   [])
    3.24      ## drop-tail-queue.h: bool ns3::DropTailQueue::DoEnqueue(ns3::Ptr<ns3::Packet> p) [member function]
    3.25      cls.add_method('DoEnqueue', 
    3.26                     'bool', 
     4.1 --- a/bindings/python/ns3_module_simulator.py	Sat Feb 21 22:50:53 2009 +0000
     4.2 +++ b/bindings/python/ns3_module_simulator.py	Sat Feb 21 23:19:18 2009 +0000
     4.3 @@ -55,6 +55,8 @@
     4.4      module.add_class('ListScheduler', parent=root_module['ns3::Scheduler'])
     4.5      ## map-scheduler.h: ns3::MapScheduler [class]
     4.6      module.add_class('MapScheduler', parent=root_module['ns3::Scheduler'])
     4.7 +    ## ns2-calendar-scheduler.h: ns3::Ns2CalendarScheduler [class]
     4.8 +    module.add_class('Ns2CalendarScheduler', parent=root_module['ns3::Scheduler'])
     4.9      ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl [class]
    4.10      module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
    4.11      ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration]
    4.12 @@ -127,6 +129,7 @@
    4.13      register_Ns3HeapScheduler_methods(root_module, root_module['ns3::HeapScheduler'])
    4.14      register_Ns3ListScheduler_methods(root_module, root_module['ns3::ListScheduler'])
    4.15      register_Ns3MapScheduler_methods(root_module, root_module['ns3::MapScheduler'])
    4.16 +    register_Ns3Ns2CalendarScheduler_methods(root_module, root_module['ns3::Ns2CalendarScheduler'])
    4.17      register_Ns3RealtimeSimulatorImpl_methods(root_module, root_module['ns3::RealtimeSimulatorImpl'])
    4.18      return
    4.19  
    4.20 @@ -726,7 +729,9 @@
    4.21      return
    4.22  
    4.23  def register_Ns3SchedulerEventKey_methods(root_module, cls):
    4.24 +    cls.add_binary_comparison_operator('!=')
    4.25      cls.add_binary_comparison_operator('<')
    4.26 +    cls.add_binary_comparison_operator('>')
    4.27      ## scheduler.h: ns3::Scheduler::EventKey::EventKey() [constructor]
    4.28      cls.add_constructor([])
    4.29      ## scheduler.h: ns3::Scheduler::EventKey::EventKey(ns3::Scheduler::EventKey const & arg0) [copy constructor]
    4.30 @@ -1309,6 +1314,43 @@
    4.31                     is_virtual=True)
    4.32      return
    4.33  
    4.34 +def register_Ns3Ns2CalendarScheduler_methods(root_module, cls):
    4.35 +    ## ns2-calendar-scheduler.h: ns3::Ns2CalendarScheduler::Ns2CalendarScheduler(ns3::Ns2CalendarScheduler const & arg0) [copy constructor]
    4.36 +    cls.add_constructor([param('ns3::Ns2CalendarScheduler const &', 'arg0')])
    4.37 +    ## ns2-calendar-scheduler.h: static ns3::TypeId ns3::Ns2CalendarScheduler::GetTypeId() [member function]
    4.38 +    cls.add_method('GetTypeId', 
    4.39 +                   'ns3::TypeId', 
    4.40 +                   [], 
    4.41 +                   is_static=True)
    4.42 +    ## ns2-calendar-scheduler.h: ns3::Ns2CalendarScheduler::Ns2CalendarScheduler() [constructor]
    4.43 +    cls.add_constructor([])
    4.44 +    ## ns2-calendar-scheduler.h: void ns3::Ns2CalendarScheduler::Insert(ns3::Scheduler::Event const & ev) [member function]
    4.45 +    cls.add_method('Insert', 
    4.46 +                   'void', 
    4.47 +                   [param('ns3::Scheduler::Event const &', 'ev')], 
    4.48 +                   is_virtual=True)
    4.49 +    ## ns2-calendar-scheduler.h: bool ns3::Ns2CalendarScheduler::IsEmpty() const [member function]
    4.50 +    cls.add_method('IsEmpty', 
    4.51 +                   'bool', 
    4.52 +                   [], 
    4.53 +                   is_const=True, is_virtual=True)
    4.54 +    ## ns2-calendar-scheduler.h: ns3::Scheduler::Event ns3::Ns2CalendarScheduler::PeekNext() const [member function]
    4.55 +    cls.add_method('PeekNext', 
    4.56 +                   'ns3::Scheduler::Event', 
    4.57 +                   [], 
    4.58 +                   is_const=True, is_virtual=True)
    4.59 +    ## ns2-calendar-scheduler.h: ns3::Scheduler::Event ns3::Ns2CalendarScheduler::RemoveNext() [member function]
    4.60 +    cls.add_method('RemoveNext', 
    4.61 +                   'ns3::Scheduler::Event', 
    4.62 +                   [], 
    4.63 +                   is_virtual=True)
    4.64 +    ## ns2-calendar-scheduler.h: void ns3::Ns2CalendarScheduler::Remove(ns3::Scheduler::Event const & ev) [member function]
    4.65 +    cls.add_method('Remove', 
    4.66 +                   'void', 
    4.67 +                   [param('ns3::Scheduler::Event const &', 'ev')], 
    4.68 +                   is_virtual=True)
    4.69 +    return
    4.70 +
    4.71  def register_Ns3RealtimeSimulatorImpl_methods(root_module, cls):
    4.72      ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::RealtimeSimulatorImpl(ns3::RealtimeSimulatorImpl const & arg0) [copy constructor]
    4.73      cls.add_constructor([param('ns3::RealtimeSimulatorImpl const &', 'arg0')])
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/bindings/python/ns3_module_tap_bridge.py	Sat Feb 21 23:19:18 2009 +0000
     5.3 @@ -0,0 +1,235 @@
     5.4 +from pybindgen import Module, FileCodeSink, param, retval, cppclass
     5.5 +
     5.6 +def register_types(module):
     5.7 +    root_module = module.get_root()
     5.8 +    
     5.9 +    ## tap-bridge.h: ns3::TapBridge [class]
    5.10 +    module.add_class('TapBridge', parent=root_module['ns3::NetDevice'])
    5.11 +    
    5.12 +    ## Register a nested module for the namespace Config
    5.13 +    
    5.14 +    nested_module = module.add_cpp_namespace('Config')
    5.15 +    register_types_ns3_Config(nested_module)
    5.16 +    
    5.17 +    
    5.18 +    ## Register a nested module for the namespace TimeStepPrecision
    5.19 +    
    5.20 +    nested_module = module.add_cpp_namespace('TimeStepPrecision')
    5.21 +    register_types_ns3_TimeStepPrecision(nested_module)
    5.22 +    
    5.23 +    
    5.24 +    ## Register a nested module for the namespace internal
    5.25 +    
    5.26 +    nested_module = module.add_cpp_namespace('internal')
    5.27 +    register_types_ns3_internal(nested_module)
    5.28 +    
    5.29 +    
    5.30 +    ## Register a nested module for the namespace olsr
    5.31 +    
    5.32 +    nested_module = module.add_cpp_namespace('olsr')
    5.33 +    register_types_ns3_olsr(nested_module)
    5.34 +    
    5.35 +
    5.36 +def register_types_ns3_Config(module):
    5.37 +    root_module = module.get_root()
    5.38 +    
    5.39 +
    5.40 +def register_types_ns3_TimeStepPrecision(module):
    5.41 +    root_module = module.get_root()
    5.42 +    
    5.43 +
    5.44 +def register_types_ns3_internal(module):
    5.45 +    root_module = module.get_root()
    5.46 +    
    5.47 +
    5.48 +def register_types_ns3_olsr(module):
    5.49 +    root_module = module.get_root()
    5.50 +    
    5.51 +
    5.52 +def register_methods(root_module):
    5.53 +    register_Ns3TapBridge_methods(root_module, root_module['ns3::TapBridge'])
    5.54 +    return
    5.55 +
    5.56 +def register_Ns3TapBridge_methods(root_module, cls):
    5.57 +    ## tap-bridge.h: ns3::TapBridge::TapBridge(ns3::TapBridge const & arg0) [copy constructor]
    5.58 +    cls.add_constructor([param('ns3::TapBridge const &', 'arg0')])
    5.59 +    ## tap-bridge.h: static ns3::TypeId ns3::TapBridge::GetTypeId() [member function]
    5.60 +    cls.add_method('GetTypeId', 
    5.61 +                   'ns3::TypeId', 
    5.62 +                   [], 
    5.63 +                   is_static=True)
    5.64 +    ## tap-bridge.h: ns3::TapBridge::TapBridge() [constructor]
    5.65 +    cls.add_constructor([])
    5.66 +    ## tap-bridge.h: ns3::Ptr<ns3::NetDevice> ns3::TapBridge::GetBridgedNetDevice() [member function]
    5.67 +    cls.add_method('GetBridgedNetDevice', 
    5.68 +                   'ns3::Ptr< ns3::NetDevice >', 
    5.69 +                   [])
    5.70 +    ## tap-bridge.h: void ns3::TapBridge::SetBridgedNetDevice(ns3::Ptr<ns3::NetDevice> bridgedDevice) [member function]
    5.71 +    cls.add_method('SetBridgedNetDevice', 
    5.72 +                   'void', 
    5.73 +                   [param('ns3::Ptr< ns3::NetDevice >', 'bridgedDevice')])
    5.74 +    ## tap-bridge.h: void ns3::TapBridge::Start(ns3::Time tStart) [member function]
    5.75 +    cls.add_method('Start', 
    5.76 +                   'void', 
    5.77 +                   [param('ns3::Time', 'tStart')])
    5.78 +    ## tap-bridge.h: void ns3::TapBridge::Stop(ns3::Time tStop) [member function]
    5.79 +    cls.add_method('Stop', 
    5.80 +                   'void', 
    5.81 +                   [param('ns3::Time', 'tStop')])
    5.82 +    ## tap-bridge.h: void ns3::TapBridge::SetName(std::string const name) [member function]
    5.83 +    cls.add_method('SetName', 
    5.84 +                   'void', 
    5.85 +                   [param('std::string const', 'name')], 
    5.86 +                   is_virtual=True)
    5.87 +    ## tap-bridge.h: std::string ns3::TapBridge::GetName() const [member function]
    5.88 +    cls.add_method('GetName', 
    5.89 +                   'std::string', 
    5.90 +                   [], 
    5.91 +                   is_const=True, is_virtual=True)
    5.92 +    ## tap-bridge.h: void ns3::TapBridge::SetIfIndex(uint32_t const index) [member function]
    5.93 +    cls.add_method('SetIfIndex', 
    5.94 +                   'void', 
    5.95 +                   [param('uint32_t const', 'index')], 
    5.96 +                   is_virtual=True)
    5.97 +    ## tap-bridge.h: uint32_t ns3::TapBridge::GetIfIndex() const [member function]
    5.98 +    cls.add_method('GetIfIndex', 
    5.99 +                   'uint32_t', 
   5.100 +                   [], 
   5.101 +                   is_const=True, is_virtual=True)
   5.102 +    ## tap-bridge.h: ns3::Ptr<ns3::Channel> ns3::TapBridge::GetChannel() const [member function]
   5.103 +    cls.add_method('GetChannel', 
   5.104 +                   'ns3::Ptr< ns3::Channel >', 
   5.105 +                   [], 
   5.106 +                   is_const=True, is_virtual=True)
   5.107 +    ## tap-bridge.h: ns3::Address ns3::TapBridge::GetAddress() const [member function]
   5.108 +    cls.add_method('GetAddress', 
   5.109 +                   'ns3::Address', 
   5.110 +                   [], 
   5.111 +                   is_const=True, is_virtual=True)
   5.112 +    ## tap-bridge.h: bool ns3::TapBridge::SetMtu(uint16_t const mtu) [member function]
   5.113 +    cls.add_method('SetMtu', 
   5.114 +                   'bool', 
   5.115 +                   [param('uint16_t const', 'mtu')], 
   5.116 +                   is_virtual=True)
   5.117 +    ## tap-bridge.h: uint16_t ns3::TapBridge::GetMtu() const [member function]
   5.118 +    cls.add_method('GetMtu', 
   5.119 +                   'uint16_t', 
   5.120 +                   [], 
   5.121 +                   is_const=True, is_virtual=True)
   5.122 +    ## tap-bridge.h: bool ns3::TapBridge::IsLinkUp() const [member function]
   5.123 +    cls.add_method('IsLinkUp', 
   5.124 +                   'bool', 
   5.125 +                   [], 
   5.126 +                   is_const=True, is_virtual=True)
   5.127 +    ## tap-bridge.h: void ns3::TapBridge::SetLinkChangeCallback(ns3::Callback<void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> callback) [member function]
   5.128 +    cls.add_method('SetLinkChangeCallback', 
   5.129 +                   'void', 
   5.130 +                   [param('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'callback')], 
   5.131 +                   is_virtual=True)
   5.132 +    ## tap-bridge.h: bool ns3::TapBridge::IsBroadcast() const [member function]
   5.133 +    cls.add_method('IsBroadcast', 
   5.134 +                   'bool', 
   5.135 +                   [], 
   5.136 +                   is_const=True, is_virtual=True)
   5.137 +    ## tap-bridge.h: ns3::Address ns3::TapBridge::GetBroadcast() const [member function]
   5.138 +    cls.add_method('GetBroadcast', 
   5.139 +                   'ns3::Address', 
   5.140 +                   [], 
   5.141 +                   is_const=True, is_virtual=True)
   5.142 +    ## tap-bridge.h: bool ns3::TapBridge::IsMulticast() const [member function]
   5.143 +    cls.add_method('IsMulticast', 
   5.144 +                   'bool', 
   5.145 +                   [], 
   5.146 +                   is_const=True, is_virtual=True)
   5.147 +    ## tap-bridge.h: ns3::Address ns3::TapBridge::GetMulticast(ns3::Ipv4Address multicastGroup) const [member function]
   5.148 +    cls.add_method('GetMulticast', 
   5.149 +                   'ns3::Address', 
   5.150 +                   [param('ns3::Ipv4Address', 'multicastGroup')], 
   5.151 +                   is_const=True, is_virtual=True)
   5.152 +    ## tap-bridge.h: bool ns3::TapBridge::IsPointToPoint() const [member function]
   5.153 +    cls.add_method('IsPointToPoint', 
   5.154 +                   'bool', 
   5.155 +                   [], 
   5.156 +                   is_const=True, is_virtual=True)
   5.157 +    ## tap-bridge.h: bool ns3::TapBridge::IsBridge() const [member function]
   5.158 +    cls.add_method('IsBridge', 
   5.159 +                   'bool', 
   5.160 +                   [], 
   5.161 +                   is_const=True, is_virtual=True)
   5.162 +    ## tap-bridge.h: bool ns3::TapBridge::Send(ns3::Ptr<ns3::Packet> packet, ns3::Address const & dest, uint16_t protocolNumber) [member function]
   5.163 +    cls.add_method('Send', 
   5.164 +                   'bool', 
   5.165 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
   5.166 +                   is_virtual=True)
   5.167 +    ## tap-bridge.h: bool ns3::TapBridge::SendFrom(ns3::Ptr<ns3::Packet> packet, ns3::Address const & source, ns3::Address const & dest, uint16_t protocolNumber) [member function]
   5.168 +    cls.add_method('SendFrom', 
   5.169 +                   'bool', 
   5.170 +                   [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'dest'), param('uint16_t', 'protocolNumber')], 
   5.171 +                   is_virtual=True)
   5.172 +    ## tap-bridge.h: ns3::Ptr<ns3::Node> ns3::TapBridge::GetNode() const [member function]
   5.173 +    cls.add_method('GetNode', 
   5.174 +                   'ns3::Ptr< ns3::Node >', 
   5.175 +                   [], 
   5.176 +                   is_const=True, is_virtual=True)
   5.177 +    ## tap-bridge.h: void ns3::TapBridge::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   5.178 +    cls.add_method('SetNode', 
   5.179 +                   'void', 
   5.180 +                   [param('ns3::Ptr< ns3::Node >', 'node')], 
   5.181 +                   is_virtual=True)
   5.182 +    ## tap-bridge.h: bool ns3::TapBridge::NeedsArp() const [member function]
   5.183 +    cls.add_method('NeedsArp', 
   5.184 +                   'bool', 
   5.185 +                   [], 
   5.186 +                   is_const=True, is_virtual=True)
   5.187 +    ## tap-bridge.h: void ns3::TapBridge::SetReceiveCallback(ns3::Callback<bool, ns3::Ptr<ns3::NetDevice>, ns3::Ptr<ns3::Packet const>, unsigned short, ns3::Address const&, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty> cb) [member function]
   5.188 +    cls.add_method('SetReceiveCallback', 
   5.189 +                   'void', 
   5.190 +                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'cb')], 
   5.191 +                   is_virtual=True)
   5.192 +    ## tap-bridge.h: void ns3::TapBridge::SetPromiscReceiveCallback(ns3::Callback<bool, ns3::Ptr<ns3::NetDevice>, ns3::Ptr<ns3::Packet const>, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> cb) [member function]
   5.193 +    cls.add_method('SetPromiscReceiveCallback', 
   5.194 +                   'void', 
   5.195 +                   [param('ns3::Callback< bool, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'cb')], 
   5.196 +                   is_virtual=True)
   5.197 +    ## tap-bridge.h: bool ns3::TapBridge::SupportsSendFrom() const [member function]
   5.198 +    cls.add_method('SupportsSendFrom', 
   5.199 +                   'bool', 
   5.200 +                   [], 
   5.201 +                   is_const=True, is_virtual=True)
   5.202 +    ## tap-bridge.h: ns3::Address ns3::TapBridge::GetMulticast(ns3::Ipv6Address addr) const [member function]
   5.203 +    cls.add_method('GetMulticast', 
   5.204 +                   'ns3::Address', 
   5.205 +                   [param('ns3::Ipv6Address', 'addr')], 
   5.206 +                   is_const=True, is_virtual=True)
   5.207 +    ## tap-bridge.h: void ns3::TapBridge::DoDispose() [member function]
   5.208 +    cls.add_method('DoDispose', 
   5.209 +                   'void', 
   5.210 +                   [], 
   5.211 +                   visibility='protected', is_virtual=True)
   5.212 +    ## tap-bridge.h: void ns3::TapBridge::ReceiveFromBridgedDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<const ns3::Packet> packet, uint16_t protocol, ns3::Address const & src, ns3::Address const & dst, ns3::NetDevice::PacketType packetType) [member function]
   5.213 +    cls.add_method('ReceiveFromBridgedDevice', 
   5.214 +                   'void', 
   5.215 +                   [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'src'), param('ns3::Address const &', 'dst'), param('ns3::NetDevice::PacketType', 'packetType')], 
   5.216 +                   visibility='protected')
   5.217 +    return
   5.218 +
   5.219 +def register_functions(root_module):
   5.220 +    module = root_module
   5.221 +    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   5.222 +    register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   5.223 +    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   5.224 +    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   5.225 +    return
   5.226 +
   5.227 +def register_functions_ns3_Config(module, root_module):
   5.228 +    return
   5.229 +
   5.230 +def register_functions_ns3_TimeStepPrecision(module, root_module):
   5.231 +    return
   5.232 +
   5.233 +def register_functions_ns3_internal(module, root_module):
   5.234 +    return
   5.235 +
   5.236 +def register_functions_ns3_olsr(module, root_module):
   5.237 +    return
   5.238 +
     6.1 --- a/bindings/python/ns3modulegen_generated.py	Sat Feb 21 22:50:53 2009 +0000
     6.2 +++ b/bindings/python/ns3modulegen_generated.py	Sat Feb 21 23:19:18 2009 +0000
     6.3 @@ -20,17 +20,18 @@
     6.4  import ns3_module_contrib
     6.5  import ns3_module_point_to_point
     6.6  import ns3_module_stats
     6.7 +import ns3_module_tap_bridge
     6.8  import ns3_module_internet_stack
     6.9  import ns3_module_wifi
    6.10  import ns3_module_csma
    6.11  import ns3_module_emu
    6.12  import ns3_module_bridge
    6.13 +import ns3_module_onoff
    6.14  import ns3_module_packet_sink
    6.15  import ns3_module_v4ping
    6.16  import ns3_module_global_routing
    6.17 -import ns3_module_onoff
    6.18 +import ns3_module_udp_echo
    6.19  import ns3_module_olsr
    6.20 -import ns3_module_udp_echo
    6.21  import ns3_module_helper
    6.22  
    6.23  def module_init():
    6.24 @@ -128,6 +129,17 @@
    6.25          ns3_module_stats__local.register_types(module)
    6.26      
    6.27      root_module.end_section('ns3_module_stats')
    6.28 +    root_module.begin_section('ns3_module_tap_bridge')
    6.29 +    ns3_module_tap_bridge.register_types(module)
    6.30 +    
    6.31 +    try:
    6.32 +        import ns3_module_tap_bridge__local
    6.33 +    except ImportError:
    6.34 +        pass
    6.35 +    else:
    6.36 +        ns3_module_tap_bridge__local.register_types(module)
    6.37 +    
    6.38 +    root_module.end_section('ns3_module_tap_bridge')
    6.39      root_module.begin_section('ns3_module_internet_stack')
    6.40      ns3_module_internet_stack.register_types(module)
    6.41      
    6.42 @@ -183,6 +195,17 @@
    6.43          ns3_module_bridge__local.register_types(module)
    6.44      
    6.45      root_module.end_section('ns3_module_bridge')
    6.46 +    root_module.begin_section('ns3_module_onoff')
    6.47 +    ns3_module_onoff.register_types(module)
    6.48 +    
    6.49 +    try:
    6.50 +        import ns3_module_onoff__local
    6.51 +    except ImportError:
    6.52 +        pass
    6.53 +    else:
    6.54 +        ns3_module_onoff__local.register_types(module)
    6.55 +    
    6.56 +    root_module.end_section('ns3_module_onoff')
    6.57      root_module.begin_section('ns3_module_packet_sink')
    6.58      ns3_module_packet_sink.register_types(module)
    6.59      
    6.60 @@ -216,17 +239,17 @@
    6.61          ns3_module_global_routing__local.register_types(module)
    6.62      
    6.63      root_module.end_section('ns3_module_global_routing')
    6.64 -    root_module.begin_section('ns3_module_onoff')
    6.65 -    ns3_module_onoff.register_types(module)
    6.66 +    root_module.begin_section('ns3_module_udp_echo')
    6.67 +    ns3_module_udp_echo.register_types(module)
    6.68      
    6.69      try:
    6.70 -        import ns3_module_onoff__local
    6.71 +        import ns3_module_udp_echo__local
    6.72      except ImportError:
    6.73          pass
    6.74      else:
    6.75 -        ns3_module_onoff__local.register_types(module)
    6.76 +        ns3_module_udp_echo__local.register_types(module)
    6.77      
    6.78 -    root_module.end_section('ns3_module_onoff')
    6.79 +    root_module.end_section('ns3_module_udp_echo')
    6.80      root_module.begin_section('ns3_module_olsr')
    6.81      ns3_module_olsr.register_types(module)
    6.82      
    6.83 @@ -238,17 +261,6 @@
    6.84          ns3_module_olsr__local.register_types(module)
    6.85      
    6.86      root_module.end_section('ns3_module_olsr')
    6.87 -    root_module.begin_section('ns3_module_udp_echo')
    6.88 -    ns3_module_udp_echo.register_types(module)
    6.89 -    
    6.90 -    try:
    6.91 -        import ns3_module_udp_echo__local
    6.92 -    except ImportError:
    6.93 -        pass
    6.94 -    else:
    6.95 -        ns3_module_udp_echo__local.register_types(module)
    6.96 -    
    6.97 -    root_module.end_section('ns3_module_udp_echo')
    6.98      root_module.begin_section('ns3_module_helper')
    6.99      ns3_module_helper.register_types(module)
   6.100      
   6.101 @@ -393,6 +405,17 @@
   6.102          ns3_module_stats__local.register_methods(root_module)
   6.103      
   6.104      root_module.end_section('ns3_module_stats')
   6.105 +    root_module.begin_section('ns3_module_tap_bridge')
   6.106 +    ns3_module_tap_bridge.register_methods(root_module)
   6.107 +    
   6.108 +    try:
   6.109 +        import ns3_module_tap_bridge__local
   6.110 +    except ImportError:
   6.111 +        pass
   6.112 +    else:
   6.113 +        ns3_module_tap_bridge__local.register_methods(root_module)
   6.114 +    
   6.115 +    root_module.end_section('ns3_module_tap_bridge')
   6.116      root_module.begin_section('ns3_module_internet_stack')
   6.117      ns3_module_internet_stack.register_methods(root_module)
   6.118      
   6.119 @@ -448,6 +471,17 @@
   6.120          ns3_module_bridge__local.register_methods(root_module)
   6.121      
   6.122      root_module.end_section('ns3_module_bridge')
   6.123 +    root_module.begin_section('ns3_module_onoff')
   6.124 +    ns3_module_onoff.register_methods(root_module)
   6.125 +    
   6.126 +    try:
   6.127 +        import ns3_module_onoff__local
   6.128 +    except ImportError:
   6.129 +        pass
   6.130 +    else:
   6.131 +        ns3_module_onoff__local.register_methods(root_module)
   6.132 +    
   6.133 +    root_module.end_section('ns3_module_onoff')
   6.134      root_module.begin_section('ns3_module_packet_sink')
   6.135      ns3_module_packet_sink.register_methods(root_module)
   6.136      
   6.137 @@ -481,17 +515,17 @@
   6.138          ns3_module_global_routing__local.register_methods(root_module)
   6.139      
   6.140      root_module.end_section('ns3_module_global_routing')
   6.141 -    root_module.begin_section('ns3_module_onoff')
   6.142 -    ns3_module_onoff.register_methods(root_module)
   6.143 +    root_module.begin_section('ns3_module_udp_echo')
   6.144 +    ns3_module_udp_echo.register_methods(root_module)
   6.145      
   6.146      try:
   6.147 -        import ns3_module_onoff__local
   6.148 +        import ns3_module_udp_echo__local
   6.149      except ImportError:
   6.150          pass
   6.151      else:
   6.152 -        ns3_module_onoff__local.register_methods(root_module)
   6.153 +        ns3_module_udp_echo__local.register_methods(root_module)
   6.154      
   6.155 -    root_module.end_section('ns3_module_onoff')
   6.156 +    root_module.end_section('ns3_module_udp_echo')
   6.157      root_module.begin_section('ns3_module_olsr')
   6.158      ns3_module_olsr.register_methods(root_module)
   6.159      
   6.160 @@ -503,17 +537,6 @@
   6.161          ns3_module_olsr__local.register_methods(root_module)
   6.162      
   6.163      root_module.end_section('ns3_module_olsr')
   6.164 -    root_module.begin_section('ns3_module_udp_echo')
   6.165 -    ns3_module_udp_echo.register_methods(root_module)
   6.166 -    
   6.167 -    try:
   6.168 -        import ns3_module_udp_echo__local
   6.169 -    except ImportError:
   6.170 -        pass
   6.171 -    else:
   6.172 -        ns3_module_udp_echo__local.register_methods(root_module)
   6.173 -    
   6.174 -    root_module.end_section('ns3_module_udp_echo')
   6.175      root_module.begin_section('ns3_module_helper')
   6.176      ns3_module_helper.register_methods(root_module)
   6.177      
   6.178 @@ -617,6 +640,17 @@
   6.179          ns3_module_stats__local.register_functions(root_module)
   6.180      
   6.181      root_module.end_section('ns3_module_stats')
   6.182 +    root_module.begin_section('ns3_module_tap_bridge')
   6.183 +    ns3_module_tap_bridge.register_functions(root_module)
   6.184 +    
   6.185 +    try:
   6.186 +        import ns3_module_tap_bridge__local
   6.187 +    except ImportError:
   6.188 +        pass
   6.189 +    else:
   6.190 +        ns3_module_tap_bridge__local.register_functions(root_module)
   6.191 +    
   6.192 +    root_module.end_section('ns3_module_tap_bridge')
   6.193      root_module.begin_section('ns3_module_internet_stack')
   6.194      ns3_module_internet_stack.register_functions(root_module)
   6.195      
   6.196 @@ -672,6 +706,17 @@
   6.197          ns3_module_bridge__local.register_functions(root_module)
   6.198      
   6.199      root_module.end_section('ns3_module_bridge')
   6.200 +    root_module.begin_section('ns3_module_onoff')
   6.201 +    ns3_module_onoff.register_functions(root_module)
   6.202 +    
   6.203 +    try:
   6.204 +        import ns3_module_onoff__local
   6.205 +    except ImportError:
   6.206 +        pass
   6.207 +    else:
   6.208 +        ns3_module_onoff__local.register_functions(root_module)
   6.209 +    
   6.210 +    root_module.end_section('ns3_module_onoff')
   6.211      root_module.begin_section('ns3_module_packet_sink')
   6.212      ns3_module_packet_sink.register_functions(root_module)
   6.213      
   6.214 @@ -705,17 +750,17 @@
   6.215          ns3_module_global_routing__local.register_functions(root_module)
   6.216      
   6.217      root_module.end_section('ns3_module_global_routing')
   6.218 -    root_module.begin_section('ns3_module_onoff')
   6.219 -    ns3_module_onoff.register_functions(root_module)
   6.220 +    root_module.begin_section('ns3_module_udp_echo')
   6.221 +    ns3_module_udp_echo.register_functions(root_module)
   6.222      
   6.223      try:
   6.224 -        import ns3_module_onoff__local
   6.225 +        import ns3_module_udp_echo__local
   6.226      except ImportError:
   6.227          pass
   6.228      else:
   6.229 -        ns3_module_onoff__local.register_functions(root_module)
   6.230 +        ns3_module_udp_echo__local.register_functions(root_module)
   6.231      
   6.232 -    root_module.end_section('ns3_module_onoff')
   6.233 +    root_module.end_section('ns3_module_udp_echo')
   6.234      root_module.begin_section('ns3_module_olsr')
   6.235      ns3_module_olsr.register_functions(root_module)
   6.236      
   6.237 @@ -727,17 +772,6 @@
   6.238          ns3_module_olsr__local.register_functions(root_module)
   6.239      
   6.240      root_module.end_section('ns3_module_olsr')
   6.241 -    root_module.begin_section('ns3_module_udp_echo')
   6.242 -    ns3_module_udp_echo.register_functions(root_module)
   6.243 -    
   6.244 -    try:
   6.245 -        import ns3_module_udp_echo__local
   6.246 -    except ImportError:
   6.247 -        pass
   6.248 -    else:
   6.249 -        ns3_module_udp_echo__local.register_functions(root_module)
   6.250 -    
   6.251 -    root_module.end_section('ns3_module_udp_echo')
   6.252      root_module.begin_section('ns3_module_helper')
   6.253      ns3_module_helper.register_functions(root_module)
   6.254