bindings/ changes for IPv4 routing rework
authorTom Henderson <tomh@tomh.org>
Thu, 28 May 2009 21:38:49 -0700
changeset 447419e2b7ff3482
parent 4473 39ac17168023
child 4475 a232dcbbe7a8
bindings/ changes for IPv4 routing rework
bindings/python/ns3_module_bridge.py
bindings/python/ns3_module_common.py
bindings/python/ns3_module_contrib.py
bindings/python/ns3_module_core.py
bindings/python/ns3_module_csma.py
bindings/python/ns3_module_emu.py
bindings/python/ns3_module_global_routing.py
bindings/python/ns3_module_helper.py
bindings/python/ns3_module_internet_stack.py
bindings/python/ns3_module_mobility.py
bindings/python/ns3_module_node.py
bindings/python/ns3_module_olsr.py
bindings/python/ns3_module_onoff.py
bindings/python/ns3_module_packet_sink.py
bindings/python/ns3_module_point_to_point.py
bindings/python/ns3_module_simulator.py
bindings/python/ns3_module_stats.py
bindings/python/ns3_module_tap_bridge.py
bindings/python/ns3_module_udp_echo.py
bindings/python/ns3_module_v4ping.py
bindings/python/ns3_module_wifi.py
bindings/python/ns3modulegen_generated.py
     1.1 --- a/bindings/python/ns3_module_bridge.py	Thu May 28 21:38:06 2009 -0700
     1.2 +++ b/bindings/python/ns3_module_bridge.py	Thu May 28 21:38:49 2009 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     1.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     1.6  
     1.7  def register_types(module):
     1.8      root_module = module.get_root()
     1.9 @@ -20,6 +20,12 @@
    1.10      register_types_ns3_TimeStepPrecision(nested_module)
    1.11      
    1.12      
    1.13 +    ## Register a nested module for the namespace addressUtils
    1.14 +    
    1.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    1.16 +    register_types_ns3_addressUtils(nested_module)
    1.17 +    
    1.18 +    
    1.19      ## Register a nested module for the namespace internal
    1.20      
    1.21      nested_module = module.add_cpp_namespace('internal')
    1.22 @@ -40,6 +46,10 @@
    1.23      root_module = module.get_root()
    1.24      
    1.25  
    1.26 +def register_types_ns3_addressUtils(module):
    1.27 +    root_module = module.get_root()
    1.28 +    
    1.29 +
    1.30  def register_types_ns3_internal(module):
    1.31      root_module = module.get_root()
    1.32      
    1.33 @@ -254,6 +264,7 @@
    1.34      module = root_module
    1.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    1.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    1.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    1.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    1.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    1.40      return
    1.41 @@ -264,6 +275,9 @@
    1.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
    1.43      return
    1.44  
    1.45 +def register_functions_ns3_addressUtils(module, root_module):
    1.46 +    return
    1.47 +
    1.48  def register_functions_ns3_internal(module, root_module):
    1.49      return
    1.50  
     2.1 --- a/bindings/python/ns3_module_common.py	Thu May 28 21:38:06 2009 -0700
     2.2 +++ b/bindings/python/ns3_module_common.py	Thu May 28 21:38:49 2009 -0700
     2.3 @@ -1,4 +1,4 @@
     2.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     2.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     2.6  
     2.7  def register_types(module):
     2.8      root_module = module.get_root()
     2.9 @@ -66,6 +66,12 @@
    2.10      register_types_ns3_TimeStepPrecision(nested_module)
    2.11      
    2.12      
    2.13 +    ## Register a nested module for the namespace addressUtils
    2.14 +    
    2.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    2.16 +    register_types_ns3_addressUtils(nested_module)
    2.17 +    
    2.18 +    
    2.19      ## Register a nested module for the namespace internal
    2.20      
    2.21      nested_module = module.add_cpp_namespace('internal')
    2.22 @@ -86,6 +92,10 @@
    2.23      root_module = module.get_root()
    2.24      
    2.25  
    2.26 +def register_types_ns3_addressUtils(module):
    2.27 +    root_module = module.get_root()
    2.28 +    
    2.29 +
    2.30  def register_types_ns3_internal(module):
    2.31      root_module = module.get_root()
    2.32      
    2.33 @@ -1115,6 +1125,7 @@
    2.34                          [])
    2.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    2.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    2.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    2.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    2.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    2.40      return
    2.41 @@ -1125,6 +1136,9 @@
    2.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
    2.43      return
    2.44  
    2.45 +def register_functions_ns3_addressUtils(module, root_module):
    2.46 +    return
    2.47 +
    2.48  def register_functions_ns3_internal(module, root_module):
    2.49      return
    2.50  
     3.1 --- a/bindings/python/ns3_module_contrib.py	Thu May 28 21:38:06 2009 -0700
     3.2 +++ b/bindings/python/ns3_module_contrib.py	Thu May 28 21:38:49 2009 -0700
     3.3 @@ -1,4 +1,4 @@
     3.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     3.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     3.6  
     3.7  def register_types(module):
     3.8      root_module = module.get_root()
     3.9 @@ -52,6 +52,12 @@
    3.10      register_types_ns3_TimeStepPrecision(nested_module)
    3.11      
    3.12      
    3.13 +    ## Register a nested module for the namespace addressUtils
    3.14 +    
    3.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    3.16 +    register_types_ns3_addressUtils(nested_module)
    3.17 +    
    3.18 +    
    3.19      ## Register a nested module for the namespace internal
    3.20      
    3.21      nested_module = module.add_cpp_namespace('internal')
    3.22 @@ -72,6 +78,10 @@
    3.23      root_module = module.get_root()
    3.24      
    3.25  
    3.26 +def register_types_ns3_addressUtils(module):
    3.27 +    root_module = module.get_root()
    3.28 +    
    3.29 +
    3.30  def register_types_ns3_internal(module):
    3.31      root_module = module.get_root()
    3.32      
    3.33 @@ -470,6 +480,7 @@
    3.34      module = root_module
    3.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    3.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    3.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    3.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    3.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    3.40      return
    3.41 @@ -480,6 +491,9 @@
    3.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
    3.43      return
    3.44  
    3.45 +def register_functions_ns3_addressUtils(module, root_module):
    3.46 +    return
    3.47 +
    3.48  def register_functions_ns3_internal(module, root_module):
    3.49      return
    3.50  
     4.1 --- a/bindings/python/ns3_module_core.py	Thu May 28 21:38:06 2009 -0700
     4.2 +++ b/bindings/python/ns3_module_core.py	Thu May 28 21:38:49 2009 -0700
     4.3 @@ -1,4 +1,4 @@
     4.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     4.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     4.6  
     4.7  def register_types(module):
     4.8      root_module = module.get_root()
     4.9 @@ -186,6 +186,12 @@
    4.10      register_types_ns3_TimeStepPrecision(nested_module)
    4.11      
    4.12      
    4.13 +    ## Register a nested module for the namespace addressUtils
    4.14 +    
    4.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    4.16 +    register_types_ns3_addressUtils(nested_module)
    4.17 +    
    4.18 +    
    4.19      ## Register a nested module for the namespace internal
    4.20      
    4.21      nested_module = module.add_cpp_namespace('internal')
    4.22 @@ -209,6 +215,10 @@
    4.23      root_module = module.get_root()
    4.24      
    4.25  
    4.26 +def register_types_ns3_addressUtils(module):
    4.27 +    root_module = module.get_root()
    4.28 +    
    4.29 +
    4.30  def register_types_ns3_internal(module):
    4.31      root_module = module.get_root()
    4.32      
    4.33 @@ -1641,6 +1651,11 @@
    4.34                     'ns3::Object::AggregateIterator', 
    4.35                     [], 
    4.36                     is_const=True)
    4.37 +    ## object.h: void ns3::Object::NotifyNewAggregate() [member function]
    4.38 +    cls.add_method('NotifyNewAggregate', 
    4.39 +                   'void', 
    4.40 +                   [], 
    4.41 +                   visibility='protected', is_virtual=True)
    4.42      ## object.h: void ns3::Object::DoDispose() [member function]
    4.43      cls.add_method('DoDispose', 
    4.44                     'void', 
    4.45 @@ -2222,6 +2237,7 @@
    4.46                          template_parameters=['unsigned char'])
    4.47      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    4.48      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    4.49 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    4.50      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    4.51      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    4.52      return
    4.53 @@ -2288,6 +2304,9 @@
    4.54  def register_functions_ns3_TimeStepPrecision(module, root_module):
    4.55      return
    4.56  
    4.57 +def register_functions_ns3_addressUtils(module, root_module):
    4.58 +    return
    4.59 +
    4.60  def register_functions_ns3_internal(module, root_module):
    4.61      ## double.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::internal::MakeDoubleChecker(double min, double max, std::string name) [free function]
    4.62      module.add_function('MakeDoubleChecker', 
     5.1 --- a/bindings/python/ns3_module_csma.py	Thu May 28 21:38:06 2009 -0700
     5.2 +++ b/bindings/python/ns3_module_csma.py	Thu May 28 21:38:49 2009 -0700
     5.3 @@ -1,4 +1,4 @@
     5.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     5.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     5.6  
     5.7  def register_types(module):
     5.8      root_module = module.get_root()
     5.9 @@ -28,6 +28,12 @@
    5.10      register_types_ns3_TimeStepPrecision(nested_module)
    5.11      
    5.12      
    5.13 +    ## Register a nested module for the namespace addressUtils
    5.14 +    
    5.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    5.16 +    register_types_ns3_addressUtils(nested_module)
    5.17 +    
    5.18 +    
    5.19      ## Register a nested module for the namespace internal
    5.20      
    5.21      nested_module = module.add_cpp_namespace('internal')
    5.22 @@ -48,6 +54,10 @@
    5.23      root_module = module.get_root()
    5.24      
    5.25  
    5.26 +def register_types_ns3_addressUtils(module):
    5.27 +    root_module = module.get_root()
    5.28 +    
    5.29 +
    5.30  def register_types_ns3_internal(module):
    5.31      root_module = module.get_root()
    5.32      
    5.33 @@ -414,6 +424,7 @@
    5.34      module = root_module
    5.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    5.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    5.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    5.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    5.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    5.40      return
    5.41 @@ -424,6 +435,9 @@
    5.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
    5.43      return
    5.44  
    5.45 +def register_functions_ns3_addressUtils(module, root_module):
    5.46 +    return
    5.47 +
    5.48  def register_functions_ns3_internal(module, root_module):
    5.49      return
    5.50  
     6.1 --- a/bindings/python/ns3_module_emu.py	Thu May 28 21:38:06 2009 -0700
     6.2 +++ b/bindings/python/ns3_module_emu.py	Thu May 28 21:38:49 2009 -0700
     6.3 @@ -1,4 +1,4 @@
     6.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     6.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     6.6  
     6.7  def register_types(module):
     6.8      root_module = module.get_root()
     6.9 @@ -18,6 +18,12 @@
    6.10      register_types_ns3_TimeStepPrecision(nested_module)
    6.11      
    6.12      
    6.13 +    ## Register a nested module for the namespace addressUtils
    6.14 +    
    6.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    6.16 +    register_types_ns3_addressUtils(nested_module)
    6.17 +    
    6.18 +    
    6.19      ## Register a nested module for the namespace internal
    6.20      
    6.21      nested_module = module.add_cpp_namespace('internal')
    6.22 @@ -38,6 +44,10 @@
    6.23      root_module = module.get_root()
    6.24      
    6.25  
    6.26 +def register_types_ns3_addressUtils(module):
    6.27 +    root_module = module.get_root()
    6.28 +    
    6.29 +
    6.30  def register_types_ns3_internal(module):
    6.31      root_module = module.get_root()
    6.32      
    6.33 @@ -206,6 +216,7 @@
    6.34      module = root_module
    6.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    6.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    6.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    6.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    6.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    6.40      return
    6.41 @@ -216,6 +227,9 @@
    6.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
    6.43      return
    6.44  
    6.45 +def register_functions_ns3_addressUtils(module, root_module):
    6.46 +    return
    6.47 +
    6.48  def register_functions_ns3_internal(module, root_module):
    6.49      return
    6.50  
     7.1 --- a/bindings/python/ns3_module_global_routing.py	Thu May 28 21:38:06 2009 -0700
     7.2 +++ b/bindings/python/ns3_module_global_routing.py	Thu May 28 21:38:49 2009 -0700
     7.3 @@ -1,4 +1,4 @@
     7.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     7.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     7.6  
     7.7  def register_types(module):
     7.8      root_module = module.get_root()
     7.9 @@ -30,6 +30,12 @@
    7.10      register_types_ns3_TimeStepPrecision(nested_module)
    7.11      
    7.12      
    7.13 +    ## Register a nested module for the namespace addressUtils
    7.14 +    
    7.15 +    nested_module = module.add_cpp_namespace('addressUtils')
    7.16 +    register_types_ns3_addressUtils(nested_module)
    7.17 +    
    7.18 +    
    7.19      ## Register a nested module for the namespace internal
    7.20      
    7.21      nested_module = module.add_cpp_namespace('internal')
    7.22 @@ -50,6 +56,10 @@
    7.23      root_module = module.get_root()
    7.24      
    7.25  
    7.26 +def register_types_ns3_addressUtils(module):
    7.27 +    root_module = module.get_root()
    7.28 +    
    7.29 +
    7.30  def register_types_ns3_internal(module):
    7.31      root_module = module.get_root()
    7.32      
    7.33 @@ -287,6 +297,7 @@
    7.34      module = root_module
    7.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
    7.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
    7.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
    7.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
    7.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
    7.40      return
    7.41 @@ -297,6 +308,9 @@
    7.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
    7.43      return
    7.44  
    7.45 +def register_functions_ns3_addressUtils(module, root_module):
    7.46 +    return
    7.47 +
    7.48  def register_functions_ns3_internal(module, root_module):
    7.49      return
    7.50  
     8.1 --- a/bindings/python/ns3_module_helper.py	Thu May 28 21:38:06 2009 -0700
     8.2 +++ b/bindings/python/ns3_module_helper.py	Thu May 28 21:38:49 2009 -0700
     8.3 @@ -1,4 +1,4 @@
     8.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     8.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     8.6  
     8.7  def register_types(module):
     8.8      root_module = module.get_root()
     8.9 @@ -17,6 +17,8 @@
    8.10      module.add_class('Ipv4AddressHelper', allow_subclassing=False)
    8.11      ## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer [class]
    8.12      module.add_class('Ipv4InterfaceContainer')
    8.13 +    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper [class]
    8.14 +    module.add_class('Ipv4StaticRoutingHelper', allow_subclassing=False)
    8.15      ## mobility-helper.h: ns3::MobilityHelper [class]
    8.16      module.add_class('MobilityHelper', allow_subclassing=False)
    8.17      ## net-device-container.h: ns3::NetDeviceContainer [class]
    8.18 @@ -35,8 +37,6 @@
    8.19      module.add_class('PacketSocketHelper', allow_subclassing=False)
    8.20      ## point-to-point-helper.h: ns3::PointToPointHelper [class]
    8.21      module.add_class('PointToPointHelper', allow_subclassing=False)
    8.22 -    ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper [class]
    8.23 -    module.add_class('StaticMulticastRouteHelper', allow_subclassing=False)
    8.24      ## tap-bridge-helper.h: ns3::TapBridgeHelper [class]
    8.25      module.add_class('TapBridgeHelper', allow_subclassing=False)
    8.26      ## udp-echo-helper.h: ns3::UdpEchoClientHelper [class]
    8.27 @@ -72,6 +72,12 @@
    8.28      register_types_ns3_TimeStepPrecision(nested_module)
    8.29      
    8.30      
    8.31 +    ## Register a nested module for the namespace addressUtils
    8.32 +    
    8.33 +    nested_module = module.add_cpp_namespace('addressUtils')
    8.34 +    register_types_ns3_addressUtils(nested_module)
    8.35 +    
    8.36 +    
    8.37      ## Register a nested module for the namespace internal
    8.38      
    8.39      nested_module = module.add_cpp_namespace('internal')
    8.40 @@ -92,6 +98,10 @@
    8.41      root_module = module.get_root()
    8.42      
    8.43  
    8.44 +def register_types_ns3_addressUtils(module):
    8.45 +    root_module = module.get_root()
    8.46 +    
    8.47 +
    8.48  def register_types_ns3_internal(module):
    8.49      root_module = module.get_root()
    8.50      
    8.51 @@ -108,6 +118,7 @@
    8.52      register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])
    8.53      register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper'])
    8.54      register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer'])
    8.55 +    register_Ns3Ipv4StaticRoutingHelper_methods(root_module, root_module['ns3::Ipv4StaticRoutingHelper'])
    8.56      register_Ns3MobilityHelper_methods(root_module, root_module['ns3::MobilityHelper'])
    8.57      register_Ns3NetDeviceContainer_methods(root_module, root_module['ns3::NetDeviceContainer'])
    8.58      register_Ns3NodeContainer_methods(root_module, root_module['ns3::NodeContainer'])
    8.59 @@ -117,7 +128,6 @@
    8.60      register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper'])
    8.61      register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper'])
    8.62      register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper'])
    8.63 -    register_Ns3StaticMulticastRouteHelper_methods(root_module, root_module['ns3::StaticMulticastRouteHelper'])
    8.64      register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper'])
    8.65      register_Ns3UdpEchoClientHelper_methods(root_module, root_module['ns3::UdpEchoClientHelper'])
    8.66      register_Ns3UdpEchoServerHelper_methods(root_module, root_module['ns3::UdpEchoServerHelper'])
    8.67 @@ -423,10 +433,14 @@
    8.68                     'void', 
    8.69                     [param('ns3::NodeContainer', 'c')], 
    8.70                     is_const=True)
    8.71 -    ## internet-stack-helper.h: void ns3::InternetStackHelper::SetNscStack(std::string soname) [member function]
    8.72 -    cls.add_method('SetNscStack', 
    8.73 +    ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid) [member function]
    8.74 +    cls.add_method('SetTcp', 
    8.75                     'void', 
    8.76 -                   [param('std::string', 'soname')])
    8.77 +                   [param('std::string', 'tid')])
    8.78 +    ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid, std::string attr, ns3::AttributeValue const & val) [member function]
    8.79 +    cls.add_method('SetTcp', 
    8.80 +                   'void', 
    8.81 +                   [param('std::string', 'tid'), param('std::string', 'attr'), param('ns3::AttributeValue const &', 'val')])
    8.82      ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
    8.83      cls.add_method('EnableAscii', 
    8.84                     'void', 
    8.85 @@ -500,6 +514,50 @@
    8.86                     [param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
    8.87      return
    8.88  
    8.89 +def register_Ns3Ipv4StaticRoutingHelper_methods(root_module, cls):
    8.90 +    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper(ns3::Ipv4StaticRoutingHelper const & arg0) [copy constructor]
    8.91 +    cls.add_constructor([param('ns3::Ipv4StaticRoutingHelper const &', 'arg0')])
    8.92 +    ## ipv4-static-routing-helper.h: ns3::Ipv4StaticRoutingHelper::Ipv4StaticRoutingHelper() [constructor]
    8.93 +    cls.add_constructor([])
    8.94 +    ## ipv4-static-routing-helper.h: ns3::Ptr<ns3::Ipv4StaticRouting> ns3::Ipv4StaticRoutingHelper::GetStaticRouting(ns3::Ptr<ns3::Ipv4> ipv4) const [member function]
    8.95 +    cls.add_method('GetStaticRouting', 
    8.96 +                   'ns3::Ptr< ns3::Ipv4StaticRouting >', 
    8.97 +                   [param('ns3::Ptr< ns3::Ipv4 >', 'ipv4')], 
    8.98 +                   is_const=True)
    8.99 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr<ns3::NetDevice> input, ns3::NetDeviceContainer output) [member function]
   8.100 +    cls.add_method('AddMulticastRoute', 
   8.101 +                   'void', 
   8.102 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   8.103 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(std::string n, ns3::Ipv4Address source, ns3::Ipv4Address group, ns3::Ptr<ns3::NetDevice> input, ns3::NetDeviceContainer output) [member function]
   8.104 +    cls.add_method('AddMulticastRoute', 
   8.105 +                   'void', 
   8.106 +                   [param('std::string', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   8.107 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function]
   8.108 +    cls.add_method('AddMulticastRoute', 
   8.109 +                   'void', 
   8.110 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')])
   8.111 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::AddMulticastRoute(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group, std::string inputName, ns3::NetDeviceContainer output) [member function]
   8.112 +    cls.add_method('AddMulticastRoute', 
   8.113 +                   'void', 
   8.114 +                   [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')])
   8.115 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ptr<ns3::NetDevice> nd) [member function]
   8.116 +    cls.add_method('SetDefaultMulticastRoute', 
   8.117 +                   'void', 
   8.118 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   8.119 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, std::string ndName) [member function]
   8.120 +    cls.add_method('SetDefaultMulticastRoute', 
   8.121 +                   'void', 
   8.122 +                   [param('ns3::Ptr< ns3::Node >', 'n'), param('std::string', 'ndName')])
   8.123 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(std::string nName, ns3::Ptr<ns3::NetDevice> nd) [member function]
   8.124 +    cls.add_method('SetDefaultMulticastRoute', 
   8.125 +                   'void', 
   8.126 +                   [param('std::string', 'nName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   8.127 +    ## ipv4-static-routing-helper.h: void ns3::Ipv4StaticRoutingHelper::SetDefaultMulticastRoute(std::string nName, std::string ndName) [member function]
   8.128 +    cls.add_method('SetDefaultMulticastRoute', 
   8.129 +                   'void', 
   8.130 +                   [param('std::string', 'nName'), param('std::string', 'ndName')])
   8.131 +    return
   8.132 +
   8.133  def register_Ns3MobilityHelper_methods(root_module, cls):
   8.134      ## mobility-helper.h: ns3::MobilityHelper::MobilityHelper(ns3::MobilityHelper const & arg0) [copy constructor]
   8.135      cls.add_constructor([param('ns3::MobilityHelper const &', 'arg0')])
   8.136 @@ -885,53 +943,6 @@
   8.137                     [param('std::string', 'hubName'), param('ns3::NodeContainer', 'spokes'), param('ns3::NetDeviceContainer &', 'hubDevices'), param('ns3::NetDeviceContainer &', 'spokeDevices')])
   8.138      return
   8.139  
   8.140 -def register_Ns3StaticMulticastRouteHelper_methods(root_module, cls):
   8.141 -    ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper::StaticMulticastRouteHelper(ns3::StaticMulticastRouteHelper const & arg0) [copy constructor]
   8.142 -    cls.add_constructor([param('ns3::StaticMulticastRouteHelper const &', 'arg0')])
   8.143 -    ## static-multicast-route-helper.h: ns3::StaticMulticastRouteHelper::StaticMulticastRouteHelper() [constructor]
   8.144 -    cls.add_constructor([])
   8.145 -    ## 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]
   8.146 -    cls.add_method('AddMulticastRoute', 
   8.147 -                   'void', 
   8.148 -                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   8.149 -    ## 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]
   8.150 -    cls.add_method('AddMulticastRoute', 
   8.151 -                   'void', 
   8.152 -                   [param('std::string', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('ns3::Ptr< ns3::NetDevice >', 'input'), param('ns3::NetDeviceContainer', 'output')])
   8.153 -    ## 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]
   8.154 -    cls.add_method('AddMulticastRoute', 
   8.155 -                   'void', 
   8.156 -                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')])
   8.157 -    ## 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]
   8.158 -    cls.add_method('AddMulticastRoute', 
   8.159 -                   'void', 
   8.160 -                   [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group'), param('std::string', 'inputName'), param('ns3::NetDeviceContainer', 'output')])
   8.161 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, ns3::Ptr<ns3::NetDevice> nd) [member function]
   8.162 -    cls.add_method('SetDefaultMulticastRoute', 
   8.163 -                   'void', 
   8.164 -                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   8.165 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(ns3::Ptr<ns3::Node> n, std::string ndName) [member function]
   8.166 -    cls.add_method('SetDefaultMulticastRoute', 
   8.167 -                   'void', 
   8.168 -                   [param('ns3::Ptr< ns3::Node >', 'n'), param('std::string', 'ndName')])
   8.169 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(std::string nName, ns3::Ptr<ns3::NetDevice> nd) [member function]
   8.170 -    cls.add_method('SetDefaultMulticastRoute', 
   8.171 -                   'void', 
   8.172 -                   [param('std::string', 'nName'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
   8.173 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::SetDefaultMulticastRoute(std::string nName, std::string ndName) [member function]
   8.174 -    cls.add_method('SetDefaultMulticastRoute', 
   8.175 -                   'void', 
   8.176 -                   [param('std::string', 'nName'), param('std::string', 'ndName')])
   8.177 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(ns3::Ptr<ns3::Node> n, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function]
   8.178 -    cls.add_method('JoinMulticastGroup', 
   8.179 -                   'void', 
   8.180 -                   [param('ns3::Ptr< ns3::Node >', 'n'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')])
   8.181 -    ## static-multicast-route-helper.h: void ns3::StaticMulticastRouteHelper::JoinMulticastGroup(std::string nName, ns3::Ipv4Address source, ns3::Ipv4Address group) [member function]
   8.182 -    cls.add_method('JoinMulticastGroup', 
   8.183 -                   'void', 
   8.184 -                   [param('std::string', 'nName'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'group')])
   8.185 -    return
   8.186 -
   8.187  def register_Ns3TapBridgeHelper_methods(root_module, cls):
   8.188      ## tap-bridge-helper.h: ns3::TapBridgeHelper::TapBridgeHelper(ns3::TapBridgeHelper const & arg0) [copy constructor]
   8.189      cls.add_constructor([param('ns3::TapBridgeHelper const &', 'arg0')])
   8.190 @@ -1264,6 +1275,7 @@
   8.191      module = root_module
   8.192      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   8.193      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   8.194 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   8.195      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   8.196      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   8.197      return
   8.198 @@ -1274,6 +1286,9 @@
   8.199  def register_functions_ns3_TimeStepPrecision(module, root_module):
   8.200      return
   8.201  
   8.202 +def register_functions_ns3_addressUtils(module, root_module):
   8.203 +    return
   8.204 +
   8.205  def register_functions_ns3_internal(module, root_module):
   8.206      return
   8.207  
     9.1 --- a/bindings/python/ns3_module_internet_stack.py	Thu May 28 21:38:06 2009 -0700
     9.2 +++ b/bindings/python/ns3_module_internet_stack.py	Thu May 28 21:38:49 2009 -0700
     9.3 @@ -1,4 +1,4 @@
     9.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     9.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     9.6  
     9.7  def register_types(module):
     9.8      root_module = module.get_root()
     9.9 @@ -23,8 +23,12 @@
    9.10      module.add_enum('Flags_t', ['NONE', 'FIN', 'SYN', 'RST', 'PSH', 'ACK', 'URG'], outer_class=root_module['ns3::TcpHeader'])
    9.11      ## udp-header.h: ns3::UdpHeader [class]
    9.12      module.add_class('UdpHeader', parent=root_module['ns3::Header'])
    9.13 +    ## ipv4-static-routing-impl.h: ns3::Ipv4StaticRoutingImpl [class]
    9.14 +    module.add_class('Ipv4StaticRoutingImpl', parent=root_module['ns3::Ipv4StaticRouting'])
    9.15      ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting [class]
    9.16      module.add_class('Ipv4GlobalRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
    9.17 +    ## ipv4-list-routing-impl.h: ns3::Ipv4ListRoutingImpl [class]
    9.18 +    module.add_class('Ipv4ListRoutingImpl', parent=root_module['ns3::Ipv4ListRouting'])
    9.19      
    9.20      ## Register a nested module for the namespace Config
    9.21      
    9.22 @@ -38,6 +42,12 @@
    9.23      register_types_ns3_TimeStepPrecision(nested_module)
    9.24      
    9.25      
    9.26 +    ## Register a nested module for the namespace addressUtils
    9.27 +    
    9.28 +    nested_module = module.add_cpp_namespace('addressUtils')
    9.29 +    register_types_ns3_addressUtils(nested_module)
    9.30 +    
    9.31 +    
    9.32      ## Register a nested module for the namespace internal
    9.33      
    9.34      nested_module = module.add_cpp_namespace('internal')
    9.35 @@ -58,6 +68,10 @@
    9.36      root_module = module.get_root()
    9.37      
    9.38  
    9.39 +def register_types_ns3_addressUtils(module):
    9.40 +    root_module = module.get_root()
    9.41 +    
    9.42 +
    9.43  def register_types_ns3_internal(module):
    9.44      root_module = module.get_root()
    9.45      
    9.46 @@ -73,7 +87,9 @@
    9.47      register_Ns3Icmpv4TimeExceeded_methods(root_module, root_module['ns3::Icmpv4TimeExceeded'])
    9.48      register_Ns3TcpHeader_methods(root_module, root_module['ns3::TcpHeader'])
    9.49      register_Ns3UdpHeader_methods(root_module, root_module['ns3::UdpHeader'])
    9.50 +    register_Ns3Ipv4StaticRoutingImpl_methods(root_module, root_module['ns3::Ipv4StaticRoutingImpl'])
    9.51      register_Ns3Ipv4GlobalRouting_methods(root_module, root_module['ns3::Ipv4GlobalRouting'])
    9.52 +    register_Ns3Ipv4ListRoutingImpl_methods(root_module, root_module['ns3::Ipv4ListRoutingImpl'])
    9.53      return
    9.54  
    9.55  def register_Ns3Icmpv4DestinationUnreachable_methods(root_module, cls):
    9.56 @@ -508,6 +524,118 @@
    9.57                     is_const=True)
    9.58      return
    9.59  
    9.60 +def register_Ns3Ipv4StaticRoutingImpl_methods(root_module, cls):
    9.61 +    ## ipv4-static-routing-impl.h: ns3::Ipv4StaticRoutingImpl::Ipv4StaticRoutingImpl(ns3::Ipv4StaticRoutingImpl const & arg0) [copy constructor]
    9.62 +    cls.add_constructor([param('ns3::Ipv4StaticRoutingImpl const &', 'arg0')])
    9.63 +    ## ipv4-static-routing-impl.h: static ns3::TypeId ns3::Ipv4StaticRoutingImpl::GetTypeId() [member function]
    9.64 +    cls.add_method('GetTypeId', 
    9.65 +                   'ns3::TypeId', 
    9.66 +                   [], 
    9.67 +                   is_static=True)
    9.68 +    ## ipv4-static-routing-impl.h: ns3::Ipv4StaticRoutingImpl::Ipv4StaticRoutingImpl() [constructor]
    9.69 +    cls.add_constructor([])
    9.70 +    ## ipv4-static-routing-impl.h: ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4StaticRoutingImpl::RouteOutput(ns3::Ipv4Header const & header, uint32_t oif, ns3::Socket::SocketErrno & sockerr) [member function]
    9.71 +    cls.add_method('RouteOutput', 
    9.72 +                   'ns3::Ptr< ns3::Ipv4Route >', 
    9.73 +                   [param('ns3::Ipv4Header const &', 'header'), param('uint32_t', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
    9.74 +                   is_virtual=True)
    9.75 +    ## ipv4-static-routing-impl.h: bool ns3::Ipv4StaticRoutingImpl::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
    9.76 +    cls.add_method('RouteInput', 
    9.77 +                   'bool', 
    9.78 +                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
    9.79 +                   is_virtual=True)
    9.80 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
    9.81 +    cls.add_method('AddHostRouteTo', 
    9.82 +                   'void', 
    9.83 +                   [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
    9.84 +                   is_virtual=True)
    9.85 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
    9.86 +    cls.add_method('AddHostRouteTo', 
    9.87 +                   'void', 
    9.88 +                   [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], 
    9.89 +                   is_virtual=True)
    9.90 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
    9.91 +    cls.add_method('AddNetworkRouteTo', 
    9.92 +                   'void', 
    9.93 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
    9.94 +                   is_virtual=True)
    9.95 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
    9.96 +    cls.add_method('AddNetworkRouteTo', 
    9.97 +                   'void', 
    9.98 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')], 
    9.99 +                   is_virtual=True)
   9.100 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   9.101 +    cls.add_method('SetDefaultRoute', 
   9.102 +                   'void', 
   9.103 +                   [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
   9.104 +                   is_virtual=True)
   9.105 +    ## ipv4-static-routing-impl.h: uint32_t ns3::Ipv4StaticRoutingImpl::GetNRoutes() [member function]
   9.106 +    cls.add_method('GetNRoutes', 
   9.107 +                   'uint32_t', 
   9.108 +                   [], 
   9.109 +                   is_virtual=True)
   9.110 +    ## ipv4-static-routing-impl.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRoutingImpl::GetDefaultRoute() [member function]
   9.111 +    cls.add_method('GetDefaultRoute', 
   9.112 +                   'ns3::Ipv4RoutingTableEntry', 
   9.113 +                   [], 
   9.114 +                   is_virtual=True)
   9.115 +    ## ipv4-static-routing-impl.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRoutingImpl::GetRoute(uint32_t i) [member function]
   9.116 +    cls.add_method('GetRoute', 
   9.117 +                   'ns3::Ipv4RoutingTableEntry', 
   9.118 +                   [param('uint32_t', 'i')], 
   9.119 +                   is_virtual=True)
   9.120 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::RemoveRoute(uint32_t i) [member function]
   9.121 +    cls.add_method('RemoveRoute', 
   9.122 +                   'void', 
   9.123 +                   [param('uint32_t', 'i')], 
   9.124 +                   is_virtual=True)
   9.125 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
   9.126 +    cls.add_method('AddMulticastRoute', 
   9.127 +                   'void', 
   9.128 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], 
   9.129 +                   is_virtual=True)
   9.130 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::SetDefaultMulticastRoute(uint32_t outputInterface) [member function]
   9.131 +    cls.add_method('SetDefaultMulticastRoute', 
   9.132 +                   'void', 
   9.133 +                   [param('uint32_t', 'outputInterface')], 
   9.134 +                   is_virtual=True)
   9.135 +    ## ipv4-static-routing-impl.h: uint32_t ns3::Ipv4StaticRoutingImpl::GetNMulticastRoutes() const [member function]
   9.136 +    cls.add_method('GetNMulticastRoutes', 
   9.137 +                   'uint32_t', 
   9.138 +                   [], 
   9.139 +                   is_const=True, is_virtual=True)
   9.140 +    ## ipv4-static-routing-impl.h: ns3::Ipv4MulticastRoutingTableEntry ns3::Ipv4StaticRoutingImpl::GetMulticastRoute(uint32_t i) const [member function]
   9.141 +    cls.add_method('GetMulticastRoute', 
   9.142 +                   'ns3::Ipv4MulticastRoutingTableEntry', 
   9.143 +                   [param('uint32_t', 'i')], 
   9.144 +                   is_const=True, is_virtual=True)
   9.145 +    ## ipv4-static-routing-impl.h: bool ns3::Ipv4StaticRoutingImpl::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function]
   9.146 +    cls.add_method('RemoveMulticastRoute', 
   9.147 +                   'bool', 
   9.148 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')], 
   9.149 +                   is_virtual=True)
   9.150 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::RemoveMulticastRoute(uint32_t index) [member function]
   9.151 +    cls.add_method('RemoveMulticastRoute', 
   9.152 +                   'void', 
   9.153 +                   [param('uint32_t', 'index')], 
   9.154 +                   is_virtual=True)
   9.155 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   9.156 +    cls.add_method('SetNode', 
   9.157 +                   'void', 
   9.158 +                   [param('ns3::Ptr< ns3::Node >', 'node')], 
   9.159 +                   is_virtual=True)
   9.160 +    ## ipv4-static-routing-impl.h: ns3::Ptr<ns3::Node> ns3::Ipv4StaticRoutingImpl::GetNode() const [member function]
   9.161 +    cls.add_method('GetNode', 
   9.162 +                   'ns3::Ptr< ns3::Node >', 
   9.163 +                   [], 
   9.164 +                   is_const=True, is_virtual=True)
   9.165 +    ## ipv4-static-routing-impl.h: void ns3::Ipv4StaticRoutingImpl::DoDispose() [member function]
   9.166 +    cls.add_method('DoDispose', 
   9.167 +                   'void', 
   9.168 +                   [], 
   9.169 +                   visibility='protected', is_virtual=True)
   9.170 +    return
   9.171 +
   9.172  def register_Ns3Ipv4GlobalRouting_methods(root_module, cls):
   9.173      ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting::Ipv4GlobalRouting(ns3::Ipv4GlobalRouting const & arg0) [copy constructor]
   9.174      cls.add_constructor([param('ns3::Ipv4GlobalRouting const &', 'arg0')])
   9.175 @@ -518,15 +646,15 @@
   9.176                     is_static=True)
   9.177      ## ipv4-global-routing.h: ns3::Ipv4GlobalRouting::Ipv4GlobalRouting() [constructor]
   9.178      cls.add_constructor([])
   9.179 -    ## ipv4-global-routing.h: bool ns3::Ipv4GlobalRouting::RequestRoute(uint32_t interface, ns3::Ipv4Header const & ipHeader, ns3::Ptr<ns3::Packet> packet, ns3::Callback<void,bool,const ns3::Ipv4Route&,ns3::Ptr<ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> routeReply) [member function]
   9.180 -    cls.add_method('RequestRoute', 
   9.181 +    ## ipv4-global-routing.h: ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4GlobalRouting::RouteOutput(ns3::Ipv4Header const & header, uint32_t oif, ns3::Socket::SocketErrno & sockerr) [member function]
   9.182 +    cls.add_method('RouteOutput', 
   9.183 +                   'ns3::Ptr< ns3::Ipv4Route >', 
   9.184 +                   [param('ns3::Ipv4Header const &', 'header'), param('uint32_t', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
   9.185 +                   is_virtual=True)
   9.186 +    ## ipv4-global-routing.h: bool ns3::Ipv4GlobalRouting::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
   9.187 +    cls.add_method('RouteInput', 
   9.188                     'bool', 
   9.189 -                   [param('uint32_t', 'interface'), param('ns3::Ipv4Header const &', 'ipHeader'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, ns3::Ipv4Route const &, ns3::Ptr< ns3::Packet >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'routeReply')], 
   9.190 -                   is_virtual=True)
   9.191 -    ## ipv4-global-routing.h: bool ns3::Ipv4GlobalRouting::RequestInterface(ns3::Ipv4Address destination, uint32_t & interface) [member function]
   9.192 -    cls.add_method('RequestInterface', 
   9.193 -                   'bool', 
   9.194 -                   [param('ns3::Ipv4Address', 'destination'), param('uint32_t &', 'interface')], 
   9.195 +                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
   9.196                     is_virtual=True)
   9.197      ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
   9.198      cls.add_method('AddHostRouteTo', 
   9.199 @@ -548,14 +676,23 @@
   9.200      cls.add_method('GetNRoutes', 
   9.201                     'uint32_t', 
   9.202                     [])
   9.203 -    ## ipv4-global-routing.h: ns3::Ipv4Route * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) [member function]
   9.204 +    ## ipv4-global-routing.h: ns3::Ipv4RoutingTableEntry * ns3::Ipv4GlobalRouting::GetRoute(uint32_t i) [member function]
   9.205      cls.add_method('GetRoute', 
   9.206 -                   'ns3::Ipv4Route *', 
   9.207 +                   'ns3::Ipv4RoutingTableEntry *', 
   9.208                     [param('uint32_t', 'i')])
   9.209      ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::RemoveRoute(uint32_t i) [member function]
   9.210      cls.add_method('RemoveRoute', 
   9.211                     'void', 
   9.212                     [param('uint32_t', 'i')])
   9.213 +    ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   9.214 +    cls.add_method('SetNode', 
   9.215 +                   'void', 
   9.216 +                   [param('ns3::Ptr< ns3::Node >', 'node')])
   9.217 +    ## ipv4-global-routing.h: ns3::Ptr<ns3::Node> ns3::Ipv4GlobalRouting::GetNode() const [member function]
   9.218 +    cls.add_method('GetNode', 
   9.219 +                   'ns3::Ptr< ns3::Node >', 
   9.220 +                   [], 
   9.221 +                   is_const=True)
   9.222      ## ipv4-global-routing.h: void ns3::Ipv4GlobalRouting::DoDispose() [member function]
   9.223      cls.add_method('DoDispose', 
   9.224                     'void', 
   9.225 @@ -563,18 +700,67 @@
   9.226                     visibility='protected', is_virtual=True)
   9.227      return
   9.228  
   9.229 +def register_Ns3Ipv4ListRoutingImpl_methods(root_module, cls):
   9.230 +    ## ipv4-list-routing-impl.h: ns3::Ipv4ListRoutingImpl::Ipv4ListRoutingImpl(ns3::Ipv4ListRoutingImpl const & arg0) [copy constructor]
   9.231 +    cls.add_constructor([param('ns3::Ipv4ListRoutingImpl const &', 'arg0')])
   9.232 +    ## ipv4-list-routing-impl.h: static ns3::TypeId ns3::Ipv4ListRoutingImpl::GetTypeId() [member function]
   9.233 +    cls.add_method('GetTypeId', 
   9.234 +                   'ns3::TypeId', 
   9.235 +                   [], 
   9.236 +                   is_static=True)
   9.237 +    ## ipv4-list-routing-impl.h: ns3::Ipv4ListRoutingImpl::Ipv4ListRoutingImpl() [constructor]
   9.238 +    cls.add_constructor([])
   9.239 +    ## ipv4-list-routing-impl.h: ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4ListRoutingImpl::RouteOutput(ns3::Ipv4Header const & header, uint32_t oif, ns3::Socket::SocketErrno & sockerr) [member function]
   9.240 +    cls.add_method('RouteOutput', 
   9.241 +                   'ns3::Ptr< ns3::Ipv4Route >', 
   9.242 +                   [param('ns3::Ipv4Header const &', 'header'), param('uint32_t', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
   9.243 +                   is_virtual=True)
   9.244 +    ## ipv4-list-routing-impl.h: bool ns3::Ipv4ListRoutingImpl::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
   9.245 +    cls.add_method('RouteInput', 
   9.246 +                   'bool', 
   9.247 +                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
   9.248 +                   is_virtual=True)
   9.249 +    ## ipv4-list-routing-impl.h: void ns3::Ipv4ListRoutingImpl::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
   9.250 +    cls.add_method('AddRoutingProtocol', 
   9.251 +                   'void', 
   9.252 +                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
   9.253 +                   is_virtual=True)
   9.254 +    ## ipv4-list-routing-impl.h: uint32_t ns3::Ipv4ListRoutingImpl::GetNRoutingProtocols() const [member function]
   9.255 +    cls.add_method('GetNRoutingProtocols', 
   9.256 +                   'uint32_t', 
   9.257 +                   [], 
   9.258 +                   is_const=True, is_virtual=True)
   9.259 +    ## ipv4-list-routing-impl.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRoutingImpl::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function]
   9.260 +    cls.add_method('GetRoutingProtocol', 
   9.261 +                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
   9.262 +                   [param('uint32_t', 'index'), param('int16_t &', 'priority')], 
   9.263 +                   is_const=True, is_virtual=True)
   9.264 +    ## ipv4-list-routing-impl.h: ns3::Ptr<ns3::Ipv4StaticRouting> ns3::Ipv4ListRoutingImpl::GetStaticRouting() const [member function]
   9.265 +    cls.add_method('GetStaticRouting', 
   9.266 +                   'ns3::Ptr< ns3::Ipv4StaticRouting >', 
   9.267 +                   [], 
   9.268 +                   is_const=True, is_virtual=True)
   9.269 +    ## ipv4-list-routing-impl.h: void ns3::Ipv4ListRoutingImpl::SetNode(ns3::Ptr<ns3::Node> node) [member function]
   9.270 +    cls.add_method('SetNode', 
   9.271 +                   'void', 
   9.272 +                   [param('ns3::Ptr< ns3::Node >', 'node')])
   9.273 +    ## ipv4-list-routing-impl.h: ns3::Ptr<ns3::Node> ns3::Ipv4ListRoutingImpl::GetNode() const [member function]
   9.274 +    cls.add_method('GetNode', 
   9.275 +                   'ns3::Ptr< ns3::Node >', 
   9.276 +                   [], 
   9.277 +                   is_const=True)
   9.278 +    ## ipv4-list-routing-impl.h: void ns3::Ipv4ListRoutingImpl::DoDispose() [member function]
   9.279 +    cls.add_method('DoDispose', 
   9.280 +                   'void', 
   9.281 +                   [], 
   9.282 +                   visibility='protected', is_virtual=True)
   9.283 +    return
   9.284 +
   9.285  def register_functions(root_module):
   9.286      module = root_module
   9.287 -    ## internet-stack.h: extern void ns3::AddInternetStack(ns3::Ptr<ns3::Node> node) [free function]
   9.288 -    module.add_function('AddInternetStack', 
   9.289 -                        'void', 
   9.290 -                        [param('ns3::Ptr< ns3::Node >', 'node')])
   9.291 -    ## internet-stack.h: extern void ns3::AddNscInternetStack(ns3::Ptr<ns3::Node> node, std::string const & soname) [free function]
   9.292 -    module.add_function('AddNscInternetStack', 
   9.293 -                        'void', 
   9.294 -                        [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string const &', 'soname')])
   9.295      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   9.296      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   9.297 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   9.298      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   9.299      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   9.300      return
   9.301 @@ -585,6 +771,9 @@
   9.302  def register_functions_ns3_TimeStepPrecision(module, root_module):
   9.303      return
   9.304  
   9.305 +def register_functions_ns3_addressUtils(module, root_module):
   9.306 +    return
   9.307 +
   9.308  def register_functions_ns3_internal(module, root_module):
   9.309      return
   9.310  
    10.1 --- a/bindings/python/ns3_module_mobility.py	Thu May 28 21:38:06 2009 -0700
    10.2 +++ b/bindings/python/ns3_module_mobility.py	Thu May 28 21:38:49 2009 -0700
    10.3 @@ -1,4 +1,4 @@
    10.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    10.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    10.6  
    10.7  def register_types(module):
    10.8      root_module = module.get_root()
    10.9 @@ -62,6 +62,12 @@
   10.10      register_types_ns3_TimeStepPrecision(nested_module)
   10.11      
   10.12      
   10.13 +    ## Register a nested module for the namespace addressUtils
   10.14 +    
   10.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   10.16 +    register_types_ns3_addressUtils(nested_module)
   10.17 +    
   10.18 +    
   10.19      ## Register a nested module for the namespace internal
   10.20      
   10.21      nested_module = module.add_cpp_namespace('internal')
   10.22 @@ -82,6 +88,10 @@
   10.23      root_module = module.get_root()
   10.24      
   10.25  
   10.26 +def register_types_ns3_addressUtils(module):
   10.27 +    root_module = module.get_root()
   10.28 +    
   10.29 +
   10.30  def register_types_ns3_internal(module):
   10.31      root_module = module.get_root()
   10.32      
   10.33 @@ -748,6 +758,7 @@
   10.34                          [])
   10.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   10.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   10.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   10.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   10.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   10.40      return
   10.41 @@ -758,6 +769,9 @@
   10.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   10.43      return
   10.44  
   10.45 +def register_functions_ns3_addressUtils(module, root_module):
   10.46 +    return
   10.47 +
   10.48  def register_functions_ns3_internal(module, root_module):
   10.49      return
   10.50  
    11.1 --- a/bindings/python/ns3_module_node.py	Thu May 28 21:38:06 2009 -0700
    11.2 +++ b/bindings/python/ns3_module_node.py	Thu May 28 21:38:49 2009 -0700
    11.3 @@ -1,4 +1,4 @@
    11.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    11.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    11.6  
    11.7  def register_types(module):
    11.8      root_module = module.get_root()
    11.9 @@ -29,10 +29,10 @@
   11.10      module.add_enum('InterfaceAddressScope_e', ['HOST', 'LINK', 'GLOBAL'], outer_class=root_module['ns3::Ipv4InterfaceAddress'])
   11.11      ## ipv4-address.h: ns3::Ipv4Mask [class]
   11.12      module.add_class('Ipv4Mask')
   11.13 -    ## ipv4-route.h: ns3::Ipv4MulticastRoute [class]
   11.14 -    module.add_class('Ipv4MulticastRoute')
   11.15 -    ## ipv4-route.h: ns3::Ipv4Route [class]
   11.16 -    module.add_class('Ipv4Route')
   11.17 +    ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry [class]
   11.18 +    module.add_class('Ipv4MulticastRoutingTableEntry')
   11.19 +    ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry [class]
   11.20 +    module.add_class('Ipv4RoutingTableEntry')
   11.21      ## ipv6-address.h: ns3::Ipv6Address [class]
   11.22      module.add_class('Ipv6Address')
   11.23      ## ipv6-address.h: ns3::Ipv6Address [class]
   11.24 @@ -63,6 +63,10 @@
   11.25      module.add_class('Ipv4MaskChecker', parent=root_module['ns3::AttributeChecker'])
   11.26      ## ipv4-address.h: ns3::Ipv4MaskValue [class]
   11.27      module.add_class('Ipv4MaskValue', parent=root_module['ns3::AttributeValue'])
   11.28 +    ## ipv4-route.h: ns3::Ipv4MulticastRoute [class]
   11.29 +    module.add_class('Ipv4MulticastRoute', parent=root_module['ns3::RefCountBase'])
   11.30 +    ## ipv4-route.h: ns3::Ipv4Route [class]
   11.31 +    module.add_class('Ipv4Route', parent=root_module['ns3::RefCountBase'])
   11.32      ## ipv6-address.h: ns3::Ipv6AddressChecker [class]
   11.33      module.add_class('Ipv6AddressChecker', parent=root_module['ns3::AttributeChecker'])
   11.34      ## ipv6-address.h: ns3::Ipv6AddressValue [class]
   11.35 @@ -123,8 +127,10 @@
   11.36      module.add_class('Ipv4', parent=root_module['ns3::Object'])
   11.37      ## ipv4-raw-socket-factory.h: ns3::Ipv4RawSocketFactory [class]
   11.38      module.add_class('Ipv4RawSocketFactory', parent=root_module['ns3::SocketFactory'])
   11.39 -    ## ipv4.h: ns3::Ipv4RoutingProtocol [class]
   11.40 +    ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol [class]
   11.41      module.add_class('Ipv4RoutingProtocol', parent=root_module['ns3::Object'])
   11.42 +    ## ipv4-static-routing.h: ns3::Ipv4StaticRouting [class]
   11.43 +    module.add_class('Ipv4StaticRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
   11.44      ## net-device.h: ns3::NetDevice [class]
   11.45      module.add_class('NetDevice', parent=root_module['ns3::Object'])
   11.46      ## net-device.h: ns3::NetDevice::PacketType [enumeration]
   11.47 @@ -137,6 +143,8 @@
   11.48      module.add_class('SimpleChannel', parent=root_module['ns3::Channel'])
   11.49      ## simple-net-device.h: ns3::SimpleNetDevice [class]
   11.50      module.add_class('SimpleNetDevice', parent=root_module['ns3::NetDevice'])
   11.51 +    ## ipv4-list-routing.h: ns3::Ipv4ListRouting [class]
   11.52 +    module.add_class('Ipv4ListRouting', parent=root_module['ns3::Ipv4RoutingProtocol'])
   11.53      module.add_container('ns3::olsr::MprSet', 'ns3::Ipv4Address', container_type='set')
   11.54      module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector')
   11.55      
   11.56 @@ -152,6 +160,12 @@
   11.57      register_types_ns3_TimeStepPrecision(nested_module)
   11.58      
   11.59      
   11.60 +    ## Register a nested module for the namespace addressUtils
   11.61 +    
   11.62 +    nested_module = module.add_cpp_namespace('addressUtils')
   11.63 +    register_types_ns3_addressUtils(nested_module)
   11.64 +    
   11.65 +    
   11.66      ## Register a nested module for the namespace internal
   11.67      
   11.68      nested_module = module.add_cpp_namespace('internal')
   11.69 @@ -172,6 +186,10 @@
   11.70      root_module = module.get_root()
   11.71      
   11.72  
   11.73 +def register_types_ns3_addressUtils(module):
   11.74 +    root_module = module.get_root()
   11.75 +    
   11.76 +
   11.77  def register_types_ns3_internal(module):
   11.78      root_module = module.get_root()
   11.79      
   11.80 @@ -188,8 +206,8 @@
   11.81      register_Ns3Ipv4AddressGenerator_methods(root_module, root_module['ns3::Ipv4AddressGenerator'])
   11.82      register_Ns3Ipv4InterfaceAddress_methods(root_module, root_module['ns3::Ipv4InterfaceAddress'])
   11.83      register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask'])
   11.84 -    register_Ns3Ipv4MulticastRoute_methods(root_module, root_module['ns3::Ipv4MulticastRoute'])
   11.85 -    register_Ns3Ipv4Route_methods(root_module, root_module['ns3::Ipv4Route'])
   11.86 +    register_Ns3Ipv4MulticastRoutingTableEntry_methods(root_module, root_module['ns3::Ipv4MulticastRoutingTableEntry'])
   11.87 +    register_Ns3Ipv4RoutingTableEntry_methods(root_module, root_module['ns3::Ipv4RoutingTableEntry'])
   11.88      register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address'])
   11.89      register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix'])
   11.90      register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address'])
   11.91 @@ -201,6 +219,8 @@
   11.92      register_Ns3Ipv4Header_methods(root_module, root_module['ns3::Ipv4Header'])
   11.93      register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker'])
   11.94      register_Ns3Ipv4MaskValue_methods(root_module, root_module['ns3::Ipv4MaskValue'])
   11.95 +    register_Ns3Ipv4MulticastRoute_methods(root_module, root_module['ns3::Ipv4MulticastRoute'])
   11.96 +    register_Ns3Ipv4Route_methods(root_module, root_module['ns3::Ipv4Route'])
   11.97      register_Ns3Ipv6AddressChecker_methods(root_module, root_module['ns3::Ipv6AddressChecker'])
   11.98      register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue'])
   11.99      register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header'])
  11.100 @@ -229,11 +249,13 @@
  11.101      register_Ns3Ipv4_methods(root_module, root_module['ns3::Ipv4'])
  11.102      register_Ns3Ipv4RawSocketFactory_methods(root_module, root_module['ns3::Ipv4RawSocketFactory'])
  11.103      register_Ns3Ipv4RoutingProtocol_methods(root_module, root_module['ns3::Ipv4RoutingProtocol'])
  11.104 +    register_Ns3Ipv4StaticRouting_methods(root_module, root_module['ns3::Ipv4StaticRouting'])
  11.105      register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice'])
  11.106      register_Ns3Node_methods(root_module, root_module['ns3::Node'])
  11.107      register_Ns3PacketSocketFactory_methods(root_module, root_module['ns3::PacketSocketFactory'])
  11.108      register_Ns3SimpleChannel_methods(root_module, root_module['ns3::SimpleChannel'])
  11.109      register_Ns3SimpleNetDevice_methods(root_module, root_module['ns3::SimpleNetDevice'])
  11.110 +    register_Ns3Ipv4ListRouting_methods(root_module, root_module['ns3::Ipv4ListRouting'])
  11.111      return
  11.112  
  11.113  def register_Ns3Address_methods(root_module, cls):
  11.114 @@ -664,125 +686,125 @@
  11.115                     [param('uint32_t', 'mask')])
  11.116      return
  11.117  
  11.118 -def register_Ns3Ipv4MulticastRoute_methods(root_module, cls):
  11.119 +def register_Ns3Ipv4MulticastRoutingTableEntry_methods(root_module, cls):
  11.120      cls.add_output_stream_operator()
  11.121 -    ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute() [constructor]
  11.122 +    ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry::Ipv4MulticastRoutingTableEntry() [constructor]
  11.123      cls.add_constructor([])
  11.124 -    ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute(ns3::Ipv4MulticastRoute const & route) [copy constructor]
  11.125 -    cls.add_constructor([param('ns3::Ipv4MulticastRoute const &', 'route')])
  11.126 -    ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute(ns3::Ipv4MulticastRoute const * route) [constructor]
  11.127 -    cls.add_constructor([param('ns3::Ipv4MulticastRoute const *', 'route')])
  11.128 -    ## ipv4-route.h: static ns3::Ipv4MulticastRoute ns3::Ipv4MulticastRoute::CreateMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
  11.129 +    ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry::Ipv4MulticastRoutingTableEntry(ns3::Ipv4MulticastRoutingTableEntry const & route) [copy constructor]
  11.130 +    cls.add_constructor([param('ns3::Ipv4MulticastRoutingTableEntry const &', 'route')])
  11.131 +    ## ipv4-routing-table-entry.h: ns3::Ipv4MulticastRoutingTableEntry::Ipv4MulticastRoutingTableEntry(ns3::Ipv4MulticastRoutingTableEntry const * route) [constructor]
  11.132 +    cls.add_constructor([param('ns3::Ipv4MulticastRoutingTableEntry const *', 'route')])
  11.133 +    ## ipv4-routing-table-entry.h: static ns3::Ipv4MulticastRoutingTableEntry ns3::Ipv4MulticastRoutingTableEntry::CreateMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
  11.134      cls.add_method('CreateMulticastRoute', 
  11.135 -                   'ns3::Ipv4MulticastRoute', 
  11.136 +                   'ns3::Ipv4MulticastRoutingTableEntry', 
  11.137                     [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], 
  11.138                     is_static=True)
  11.139 -    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetGroup() const [member function]
  11.140 +    ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4MulticastRoutingTableEntry::GetGroup() const [member function]
  11.141      cls.add_method('GetGroup', 
  11.142                     'ns3::Ipv4Address', 
  11.143                     [], 
  11.144                     is_const=True)
  11.145 -    ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetInputInterface() const [member function]
  11.146 +    ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4MulticastRoutingTableEntry::GetInputInterface() const [member function]
  11.147      cls.add_method('GetInputInterface', 
  11.148                     'uint32_t', 
  11.149                     [], 
  11.150                     is_const=True)
  11.151 -    ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetNOutputInterfaces() const [member function]
  11.152 +    ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4MulticastRoutingTableEntry::GetNOutputInterfaces() const [member function]
  11.153      cls.add_method('GetNOutputInterfaces', 
  11.154                     'uint32_t', 
  11.155                     [], 
  11.156                     is_const=True)
  11.157 -    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetOrigin() const [member function]
  11.158 +    ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4MulticastRoutingTableEntry::GetOrigin() const [member function]
  11.159      cls.add_method('GetOrigin', 
  11.160                     'ns3::Ipv4Address', 
  11.161                     [], 
  11.162                     is_const=True)
  11.163 -    ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetOutputInterface(uint32_t n) const [member function]
  11.164 +    ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4MulticastRoutingTableEntry::GetOutputInterface(uint32_t n) const [member function]
  11.165      cls.add_method('GetOutputInterface', 
  11.166                     'uint32_t', 
  11.167                     [param('uint32_t', 'n')], 
  11.168                     is_const=True)
  11.169 -    ## ipv4-route.h: std::vector<unsigned int, std::allocator<unsigned int> > ns3::Ipv4MulticastRoute::GetOutputInterfaces() const [member function]
  11.170 +    ## ipv4-routing-table-entry.h: std::vector<unsigned int, std::allocator<unsigned int> > ns3::Ipv4MulticastRoutingTableEntry::GetOutputInterfaces() const [member function]
  11.171      cls.add_method('GetOutputInterfaces', 
  11.172                     'std::vector< unsigned int >', 
  11.173                     [], 
  11.174                     is_const=True)
  11.175      return
  11.176  
  11.177 -def register_Ns3Ipv4Route_methods(root_module, cls):
  11.178 +def register_Ns3Ipv4RoutingTableEntry_methods(root_module, cls):
  11.179      cls.add_output_stream_operator()
  11.180 -    ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route() [constructor]
  11.181 +    ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry::Ipv4RoutingTableEntry() [constructor]
  11.182      cls.add_constructor([])
  11.183 -    ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const & route) [copy constructor]
  11.184 -    cls.add_constructor([param('ns3::Ipv4Route const &', 'route')])
  11.185 -    ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const * route) [constructor]
  11.186 -    cls.add_constructor([param('ns3::Ipv4Route const *', 'route')])
  11.187 -    ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.188 +    ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry::Ipv4RoutingTableEntry(ns3::Ipv4RoutingTableEntry const & route) [copy constructor]
  11.189 +    cls.add_constructor([param('ns3::Ipv4RoutingTableEntry const &', 'route')])
  11.190 +    ## ipv4-routing-table-entry.h: ns3::Ipv4RoutingTableEntry::Ipv4RoutingTableEntry(ns3::Ipv4RoutingTableEntry const * route) [constructor]
  11.191 +    cls.add_constructor([param('ns3::Ipv4RoutingTableEntry const *', 'route')])
  11.192 +    ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.193      cls.add_method('CreateDefaultRoute', 
  11.194 -                   'ns3::Ipv4Route', 
  11.195 +                   'ns3::Ipv4RoutingTableEntry', 
  11.196                     [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.197                     is_static=True)
  11.198 -    ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.199 +    ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.200      cls.add_method('CreateHostRouteTo', 
  11.201 -                   'ns3::Ipv4Route', 
  11.202 +                   'ns3::Ipv4RoutingTableEntry', 
  11.203                     [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.204                     is_static=True)
  11.205 -    ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
  11.206 +    ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
  11.207      cls.add_method('CreateHostRouteTo', 
  11.208 -                   'ns3::Ipv4Route', 
  11.209 +                   'ns3::Ipv4RoutingTableEntry', 
  11.210                     [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], 
  11.211                     is_static=True)
  11.212 -    ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.213 +    ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.214      cls.add_method('CreateNetworkRouteTo', 
  11.215 -                   'ns3::Ipv4Route', 
  11.216 +                   'ns3::Ipv4RoutingTableEntry', 
  11.217                     [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.218                     is_static=True)
  11.219 -    ## ipv4-route.h: static ns3::Ipv4Route ns3::Ipv4Route::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
  11.220 +    ## ipv4-routing-table-entry.h: static ns3::Ipv4RoutingTableEntry ns3::Ipv4RoutingTableEntry::CreateNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
  11.221      cls.add_method('CreateNetworkRouteTo', 
  11.222 -                   'ns3::Ipv4Route', 
  11.223 +                   'ns3::Ipv4RoutingTableEntry', 
  11.224                     [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')], 
  11.225                     is_static=True)
  11.226 -    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetDest() const [member function]
  11.227 +    ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4RoutingTableEntry::GetDest() const [member function]
  11.228      cls.add_method('GetDest', 
  11.229                     'ns3::Ipv4Address', 
  11.230                     [], 
  11.231                     is_const=True)
  11.232 -    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetDestNetwork() const [member function]
  11.233 +    ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4RoutingTableEntry::GetDestNetwork() const [member function]
  11.234      cls.add_method('GetDestNetwork', 
  11.235                     'ns3::Ipv4Address', 
  11.236                     [], 
  11.237                     is_const=True)
  11.238 -    ## ipv4-route.h: ns3::Ipv4Mask ns3::Ipv4Route::GetDestNetworkMask() const [member function]
  11.239 +    ## ipv4-routing-table-entry.h: ns3::Ipv4Mask ns3::Ipv4RoutingTableEntry::GetDestNetworkMask() const [member function]
  11.240      cls.add_method('GetDestNetworkMask', 
  11.241                     'ns3::Ipv4Mask', 
  11.242                     [], 
  11.243                     is_const=True)
  11.244 -    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetGateway() const [member function]
  11.245 +    ## ipv4-routing-table-entry.h: ns3::Ipv4Address ns3::Ipv4RoutingTableEntry::GetGateway() const [member function]
  11.246      cls.add_method('GetGateway', 
  11.247                     'ns3::Ipv4Address', 
  11.248                     [], 
  11.249                     is_const=True)
  11.250 -    ## ipv4-route.h: uint32_t ns3::Ipv4Route::GetInterface() const [member function]
  11.251 +    ## ipv4-routing-table-entry.h: uint32_t ns3::Ipv4RoutingTableEntry::GetInterface() const [member function]
  11.252      cls.add_method('GetInterface', 
  11.253                     'uint32_t', 
  11.254                     [], 
  11.255                     is_const=True)
  11.256 -    ## ipv4-route.h: bool ns3::Ipv4Route::IsDefault() const [member function]
  11.257 +    ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsDefault() const [member function]
  11.258      cls.add_method('IsDefault', 
  11.259                     'bool', 
  11.260                     [], 
  11.261                     is_const=True)
  11.262 -    ## ipv4-route.h: bool ns3::Ipv4Route::IsGateway() const [member function]
  11.263 +    ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsGateway() const [member function]
  11.264      cls.add_method('IsGateway', 
  11.265                     'bool', 
  11.266                     [], 
  11.267                     is_const=True)
  11.268 -    ## ipv4-route.h: bool ns3::Ipv4Route::IsHost() const [member function]
  11.269 +    ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsHost() const [member function]
  11.270      cls.add_method('IsHost', 
  11.271                     'bool', 
  11.272                     [], 
  11.273                     is_const=True)
  11.274 -    ## ipv4-route.h: bool ns3::Ipv4Route::IsNetwork() const [member function]
  11.275 +    ## ipv4-routing-table-entry.h: bool ns3::Ipv4RoutingTableEntry::IsNetwork() const [member function]
  11.276      cls.add_method('IsNetwork', 
  11.277                     'bool', 
  11.278                     [], 
  11.279 @@ -1403,6 +1425,97 @@
  11.280                     is_virtual=True)
  11.281      return
  11.282  
  11.283 +def register_Ns3Ipv4MulticastRoute_methods(root_module, cls):
  11.284 +    ## ipv4-route.h: ns3::Ipv4MulticastRoute::MAX_INTERFACES [variable]
  11.285 +    cls.add_static_attribute('MAX_INTERFACES', 'uint32_t const', is_const=True)
  11.286 +    ## ipv4-route.h: ns3::Ipv4MulticastRoute::MAX_TTL [variable]
  11.287 +    cls.add_static_attribute('MAX_TTL', 'uint32_t const', is_const=True)
  11.288 +    ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute(ns3::Ipv4MulticastRoute const & arg0) [copy constructor]
  11.289 +    cls.add_constructor([param('ns3::Ipv4MulticastRoute const &', 'arg0')])
  11.290 +    ## ipv4-route.h: ns3::Ipv4MulticastRoute::Ipv4MulticastRoute() [constructor]
  11.291 +    cls.add_constructor([])
  11.292 +    ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetGroup(ns3::Ipv4Address const group) [member function]
  11.293 +    cls.add_method('SetGroup', 
  11.294 +                   'void', 
  11.295 +                   [param('ns3::Ipv4Address const', 'group')])
  11.296 +    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetGroup() const [member function]
  11.297 +    cls.add_method('GetGroup', 
  11.298 +                   'ns3::Ipv4Address', 
  11.299 +                   [], 
  11.300 +                   is_const=True)
  11.301 +    ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetOrigin(ns3::Ipv4Address const group) [member function]
  11.302 +    cls.add_method('SetOrigin', 
  11.303 +                   'void', 
  11.304 +                   [param('ns3::Ipv4Address const', 'group')])
  11.305 +    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4MulticastRoute::GetOrigin() const [member function]
  11.306 +    cls.add_method('GetOrigin', 
  11.307 +                   'ns3::Ipv4Address', 
  11.308 +                   [], 
  11.309 +                   is_const=True)
  11.310 +    ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetParent(uint32_t iif) [member function]
  11.311 +    cls.add_method('SetParent', 
  11.312 +                   'void', 
  11.313 +                   [param('uint32_t', 'iif')])
  11.314 +    ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function]
  11.315 +    cls.add_method('GetParent', 
  11.316 +                   'uint32_t', 
  11.317 +                   [], 
  11.318 +                   is_const=True)
  11.319 +    ## ipv4-route.h: void ns3::Ipv4MulticastRoute::SetOutputTtl(uint32_t oif, uint32_t ttl) [member function]
  11.320 +    cls.add_method('SetOutputTtl', 
  11.321 +                   'void', 
  11.322 +                   [param('uint32_t', 'oif'), param('uint32_t', 'ttl')])
  11.323 +    ## ipv4-route.h: uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function]
  11.324 +    cls.add_method('GetOutputTtl', 
  11.325 +                   'uint32_t', 
  11.326 +                   [param('uint32_t', 'oif')], 
  11.327 +                   is_const=True)
  11.328 +    return
  11.329 +
  11.330 +def register_Ns3Ipv4Route_methods(root_module, cls):
  11.331 +    cls.add_output_stream_operator()
  11.332 +    ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route(ns3::Ipv4Route const & arg0) [copy constructor]
  11.333 +    cls.add_constructor([param('ns3::Ipv4Route const &', 'arg0')])
  11.334 +    ## ipv4-route.h: ns3::Ipv4Route::Ipv4Route() [constructor]
  11.335 +    cls.add_constructor([])
  11.336 +    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetDestination() const [member function]
  11.337 +    cls.add_method('GetDestination', 
  11.338 +                   'ns3::Ipv4Address', 
  11.339 +                   [], 
  11.340 +                   is_const=True)
  11.341 +    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetGateway() const [member function]
  11.342 +    cls.add_method('GetGateway', 
  11.343 +                   'ns3::Ipv4Address', 
  11.344 +                   [], 
  11.345 +                   is_const=True)
  11.346 +    ## ipv4-route.h: ns3::Ptr<ns3::NetDevice> ns3::Ipv4Route::GetOutputDevice() const [member function]
  11.347 +    cls.add_method('GetOutputDevice', 
  11.348 +                   'ns3::Ptr< ns3::NetDevice >', 
  11.349 +                   [], 
  11.350 +                   is_const=True)
  11.351 +    ## ipv4-route.h: ns3::Ipv4Address ns3::Ipv4Route::GetSource() const [member function]
  11.352 +    cls.add_method('GetSource', 
  11.353 +                   'ns3::Ipv4Address', 
  11.354 +                   [], 
  11.355 +                   is_const=True)
  11.356 +    ## ipv4-route.h: void ns3::Ipv4Route::SetDestination(ns3::Ipv4Address dest) [member function]
  11.357 +    cls.add_method('SetDestination', 
  11.358 +                   'void', 
  11.359 +                   [param('ns3::Ipv4Address', 'dest')])
  11.360 +    ## ipv4-route.h: void ns3::Ipv4Route::SetGateway(ns3::Ipv4Address gw) [member function]
  11.361 +    cls.add_method('SetGateway', 
  11.362 +                   'void', 
  11.363 +                   [param('ns3::Ipv4Address', 'gw')])
  11.364 +    ## ipv4-route.h: void ns3::Ipv4Route::SetOutputDevice(ns3::Ptr<ns3::NetDevice> outputDevice) [member function]
  11.365 +    cls.add_method('SetOutputDevice', 
  11.366 +                   'void', 
  11.367 +                   [param('ns3::Ptr< ns3::NetDevice >', 'outputDevice')])
  11.368 +    ## ipv4-route.h: void ns3::Ipv4Route::SetSource(ns3::Ipv4Address src) [member function]
  11.369 +    cls.add_method('SetSource', 
  11.370 +                   'void', 
  11.371 +                   [param('ns3::Ipv4Address', 'src')])
  11.372 +    return
  11.373 +
  11.374  def register_Ns3Ipv6AddressChecker_methods(root_module, cls):
  11.375      ## ipv6-address.h: ns3::Ipv6AddressChecker::Ipv6AddressChecker(ns3::Ipv6AddressChecker const & arg0) [copy constructor]
  11.376      cls.add_constructor([param('ns3::Ipv6AddressChecker const &', 'arg0')])
  11.377 @@ -2219,6 +2332,16 @@
  11.378                     is_static=True)
  11.379      ## udp-socket.h: ns3::UdpSocket::UdpSocket() [constructor]
  11.380      cls.add_constructor([])
  11.381 +    ## udp-socket.h: int ns3::UdpSocket::MulticastJoinGroup(uint32_t interface, ns3::Address const & groupAddress) [member function]
  11.382 +    cls.add_method('MulticastJoinGroup', 
  11.383 +                   'int', 
  11.384 +                   [param('uint32_t', 'interface'), param('ns3::Address const &', 'groupAddress')], 
  11.385 +                   is_pure_virtual=True, is_virtual=True)
  11.386 +    ## udp-socket.h: int ns3::UdpSocket::MulticastLeaveGroup(uint32_t interface, ns3::Address const & groupAddress) [member function]
  11.387 +    cls.add_method('MulticastLeaveGroup', 
  11.388 +                   'int', 
  11.389 +                   [param('uint32_t', 'interface'), param('ns3::Address const &', 'groupAddress')], 
  11.390 +                   is_pure_virtual=True, is_virtual=True)
  11.391      ## udp-socket.h: void ns3::UdpSocket::SetRcvBufSize(uint32_t size) [member function]
  11.392      cls.add_method('SetRcvBufSize', 
  11.393                     'void', 
  11.394 @@ -2229,24 +2352,44 @@
  11.395                     'uint32_t', 
  11.396                     [], 
  11.397                     is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  11.398 -    ## udp-socket.h: void ns3::UdpSocket::SetIpTtl(uint32_t ipTtl) [member function]
  11.399 +    ## udp-socket.h: void ns3::UdpSocket::SetIpTtl(uint8_t ipTtl) [member function]
  11.400      cls.add_method('SetIpTtl', 
  11.401                     'void', 
  11.402 -                   [param('uint32_t', 'ipTtl')], 
  11.403 +                   [param('uint8_t', 'ipTtl')], 
  11.404                     is_pure_virtual=True, visibility='private', is_virtual=True)
  11.405 -    ## udp-socket.h: uint32_t ns3::UdpSocket::GetIpTtl() const [member function]
  11.406 +    ## udp-socket.h: uint8_t ns3::UdpSocket::GetIpTtl() const [member function]
  11.407      cls.add_method('GetIpTtl', 
  11.408 -                   'uint32_t', 
  11.409 +                   'uint8_t', 
  11.410                     [], 
  11.411                     is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  11.412 -    ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastTtl(uint32_t ipTtl) [member function]
  11.413 +    ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastTtl(uint8_t ipTtl) [member function]
  11.414      cls.add_method('SetIpMulticastTtl', 
  11.415                     'void', 
  11.416 -                   [param('uint32_t', 'ipTtl')], 
  11.417 +                   [param('uint8_t', 'ipTtl')], 
  11.418                     is_pure_virtual=True, visibility='private', is_virtual=True)
  11.419 -    ## udp-socket.h: uint32_t ns3::UdpSocket::GetIpMulticastTtl() const [member function]
  11.420 +    ## udp-socket.h: uint8_t ns3::UdpSocket::GetIpMulticastTtl() const [member function]
  11.421      cls.add_method('GetIpMulticastTtl', 
  11.422 -                   'uint32_t', 
  11.423 +                   'uint8_t', 
  11.424 +                   [], 
  11.425 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  11.426 +    ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastIf(int32_t ipIf) [member function]
  11.427 +    cls.add_method('SetIpMulticastIf', 
  11.428 +                   'void', 
  11.429 +                   [param('int32_t', 'ipIf')], 
  11.430 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
  11.431 +    ## udp-socket.h: int32_t ns3::UdpSocket::GetIpMulticastIf() const [member function]
  11.432 +    cls.add_method('GetIpMulticastIf', 
  11.433 +                   'int32_t', 
  11.434 +                   [], 
  11.435 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  11.436 +    ## udp-socket.h: void ns3::UdpSocket::SetIpMulticastLoop(bool loop) [member function]
  11.437 +    cls.add_method('SetIpMulticastLoop', 
  11.438 +                   'void', 
  11.439 +                   [param('bool', 'loop')], 
  11.440 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
  11.441 +    ## udp-socket.h: bool ns3::UdpSocket::GetIpMulticastLoop() const [member function]
  11.442 +    cls.add_method('GetIpMulticastLoop', 
  11.443 +                   'bool', 
  11.444                     [], 
  11.445                     is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  11.446      ## udp-socket.h: void ns3::UdpSocket::SetMtuDiscover(bool discover) [member function]
  11.447 @@ -2572,6 +2715,8 @@
  11.448      return
  11.449  
  11.450  def register_Ns3Ipv4_methods(root_module, cls):
  11.451 +    ## ipv4.h: ns3::Ipv4::IF_ANY [variable]
  11.452 +    cls.add_static_attribute('IF_ANY', 'uint32_t const', is_const=True)
  11.453      ## ipv4.h: ns3::Ipv4::Ipv4(ns3::Ipv4 const & arg0) [copy constructor]
  11.454      cls.add_constructor([param('ns3::Ipv4 const &', 'arg0')])
  11.455      ## ipv4.h: static ns3::TypeId ns3::Ipv4::GetTypeId() [member function]
  11.456 @@ -2581,81 +2726,16 @@
  11.457                     is_static=True)
  11.458      ## ipv4.h: ns3::Ipv4::Ipv4() [constructor]
  11.459      cls.add_constructor([])
  11.460 -    ## ipv4.h: void ns3::Ipv4::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
  11.461 -    cls.add_method('AddRoutingProtocol', 
  11.462 +    ## ipv4.h: void ns3::Ipv4::SetRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol) [member function]
  11.463 +    cls.add_method('SetRoutingProtocol', 
  11.464                     'void', 
  11.465 -                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
  11.466 +                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], 
  11.467                     is_pure_virtual=True, is_virtual=True)
  11.468 -    ## ipv4.h: void ns3::Ipv4::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.469 -    cls.add_method('AddHostRouteTo', 
  11.470 -                   'void', 
  11.471 -                   [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.472 -                   is_pure_virtual=True, is_virtual=True)
  11.473 -    ## ipv4.h: void ns3::Ipv4::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
  11.474 -    cls.add_method('AddHostRouteTo', 
  11.475 -                   'void', 
  11.476 -                   [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], 
  11.477 -                   is_pure_virtual=True, is_virtual=True)
  11.478 -    ## ipv4.h: void ns3::Ipv4::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.479 -    cls.add_method('AddNetworkRouteTo', 
  11.480 -                   'void', 
  11.481 -                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.482 -                   is_pure_virtual=True, is_virtual=True)
  11.483 -    ## ipv4.h: void ns3::Ipv4::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
  11.484 -    cls.add_method('AddNetworkRouteTo', 
  11.485 -                   'void', 
  11.486 -                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')], 
  11.487 -                   is_pure_virtual=True, is_virtual=True)
  11.488 -    ## ipv4.h: void ns3::Ipv4::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.489 -    cls.add_method('SetDefaultRoute', 
  11.490 -                   'void', 
  11.491 -                   [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.492 -                   is_pure_virtual=True, is_virtual=True)
  11.493 -    ## ipv4.h: uint32_t ns3::Ipv4::GetNRoutes() [member function]
  11.494 -    cls.add_method('GetNRoutes', 
  11.495 -                   'uint32_t', 
  11.496 -                   [], 
  11.497 -                   is_pure_virtual=True, is_virtual=True)
  11.498 -    ## ipv4.h: ns3::Ipv4Route ns3::Ipv4::GetRoute(uint32_t i) [member function]
  11.499 -    cls.add_method('GetRoute', 
  11.500 -                   'ns3::Ipv4Route', 
  11.501 -                   [param('uint32_t', 'i')], 
  11.502 -                   is_pure_virtual=True, is_virtual=True)
  11.503 -    ## ipv4.h: void ns3::Ipv4::RemoveRoute(uint32_t i) [member function]
  11.504 -    cls.add_method('RemoveRoute', 
  11.505 -                   'void', 
  11.506 -                   [param('uint32_t', 'i')], 
  11.507 -                   is_pure_virtual=True, is_virtual=True)
  11.508 -    ## ipv4.h: void ns3::Ipv4::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
  11.509 -    cls.add_method('AddMulticastRoute', 
  11.510 -                   'void', 
  11.511 -                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], 
  11.512 -                   is_pure_virtual=True, is_virtual=True)
  11.513 -    ## ipv4.h: void ns3::Ipv4::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function]
  11.514 -    cls.add_method('RemoveMulticastRoute', 
  11.515 -                   'void', 
  11.516 -                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')], 
  11.517 -                   is_pure_virtual=True, is_virtual=True)
  11.518 -    ## ipv4.h: void ns3::Ipv4::SetDefaultMulticastRoute(uint32_t outputInterface) [member function]
  11.519 -    cls.add_method('SetDefaultMulticastRoute', 
  11.520 -                   'void', 
  11.521 -                   [param('uint32_t', 'outputInterface')], 
  11.522 -                   is_pure_virtual=True, is_virtual=True)
  11.523 -    ## ipv4.h: uint32_t ns3::Ipv4::GetNMulticastRoutes() const [member function]
  11.524 -    cls.add_method('GetNMulticastRoutes', 
  11.525 -                   'uint32_t', 
  11.526 +    ## ipv4.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4::GetRoutingProtocol() const [member function]
  11.527 +    cls.add_method('GetRoutingProtocol', 
  11.528 +                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
  11.529                     [], 
  11.530                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.531 -    ## ipv4.h: ns3::Ipv4MulticastRoute ns3::Ipv4::GetMulticastRoute(uint32_t i) const [member function]
  11.532 -    cls.add_method('GetMulticastRoute', 
  11.533 -                   'ns3::Ipv4MulticastRoute', 
  11.534 -                   [param('uint32_t', 'i')], 
  11.535 -                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.536 -    ## ipv4.h: void ns3::Ipv4::RemoveMulticastRoute(uint32_t i) [member function]
  11.537 -    cls.add_method('RemoveMulticastRoute', 
  11.538 -                   'void', 
  11.539 -                   [param('uint32_t', 'i')], 
  11.540 -                   is_pure_virtual=True, is_virtual=True)
  11.541      ## ipv4.h: uint32_t ns3::Ipv4::AddInterface(ns3::Ptr<ns3::NetDevice> device) [member function]
  11.542      cls.add_method('AddInterface', 
  11.543                     'uint32_t', 
  11.544 @@ -2666,36 +2746,26 @@
  11.545                     'uint32_t', 
  11.546                     [], 
  11.547                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.548 -    ## ipv4.h: uint32_t ns3::Ipv4::FindInterfaceForAddr(ns3::Ipv4Address addr) const [member function]
  11.549 -    cls.add_method('FindInterfaceForAddr', 
  11.550 -                   'uint32_t', 
  11.551 -                   [param('ns3::Ipv4Address', 'addr')], 
  11.552 +    ## ipv4.h: int32_t ns3::Ipv4::GetInterfaceForAddress(ns3::Ipv4Address address) const [member function]
  11.553 +    cls.add_method('GetInterfaceForAddress', 
  11.554 +                   'int32_t', 
  11.555 +                   [param('ns3::Ipv4Address', 'address')], 
  11.556                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.557 -    ## ipv4.h: uint32_t ns3::Ipv4::FindInterfaceForAddr(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function]
  11.558 -    cls.add_method('FindInterfaceForAddr', 
  11.559 -                   'uint32_t', 
  11.560 -                   [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], 
  11.561 +    ## ipv4.h: int32_t ns3::Ipv4::GetInterfaceForPrefix(ns3::Ipv4Address address, ns3::Ipv4Mask mask) const [member function]
  11.562 +    cls.add_method('GetInterfaceForPrefix', 
  11.563 +                   'int32_t', 
  11.564 +                   [param('ns3::Ipv4Address', 'address'), param('ns3::Ipv4Mask', 'mask')], 
  11.565                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.566 -    ## ipv4.h: int32_t ns3::Ipv4::FindInterfaceForDevice(ns3::Ptr<ns3::NetDevice> nd) const [member function]
  11.567 -    cls.add_method('FindInterfaceForDevice', 
  11.568 -                   'int32_t', 
  11.569 -                   [param('ns3::Ptr< ns3::NetDevice >', 'nd')], 
  11.570 -                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.571 -    ## ipv4.h: ns3::Ptr<ns3::NetDevice> ns3::Ipv4::GetNetDevice(uint32_t i) [member function]
  11.572 +    ## ipv4.h: ns3::Ptr<ns3::NetDevice> ns3::Ipv4::GetNetDevice(uint32_t interface) [member function]
  11.573      cls.add_method('GetNetDevice', 
  11.574                     'ns3::Ptr< ns3::NetDevice >', 
  11.575 -                   [param('uint32_t', 'i')], 
  11.576 +                   [param('uint32_t', 'interface')], 
  11.577                     is_pure_virtual=True, is_virtual=True)
  11.578 -    ## ipv4.h: void ns3::Ipv4::JoinMulticastGroup(ns3::Ipv4Address origin, ns3::Ipv4Address group) [member function]
  11.579 -    cls.add_method('JoinMulticastGroup', 
  11.580 -                   'void', 
  11.581 -                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')], 
  11.582 -                   is_pure_virtual=True, is_virtual=True)
  11.583 -    ## ipv4.h: void ns3::Ipv4::LeaveMulticastGroup(ns3::Ipv4Address origin, ns3::Ipv4Address group) [member function]
  11.584 -    cls.add_method('LeaveMulticastGroup', 
  11.585 -                   'void', 
  11.586 -                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group')], 
  11.587 -                   is_pure_virtual=True, is_virtual=True)
  11.588 +    ## ipv4.h: int32_t ns3::Ipv4::GetInterfaceForDevice(ns3::Ptr<const ns3::NetDevice> device) const [member function]
  11.589 +    cls.add_method('GetInterfaceForDevice', 
  11.590 +                   'int32_t', 
  11.591 +                   [param('ns3::Ptr< ns3::NetDevice const >', 'device')], 
  11.592 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.593      ## ipv4.h: uint32_t ns3::Ipv4::AddAddress(uint32_t interface, ns3::Ipv4InterfaceAddress address) [member function]
  11.594      cls.add_method('AddAddress', 
  11.595                     'uint32_t', 
  11.596 @@ -2711,51 +2781,46 @@
  11.597                     'ns3::Ipv4InterfaceAddress', 
  11.598                     [param('uint32_t', 'interface'), param('uint32_t', 'addressIndex')], 
  11.599                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.600 -    ## ipv4.h: void ns3::Ipv4::SetMetric(uint32_t i, uint16_t metric) [member function]
  11.601 +    ## ipv4.h: void ns3::Ipv4::SetMetric(uint32_t interface, uint16_t metric) [member function]
  11.602      cls.add_method('SetMetric', 
  11.603                     'void', 
  11.604 -                   [param('uint32_t', 'i'), param('uint16_t', 'metric')], 
  11.605 +                   [param('uint32_t', 'interface'), param('uint16_t', 'metric')], 
  11.606                     is_pure_virtual=True, is_virtual=True)
  11.607 -    ## ipv4.h: uint16_t ns3::Ipv4::GetMetric(uint32_t i) const [member function]
  11.608 +    ## ipv4.h: uint16_t ns3::Ipv4::GetMetric(uint32_t interface) const [member function]
  11.609      cls.add_method('GetMetric', 
  11.610                     'uint16_t', 
  11.611 -                   [param('uint32_t', 'i')], 
  11.612 +                   [param('uint32_t', 'interface')], 
  11.613                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.614 -    ## ipv4.h: ns3::Ipv4Address ns3::Ipv4::GetSourceAddress(ns3::Ipv4Address destination) const [member function]
  11.615 -    cls.add_method('GetSourceAddress', 
  11.616 -                   'ns3::Ipv4Address', 
  11.617 -                   [param('ns3::Ipv4Address', 'destination')], 
  11.618 -                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.619 -    ## ipv4.h: bool ns3::Ipv4::GetInterfaceForDestination(ns3::Ipv4Address dest, uint32_t & interface) const [member function]
  11.620 -    cls.add_method('GetInterfaceForDestination', 
  11.621 -                   'bool', 
  11.622 -                   [param('ns3::Ipv4Address', 'dest'), param('uint32_t &', 'interface')], 
  11.623 -                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.624 -    ## ipv4.h: uint16_t ns3::Ipv4::GetMtu(uint32_t i) const [member function]
  11.625 +    ## ipv4.h: uint16_t ns3::Ipv4::GetMtu(uint32_t interface) const [member function]
  11.626      cls.add_method('GetMtu', 
  11.627                     'uint16_t', 
  11.628 -                   [param('uint32_t', 'i')], 
  11.629 +                   [param('uint32_t', 'interface')], 
  11.630                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.631 -    ## ipv4.h: bool ns3::Ipv4::IsUp(uint32_t i) const [member function]
  11.632 +    ## ipv4.h: bool ns3::Ipv4::IsUp(uint32_t interface) const [member function]
  11.633      cls.add_method('IsUp', 
  11.634                     'bool', 
  11.635 -                   [param('uint32_t', 'i')], 
  11.636 +                   [param('uint32_t', 'interface')], 
  11.637                     is_pure_virtual=True, is_const=True, is_virtual=True)
  11.638 -    ## ipv4.h: void ns3::Ipv4::SetUp(uint32_t i) [member function]
  11.639 +    ## ipv4.h: void ns3::Ipv4::SetUp(uint32_t interface) [member function]
  11.640      cls.add_method('SetUp', 
  11.641                     'void', 
  11.642 -                   [param('uint32_t', 'i')], 
  11.643 +                   [param('uint32_t', 'interface')], 
  11.644                     is_pure_virtual=True, is_virtual=True)
  11.645 -    ## ipv4.h: void ns3::Ipv4::SetDown(uint32_t i) [member function]
  11.646 +    ## ipv4.h: void ns3::Ipv4::SetDown(uint32_t interface) [member function]
  11.647      cls.add_method('SetDown', 
  11.648                     'void', 
  11.649 -                   [param('uint32_t', 'i')], 
  11.650 +                   [param('uint32_t', 'interface')], 
  11.651                     is_pure_virtual=True, is_virtual=True)
  11.652 -    ## ipv4.h: uint32_t ns3::Ipv4::GetInterfaceByAddress(ns3::Ipv4Address addr, ns3::Ipv4Mask mask=ns3::Ipv4Mask(((const char*)"255.255.255.255"))) [member function]
  11.653 -    cls.add_method('GetInterfaceByAddress', 
  11.654 -                   'uint32_t', 
  11.655 -                   [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask', default_value='ns3::Ipv4Mask(((const char*)"255.255.255.255"))')], 
  11.656 -                   is_virtual=True)
  11.657 +    ## ipv4.h: void ns3::Ipv4::SetIpForward(bool forward) [member function]
  11.658 +    cls.add_method('SetIpForward', 
  11.659 +                   'void', 
  11.660 +                   [param('bool', 'forward')], 
  11.661 +                   is_pure_virtual=True, visibility='private', is_virtual=True)
  11.662 +    ## ipv4.h: bool ns3::Ipv4::GetIpForward() const [member function]
  11.663 +    cls.add_method('GetIpForward', 
  11.664 +                   'bool', 
  11.665 +                   [], 
  11.666 +                   is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
  11.667      return
  11.668  
  11.669  def register_Ns3Ipv4RawSocketFactory_methods(root_module, cls):
  11.670 @@ -2771,22 +2836,122 @@
  11.671      return
  11.672  
  11.673  def register_Ns3Ipv4RoutingProtocol_methods(root_module, cls):
  11.674 -    ## ipv4.h: ns3::Ipv4RoutingProtocol::INTERFACE_ANY [variable]
  11.675 -    cls.add_static_attribute('INTERFACE_ANY', 'uint32_t const', is_const=True)
  11.676 -    ## ipv4.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol(ns3::Ipv4RoutingProtocol const & arg0) [copy constructor]
  11.677 +    ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol(ns3::Ipv4RoutingProtocol const & arg0) [copy constructor]
  11.678      cls.add_constructor([param('ns3::Ipv4RoutingProtocol const &', 'arg0')])
  11.679 -    ## ipv4.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol() [constructor]
  11.680 +    ## ipv4-routing-protocol.h: ns3::Ipv4RoutingProtocol::Ipv4RoutingProtocol() [constructor]
  11.681      cls.add_constructor([])
  11.682 -    ## ipv4.h: bool ns3::Ipv4RoutingProtocol::RequestRoute(uint32_t interface, ns3::Ipv4Header const & ipHeader, ns3::Ptr<ns3::Packet> packet, ns3::Callback<void,bool,const ns3::Ipv4Route&,ns3::Ptr<ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> routeReply) [member function]
  11.683 -    cls.add_method('RequestRoute', 
  11.684 +    ## ipv4-routing-protocol.h: static ns3::TypeId ns3::Ipv4RoutingProtocol::GetTypeId() [member function]
  11.685 +    cls.add_method('GetTypeId', 
  11.686 +                   'ns3::TypeId', 
  11.687 +                   [], 
  11.688 +                   is_static=True)
  11.689 +    ## ipv4-routing-protocol.h: ns3::Ptr<ns3::Ipv4Route> ns3::Ipv4RoutingProtocol::RouteOutput(ns3::Ipv4Header const & header, uint32_t oif, ns3::Socket::SocketErrno & sockerr) [member function]
  11.690 +    cls.add_method('RouteOutput', 
  11.691 +                   'ns3::Ptr< ns3::Ipv4Route >', 
  11.692 +                   [param('ns3::Ipv4Header const &', 'header'), param('uint32_t', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
  11.693 +                   is_pure_virtual=True, is_virtual=True)
  11.694 +    ## ipv4-routing-protocol.h: bool ns3::Ipv4RoutingProtocol::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
  11.695 +    cls.add_method('RouteInput', 
  11.696                     'bool', 
  11.697 -                   [param('uint32_t', 'interface'), param('ns3::Ipv4Header const &', 'ipHeader'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, ns3::Ipv4Route const &, ns3::Ptr< ns3::Packet >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'routeReply')], 
  11.698 +                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
  11.699                     is_pure_virtual=True, is_virtual=True)
  11.700 -    ## ipv4.h: bool ns3::Ipv4RoutingProtocol::RequestInterface(ns3::Ipv4Address destination, uint32_t & interface) [member function]
  11.701 -    cls.add_method('RequestInterface', 
  11.702 +    return
  11.703 +
  11.704 +def register_Ns3Ipv4StaticRouting_methods(root_module, cls):
  11.705 +    ## ipv4-static-routing.h: ns3::Ipv4StaticRouting::Ipv4StaticRouting(ns3::Ipv4StaticRouting const & arg0) [copy constructor]
  11.706 +    cls.add_constructor([param('ns3::Ipv4StaticRouting const &', 'arg0')])
  11.707 +    ## ipv4-static-routing.h: ns3::Ipv4StaticRouting::Ipv4StaticRouting() [constructor]
  11.708 +    cls.add_constructor([])
  11.709 +    ## ipv4-static-routing.h: static ns3::TypeId ns3::Ipv4StaticRouting::GetTypeId() [member function]
  11.710 +    cls.add_method('GetTypeId', 
  11.711 +                   'ns3::TypeId', 
  11.712 +                   [], 
  11.713 +                   is_static=True)
  11.714 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddHostRouteTo(ns3::Ipv4Address dest, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.715 +    cls.add_method('AddHostRouteTo', 
  11.716 +                   'void', 
  11.717 +                   [param('ns3::Ipv4Address', 'dest'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.718 +                   is_pure_virtual=True, is_virtual=True)
  11.719 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddHostRouteTo(ns3::Ipv4Address dest, uint32_t interface) [member function]
  11.720 +    cls.add_method('AddHostRouteTo', 
  11.721 +                   'void', 
  11.722 +                   [param('ns3::Ipv4Address', 'dest'), param('uint32_t', 'interface')], 
  11.723 +                   is_pure_virtual=True, is_virtual=True)
  11.724 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.725 +    cls.add_method('AddNetworkRouteTo', 
  11.726 +                   'void', 
  11.727 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.728 +                   is_pure_virtual=True, is_virtual=True)
  11.729 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddNetworkRouteTo(ns3::Ipv4Address network, ns3::Ipv4Mask networkMask, uint32_t interface) [member function]
  11.730 +    cls.add_method('AddNetworkRouteTo', 
  11.731 +                   'void', 
  11.732 +                   [param('ns3::Ipv4Address', 'network'), param('ns3::Ipv4Mask', 'networkMask'), param('uint32_t', 'interface')], 
  11.733 +                   is_pure_virtual=True, is_virtual=True)
  11.734 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetDefaultRoute(ns3::Ipv4Address nextHop, uint32_t interface) [member function]
  11.735 +    cls.add_method('SetDefaultRoute', 
  11.736 +                   'void', 
  11.737 +                   [param('ns3::Ipv4Address', 'nextHop'), param('uint32_t', 'interface')], 
  11.738 +                   is_pure_virtual=True, is_virtual=True)
  11.739 +    ## ipv4-static-routing.h: uint32_t ns3::Ipv4StaticRouting::GetNRoutes() [member function]
  11.740 +    cls.add_method('GetNRoutes', 
  11.741 +                   'uint32_t', 
  11.742 +                   [], 
  11.743 +                   is_pure_virtual=True, is_virtual=True)
  11.744 +    ## ipv4-static-routing.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRouting::GetDefaultRoute() [member function]
  11.745 +    cls.add_method('GetDefaultRoute', 
  11.746 +                   'ns3::Ipv4RoutingTableEntry', 
  11.747 +                   [], 
  11.748 +                   is_pure_virtual=True, is_virtual=True)
  11.749 +    ## ipv4-static-routing.h: ns3::Ipv4RoutingTableEntry ns3::Ipv4StaticRouting::GetRoute(uint32_t i) [member function]
  11.750 +    cls.add_method('GetRoute', 
  11.751 +                   'ns3::Ipv4RoutingTableEntry', 
  11.752 +                   [param('uint32_t', 'i')], 
  11.753 +                   is_pure_virtual=True, is_virtual=True)
  11.754 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::RemoveRoute(uint32_t i) [member function]
  11.755 +    cls.add_method('RemoveRoute', 
  11.756 +                   'void', 
  11.757 +                   [param('uint32_t', 'i')], 
  11.758 +                   is_pure_virtual=True, is_virtual=True)
  11.759 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::AddMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface, std::vector<unsigned int, std::allocator<unsigned int> > outputInterfaces) [member function]
  11.760 +    cls.add_method('AddMulticastRoute', 
  11.761 +                   'void', 
  11.762 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface'), param('std::vector< unsigned int >', 'outputInterfaces')], 
  11.763 +                   is_pure_virtual=True, is_virtual=True)
  11.764 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetDefaultMulticastRoute(uint32_t outputInterface) [member function]
  11.765 +    cls.add_method('SetDefaultMulticastRoute', 
  11.766 +                   'void', 
  11.767 +                   [param('uint32_t', 'outputInterface')], 
  11.768 +                   is_pure_virtual=True, is_virtual=True)
  11.769 +    ## ipv4-static-routing.h: uint32_t ns3::Ipv4StaticRouting::GetNMulticastRoutes() const [member function]
  11.770 +    cls.add_method('GetNMulticastRoutes', 
  11.771 +                   'uint32_t', 
  11.772 +                   [], 
  11.773 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.774 +    ## ipv4-static-routing.h: ns3::Ipv4MulticastRoutingTableEntry ns3::Ipv4StaticRouting::GetMulticastRoute(uint32_t i) const [member function]
  11.775 +    cls.add_method('GetMulticastRoute', 
  11.776 +                   'ns3::Ipv4MulticastRoutingTableEntry', 
  11.777 +                   [param('uint32_t', 'i')], 
  11.778 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.779 +    ## ipv4-static-routing.h: bool ns3::Ipv4StaticRouting::RemoveMulticastRoute(ns3::Ipv4Address origin, ns3::Ipv4Address group, uint32_t inputInterface) [member function]
  11.780 +    cls.add_method('RemoveMulticastRoute', 
  11.781                     'bool', 
  11.782 -                   [param('ns3::Ipv4Address', 'destination'), param('uint32_t &', 'interface')], 
  11.783 +                   [param('ns3::Ipv4Address', 'origin'), param('ns3::Ipv4Address', 'group'), param('uint32_t', 'inputInterface')], 
  11.784                     is_pure_virtual=True, is_virtual=True)
  11.785 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::RemoveMulticastRoute(uint32_t index) [member function]
  11.786 +    cls.add_method('RemoveMulticastRoute', 
  11.787 +                   'void', 
  11.788 +                   [param('uint32_t', 'index')], 
  11.789 +                   is_pure_virtual=True, is_virtual=True)
  11.790 +    ## ipv4-static-routing.h: void ns3::Ipv4StaticRouting::SetNode(ns3::Ptr<ns3::Node> node) [member function]
  11.791 +    cls.add_method('SetNode', 
  11.792 +                   'void', 
  11.793 +                   [param('ns3::Ptr< ns3::Node >', 'node')], 
  11.794 +                   is_pure_virtual=True, is_virtual=True)
  11.795 +    ## ipv4-static-routing.h: ns3::Ptr<ns3::Node> ns3::Ipv4StaticRouting::GetNode() const [member function]
  11.796 +    cls.add_method('GetNode', 
  11.797 +                   'ns3::Ptr< ns3::Node >', 
  11.798 +                   [], 
  11.799 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.800      return
  11.801  
  11.802  def register_Ns3NetDevice_methods(root_module, cls):
  11.803 @@ -3177,6 +3342,33 @@
  11.804                     visibility='protected', is_virtual=True)
  11.805      return
  11.806  
  11.807 +def register_Ns3Ipv4ListRouting_methods(root_module, cls):
  11.808 +    ## ipv4-list-routing.h: ns3::Ipv4ListRouting::Ipv4ListRouting(ns3::Ipv4ListRouting const & arg0) [copy constructor]
  11.809 +    cls.add_constructor([param('ns3::Ipv4ListRouting const &', 'arg0')])
  11.810 +    ## ipv4-list-routing.h: ns3::Ipv4ListRouting::Ipv4ListRouting() [constructor]
  11.811 +    cls.add_constructor([])
  11.812 +    ## ipv4-list-routing.h: static ns3::TypeId ns3::Ipv4ListRouting::GetTypeId() [member function]
  11.813 +    cls.add_method('GetTypeId', 
  11.814 +                   'ns3::TypeId', 
  11.815 +                   [], 
  11.816 +                   is_static=True)
  11.817 +    ## ipv4-list-routing.h: void ns3::Ipv4ListRouting::AddRoutingProtocol(ns3::Ptr<ns3::Ipv4RoutingProtocol> routingProtocol, int16_t priority) [member function]
  11.818 +    cls.add_method('AddRoutingProtocol', 
  11.819 +                   'void', 
  11.820 +                   [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol'), param('int16_t', 'priority')], 
  11.821 +                   is_pure_virtual=True, is_virtual=True)
  11.822 +    ## ipv4-list-routing.h: uint32_t ns3::Ipv4ListRouting::GetNRoutingProtocols() const [member function]
  11.823 +    cls.add_method('GetNRoutingProtocols', 
  11.824 +                   'uint32_t', 
  11.825 +                   [], 
  11.826 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.827 +    ## ipv4-list-routing.h: ns3::Ptr<ns3::Ipv4RoutingProtocol> ns3::Ipv4ListRouting::GetRoutingProtocol(uint32_t index, int16_t & priority) const [member function]
  11.828 +    cls.add_method('GetRoutingProtocol', 
  11.829 +                   'ns3::Ptr< ns3::Ipv4RoutingProtocol >', 
  11.830 +                   [param('uint32_t', 'index'), param('int16_t &', 'priority')], 
  11.831 +                   is_pure_virtual=True, is_const=True, is_virtual=True)
  11.832 +    return
  11.833 +
  11.834  def register_functions(root_module):
  11.835      module = root_module
  11.836      ## address.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeAddressChecker() [free function]
  11.837 @@ -3237,6 +3429,7 @@
  11.838                          [param('ns3::Buffer::Iterator &', 'i'), param('ns3::Mac48Address', 'ad')])
  11.839      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
  11.840      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
  11.841 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
  11.842      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
  11.843      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
  11.844      return
  11.845 @@ -3247,6 +3440,13 @@
  11.846  def register_functions_ns3_TimeStepPrecision(module, root_module):
  11.847      return
  11.848  
  11.849 +def register_functions_ns3_addressUtils(module, root_module):
  11.850 +    ## address-utils.h: extern bool ns3::addressUtils::IsMulticast(ns3::Address const & ad) [free function]
  11.851 +    module.add_function('IsMulticast', 
  11.852 +                        'bool', 
  11.853 +                        [param('ns3::Address const &', 'ad')])
  11.854 +    return
  11.855 +
  11.856  def register_functions_ns3_internal(module, root_module):
  11.857      return
  11.858  
    12.1 --- a/bindings/python/ns3_module_olsr.py	Thu May 28 21:38:06 2009 -0700
    12.2 +++ b/bindings/python/ns3_module_olsr.py	Thu May 28 21:38:49 2009 -0700
    12.3 @@ -1,4 +1,4 @@
    12.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    12.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    12.6  
    12.7  def register_types(module):
    12.8      root_module = module.get_root()
    12.9 @@ -24,6 +24,12 @@
   12.10      register_types_ns3_TimeStepPrecision(nested_module)
   12.11      
   12.12      
   12.13 +    ## Register a nested module for the namespace addressUtils
   12.14 +    
   12.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   12.16 +    register_types_ns3_addressUtils(nested_module)
   12.17 +    
   12.18 +    
   12.19      ## Register a nested module for the namespace internal
   12.20      
   12.21      nested_module = module.add_cpp_namespace('internal')
   12.22 @@ -44,6 +50,10 @@
   12.23      root_module = module.get_root()
   12.24      
   12.25  
   12.26 +def register_types_ns3_addressUtils(module):
   12.27 +    root_module = module.get_root()
   12.28 +    
   12.29 +
   12.30  def register_types_ns3_internal(module):
   12.31      root_module = module.get_root()
   12.32      
   12.33 @@ -91,6 +101,15 @@
   12.34      module.add_class('TwoHopNeighborTuple')
   12.35      module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
   12.36      module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
   12.37 +    typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
   12.38 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
   12.39 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
   12.40 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
   12.41 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
   12.42 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
   12.43 +    typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
   12.44 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
   12.45 +    typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')
   12.46  
   12.47  def register_methods(root_module):
   12.48      register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState'])
   12.49 @@ -740,15 +759,15 @@
   12.50      cls.add_method('SetMainInterface', 
   12.51                     'void', 
   12.52                     [param('uint32_t', 'interface')])
   12.53 -    ## olsr-routing-protocol.h: bool ns3::olsr::RoutingProtocol::RequestRoute(uint32_t ifIndex, ns3::Ipv4Header const & ipHeader, ns3::Ptr<ns3::Packet> packet, ns3::Callback<void,bool,const ns3::Ipv4Route&,ns3::Ptr<ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> routeReply) [member function]
   12.54 -    cls.add_method('RequestRoute', 
   12.55 +    ## olsr-routing-protocol.h: ns3::Ptr<ns3::Ipv4Route> ns3::olsr::RoutingProtocol::RouteOutput(ns3::Ipv4Header const & header, uint32_t oif, ns3::Socket::SocketErrno & sockerr) [member function]
   12.56 +    cls.add_method('RouteOutput', 
   12.57 +                   'ns3::Ptr< ns3::Ipv4Route >', 
   12.58 +                   [param('ns3::Ipv4Header const &', 'header'), param('uint32_t', 'oif'), param('ns3::Socket::SocketErrno &', 'sockerr')], 
   12.59 +                   visibility='private', is_virtual=True)
   12.60 +    ## olsr-routing-protocol.h: bool ns3::olsr::RoutingProtocol::RouteInput(ns3::Ptr<ns3::Packet const> p, ns3::Ipv4Header const & header, ns3::Ptr<const ns3::NetDevice> idev, ns3::Callback<void,ns3::Ptr<ns3::Ipv4Route>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ucb, ns3::Callback<void,ns3::Ptr<ns3::Ipv4MulticastRoute>,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> mcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,unsigned int,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> lcb, ns3::Callback<void,ns3::Ptr<const ns3::Packet>,const ns3::Ipv4Header&,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ecb) [member function]
   12.61 +    cls.add_method('RouteInput', 
   12.62                     'bool', 
   12.63 -                   [param('uint32_t', 'ifIndex'), param('ns3::Ipv4Header const &', 'ipHeader'), param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Callback< void, bool, ns3::Ipv4Route const &, ns3::Ptr< ns3::Packet >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'routeReply')], 
   12.64 -                   visibility='private', is_virtual=True)
   12.65 -    ## olsr-routing-protocol.h: bool ns3::olsr::RoutingProtocol::RequestInterface(ns3::Ipv4Address destination, uint32_t & ifIndex) [member function]
   12.66 -    cls.add_method('RequestInterface', 
   12.67 -                   'bool', 
   12.68 -                   [param('ns3::Ipv4Address', 'destination'), param('uint32_t &', 'ifIndex')], 
   12.69 +                   [param('ns3::Ptr< ns3::Packet const >', 'p'), param('ns3::Ipv4Header const &', 'header'), param('ns3::Ptr< ns3::NetDevice const >', 'idev'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4Route >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ucb'), param('ns3::Callback< void, ns3::Ptr< ns3::Ipv4MulticastRoute >, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'mcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, unsigned int, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'lcb'), param('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::Ipv4Header const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ecb')], 
   12.70                     visibility='private', is_virtual=True)
   12.71      ## olsr-routing-protocol.h: void ns3::olsr::RoutingProtocol::DoDispose() [member function]
   12.72      cls.add_method('DoDispose', 
   12.73 @@ -808,6 +827,7 @@
   12.74      module = root_module
   12.75      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   12.76      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   12.77 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   12.78      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   12.79      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   12.80      return
   12.81 @@ -818,6 +838,9 @@
   12.82  def register_functions_ns3_TimeStepPrecision(module, root_module):
   12.83      return
   12.84  
   12.85 +def register_functions_ns3_addressUtils(module, root_module):
   12.86 +    return
   12.87 +
   12.88  def register_functions_ns3_internal(module, root_module):
   12.89      return
   12.90  
    13.1 --- a/bindings/python/ns3_module_onoff.py	Thu May 28 21:38:06 2009 -0700
    13.2 +++ b/bindings/python/ns3_module_onoff.py	Thu May 28 21:38:49 2009 -0700
    13.3 @@ -1,4 +1,4 @@
    13.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    13.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    13.6  
    13.7  def register_types(module):
    13.8      root_module = module.get_root()
    13.9 @@ -18,6 +18,12 @@
   13.10      register_types_ns3_TimeStepPrecision(nested_module)
   13.11      
   13.12      
   13.13 +    ## Register a nested module for the namespace addressUtils
   13.14 +    
   13.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   13.16 +    register_types_ns3_addressUtils(nested_module)
   13.17 +    
   13.18 +    
   13.19      ## Register a nested module for the namespace internal
   13.20      
   13.21      nested_module = module.add_cpp_namespace('internal')
   13.22 @@ -38,6 +44,10 @@
   13.23      root_module = module.get_root()
   13.24      
   13.25  
   13.26 +def register_types_ns3_addressUtils(module):
   13.27 +    root_module = module.get_root()
   13.28 +    
   13.29 +
   13.30  def register_types_ns3_internal(module):
   13.31      root_module = module.get_root()
   13.32      
   13.33 @@ -85,6 +95,7 @@
   13.34      module = root_module
   13.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   13.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   13.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   13.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   13.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   13.40      return
   13.41 @@ -95,6 +106,9 @@
   13.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   13.43      return
   13.44  
   13.45 +def register_functions_ns3_addressUtils(module, root_module):
   13.46 +    return
   13.47 +
   13.48  def register_functions_ns3_internal(module, root_module):
   13.49      return
   13.50  
    14.1 --- a/bindings/python/ns3_module_packet_sink.py	Thu May 28 21:38:06 2009 -0700
    14.2 +++ b/bindings/python/ns3_module_packet_sink.py	Thu May 28 21:38:49 2009 -0700
    14.3 @@ -1,4 +1,4 @@
    14.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    14.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    14.6  
    14.7  def register_types(module):
    14.8      root_module = module.get_root()
    14.9 @@ -18,6 +18,12 @@
   14.10      register_types_ns3_TimeStepPrecision(nested_module)
   14.11      
   14.12      
   14.13 +    ## Register a nested module for the namespace addressUtils
   14.14 +    
   14.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   14.16 +    register_types_ns3_addressUtils(nested_module)
   14.17 +    
   14.18 +    
   14.19      ## Register a nested module for the namespace internal
   14.20      
   14.21      nested_module = module.add_cpp_namespace('internal')
   14.22 @@ -38,6 +44,10 @@
   14.23      root_module = module.get_root()
   14.24      
   14.25  
   14.26 +def register_types_ns3_addressUtils(module):
   14.27 +    root_module = module.get_root()
   14.28 +    
   14.29 +
   14.30  def register_types_ns3_internal(module):
   14.31      root_module = module.get_root()
   14.32      
   14.33 @@ -81,6 +91,7 @@
   14.34      module = root_module
   14.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   14.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   14.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   14.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   14.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   14.40      return
   14.41 @@ -91,6 +102,9 @@
   14.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   14.43      return
   14.44  
   14.45 +def register_functions_ns3_addressUtils(module, root_module):
   14.46 +    return
   14.47 +
   14.48  def register_functions_ns3_internal(module, root_module):
   14.49      return
   14.50  
    15.1 --- a/bindings/python/ns3_module_point_to_point.py	Thu May 28 21:38:06 2009 -0700
    15.2 +++ b/bindings/python/ns3_module_point_to_point.py	Thu May 28 21:38:49 2009 -0700
    15.3 @@ -1,4 +1,4 @@
    15.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    15.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    15.6  
    15.7  def register_types(module):
    15.8      root_module = module.get_root()
    15.9 @@ -22,6 +22,12 @@
   15.10      register_types_ns3_TimeStepPrecision(nested_module)
   15.11      
   15.12      
   15.13 +    ## Register a nested module for the namespace addressUtils
   15.14 +    
   15.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   15.16 +    register_types_ns3_addressUtils(nested_module)
   15.17 +    
   15.18 +    
   15.19      ## Register a nested module for the namespace internal
   15.20      
   15.21      nested_module = module.add_cpp_namespace('internal')
   15.22 @@ -42,6 +48,10 @@
   15.23      root_module = module.get_root()
   15.24      
   15.25  
   15.26 +def register_types_ns3_addressUtils(module):
   15.27 +    root_module = module.get_root()
   15.28 +    
   15.29 +
   15.30  def register_types_ns3_internal(module):
   15.31      root_module = module.get_root()
   15.32      
   15.33 @@ -301,6 +311,7 @@
   15.34      module = root_module
   15.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   15.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   15.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   15.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   15.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   15.40      return
   15.41 @@ -311,6 +322,9 @@
   15.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   15.43      return
   15.44  
   15.45 +def register_functions_ns3_addressUtils(module, root_module):
   15.46 +    return
   15.47 +
   15.48  def register_functions_ns3_internal(module, root_module):
   15.49      return
   15.50  
    16.1 --- a/bindings/python/ns3_module_simulator.py	Thu May 28 21:38:06 2009 -0700
    16.2 +++ b/bindings/python/ns3_module_simulator.py	Thu May 28 21:38:49 2009 -0700
    16.3 @@ -1,4 +1,4 @@
    16.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    16.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    16.6  
    16.7  def register_types(module):
    16.8      root_module = module.get_root()
    16.9 @@ -61,6 +61,10 @@
   16.10      module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
   16.11      ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration]
   16.12      module.add_enum('SynchronizationMode', ['SYNC_BEST_EFFORT', 'SYNC_HARD_LIMIT'], outer_class=root_module['ns3::RealtimeSimulatorImpl'])
   16.13 +    typehandlers.add_type_alias('ns3::TimeUnit< 2 >', 'ns3::TimeSquare')
   16.14 +    typehandlers.add_type_alias('ns3::TimeUnit< - 1 >', 'ns3::TimeInvert')
   16.15 +    typehandlers.add_type_alias('ns3::TimeUnit< 0 >', 'ns3::Scalar')
   16.16 +    typehandlers.add_type_alias('ns3::TimeUnit< 1 >', 'ns3::Time')
   16.17      
   16.18      ## Register a nested module for the namespace Config
   16.19      
   16.20 @@ -74,6 +78,12 @@
   16.21      register_types_ns3_TimeStepPrecision(nested_module)
   16.22      
   16.23      
   16.24 +    ## Register a nested module for the namespace addressUtils
   16.25 +    
   16.26 +    nested_module = module.add_cpp_namespace('addressUtils')
   16.27 +    register_types_ns3_addressUtils(nested_module)
   16.28 +    
   16.29 +    
   16.30      ## Register a nested module for the namespace internal
   16.31      
   16.32      nested_module = module.add_cpp_namespace('internal')
   16.33 @@ -96,6 +106,10 @@
   16.34      ## nstime.h: ns3::TimeStepPrecision::precision_t [enumeration]
   16.35      module.add_enum('precision_t', ['S', 'MS', 'US', 'NS', 'PS', 'FS'])
   16.36  
   16.37 +def register_types_ns3_addressUtils(module):
   16.38 +    root_module = module.get_root()
   16.39 +    
   16.40 +
   16.41  def register_types_ns3_internal(module):
   16.42      root_module = module.get_root()
   16.43      
   16.44 @@ -1530,6 +1544,7 @@
   16.45                          [param('uint64_t', 'ts')])
   16.46      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   16.47      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   16.48 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   16.49      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   16.50      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   16.51      return
   16.52 @@ -1548,6 +1563,9 @@
   16.53                          [param('ns3::TimeStepPrecision::precision_t', 'precision')])
   16.54      return
   16.55  
   16.56 +def register_functions_ns3_addressUtils(module, root_module):
   16.57 +    return
   16.58 +
   16.59  def register_functions_ns3_internal(module, root_module):
   16.60      return
   16.61  
    17.1 --- a/bindings/python/ns3_module_stats.py	Thu May 28 21:38:06 2009 -0700
    17.2 +++ b/bindings/python/ns3_module_stats.py	Thu May 28 21:38:49 2009 -0700
    17.3 @@ -1,4 +1,4 @@
    17.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    17.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    17.6  
    17.7  def register_types(module):
    17.8      root_module = module.get_root()
    17.9 @@ -25,6 +25,8 @@
   17.10      module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
   17.11      ## packet-data-calculators.h: ns3::PacketCounterCalculator [class]
   17.12      module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >'])
   17.13 +    typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList')
   17.14 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
   17.15      
   17.16      ## Register a nested module for the namespace Config
   17.17      
   17.18 @@ -38,6 +40,12 @@
   17.19      register_types_ns3_TimeStepPrecision(nested_module)
   17.20      
   17.21      
   17.22 +    ## Register a nested module for the namespace addressUtils
   17.23 +    
   17.24 +    nested_module = module.add_cpp_namespace('addressUtils')
   17.25 +    register_types_ns3_addressUtils(nested_module)
   17.26 +    
   17.27 +    
   17.28      ## Register a nested module for the namespace internal
   17.29      
   17.30      nested_module = module.add_cpp_namespace('internal')
   17.31 @@ -58,6 +66,10 @@
   17.32      root_module = module.get_root()
   17.33      
   17.34  
   17.35 +def register_types_ns3_addressUtils(module):
   17.36 +    root_module = module.get_root()
   17.37 +    
   17.38 +
   17.39  def register_types_ns3_internal(module):
   17.40      root_module = module.get_root()
   17.41      
   17.42 @@ -419,6 +431,7 @@
   17.43      module = root_module
   17.44      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   17.45      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   17.46 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   17.47      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   17.48      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   17.49      return
   17.50 @@ -429,6 +442,9 @@
   17.51  def register_functions_ns3_TimeStepPrecision(module, root_module):
   17.52      return
   17.53  
   17.54 +def register_functions_ns3_addressUtils(module, root_module):
   17.55 +    return
   17.56 +
   17.57  def register_functions_ns3_internal(module, root_module):
   17.58      return
   17.59  
    18.1 --- a/bindings/python/ns3_module_tap_bridge.py	Thu May 28 21:38:06 2009 -0700
    18.2 +++ b/bindings/python/ns3_module_tap_bridge.py	Thu May 28 21:38:49 2009 -0700
    18.3 @@ -1,4 +1,4 @@
    18.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    18.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    18.6  
    18.7  def register_types(module):
    18.8      root_module = module.get_root()
    18.9 @@ -20,6 +20,12 @@
   18.10      register_types_ns3_TimeStepPrecision(nested_module)
   18.11      
   18.12      
   18.13 +    ## Register a nested module for the namespace addressUtils
   18.14 +    
   18.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   18.16 +    register_types_ns3_addressUtils(nested_module)
   18.17 +    
   18.18 +    
   18.19      ## Register a nested module for the namespace internal
   18.20      
   18.21      nested_module = module.add_cpp_namespace('internal')
   18.22 @@ -40,6 +46,10 @@
   18.23      root_module = module.get_root()
   18.24      
   18.25  
   18.26 +def register_types_ns3_addressUtils(module):
   18.27 +    root_module = module.get_root()
   18.28 +    
   18.29 +
   18.30  def register_types_ns3_internal(module):
   18.31      root_module = module.get_root()
   18.32      
   18.33 @@ -217,6 +227,7 @@
   18.34      module = root_module
   18.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   18.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   18.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   18.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   18.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   18.40      return
   18.41 @@ -227,6 +238,9 @@
   18.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   18.43      return
   18.44  
   18.45 +def register_functions_ns3_addressUtils(module, root_module):
   18.46 +    return
   18.47 +
   18.48  def register_functions_ns3_internal(module, root_module):
   18.49      return
   18.50  
    19.1 --- a/bindings/python/ns3_module_udp_echo.py	Thu May 28 21:38:06 2009 -0700
    19.2 +++ b/bindings/python/ns3_module_udp_echo.py	Thu May 28 21:38:49 2009 -0700
    19.3 @@ -1,4 +1,4 @@
    19.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    19.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    19.6  
    19.7  def register_types(module):
    19.8      root_module = module.get_root()
    19.9 @@ -20,6 +20,12 @@
   19.10      register_types_ns3_TimeStepPrecision(nested_module)
   19.11      
   19.12      
   19.13 +    ## Register a nested module for the namespace addressUtils
   19.14 +    
   19.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   19.16 +    register_types_ns3_addressUtils(nested_module)
   19.17 +    
   19.18 +    
   19.19      ## Register a nested module for the namespace internal
   19.20      
   19.21      nested_module = module.add_cpp_namespace('internal')
   19.22 @@ -40,6 +46,10 @@
   19.23      root_module = module.get_root()
   19.24      
   19.25  
   19.26 +def register_types_ns3_addressUtils(module):
   19.27 +    root_module = module.get_root()
   19.28 +    
   19.29 +
   19.30  def register_types_ns3_internal(module):
   19.31      root_module = module.get_root()
   19.32      
   19.33 @@ -115,6 +125,7 @@
   19.34      module = root_module
   19.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   19.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   19.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   19.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   19.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   19.40      return
   19.41 @@ -125,6 +136,9 @@
   19.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   19.43      return
   19.44  
   19.45 +def register_functions_ns3_addressUtils(module, root_module):
   19.46 +    return
   19.47 +
   19.48  def register_functions_ns3_internal(module, root_module):
   19.49      return
   19.50  
    20.1 --- a/bindings/python/ns3_module_v4ping.py	Thu May 28 21:38:06 2009 -0700
    20.2 +++ b/bindings/python/ns3_module_v4ping.py	Thu May 28 21:38:49 2009 -0700
    20.3 @@ -1,4 +1,4 @@
    20.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    20.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    20.6  
    20.7  def register_types(module):
    20.8      root_module = module.get_root()
    20.9 @@ -18,6 +18,12 @@
   20.10      register_types_ns3_TimeStepPrecision(nested_module)
   20.11      
   20.12      
   20.13 +    ## Register a nested module for the namespace addressUtils
   20.14 +    
   20.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   20.16 +    register_types_ns3_addressUtils(nested_module)
   20.17 +    
   20.18 +    
   20.19      ## Register a nested module for the namespace internal
   20.20      
   20.21      nested_module = module.add_cpp_namespace('internal')
   20.22 @@ -38,6 +44,10 @@
   20.23      root_module = module.get_root()
   20.24      
   20.25  
   20.26 +def register_types_ns3_addressUtils(module):
   20.27 +    root_module = module.get_root()
   20.28 +    
   20.29 +
   20.30  def register_types_ns3_internal(module):
   20.31      root_module = module.get_root()
   20.32      
   20.33 @@ -81,6 +91,7 @@
   20.34      module = root_module
   20.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   20.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   20.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   20.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   20.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   20.40      return
   20.41 @@ -91,6 +102,9 @@
   20.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   20.43      return
   20.44  
   20.45 +def register_functions_ns3_addressUtils(module, root_module):
   20.46 +    return
   20.47 +
   20.48  def register_functions_ns3_internal(module, root_module):
   20.49      return
   20.50  
    21.1 --- a/bindings/python/ns3_module_wifi.py	Thu May 28 21:38:06 2009 -0700
    21.2 +++ b/bindings/python/ns3_module_wifi.py	Thu May 28 21:38:49 2009 -0700
    21.3 @@ -1,4 +1,4 @@
    21.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    21.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    21.6  
    21.7  def register_types(module):
    21.8      root_module = module.get_root()
    21.9 @@ -135,6 +135,7 @@
   21.10      module.add_class('YansWifiChannel', parent=root_module['ns3::WifiChannel'])
   21.11      ## aarf-wifi-manager.h: ns3::AarfWifiManager [class]
   21.12      module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager'])
   21.13 +    typehandlers.add_type_alias('std::vector< ns3::ThresholdsItem, std::allocator< ns3::ThresholdsItem > >', 'ns3::Thresholds')
   21.14      
   21.15      ## Register a nested module for the namespace Config
   21.16      
   21.17 @@ -148,6 +149,12 @@
   21.18      register_types_ns3_TimeStepPrecision(nested_module)
   21.19      
   21.20      
   21.21 +    ## Register a nested module for the namespace addressUtils
   21.22 +    
   21.23 +    nested_module = module.add_cpp_namespace('addressUtils')
   21.24 +    register_types_ns3_addressUtils(nested_module)
   21.25 +    
   21.26 +    
   21.27      ## Register a nested module for the namespace internal
   21.28      
   21.29      nested_module = module.add_cpp_namespace('internal')
   21.30 @@ -168,6 +175,10 @@
   21.31      root_module = module.get_root()
   21.32      
   21.33  
   21.34 +def register_types_ns3_addressUtils(module):
   21.35 +    root_module = module.get_root()
   21.36 +    
   21.37 +
   21.38  def register_types_ns3_internal(module):
   21.39      root_module = module.get_root()
   21.40      
   21.41 @@ -4181,6 +4192,7 @@
   21.42                          [param('uint8_t', 'tid')])
   21.43      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   21.44      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   21.45 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   21.46      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   21.47      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   21.48      return
   21.49 @@ -4191,6 +4203,9 @@
   21.50  def register_functions_ns3_TimeStepPrecision(module, root_module):
   21.51      return
   21.52  
   21.53 +def register_functions_ns3_addressUtils(module, root_module):
   21.54 +    return
   21.55 +
   21.56  def register_functions_ns3_internal(module, root_module):
   21.57      return
   21.58  
    22.1 --- a/bindings/python/ns3modulegen_generated.py	Thu May 28 21:38:06 2009 -0700
    22.2 +++ b/bindings/python/ns3modulegen_generated.py	Thu May 28 21:38:49 2009 -0700
    22.3 @@ -1,4 +1,4 @@
    22.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    22.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    22.6  
    22.7  
    22.8  import pybindgen.settings
    22.9 @@ -288,6 +288,12 @@
   22.10      register_types_ns3_TimeStepPrecision(nested_module)
   22.11      
   22.12      
   22.13 +    ## Register a nested module for the namespace addressUtils
   22.14 +    
   22.15 +    nested_module = module.add_cpp_namespace('addressUtils')
   22.16 +    register_types_ns3_addressUtils(nested_module)
   22.17 +    
   22.18 +    
   22.19      ## Register a nested module for the namespace internal
   22.20      
   22.21      nested_module = module.add_cpp_namespace('internal')
   22.22 @@ -309,6 +315,10 @@
   22.23      root_module = module.get_root()
   22.24      
   22.25  
   22.26 +def register_types_ns3_addressUtils(module):
   22.27 +    root_module = module.get_root()
   22.28 +    
   22.29 +
   22.30  def register_types_ns3_internal(module):
   22.31      root_module = module.get_root()
   22.32      
   22.33 @@ -786,6 +796,7 @@
   22.34      root_module.end_section('ns3_module_helper')
   22.35      register_functions_ns3_Config(module.get_submodule('Config'), root_module)
   22.36      register_functions_ns3_TimeStepPrecision(module.get_submodule('TimeStepPrecision'), root_module)
   22.37 +    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
   22.38      register_functions_ns3_internal(module.get_submodule('internal'), root_module)
   22.39      register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
   22.40      return
   22.41 @@ -796,6 +807,9 @@
   22.42  def register_functions_ns3_TimeStepPrecision(module, root_module):
   22.43      return
   22.44  
   22.45 +def register_functions_ns3_addressUtils(module, root_module):
   22.46 +    return
   22.47 +
   22.48  def register_functions_ns3_internal(module, root_module):
   22.49      return
   22.50