update bindings
authorTom Henderson <tomh@tomh.org>
Wed, 24 Jun 2009 15:31:53 -0700
changeset 4589 c9374dcfd09a
parent 4588 0698fdc1aaf9
child 4590 3370e6e78caf
update bindings
bindings/python/ns3_module_bridge.py
bindings/python/ns3_module_core.py
bindings/python/ns3_module_csma.py
bindings/python/ns3_module_emu.py
bindings/python/ns3_module_helper.py
bindings/python/ns3_module_internet_stack.py
bindings/python/ns3_module_node.py
bindings/python/ns3_module_point_to_point.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_virtual_net_device.py
bindings/python/ns3_module_wifi.py
--- a/bindings/python/ns3_module_bridge.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_bridge.py	Wed Jun 24 15:31:53 2009 -0700
@@ -128,6 +128,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## bridge-net-device.h: void ns3::BridgeNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## bridge-net-device.h: ns3::Address ns3::BridgeNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
--- a/bindings/python/ns3_module_core.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_core.py	Wed Jun 24 15:31:53 2009 -0700
@@ -85,6 +85,8 @@
     module.add_class('UnsafeAttributeList')
     ## random-variable.h: ns3::WeibullVariable [class]
     module.add_class('WeibullVariable', parent=root_module['ns3::RandomVariable'])
+    ## random-variable.h: ns3::ZipfVariable [class]
+    module.add_class('ZipfVariable', parent=root_module['ns3::RandomVariable'])
     ## empty.h: ns3::empty [class]
     module.add_class('empty')
     ## attribute.h: ns3::AttributeAccessor [class]
@@ -260,6 +262,7 @@
     register_Ns3UniformVariable_methods(root_module, root_module['ns3::UniformVariable'])
     register_Ns3UnsafeAttributeList_methods(root_module, root_module['ns3::UnsafeAttributeList'])
     register_Ns3WeibullVariable_methods(root_module, root_module['ns3::WeibullVariable'])
+    register_Ns3ZipfVariable_methods(root_module, root_module['ns3::ZipfVariable'])
     register_Ns3Empty_methods(root_module, root_module['ns3::empty'])
     register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor'])
     register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker'])
@@ -1180,6 +1183,15 @@
     cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')])
     return
 
+def register_Ns3ZipfVariable_methods(root_module, cls):
+    ## random-variable.h: ns3::ZipfVariable::ZipfVariable(ns3::ZipfVariable const & arg0) [copy constructor]
+    cls.add_constructor([param('ns3::ZipfVariable const &', 'arg0')])
+    ## random-variable.h: ns3::ZipfVariable::ZipfVariable(long int n, double alpha) [constructor]
+    cls.add_constructor([param('long int', 'n'), param('double', 'alpha')])
+    ## random-variable.h: ns3::ZipfVariable::ZipfVariable() [constructor]
+    cls.add_constructor([])
+    return
+
 def register_Ns3Empty_methods(root_module, cls):
     ## empty.h: ns3::empty::empty(ns3::empty const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::empty const &', 'arg0')])
--- a/bindings/python/ns3_module_csma.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_csma.py	Wed Jun 24 15:31:53 2009 -0700
@@ -262,10 +262,6 @@
     cls.add_method('SetReceiveEnable', 
                    'void', 
                    [param('bool', 'enable')])
-    ## csma-net-device.h: void ns3::CsmaNetDevice::SetAddress(ns3::Mac48Address addr) [member function]
-    cls.add_method('SetAddress', 
-                   'void', 
-                   [param('ns3::Mac48Address', 'addr')])
     ## csma-net-device.h: void ns3::CsmaNetDevice::SetFrameSize(uint16_t frameSize) [member function]
     cls.add_method('SetFrameSize', 
                    'void', 
@@ -308,6 +304,11 @@
                    'uint16_t', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## csma-net-device.h: void ns3::CsmaNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## csma-net-device.h: ns3::Address ns3::CsmaNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
--- a/bindings/python/ns3_module_emu.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_emu.py	Wed Jun 24 15:31:53 2009 -0700
@@ -86,10 +86,6 @@
     cls.add_method('SetQueue', 
                    'void', 
                    [param('ns3::Ptr< ns3::Queue >', 'queue')])
-    ## emu-net-device.h: void ns3::EmuNetDevice::SetAddress(ns3::Mac48Address addr) [member function]
-    cls.add_method('SetAddress', 
-                   'void', 
-                   [param('ns3::Mac48Address', 'addr')])
     ## emu-net-device.h: void ns3::EmuNetDevice::SetIfIndex(uint32_t const index) [member function]
     cls.add_method('SetIfIndex', 
                    'void', 
@@ -105,6 +101,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## emu-net-device.h: void ns3::EmuNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## emu-net-device.h: ns3::Address ns3::EmuNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
--- a/bindings/python/ns3_module_helper.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_helper.py	Wed Jun 24 15:31:53 2009 -0700
@@ -987,6 +987,18 @@
     cls.add_method('SetAttribute', 
                    'void', 
                    [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
+    ## udp-echo-helper.h: void ns3::UdpEchoClientHelper::SetFill(ns3::Ptr<ns3::Application> app, std::string fill) [member function]
+    cls.add_method('SetFill', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Application >', 'app'), param('std::string', 'fill')])
+    ## udp-echo-helper.h: void ns3::UdpEchoClientHelper::SetFill(ns3::Ptr<ns3::Application> app, uint8_t fill, uint32_t dataLength) [member function]
+    cls.add_method('SetFill', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Application >', 'app'), param('uint8_t', 'fill'), param('uint32_t', 'dataLength')])
+    ## udp-echo-helper.h: void ns3::UdpEchoClientHelper::SetFill(ns3::Ptr<ns3::Application> app, uint8_t * fill, uint32_t fillLength, uint32_t dataLength) [member function]
+    cls.add_method('SetFill', 
+                   'void', 
+                   [param('ns3::Ptr< ns3::Application >', 'app'), param('uint8_t *', 'fill'), param('uint32_t', 'fillLength'), param('uint32_t', 'dataLength')])
     ## udp-echo-helper.h: ns3::ApplicationContainer ns3::UdpEchoClientHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
     cls.add_method('Install', 
                    'ns3::ApplicationContainer', 
@@ -1085,6 +1097,11 @@
                    'ns3::NetDeviceContainer', 
                    [param('ns3::WifiPhyHelper const &', 'phy'), param('ns3::WifiMacHelper const &', 'mac'), param('std::string', 'nodeName')], 
                    is_const=True)
+    ## wifi-helper.h: void ns3::WifiHelper::WifiLogComponentEnable() const [member function]
+    cls.add_method('WifiLogComponentEnable', 
+                   'void', 
+                   [], 
+                   is_const=True)
     return
 
 def register_Ns3WifiMacHelper_methods(root_module, cls):
--- a/bindings/python/ns3_module_internet_stack.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_internet_stack.py	Wed Jun 24 15:31:53 2009 -0700
@@ -172,6 +172,11 @@
                    'uint16_t', 
                    [], 
                    is_const=True)
+    ## icmpv4.h: uint32_t ns3::Icmpv4Echo::GetDataSize() const [member function]
+    cls.add_method('GetDataSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
     ## icmpv4.h: uint32_t ns3::Icmpv4Echo::GetData(uint8_t * payload) const [member function]
     cls.add_method('GetData', 
                    'uint32_t', 
--- a/bindings/python/ns3_module_node.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_node.py	Wed Jun 24 15:31:53 2009 -0700
@@ -2777,6 +2777,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_pure_virtual=True, is_const=True, is_virtual=True)
+    ## net-device.h: void ns3::NetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_pure_virtual=True, is_virtual=True)
     ## net-device.h: ns3::Address ns3::NetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
@@ -3019,10 +3024,6 @@
     cls.add_method('SetChannel', 
                    'void', 
                    [param('ns3::Ptr< ns3::SimpleChannel >', 'channel')])
-    ## simple-net-device.h: void ns3::SimpleNetDevice::SetAddress(ns3::Mac48Address address) [member function]
-    cls.add_method('SetAddress', 
-                   'void', 
-                   [param('ns3::Mac48Address', 'address')])
     ## simple-net-device.h: void ns3::SimpleNetDevice::SetIfIndex(uint32_t const index) [member function]
     cls.add_method('SetIfIndex', 
                    'void', 
@@ -3038,6 +3039,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## simple-net-device.h: void ns3::SimpleNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## simple-net-device.h: ns3::Address ns3::SimpleNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
--- a/bindings/python/ns3_module_point_to_point.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_point_to_point.py	Wed Jun 24 15:31:53 2009 -0700
@@ -172,10 +172,6 @@
     cls.add_method('Receive', 
                    'void', 
                    [param('ns3::Ptr< ns3::Packet >', 'p')])
-    ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetAddress(ns3::Mac48Address addr) [member function]
-    cls.add_method('SetAddress', 
-                   'void', 
-                   [param('ns3::Mac48Address', 'addr')])
     ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetFrameSize(uint16_t frameSize) [member function]
     cls.add_method('SetFrameSize', 
                    'void', 
@@ -200,6 +196,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## point-to-point-net-device.h: void ns3::PointToPointNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## point-to-point-net-device.h: ns3::Address ns3::PointToPointNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
--- a/bindings/python/ns3_module_stats.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_stats.py	Wed Jun 24 15:31:53 2009 -0700
@@ -256,6 +256,15 @@
                    'void', 
                    [param('ns3::DataCollector &', 'dc')], 
                    is_pure_virtual=True, is_virtual=True)
+    ## data-output-interface.h: void ns3::DataOutputInterface::SetFilePrefix(std::string const prefix) [member function]
+    cls.add_method('SetFilePrefix', 
+                   'void', 
+                   [param('std::string const', 'prefix')])
+    ## data-output-interface.h: std::string ns3::DataOutputInterface::GetFilePrefix() const [member function]
+    cls.add_method('GetFilePrefix', 
+                   'std::string', 
+                   [], 
+                   is_const=True)
     ## data-output-interface.h: void ns3::DataOutputInterface::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -294,15 +303,6 @@
                    'void', 
                    [param('ns3::DataCollector &', 'dc')], 
                    is_virtual=True)
-    ## omnet-data-output.h: void ns3::OmnetDataOutput::SetFilePrefix(std::string const prefix) [member function]
-    cls.add_method('SetFilePrefix', 
-                   'void', 
-                   [param('std::string const', 'prefix')])
-    ## omnet-data-output.h: std::string ns3::OmnetDataOutput::GetFilePrefix() const [member function]
-    cls.add_method('GetFilePrefix', 
-                   'std::string', 
-                   [], 
-                   is_const=True)
     ## omnet-data-output.h: void ns3::OmnetDataOutput::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
@@ -340,15 +340,6 @@
                    'void', 
                    [param('ns3::DataCollector &', 'dc')], 
                    is_virtual=True)
-    ## sqlite-data-output.h: void ns3::SqliteDataOutput::SetDBFile(std::string const file) [member function]
-    cls.add_method('SetDBFile', 
-                   'void', 
-                   [param('std::string const', 'file')])
-    ## sqlite-data-output.h: std::string ns3::SqliteDataOutput::GetDBFile() const [member function]
-    cls.add_method('GetDBFile', 
-                   'std::string', 
-                   [], 
-                   is_const=True)
     ## sqlite-data-output.h: void ns3::SqliteDataOutput::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
--- a/bindings/python/ns3_module_tap_bridge.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_tap_bridge.py	Wed Jun 24 15:31:53 2009 -0700
@@ -111,6 +111,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## tap-bridge.h: void ns3::TapBridge::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## tap-bridge.h: ns3::Address ns3::TapBridge::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
@@ -216,11 +221,16 @@
                    'void', 
                    [], 
                    visibility='protected', is_virtual=True)
-    ## tap-bridge.h: void ns3::TapBridge::ReceiveFromBridgedDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Address const & src, ns3::Address const & dst, ns3::NetDevice::PacketType packetType) [member function]
+    ## tap-bridge.h: bool ns3::TapBridge::ReceiveFromBridgedDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Address const & src, ns3::Address const & dst, ns3::NetDevice::PacketType packetType) [member function]
     cls.add_method('ReceiveFromBridgedDevice', 
-                   'void', 
+                   'bool', 
                    [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'src'), param('ns3::Address const &', 'dst'), param('ns3::NetDevice::PacketType', 'packetType')], 
                    visibility='protected')
+    ## tap-bridge.h: bool ns3::TapBridge::DiscardFromBridgedDevice(ns3::Ptr<ns3::NetDevice> device, ns3::Ptr<ns3::Packet const> packet, uint16_t protocol, ns3::Address const & src) [member function]
+    cls.add_method('DiscardFromBridgedDevice', 
+                   'bool', 
+                   [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'src')], 
+                   visibility='protected')
     return
 
 def register_functions(root_module):
--- a/bindings/python/ns3_module_udp_echo.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_udp_echo.py	Wed Jun 24 15:31:53 2009 -0700
@@ -77,6 +77,27 @@
     cls.add_method('SetRemote', 
                    'void', 
                    [param('ns3::Ipv4Address', 'ip'), param('uint16_t', 'port')])
+    ## udp-echo-client.h: void ns3::UdpEchoClient::SetDataSize(uint32_t dataSize) [member function]
+    cls.add_method('SetDataSize', 
+                   'void', 
+                   [param('uint32_t', 'dataSize')])
+    ## udp-echo-client.h: uint32_t ns3::UdpEchoClient::GetDataSize() const [member function]
+    cls.add_method('GetDataSize', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## udp-echo-client.h: void ns3::UdpEchoClient::SetFill(std::string fill) [member function]
+    cls.add_method('SetFill', 
+                   'void', 
+                   [param('std::string', 'fill')])
+    ## udp-echo-client.h: void ns3::UdpEchoClient::SetFill(uint8_t fill, uint32_t dataSize) [member function]
+    cls.add_method('SetFill', 
+                   'void', 
+                   [param('uint8_t', 'fill'), param('uint32_t', 'dataSize')])
+    ## udp-echo-client.h: void ns3::UdpEchoClient::SetFill(uint8_t * fill, uint32_t fillSize, uint32_t dataSize) [member function]
+    cls.add_method('SetFill', 
+                   'void', 
+                   [param('uint8_t *', 'fill'), param('uint32_t', 'fillSize'), param('uint32_t', 'dataSize')])
     ## udp-echo-client.h: void ns3::UdpEchoClient::DoDispose() [member function]
     cls.add_method('DoDispose', 
                    'void', 
--- a/bindings/python/ns3_module_virtual_net_device.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_virtual_net_device.py	Wed Jun 24 15:31:53 2009 -0700
@@ -95,10 +95,6 @@
     cls.add_method('Receive', 
                    'bool', 
                    [param('ns3::Ptr< ns3::Packet >', 'packet'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'source'), param('ns3::Address const &', 'destination'), param('ns3::NetDevice::PacketType', 'packetType')])
-    ## virtual-net-device.h: void ns3::VirtualNetDevice::SetAddress(ns3::Address addr) [member function]
-    cls.add_method('SetAddress', 
-                   'void', 
-                   [param('ns3::Address', 'addr')])
     ## virtual-net-device.h: void ns3::VirtualNetDevice::SetIfIndex(uint32_t const index) [member function]
     cls.add_method('SetIfIndex', 
                    'void', 
@@ -114,6 +110,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## virtual-net-device.h: void ns3::VirtualNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## virtual-net-device.h: ns3::Address ns3::VirtualNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address', 
--- a/bindings/python/ns3_module_wifi.py	Fri Jun 19 20:26:51 2009 -0700
+++ b/bindings/python/ns3_module_wifi.py	Wed Jun 24 15:31:53 2009 -0700
@@ -4070,6 +4070,11 @@
                    'ns3::Ptr< ns3::Channel >', 
                    [], 
                    is_const=True, is_virtual=True)
+    ## wifi-net-device.h: void ns3::WifiNetDevice::SetAddress(ns3::Address address) [member function]
+    cls.add_method('SetAddress', 
+                   'void', 
+                   [param('ns3::Address', 'address')], 
+                   is_virtual=True)
     ## wifi-net-device.h: ns3::Address ns3::WifiNetDevice::GetAddress() const [member function]
     cls.add_method('GetAddress', 
                    'ns3::Address',