--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_common.py Fri Jan 22 12:44:53 2010 -0800
@@ -47,6 +47,8 @@
module.add_class('Chunk', parent=root_module['ns3::ObjectBase'])
## header.h: ns3::Header [class]
module.add_class('Header', parent=root_module['ns3::Chunk'])
+ ## output-stream-object.h: ns3::OutputStreamObject [class]
+ module.add_class('OutputStreamObject', parent=root_module['ns3::Object'])
## pcap-file-object.h: ns3::PcapFileObject [class]
module.add_class('PcapFileObject', parent=root_module['ns3::Object'])
## pcap-writer.h: ns3::PcapWriter [class]
@@ -177,6 +179,7 @@
register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+ register_Ns3OutputStreamObject_methods(root_module, root_module['ns3::OutputStreamObject'])
register_Ns3PcapFileObject_methods(root_module, root_module['ns3::PcapFileObject'])
register_Ns3PcapWriter_methods(root_module, root_module['ns3::PcapWriter'])
register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
@@ -951,6 +954,26 @@
is_pure_virtual=True, is_const=True, is_virtual=True)
return
+def register_Ns3OutputStreamObject_methods(root_module, cls):
+ ## output-stream-object.h: ns3::OutputStreamObject::OutputStreamObject(ns3::OutputStreamObject const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::OutputStreamObject const &', 'arg0')])
+ ## output-stream-object.h: ns3::OutputStreamObject::OutputStreamObject() [constructor]
+ cls.add_constructor([])
+ ## output-stream-object.h: std::ostream * ns3::OutputStreamObject::GetStream() [member function]
+ cls.add_method('GetStream',
+ 'std::ostream *',
+ [])
+ ## output-stream-object.h: static ns3::TypeId ns3::OutputStreamObject::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## output-stream-object.h: void ns3::OutputStreamObject::SetStream(std::ostream * ostream) [member function]
+ cls.add_method('SetStream',
+ 'void',
+ [param('std::ostream *', 'ostream')])
+ return
+
def register_Ns3PcapFileObject_methods(root_module, cls):
## pcap-file-object.h: ns3::PcapFileObject::PcapFileObject(ns3::PcapFileObject const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PcapFileObject const &', 'arg0')])
@@ -960,11 +983,39 @@
cls.add_method('Close',
'void',
[])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetDataLinkType() [member function]
+ cls.add_method('GetDataLinkType',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetMagic() [member function]
+ cls.add_method('GetMagic',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetSigFigs() [member function]
+ cls.add_method('GetSigFigs',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetSnapLen() [member function]
+ cls.add_method('GetSnapLen',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: int32_t ns3::PcapFileObject::GetTimeZoneOffset() [member function]
+ cls.add_method('GetTimeZoneOffset',
+ 'int32_t',
+ [])
## pcap-file-object.h: static ns3::TypeId ns3::PcapFileObject::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
+ ## pcap-file-object.h: uint16_t ns3::PcapFileObject::GetVersionMajor() [member function]
+ cls.add_method('GetVersionMajor',
+ 'uint16_t',
+ [])
+ ## pcap-file-object.h: uint16_t ns3::PcapFileObject::GetVersionMinor() [member function]
+ cls.add_method('GetVersionMinor',
+ 'uint16_t',
+ [])
## pcap-file-object.h: bool ns3::PcapFileObject::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function]
cls.add_method('Init',
'bool',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py Fri Jan 22 12:44:53 2010 -0800
@@ -3043,11 +3043,21 @@
module.add_function('MakeBooleanChecker',
'ns3::Ptr< ns3::AttributeChecker const >',
[])
+ ## callback.h: extern ns3::Callback<void,ns3::Ptr<const ns3::Packet>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr<ns3::OutputStreamObject>,::ns3::Ptr<ns3::Packet const> ) * fnPtr, ns3::Ptr<ns3::OutputStreamObject> a) [free function]
+ module.add_function('MakeBoundCallback',
+ 'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >',
+ [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamObject >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamObject >', 'a')],
+ template_parameters=['void', 'ns3::Ptr<ns3::OutputStreamObject>', 'ns3::Ptr<ns3::OutputStreamObject>', 'ns3::Ptr<ns3::Packet const>'])
## callback.h: extern ns3::Callback<void,ns3::Ptr<const ns3::Packet>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr<ns3::PcapFileObject>,::ns3::Ptr<ns3::Packet const> ) * fnPtr, ns3::Ptr<ns3::PcapFileObject> a) [free function]
module.add_function('MakeBoundCallback',
'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >',
[param('void ( * ) ( ns3::Ptr< ns3::PcapFileObject >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::PcapFileObject >', 'a')],
template_parameters=['void', 'ns3::Ptr<ns3::PcapFileObject>', 'ns3::Ptr<ns3::PcapFileObject>', 'ns3::Ptr<ns3::Packet const>'])
+ ## callback.h: extern ns3::Callback<void,std::basic_string<char, std::char_traits<char>, std::allocator<char> >,ns3::Ptr<const ns3::Packet>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr<ns3::OutputStreamObject>,::std::basic_string<char,std::char_traits<char>,std::allocator<char> >,::ns3::Ptr<ns3::Packet const> ) * fnPtr, ns3::Ptr<ns3::OutputStreamObject> a) [free function]
+ module.add_function('MakeBoundCallback',
+ 'ns3::Callback< void, std::basic_string< char, std::char_traits< char >, std::allocator< char > >, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >',
+ [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamObject >, std::string, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamObject >', 'a')],
+ template_parameters=['void', 'ns3::Ptr<ns3::OutputStreamObject>', 'ns3::Ptr<ns3::OutputStreamObject>', 'std::string', 'ns3::Ptr<ns3::Packet const>'])
## callback.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeCallbackChecker() [free function]
module.add_function('MakeCallbackChecker',
'ns3::Ptr< ns3::AttributeChecker const >',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_csma.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_csma.py Fri Jan 22 12:44:53 2010 -0800
@@ -266,6 +266,11 @@
cls.add_method('SetQueue',
'void',
[param('ns3::Ptr< ns3::Queue >', 'queue')])
+ ## csma-net-device.h: ns3::Ptr<ns3::Queue> ns3::CsmaNetDevice::GetQueue() const [member function]
+ cls.add_method('GetQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [],
+ is_const=True)
## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveErrorModel(ns3::Ptr<ns3::ErrorModel> em) [member function]
cls.add_method('SetReceiveErrorModel',
'void',
@@ -432,11 +437,6 @@
'void',
[],
visibility='protected', is_virtual=True)
- ## csma-net-device.h: ns3::Ptr<ns3::Queue> ns3::CsmaNetDevice::GetQueue() const [member function]
- cls.add_method('GetQueue',
- 'ns3::Ptr< ns3::Queue >',
- [],
- is_const=True, visibility='protected')
## csma-net-device.h: void ns3::CsmaNetDevice::AddHeader(ns3::Ptr<ns3::Packet> p, ns3::Mac48Address source, ns3::Mac48Address dest, uint16_t protocolNumber) [member function]
cls.add_method('AddHeader',
'void',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_emu.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_emu.py Fri Jan 22 12:44:53 2010 -0800
@@ -147,6 +147,11 @@
'ns3::Ptr< ns3::Node >',
[],
is_const=True, is_virtual=True)
+ ## emu-net-device.h: ns3::Ptr<ns3::Queue> ns3::EmuNetDevice::GetQueue() const [member function]
+ cls.add_method('GetQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [],
+ is_const=True)
## emu-net-device.h: static ns3::TypeId ns3::EmuNetDevice::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_helper.py Fri Jan 22 12:44:53 2010 -0800
@@ -7,6 +7,12 @@
module.add_class('AnimationInterface')
## application-container.h: ns3::ApplicationContainer [class]
module.add_class('ApplicationContainer')
+ ## ascii-trace-helper.h: ns3::AsciiTraceHelper [class]
+ module.add_class('AsciiTraceHelper', allow_subclassing=False)
+ ## ascii-trace-user-helper-for-device.h: ns3::AsciiTraceUserHelperForDevice [class]
+ module.add_class('AsciiTraceUserHelperForDevice', allow_subclassing=True)
+ ## ascii-trace-user-helper-for-ipv4.h: ns3::AsciiTraceUserHelperForIpv4 [class]
+ module.add_class('AsciiTraceUserHelperForIpv4', allow_subclassing=True)
## athstats-helper.h: ns3::AthstatsHelper [class]
module.add_class('AthstatsHelper', allow_subclassing=False)
## bridge-helper.h: ns3::BridgeHelper [class]
@@ -15,8 +21,6 @@
module.add_class('CsmaStarHelper', allow_subclassing=False)
## flow-monitor-helper.h: ns3::FlowMonitorHelper [class]
module.add_class('FlowMonitorHelper', allow_subclassing=False)
- ## internet-stack-helper.h: ns3::InternetStackHelper [class]
- module.add_class('InternetStackHelper', allow_subclassing=False)
## ipv4-address-helper.h: ns3::Ipv4AddressHelper [class]
module.add_class('Ipv4AddressHelper', allow_subclassing=False)
## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer [class]
@@ -55,18 +59,30 @@
module.add_class('PacketSocketHelper', allow_subclassing=False)
## pcap-helper.h: ns3::PcapHelper [class]
module.add_class('PcapHelper', allow_subclassing=False)
- ## pcap-helper.h: ns3::PcapHelper::DataLinkType [enumeration]
- module.add_enum('DataLinkType', ['DLT_NULL', 'DLT_EN10MB', 'DLT_PPP', 'DLT_IEEE802_11', 'DLT_PRISM_HEADER', 'DLT_IEEE802_11_RADIO'], outer_class=root_module['ns3::PcapHelper'])
- ## pcap-user-helper.h: ns3::PcapUserHelper [class]
- module.add_class('PcapUserHelper', allow_subclassing=False)
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_NULL'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_EN10MB'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_PPP'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_RAW'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_IEEE802_11'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_PRISM_HEADER'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_IEEE802_11_RADIO'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-user-helper-for-device.h: ns3::PcapUserHelperForDevice [class]
+ module.add_class('PcapUserHelperForDevice', allow_subclassing=True)
+ ## pcap-user-helper-for-ipv4.h: ns3::PcapUserHelperForIpv4 [class]
+ module.add_class('PcapUserHelperForIpv4', allow_subclassing=True)
## ping6-helper.h: ns3::Ping6Helper [class]
module.add_class('Ping6Helper', allow_subclassing=False)
## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper [class]
module.add_class('PointToPointDumbbellHelper', allow_subclassing=False)
## point-to-point-grid-helper.h: ns3::PointToPointGridHelper [class]
module.add_class('PointToPointGridHelper', allow_subclassing=False)
- ## point-to-point-helper.h: ns3::PointToPointHelper [class]
- module.add_class('PointToPointHelper', allow_subclassing=False, parent=root_module['ns3::PcapUserHelper'])
## point-to-point-star-helper.h: ns3::PointToPointStarHelper [class]
module.add_class('PointToPointStarHelper', allow_subclassing=False)
## tap-bridge-helper.h: ns3::TapBridgeHelper [class]
@@ -93,10 +109,6 @@
module.add_class('YansWifiChannelHelper', allow_subclassing=False)
## aodv-helper.h: ns3::AodvHelper [class]
module.add_class('AodvHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])
- ## csma-helper.h: ns3::CsmaHelper [class]
- module.add_class('CsmaHelper', allow_subclassing=False, parent=root_module['ns3::PcapUserHelper'])
- ## emu-helper.h: ns3::EmuHelper [class]
- module.add_class('EmuHelper', allow_subclassing=False, parent=root_module['ns3::PcapUserHelper'])
## ipv4-global-routing-helper.h: ns3::Ipv4GlobalRoutingHelper [class]
module.add_class('Ipv4GlobalRoutingHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])
## ipv4-list-routing-helper.h: ns3::Ipv4ListRoutingHelper [class]
@@ -203,11 +215,13 @@
def register_methods(root_module):
register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface'])
register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
+ register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
+ register_Ns3AsciiTraceUserHelperForDevice_methods(root_module, root_module['ns3::AsciiTraceUserHelperForDevice'])
+ register_Ns3AsciiTraceUserHelperForIpv4_methods(root_module, root_module['ns3::AsciiTraceUserHelperForIpv4'])
register_Ns3AthstatsHelper_methods(root_module, root_module['ns3::AthstatsHelper'])
register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper'])
register_Ns3FlowMonitorHelper_methods(root_module, root_module['ns3::FlowMonitorHelper'])
- register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])
register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper'])
register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer'])
register_Ns3Ipv4RoutingHelper_methods(root_module, root_module['ns3::Ipv4RoutingHelper'])
@@ -226,11 +240,11 @@
register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper'])
register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper'])
register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper'])
- register_Ns3PcapUserHelper_methods(root_module, root_module['ns3::PcapUserHelper'])
+ register_Ns3PcapUserHelperForDevice_methods(root_module, root_module['ns3::PcapUserHelperForDevice'])
+ register_Ns3PcapUserHelperForIpv4_methods(root_module, root_module['ns3::PcapUserHelperForIpv4'])
register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper'])
register_Ns3PointToPointDumbbellHelper_methods(root_module, root_module['ns3::PointToPointDumbbellHelper'])
register_Ns3PointToPointGridHelper_methods(root_module, root_module['ns3::PointToPointGridHelper'])
- register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper'])
register_Ns3PointToPointStarHelper_methods(root_module, root_module['ns3::PointToPointStarHelper'])
register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper'])
register_Ns3UdpClientHelper_methods(root_module, root_module['ns3::UdpClientHelper'])
@@ -244,8 +258,6 @@
register_Ns3WifiPhyHelper_methods(root_module, root_module['ns3::WifiPhyHelper'])
register_Ns3YansWifiChannelHelper_methods(root_module, root_module['ns3::YansWifiChannelHelper'])
register_Ns3AodvHelper_methods(root_module, root_module['ns3::AodvHelper'])
- register_Ns3CsmaHelper_methods(root_module, root_module['ns3::CsmaHelper'])
- register_Ns3EmuHelper_methods(root_module, root_module['ns3::EmuHelper'])
register_Ns3Ipv4GlobalRoutingHelper_methods(root_module, root_module['ns3::Ipv4GlobalRoutingHelper'])
register_Ns3Ipv4ListRoutingHelper_methods(root_module, root_module['ns3::Ipv4ListRoutingHelper'])
register_Ns3Ipv4NixVectorHelper_methods(root_module, root_module['ns3::Ipv4NixVectorHelper'])
@@ -333,6 +345,185 @@
[param('ns3::Time', 'stop')])
return
+def register_Ns3AsciiTraceHelper_methods(root_module, cls):
+ ## ascii-trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper(ns3::AsciiTraceHelper const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')])
+ ## ascii-trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor]
+ cls.add_constructor([])
+ ## ascii-trace-helper.h: ns3::Ptr<ns3::OutputStreamObject> ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function]
+ cls.add_method('CreateFileStream',
+ 'ns3::Ptr< ns3::OutputStreamObject >',
+ [param('std::string', 'filename'), param('std::string', 'filemode', default_value='"w"')])
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDequeueSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDequeueSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDropSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDropSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultEnqueueSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultEnqueueSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultReceiveSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultReceiveSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: std::string ns3::AsciiTraceHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromDevice',
+ 'std::string',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+ ## ascii-trace-helper.h: std::string ns3::AsciiTraceHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromInterfacePair',
+ 'std::string',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
+ return
+
+def register_Ns3AsciiTraceUserHelperForDevice_methods(root_module, cls):
+ ## ascii-trace-user-helper-for-device.h: ns3::AsciiTraceUserHelperForDevice::AsciiTraceUserHelperForDevice() [constructor]
+ cls.add_constructor([])
+ ## ascii-trace-user-helper-for-device.h: ns3::AsciiTraceUserHelperForDevice::AsciiTraceUserHelperForDevice(ns3::AsciiTraceUserHelperForDevice const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::AsciiTraceUserHelperForDevice const &', 'arg0')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, ns3::Ptr<ns3::NetDevice> nd) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::Ptr<ns3::NetDevice> nd) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, std::string ndName) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('std::string', 'ndName')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, std::string ndName) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'ndName')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, ns3::NetDeviceContainer d) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::NetDeviceContainer d) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::NetDeviceContainer', 'd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, uint32_t nodeid, uint32_t deviceid) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAsciiAll(std::string prefix) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('std::string', 'prefix')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAsciiAll(ns3::Ptr<ns3::OutputStreamObject> stream) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAsciiInternal(ns3::Ptr<ns3::OutputStreamObject> stream, std::string prefix, ns3::Ptr<ns3::NetDevice> nd) [member function]
+ cls.add_method('EnableAsciiInternal',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
+def register_Ns3AsciiTraceUserHelperForIpv4_methods(root_module, cls):
+ ## ascii-trace-user-helper-for-ipv4.h: ns3::AsciiTraceUserHelperForIpv4::AsciiTraceUserHelperForIpv4() [constructor]
+ cls.add_constructor([])
+ ## ascii-trace-user-helper-for-ipv4.h: ns3::AsciiTraceUserHelperForIpv4::AsciiTraceUserHelperForIpv4(ns3::AsciiTraceUserHelperForIpv4 const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::AsciiTraceUserHelperForIpv4 const &', 'arg0')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, std::string ipv4Name, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, std::string ipv4Name, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, ns3::Ipv4InterfaceContainer c) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ipv4InterfaceContainer', 'c')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::Ipv4InterfaceContainer c) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::Ipv4InterfaceContainer', 'c')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, uint32_t nodeid, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAsciiAll(std::string prefix) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('std::string', 'prefix')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAsciiAll(ns3::Ptr<ns3::OutputStreamObject> stream) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAsciiInternal(ns3::Ptr<ns3::OutputStreamObject> stream, std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnableAsciiInternal',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
def register_Ns3AthstatsHelper_methods(root_module, cls):
## athstats-helper.h: ns3::AthstatsHelper::AthstatsHelper(ns3::AthstatsHelper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::AthstatsHelper const &', 'arg0')])
@@ -456,76 +647,6 @@
[param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
return
-def register_Ns3InternetStackHelper_methods(root_module, cls):
- ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor]
- cls.add_constructor([])
- ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper(ns3::InternetStackHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')])
- ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnablePcapAll(std::string filename) [member function]
- cls.add_method('EnablePcapAll',
- 'void',
- [param('std::string', 'filename')],
- is_static=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(std::string nodeName) const [member function]
- cls.add_method('Install',
- 'void',
- [param('std::string', 'nodeName')],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
- cls.add_method('Install',
- 'void',
- [param('ns3::Ptr< ns3::Node >', 'node')],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::NodeContainer c) const [member function]
- cls.add_method('Install',
- 'void',
- [param('ns3::NodeContainer', 'c')],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::InstallAll() const [member function]
- cls.add_method('InstallAll',
- 'void',
- [],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Reset() [member function]
- cls.add_method('Reset',
- 'void',
- [])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetIpv4StackInstall(bool enable) [member function]
- cls.add_method('SetIpv4StackInstall',
- 'void',
- [param('bool', 'enable')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetIpv6StackInstall(bool enable) [member function]
- cls.add_method('SetIpv6StackInstall',
- 'void',
- [param('bool', 'enable')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetRoutingHelper(ns3::Ipv4RoutingHelper const & routing) [member function]
- cls.add_method('SetRoutingHelper',
- 'void',
- [param('ns3::Ipv4RoutingHelper const &', 'routing')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetRoutingHelper(ns3::Ipv6RoutingHelper const & routing) [member function]
- cls.add_method('SetRoutingHelper',
- 'void',
- [param('ns3::Ipv6RoutingHelper const &', 'routing')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid) [member function]
- cls.add_method('SetTcp',
- 'void',
- [param('std::string', 'tid')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid, std::string attr, ns3::AttributeValue const & val) [member function]
- cls.add_method('SetTcp',
- 'void',
- [param('std::string', 'tid'), param('std::string', 'attr'), param('ns3::AttributeValue const &', 'val')])
- return
-
def register_Ns3Ipv4AddressHelper_methods(root_module, cls):
## ipv4-address-helper.h: ns3::Ipv4AddressHelper::Ipv4AddressHelper(ns3::Ipv4AddressHelper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::Ipv4AddressHelper const &', 'arg0')])
@@ -572,6 +693,16 @@
cls.add_method('Add',
'void',
[param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## ipv4-interface-container.h: __gnu_cxx::__normal_iterator<const std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>*,std::vector<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>, std::allocator<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int> > > > ns3::Ipv4InterfaceContainer::Begin() const [member function]
+ cls.add_method('Begin',
+ '__gnu_cxx::__normal_iterator< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > const, std::vector< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > > >',
+ [],
+ is_const=True)
+ ## ipv4-interface-container.h: __gnu_cxx::__normal_iterator<const std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>*,std::vector<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>, std::allocator<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int> > > > ns3::Ipv4InterfaceContainer::End() const [member function]
+ cls.add_method('End',
+ '__gnu_cxx::__normal_iterator< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > const, std::vector< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > > >',
+ [],
+ is_const=True)
## ipv4-interface-container.h: std::pair<ns3::Ptr<ns3::Ipv4>,unsigned int> ns3::Ipv4InterfaceContainer::Get(uint32_t i) const [member function]
cls.add_method('Get',
'std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int >',
@@ -1128,48 +1259,88 @@
cls.add_method('CreateFile',
'ns3::Ptr< ns3::PcapFileObject >',
[param('std::string', 'filename'), param('std::string', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')])
- ## pcap-helper.h: std::string ns3::PcapHelper::GetFilename(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
- cls.add_method('GetFilename',
+ ## pcap-helper.h: std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromDevice',
'std::string',
[param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+ ## pcap-helper.h: std::string ns3::PcapHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromInterfacePair',
+ 'std::string',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
return
-def register_Ns3PcapUserHelper_methods(root_module, cls):
- ## pcap-user-helper.h: ns3::PcapUserHelper::PcapUserHelper() [constructor]
+def register_Ns3PcapUserHelperForDevice_methods(root_module, cls):
+ ## pcap-user-helper-for-device.h: ns3::PcapUserHelperForDevice::PcapUserHelperForDevice() [constructor]
cls.add_constructor([])
- ## pcap-user-helper.h: ns3::PcapUserHelper::PcapUserHelper(ns3::PcapUserHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PcapUserHelper const &', 'arg0')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
+ ## pcap-user-helper-for-device.h: ns3::PcapUserHelperForDevice::PcapUserHelperForDevice(ns3::PcapUserHelperForDevice const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PcapUserHelperForDevice const &', 'arg0')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
[param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string prefix, std::string ndName, bool promiscuous=false) [member function]
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, std::string ndName, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
[param('std::string', 'prefix'), param('std::string', 'ndName'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string filename, ns3::NetDeviceContainer d, bool promiscuous=false) [member function]
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, ns3::NetDeviceContainer d, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
- [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string filename, ns3::NodeContainer n, bool promiscuous=false) [member function]
+ [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, ns3::NodeContainer n, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
- [param('std::string', 'filename'), param('ns3::NodeContainer', 'n'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid, bool promiscuous=false) [member function]
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, uint32_t nodeid, uint32_t deviceid, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
- [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcapAll(std::string filename, bool promiscuous=false) [member function]
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcapAll(std::string prefix, bool promiscuous=false) [member function]
cls.add_method('EnablePcapAll',
'void',
- [param('std::string', 'filename'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous) [member function]
+ [param('std::string', 'prefix'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous) [member function]
cls.add_method('EnablePcapInternal',
'void',
[param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous')],
is_pure_virtual=True, is_virtual=True)
return
+def register_Ns3PcapUserHelperForIpv4_methods(root_module, cls):
+ ## pcap-user-helper-for-ipv4.h: ns3::PcapUserHelperForIpv4::PcapUserHelperForIpv4() [constructor]
+ cls.add_constructor([])
+ ## pcap-user-helper-for-ipv4.h: ns3::PcapUserHelperForIpv4::PcapUserHelperForIpv4(ns3::PcapUserHelperForIpv4 const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PcapUserHelperForIpv4 const &', 'arg0')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, std::string ipv4Name, uint32_t interface) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, ns3::Ipv4InterfaceContainer c) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ipv4InterfaceContainer', 'c')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, ns3::NodeContainer n) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, uint32_t nodeid, uint32_t interface) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcapAll(std::string prefix) [member function]
+ cls.add_method('EnablePcapAll',
+ 'void',
+ [param('std::string', 'prefix')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnablePcapInternal',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
def register_Ns3Ping6Helper_methods(root_module, cls):
## ping6-helper.h: ns3::Ping6Helper::Ping6Helper(ns3::Ping6Helper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::Ping6Helper const &', 'arg0')])
@@ -1287,70 +1458,6 @@
[param('ns3::InternetStackHelper', 'stack')])
return
-def register_Ns3PointToPointHelper_methods(root_module, cls):
- ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper(ns3::PointToPointHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PointToPointHelper const &', 'arg0')])
- ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper() [constructor]
- cls.add_constructor([])
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')],
- is_static=True)
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NetDeviceContainer', 'd')],
- is_static=True)
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::NodeContainer c) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer', 'c')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr<ns3::Node> a, ns3::Ptr<ns3::Node> b) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'a'), param('ns3::Ptr< ns3::Node >', 'b')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr<ns3::Node> a, std::string bName) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'a'), param('std::string', 'bName')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aName, ns3::Ptr<ns3::Node> b) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'aName'), param('ns3::Ptr< ns3::Node >', 'b')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aNode, std::string bNode) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'aNode'), param('std::string', 'bNode')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelAttribute(std::string name, ns3::AttributeValue const & value) [member function]
- cls.add_method('SetChannelAttribute',
- 'void',
- [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::SetDeviceAttribute(std::string name, ns3::AttributeValue const & value) [member function]
- cls.add_method('SetDeviceAttribute',
- 'void',
- [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
- cls.add_method('SetQueue',
- 'void',
- [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
- cls.add_method('EnablePcapInternal',
- 'void',
- [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')],
- visibility='private', is_virtual=True)
- return
-
def register_Ns3PointToPointStarHelper_methods(root_module, cls):
## point-to-point-star-helper.h: ns3::PointToPointStarHelper::PointToPointStarHelper(ns3::PointToPointStarHelper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PointToPointStarHelper const &', 'arg0')])
@@ -1683,150 +1790,6 @@
[param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
return
-def register_Ns3CsmaHelper_methods(root_module, cls):
- ## csma-helper.h: ns3::CsmaHelper::CsmaHelper(ns3::CsmaHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::CsmaHelper const &', 'arg0')])
- ## csma-helper.h: ns3::CsmaHelper::CsmaHelper() [constructor]
- cls.add_constructor([])
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')],
- is_static=True)
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NetDeviceContainer', 'd')],
- is_static=True)
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string name) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'name')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node, std::string channelName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string', 'channelName')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'nodeName'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, std::string channelName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'nodeName'), param('std::string', 'channelName')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, std::string channelName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c'), param('std::string', 'channelName')],
- is_const=True)
- ## csma-helper.h: void ns3::CsmaHelper::SetChannelAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
- cls.add_method('SetChannelAttribute',
- 'void',
- [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
- ## csma-helper.h: void ns3::CsmaHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
- cls.add_method('SetDeviceAttribute',
- 'void',
- [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
- ## csma-helper.h: void ns3::CsmaHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
- cls.add_method('SetQueue',
- 'void',
- [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
- ## csma-helper.h: void ns3::CsmaHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
- cls.add_method('EnablePcapInternal',
- 'void',
- [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')],
- visibility='private', is_virtual=True)
- return
-
-def register_Ns3EmuHelper_methods(root_module, cls):
- ## emu-helper.h: ns3::EmuHelper::EmuHelper(ns3::EmuHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::EmuHelper const &', 'arg0')])
- ## emu-helper.h: ns3::EmuHelper::EmuHelper() [constructor]
- cls.add_constructor([])
- ## emu-helper.h: static void ns3::EmuHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')],
- is_static=True)
- ## emu-helper.h: static void ns3::EmuHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NetDeviceContainer', 'd')],
- is_static=True)
- ## emu-helper.h: static void ns3::EmuHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## emu-helper.h: static void ns3::EmuHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node')],
- is_const=True)
- ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(std::string nodeName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'nodeName')],
- is_const=True)
- ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::NodeContainer const & c) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c')],
- is_const=True)
- ## emu-helper.h: void ns3::EmuHelper::SetAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
- cls.add_method('SetAttribute',
- 'void',
- [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
- ## emu-helper.h: void ns3::EmuHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
- cls.add_method('SetQueue',
- 'void',
- [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
- ## emu-helper.h: void ns3::EmuHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
- cls.add_method('EnablePcapInternal',
- 'void',
- [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')],
- visibility='private', is_virtual=True)
- return
-
def register_Ns3Ipv4GlobalRoutingHelper_methods(root_module, cls):
## ipv4-global-routing-helper.h: ns3::Ipv4GlobalRoutingHelper::Ipv4GlobalRoutingHelper() [constructor]
cls.add_constructor([])
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_node.py Fri Jan 22 12:44:53 2010 -0800
@@ -73,6 +73,44 @@
module.add_class('LlcSnapHeader', parent=root_module['ns3::Header'])
## queue.h: ns3::Queue [class]
module.add_class('Queue', parent=root_module['ns3::Object'])
+ ## radiotap-header.h: ns3::RadiotapHeader [class]
+ module.add_class('RadiotapHeader', parent=root_module['ns3::Header'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_NONE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_CFP'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_SHORT_PREAMBLE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_WEP'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_FRAGMENTED'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_FCS_INCLUDED'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_DATA_PADDING'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_BAD_FCS'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_SHORT_GUARD'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_NONE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_TURBO'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_CCK'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_OFDM'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_SPECTRUM_2GHZ'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_SPECTRUM_5GHZ'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_PASSIVE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_DYNAMIC'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_GFSK'], outer_class=root_module['ns3::RadiotapHeader'])
## simple-ref-count.h: ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h: ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -302,6 +340,7 @@
register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header'])
register_Ns3LlcSnapHeader_methods(root_module, root_module['ns3::LlcSnapHeader'])
register_Ns3Queue_methods(root_module, root_module['ns3::Queue'])
+ register_Ns3RadiotapHeader_methods(root_module, root_module['ns3::RadiotapHeader'])
register_Ns3Socket_methods(root_module, root_module['ns3::Socket'])
register_Ns3SocketAddressTag_methods(root_module, root_module['ns3::SocketAddressTag'])
register_Ns3SocketFactory_methods(root_module, root_module['ns3::SocketFactory'])
@@ -1864,6 +1903,110 @@
is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
return
+def register_Ns3RadiotapHeader_methods(root_module, cls):
+ ## radiotap-header.h: ns3::RadiotapHeader::RadiotapHeader(ns3::RadiotapHeader const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::RadiotapHeader const &', 'arg0')])
+ ## radiotap-header.h: ns3::RadiotapHeader::RadiotapHeader() [constructor]
+ cls.add_constructor([])
+ ## radiotap-header.h: uint32_t ns3::RadiotapHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+ cls.add_method('Deserialize',
+ 'uint32_t',
+ [param('ns3::Buffer::Iterator', 'start')],
+ is_virtual=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetAntennaNoisePower() const [member function]
+ cls.add_method('GetAntennaNoisePower',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetAntennaSignalPower() const [member function]
+ cls.add_method('GetAntennaSignalPower',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint16_t ns3::RadiotapHeader::GetChannelFlags() const [member function]
+ cls.add_method('GetChannelFlags',
+ 'uint16_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint16_t ns3::RadiotapHeader::GetChannelFrequency() const [member function]
+ cls.add_method('GetChannelFrequency',
+ 'uint16_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetFrameFlags() const [member function]
+ cls.add_method('GetFrameFlags',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: ns3::TypeId ns3::RadiotapHeader::GetInstanceTypeId() const [member function]
+ cls.add_method('GetInstanceTypeId',
+ 'ns3::TypeId',
+ [],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetRate() const [member function]
+ cls.add_method('GetRate',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint32_t ns3::RadiotapHeader::GetSerializedSize() const [member function]
+ cls.add_method('GetSerializedSize',
+ 'uint32_t',
+ [],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: uint64_t ns3::RadiotapHeader::GetTsft() const [member function]
+ cls.add_method('GetTsft',
+ 'uint64_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: static ns3::TypeId ns3::RadiotapHeader::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## radiotap-header.h: void ns3::RadiotapHeader::Print(std::ostream & os) const [member function]
+ cls.add_method('Print',
+ 'void',
+ [param('std::ostream &', 'os')],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: void ns3::RadiotapHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+ cls.add_method('Serialize',
+ 'void',
+ [param('ns3::Buffer::Iterator', 'start')],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaNoisePower(int8_t noise) [member function]
+ cls.add_method('SetAntennaNoisePower',
+ 'void',
+ [param('int8_t', 'noise')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaNoisePower(double noise) [member function]
+ cls.add_method('SetAntennaNoisePower',
+ 'void',
+ [param('double', 'noise')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaSignalPower(int8_t signal) [member function]
+ cls.add_method('SetAntennaSignalPower',
+ 'void',
+ [param('int8_t', 'signal')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaSignalPower(double signal) [member function]
+ cls.add_method('SetAntennaSignalPower',
+ 'void',
+ [param('double', 'signal')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetChannelFrequencyAndFlags(uint16_t frequency, uint16_t flags) [member function]
+ cls.add_method('SetChannelFrequencyAndFlags',
+ 'void',
+ [param('uint16_t', 'frequency'), param('uint16_t', 'flags')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetFrameFlags(uint8_t flags) [member function]
+ cls.add_method('SetFrameFlags',
+ 'void',
+ [param('uint8_t', 'flags')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetRate(uint8_t rate) [member function]
+ cls.add_method('SetRate',
+ 'void',
+ [param('uint8_t', 'rate')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetTsft(uint64_t tsft) [member function]
+ cls.add_method('SetTsft',
+ 'void',
+ [param('uint64_t', 'tsft')])
+ return
+
def register_Ns3Socket_methods(root_module, cls):
## socket.h: ns3::Socket::Socket(ns3::Socket const & arg0) [copy constructor]
cls.add_constructor([param('ns3::Socket const &', 'arg0')])
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_point_to_point.py Fri Jan 22 12:44:53 2010 -0800
@@ -235,6 +235,11 @@
'ns3::Ptr< ns3::Node >',
[],
is_const=True, is_virtual=True)
+ ## point-to-point-net-device.h: ns3::Ptr<ns3::Queue> ns3::PointToPointNetDevice::GetQueue() const [member function]
+ cls.add_method('GetQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [],
+ is_const=True)
## point-to-point-net-device.h: static ns3::TypeId ns3::PointToPointNetDevice::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_wifi.py Fri Jan 22 12:44:53 2010 -0800
@@ -46,7 +46,7 @@
## wifi-mode.h: ns3::WifiMode [class]
module.add_class('WifiMode')
## wifi-mode.h: ns3::WifiMode::ModulationType [enumeration]
- module.add_enum('ModulationType', ['BPSK', 'DBPSK', 'DQPSK', 'QAM', 'UNKNOWN'], outer_class=root_module['ns3::WifiMode'])
+ module.add_enum('ModulationType', ['BPSK', 'QPSK', 'DBPSK', 'DQPSK', 'QAM', 'UNKNOWN'], outer_class=root_module['ns3::WifiMode'])
## wifi-mode.h: ns3::WifiModeFactory [class]
module.add_class('WifiModeFactory')
## wifi-phy.h: ns3::WifiPhyListener [class]
@@ -1093,6 +1093,11 @@
'ns3::WifiMode',
[param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('uint8_t', 'constellationSize'), param('ns3::WifiPhyStandard', 'standard')],
is_static=True)
+ ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateQpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, ns3::WifiPhyStandard standard) [member function]
+ cls.add_method('CreateQpsk',
+ 'ns3::WifiMode',
+ [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('ns3::WifiPhyStandard', 'standard')],
+ is_static=True)
return
def register_Ns3WifiPhyListener_methods(root_module, cls):
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_common.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_common.py Fri Jan 22 12:44:53 2010 -0800
@@ -47,6 +47,8 @@
module.add_class('Chunk', parent=root_module['ns3::ObjectBase'])
## header.h: ns3::Header [class]
module.add_class('Header', parent=root_module['ns3::Chunk'])
+ ## output-stream-object.h: ns3::OutputStreamObject [class]
+ module.add_class('OutputStreamObject', parent=root_module['ns3::Object'])
## pcap-file-object.h: ns3::PcapFileObject [class]
module.add_class('PcapFileObject', parent=root_module['ns3::Object'])
## pcap-writer.h: ns3::PcapWriter [class]
@@ -177,6 +179,7 @@
register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer'])
register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk'])
register_Ns3Header_methods(root_module, root_module['ns3::Header'])
+ register_Ns3OutputStreamObject_methods(root_module, root_module['ns3::OutputStreamObject'])
register_Ns3PcapFileObject_methods(root_module, root_module['ns3::PcapFileObject'])
register_Ns3PcapWriter_methods(root_module, root_module['ns3::PcapWriter'])
register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer'])
@@ -951,6 +954,26 @@
is_pure_virtual=True, is_const=True, is_virtual=True)
return
+def register_Ns3OutputStreamObject_methods(root_module, cls):
+ ## output-stream-object.h: ns3::OutputStreamObject::OutputStreamObject(ns3::OutputStreamObject const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::OutputStreamObject const &', 'arg0')])
+ ## output-stream-object.h: ns3::OutputStreamObject::OutputStreamObject() [constructor]
+ cls.add_constructor([])
+ ## output-stream-object.h: std::ostream * ns3::OutputStreamObject::GetStream() [member function]
+ cls.add_method('GetStream',
+ 'std::ostream *',
+ [])
+ ## output-stream-object.h: static ns3::TypeId ns3::OutputStreamObject::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## output-stream-object.h: void ns3::OutputStreamObject::SetStream(std::ostream * ostream) [member function]
+ cls.add_method('SetStream',
+ 'void',
+ [param('std::ostream *', 'ostream')])
+ return
+
def register_Ns3PcapFileObject_methods(root_module, cls):
## pcap-file-object.h: ns3::PcapFileObject::PcapFileObject(ns3::PcapFileObject const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PcapFileObject const &', 'arg0')])
@@ -960,11 +983,39 @@
cls.add_method('Close',
'void',
[])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetDataLinkType() [member function]
+ cls.add_method('GetDataLinkType',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetMagic() [member function]
+ cls.add_method('GetMagic',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetSigFigs() [member function]
+ cls.add_method('GetSigFigs',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: uint32_t ns3::PcapFileObject::GetSnapLen() [member function]
+ cls.add_method('GetSnapLen',
+ 'uint32_t',
+ [])
+ ## pcap-file-object.h: int32_t ns3::PcapFileObject::GetTimeZoneOffset() [member function]
+ cls.add_method('GetTimeZoneOffset',
+ 'int32_t',
+ [])
## pcap-file-object.h: static ns3::TypeId ns3::PcapFileObject::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
+ ## pcap-file-object.h: uint16_t ns3::PcapFileObject::GetVersionMajor() [member function]
+ cls.add_method('GetVersionMajor',
+ 'uint16_t',
+ [])
+ ## pcap-file-object.h: uint16_t ns3::PcapFileObject::GetVersionMinor() [member function]
+ cls.add_method('GetVersionMinor',
+ 'uint16_t',
+ [])
## pcap-file-object.h: bool ns3::PcapFileObject::Init(uint32_t dataLinkType, uint32_t snapLen=ns3::PcapFile::SNAPLEN_DEFAULT, int32_t tzCorrection=ns3::PcapFile::ZONE_DEFAULT) [member function]
cls.add_method('Init',
'bool',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py Fri Jan 22 12:44:53 2010 -0800
@@ -3043,11 +3043,21 @@
module.add_function('MakeBooleanChecker',
'ns3::Ptr< ns3::AttributeChecker const >',
[])
+ ## callback.h: extern ns3::Callback<void,ns3::Ptr<const ns3::Packet>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr<ns3::OutputStreamObject>,::ns3::Ptr<ns3::Packet const> ) * fnPtr, ns3::Ptr<ns3::OutputStreamObject> a) [free function]
+ module.add_function('MakeBoundCallback',
+ 'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >',
+ [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamObject >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamObject >', 'a')],
+ template_parameters=['void', 'ns3::Ptr<ns3::OutputStreamObject>', 'ns3::Ptr<ns3::OutputStreamObject>', 'ns3::Ptr<ns3::Packet const>'])
## callback.h: extern ns3::Callback<void,ns3::Ptr<const ns3::Packet>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr<ns3::PcapFileObject>,::ns3::Ptr<ns3::Packet const> ) * fnPtr, ns3::Ptr<ns3::PcapFileObject> a) [free function]
module.add_function('MakeBoundCallback',
'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >',
[param('void ( * ) ( ns3::Ptr< ns3::PcapFileObject >, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::PcapFileObject >', 'a')],
template_parameters=['void', 'ns3::Ptr<ns3::PcapFileObject>', 'ns3::Ptr<ns3::PcapFileObject>', 'ns3::Ptr<ns3::Packet const>'])
+ ## callback.h: extern ns3::Callback<void,std::basic_string<char, std::char_traits<char>, std::allocator<char> >,ns3::Ptr<const ns3::Packet>,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> ns3::MakeBoundCallback(void (*)( ::ns3::Ptr<ns3::OutputStreamObject>,::std::basic_string<char,std::char_traits<char>,std::allocator<char> >,::ns3::Ptr<ns3::Packet const> ) * fnPtr, ns3::Ptr<ns3::OutputStreamObject> a) [free function]
+ module.add_function('MakeBoundCallback',
+ 'ns3::Callback< void, std::basic_string< char, std::char_traits< char >, std::allocator< char > >, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >',
+ [param('void ( * ) ( ns3::Ptr< ns3::OutputStreamObject >, std::string, ns3::Ptr< ns3::Packet const > ) *', 'fnPtr'), param('ns3::Ptr< ns3::OutputStreamObject >', 'a')],
+ template_parameters=['void', 'ns3::Ptr<ns3::OutputStreamObject>', 'ns3::Ptr<ns3::OutputStreamObject>', 'std::string', 'ns3::Ptr<ns3::Packet const>'])
## callback.h: extern ns3::Ptr<ns3::AttributeChecker const> ns3::MakeCallbackChecker() [free function]
module.add_function('MakeCallbackChecker',
'ns3::Ptr< ns3::AttributeChecker const >',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_csma.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_csma.py Fri Jan 22 12:44:53 2010 -0800
@@ -266,6 +266,11 @@
cls.add_method('SetQueue',
'void',
[param('ns3::Ptr< ns3::Queue >', 'queue')])
+ ## csma-net-device.h: ns3::Ptr<ns3::Queue> ns3::CsmaNetDevice::GetQueue() const [member function]
+ cls.add_method('GetQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [],
+ is_const=True)
## csma-net-device.h: void ns3::CsmaNetDevice::SetReceiveErrorModel(ns3::Ptr<ns3::ErrorModel> em) [member function]
cls.add_method('SetReceiveErrorModel',
'void',
@@ -432,11 +437,6 @@
'void',
[],
visibility='protected', is_virtual=True)
- ## csma-net-device.h: ns3::Ptr<ns3::Queue> ns3::CsmaNetDevice::GetQueue() const [member function]
- cls.add_method('GetQueue',
- 'ns3::Ptr< ns3::Queue >',
- [],
- is_const=True, visibility='protected')
## csma-net-device.h: void ns3::CsmaNetDevice::AddHeader(ns3::Ptr<ns3::Packet> p, ns3::Mac48Address source, ns3::Mac48Address dest, uint16_t protocolNumber) [member function]
cls.add_method('AddHeader',
'void',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_emu.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_emu.py Fri Jan 22 12:44:53 2010 -0800
@@ -147,6 +147,11 @@
'ns3::Ptr< ns3::Node >',
[],
is_const=True, is_virtual=True)
+ ## emu-net-device.h: ns3::Ptr<ns3::Queue> ns3::EmuNetDevice::GetQueue() const [member function]
+ cls.add_method('GetQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [],
+ is_const=True)
## emu-net-device.h: static ns3::TypeId ns3::EmuNetDevice::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_helper.py Fri Jan 22 12:44:53 2010 -0800
@@ -7,6 +7,12 @@
module.add_class('AnimationInterface')
## application-container.h: ns3::ApplicationContainer [class]
module.add_class('ApplicationContainer')
+ ## ascii-trace-helper.h: ns3::AsciiTraceHelper [class]
+ module.add_class('AsciiTraceHelper', allow_subclassing=False)
+ ## ascii-trace-user-helper-for-device.h: ns3::AsciiTraceUserHelperForDevice [class]
+ module.add_class('AsciiTraceUserHelperForDevice', allow_subclassing=True)
+ ## ascii-trace-user-helper-for-ipv4.h: ns3::AsciiTraceUserHelperForIpv4 [class]
+ module.add_class('AsciiTraceUserHelperForIpv4', allow_subclassing=True)
## athstats-helper.h: ns3::AthstatsHelper [class]
module.add_class('AthstatsHelper', allow_subclassing=False)
## bridge-helper.h: ns3::BridgeHelper [class]
@@ -15,8 +21,6 @@
module.add_class('CsmaStarHelper', allow_subclassing=False)
## flow-monitor-helper.h: ns3::FlowMonitorHelper [class]
module.add_class('FlowMonitorHelper', allow_subclassing=False)
- ## internet-stack-helper.h: ns3::InternetStackHelper [class]
- module.add_class('InternetStackHelper', allow_subclassing=False)
## ipv4-address-helper.h: ns3::Ipv4AddressHelper [class]
module.add_class('Ipv4AddressHelper', allow_subclassing=False)
## ipv4-interface-container.h: ns3::Ipv4InterfaceContainer [class]
@@ -55,18 +59,30 @@
module.add_class('PacketSocketHelper', allow_subclassing=False)
## pcap-helper.h: ns3::PcapHelper [class]
module.add_class('PcapHelper', allow_subclassing=False)
- ## pcap-helper.h: ns3::PcapHelper::DataLinkType [enumeration]
- module.add_enum('DataLinkType', ['DLT_NULL', 'DLT_EN10MB', 'DLT_PPP', 'DLT_IEEE802_11', 'DLT_PRISM_HEADER', 'DLT_IEEE802_11_RADIO'], outer_class=root_module['ns3::PcapHelper'])
- ## pcap-user-helper.h: ns3::PcapUserHelper [class]
- module.add_class('PcapUserHelper', allow_subclassing=False)
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_NULL'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_EN10MB'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_PPP'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_RAW'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_IEEE802_11'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_PRISM_HEADER'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-helper.h: ns3::PcapHelper [enumeration]
+ module.add_enum('', ['DLT_IEEE802_11_RADIO'], outer_class=root_module['ns3::PcapHelper'])
+ ## pcap-user-helper-for-device.h: ns3::PcapUserHelperForDevice [class]
+ module.add_class('PcapUserHelperForDevice', allow_subclassing=True)
+ ## pcap-user-helper-for-ipv4.h: ns3::PcapUserHelperForIpv4 [class]
+ module.add_class('PcapUserHelperForIpv4', allow_subclassing=True)
## ping6-helper.h: ns3::Ping6Helper [class]
module.add_class('Ping6Helper', allow_subclassing=False)
## point-to-point-dumbbell-helper.h: ns3::PointToPointDumbbellHelper [class]
module.add_class('PointToPointDumbbellHelper', allow_subclassing=False)
## point-to-point-grid-helper.h: ns3::PointToPointGridHelper [class]
module.add_class('PointToPointGridHelper', allow_subclassing=False)
- ## point-to-point-helper.h: ns3::PointToPointHelper [class]
- module.add_class('PointToPointHelper', allow_subclassing=False, parent=root_module['ns3::PcapUserHelper'])
## point-to-point-star-helper.h: ns3::PointToPointStarHelper [class]
module.add_class('PointToPointStarHelper', allow_subclassing=False)
## tap-bridge-helper.h: ns3::TapBridgeHelper [class]
@@ -93,10 +109,6 @@
module.add_class('YansWifiChannelHelper', allow_subclassing=False)
## aodv-helper.h: ns3::AodvHelper [class]
module.add_class('AodvHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])
- ## csma-helper.h: ns3::CsmaHelper [class]
- module.add_class('CsmaHelper', allow_subclassing=False, parent=root_module['ns3::PcapUserHelper'])
- ## emu-helper.h: ns3::EmuHelper [class]
- module.add_class('EmuHelper', allow_subclassing=False, parent=root_module['ns3::PcapUserHelper'])
## ipv4-global-routing-helper.h: ns3::Ipv4GlobalRoutingHelper [class]
module.add_class('Ipv4GlobalRoutingHelper', allow_subclassing=False, parent=root_module['ns3::Ipv4RoutingHelper'])
## ipv4-list-routing-helper.h: ns3::Ipv4ListRoutingHelper [class]
@@ -203,11 +215,13 @@
def register_methods(root_module):
register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface'])
register_Ns3ApplicationContainer_methods(root_module, root_module['ns3::ApplicationContainer'])
+ register_Ns3AsciiTraceHelper_methods(root_module, root_module['ns3::AsciiTraceHelper'])
+ register_Ns3AsciiTraceUserHelperForDevice_methods(root_module, root_module['ns3::AsciiTraceUserHelperForDevice'])
+ register_Ns3AsciiTraceUserHelperForIpv4_methods(root_module, root_module['ns3::AsciiTraceUserHelperForIpv4'])
register_Ns3AthstatsHelper_methods(root_module, root_module['ns3::AthstatsHelper'])
register_Ns3BridgeHelper_methods(root_module, root_module['ns3::BridgeHelper'])
register_Ns3CsmaStarHelper_methods(root_module, root_module['ns3::CsmaStarHelper'])
register_Ns3FlowMonitorHelper_methods(root_module, root_module['ns3::FlowMonitorHelper'])
- register_Ns3InternetStackHelper_methods(root_module, root_module['ns3::InternetStackHelper'])
register_Ns3Ipv4AddressHelper_methods(root_module, root_module['ns3::Ipv4AddressHelper'])
register_Ns3Ipv4InterfaceContainer_methods(root_module, root_module['ns3::Ipv4InterfaceContainer'])
register_Ns3Ipv4RoutingHelper_methods(root_module, root_module['ns3::Ipv4RoutingHelper'])
@@ -226,11 +240,11 @@
register_Ns3PacketSinkHelper_methods(root_module, root_module['ns3::PacketSinkHelper'])
register_Ns3PacketSocketHelper_methods(root_module, root_module['ns3::PacketSocketHelper'])
register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper'])
- register_Ns3PcapUserHelper_methods(root_module, root_module['ns3::PcapUserHelper'])
+ register_Ns3PcapUserHelperForDevice_methods(root_module, root_module['ns3::PcapUserHelperForDevice'])
+ register_Ns3PcapUserHelperForIpv4_methods(root_module, root_module['ns3::PcapUserHelperForIpv4'])
register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper'])
register_Ns3PointToPointDumbbellHelper_methods(root_module, root_module['ns3::PointToPointDumbbellHelper'])
register_Ns3PointToPointGridHelper_methods(root_module, root_module['ns3::PointToPointGridHelper'])
- register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper'])
register_Ns3PointToPointStarHelper_methods(root_module, root_module['ns3::PointToPointStarHelper'])
register_Ns3TapBridgeHelper_methods(root_module, root_module['ns3::TapBridgeHelper'])
register_Ns3UdpClientHelper_methods(root_module, root_module['ns3::UdpClientHelper'])
@@ -244,8 +258,6 @@
register_Ns3WifiPhyHelper_methods(root_module, root_module['ns3::WifiPhyHelper'])
register_Ns3YansWifiChannelHelper_methods(root_module, root_module['ns3::YansWifiChannelHelper'])
register_Ns3AodvHelper_methods(root_module, root_module['ns3::AodvHelper'])
- register_Ns3CsmaHelper_methods(root_module, root_module['ns3::CsmaHelper'])
- register_Ns3EmuHelper_methods(root_module, root_module['ns3::EmuHelper'])
register_Ns3Ipv4GlobalRoutingHelper_methods(root_module, root_module['ns3::Ipv4GlobalRoutingHelper'])
register_Ns3Ipv4ListRoutingHelper_methods(root_module, root_module['ns3::Ipv4ListRoutingHelper'])
register_Ns3Ipv4NixVectorHelper_methods(root_module, root_module['ns3::Ipv4NixVectorHelper'])
@@ -333,6 +345,185 @@
[param('ns3::Time', 'stop')])
return
+def register_Ns3AsciiTraceHelper_methods(root_module, cls):
+ ## ascii-trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper(ns3::AsciiTraceHelper const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::AsciiTraceHelper const &', 'arg0')])
+ ## ascii-trace-helper.h: ns3::AsciiTraceHelper::AsciiTraceHelper() [constructor]
+ cls.add_constructor([])
+ ## ascii-trace-helper.h: ns3::Ptr<ns3::OutputStreamObject> ns3::AsciiTraceHelper::CreateFileStream(std::string filename, std::string filemode="w") [member function]
+ cls.add_method('CreateFileStream',
+ 'ns3::Ptr< ns3::OutputStreamObject >',
+ [param('std::string', 'filename'), param('std::string', 'filemode', default_value='"w"')])
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDequeueSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDequeueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDequeueSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDropSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultDropSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultDropSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultEnqueueSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultEnqueueSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultEnqueueSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithContext(ns3::Ptr<ns3::OutputStreamObject> file, std::string context, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultReceiveSinkWithContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('std::string', 'context'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: static void ns3::AsciiTraceHelper::DefaultReceiveSinkWithoutContext(ns3::Ptr<ns3::OutputStreamObject> file, ns3::Ptr<ns3::Packet const> p) [member function]
+ cls.add_method('DefaultReceiveSinkWithoutContext',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'file'), param('ns3::Ptr< ns3::Packet const >', 'p')],
+ is_static=True)
+ ## ascii-trace-helper.h: std::string ns3::AsciiTraceHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromDevice',
+ 'std::string',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+ ## ascii-trace-helper.h: std::string ns3::AsciiTraceHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromInterfacePair',
+ 'std::string',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
+ return
+
+def register_Ns3AsciiTraceUserHelperForDevice_methods(root_module, cls):
+ ## ascii-trace-user-helper-for-device.h: ns3::AsciiTraceUserHelperForDevice::AsciiTraceUserHelperForDevice() [constructor]
+ cls.add_constructor([])
+ ## ascii-trace-user-helper-for-device.h: ns3::AsciiTraceUserHelperForDevice::AsciiTraceUserHelperForDevice(ns3::AsciiTraceUserHelperForDevice const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::AsciiTraceUserHelperForDevice const &', 'arg0')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, ns3::Ptr<ns3::NetDevice> nd) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::Ptr<ns3::NetDevice> nd) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::Ptr< ns3::NetDevice >', 'nd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, std::string ndName) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('std::string', 'ndName')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, std::string ndName) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'ndName')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, ns3::NetDeviceContainer d) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::NetDeviceContainer d) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::NetDeviceContainer', 'd')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, uint32_t nodeid, uint32_t deviceid) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAsciiAll(std::string prefix) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('std::string', 'prefix')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAsciiAll(ns3::Ptr<ns3::OutputStreamObject> stream) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream')])
+ ## ascii-trace-user-helper-for-device.h: void ns3::AsciiTraceUserHelperForDevice::EnableAsciiInternal(ns3::Ptr<ns3::OutputStreamObject> stream, std::string prefix, ns3::Ptr<ns3::NetDevice> nd) [member function]
+ cls.add_method('EnableAsciiInternal',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
+def register_Ns3AsciiTraceUserHelperForIpv4_methods(root_module, cls):
+ ## ascii-trace-user-helper-for-ipv4.h: ns3::AsciiTraceUserHelperForIpv4::AsciiTraceUserHelperForIpv4() [constructor]
+ cls.add_constructor([])
+ ## ascii-trace-user-helper-for-ipv4.h: ns3::AsciiTraceUserHelperForIpv4::AsciiTraceUserHelperForIpv4(ns3::AsciiTraceUserHelperForIpv4 const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::AsciiTraceUserHelperForIpv4 const &', 'arg0')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, std::string ipv4Name, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, std::string ipv4Name, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, ns3::Ipv4InterfaceContainer c) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ipv4InterfaceContainer', 'c')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::Ipv4InterfaceContainer c) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::Ipv4InterfaceContainer', 'c')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, ns3::NodeContainer n) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('ns3::NodeContainer', 'n')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(std::string prefix, uint32_t nodeid, uint32_t deviceid) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAscii(ns3::Ptr<ns3::OutputStreamObject> stream, uint32_t nodeid, uint32_t interface) [member function]
+ cls.add_method('EnableAscii',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAsciiAll(std::string prefix) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('std::string', 'prefix')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAsciiAll(ns3::Ptr<ns3::OutputStreamObject> stream) [member function]
+ cls.add_method('EnableAsciiAll',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream')])
+ ## ascii-trace-user-helper-for-ipv4.h: void ns3::AsciiTraceUserHelperForIpv4::EnableAsciiInternal(ns3::Ptr<ns3::OutputStreamObject> stream, std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnableAsciiInternal',
+ 'void',
+ [param('ns3::Ptr< ns3::OutputStreamObject >', 'stream'), param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
def register_Ns3AthstatsHelper_methods(root_module, cls):
## athstats-helper.h: ns3::AthstatsHelper::AthstatsHelper(ns3::AthstatsHelper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::AthstatsHelper const &', 'arg0')])
@@ -456,76 +647,6 @@
[param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
return
-def register_Ns3InternetStackHelper_methods(root_module, cls):
- ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper() [constructor]
- cls.add_constructor([])
- ## internet-stack-helper.h: ns3::InternetStackHelper::InternetStackHelper(ns3::InternetStackHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::InternetStackHelper const &', 'arg0')])
- ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## internet-stack-helper.h: static void ns3::InternetStackHelper::EnablePcapAll(std::string filename) [member function]
- cls.add_method('EnablePcapAll',
- 'void',
- [param('std::string', 'filename')],
- is_static=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(std::string nodeName) const [member function]
- cls.add_method('Install',
- 'void',
- [param('std::string', 'nodeName')],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
- cls.add_method('Install',
- 'void',
- [param('ns3::Ptr< ns3::Node >', 'node')],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Install(ns3::NodeContainer c) const [member function]
- cls.add_method('Install',
- 'void',
- [param('ns3::NodeContainer', 'c')],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::InstallAll() const [member function]
- cls.add_method('InstallAll',
- 'void',
- [],
- is_const=True)
- ## internet-stack-helper.h: void ns3::InternetStackHelper::Reset() [member function]
- cls.add_method('Reset',
- 'void',
- [])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetIpv4StackInstall(bool enable) [member function]
- cls.add_method('SetIpv4StackInstall',
- 'void',
- [param('bool', 'enable')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetIpv6StackInstall(bool enable) [member function]
- cls.add_method('SetIpv6StackInstall',
- 'void',
- [param('bool', 'enable')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetRoutingHelper(ns3::Ipv4RoutingHelper const & routing) [member function]
- cls.add_method('SetRoutingHelper',
- 'void',
- [param('ns3::Ipv4RoutingHelper const &', 'routing')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetRoutingHelper(ns3::Ipv6RoutingHelper const & routing) [member function]
- cls.add_method('SetRoutingHelper',
- 'void',
- [param('ns3::Ipv6RoutingHelper const &', 'routing')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid) [member function]
- cls.add_method('SetTcp',
- 'void',
- [param('std::string', 'tid')])
- ## internet-stack-helper.h: void ns3::InternetStackHelper::SetTcp(std::string tid, std::string attr, ns3::AttributeValue const & val) [member function]
- cls.add_method('SetTcp',
- 'void',
- [param('std::string', 'tid'), param('std::string', 'attr'), param('ns3::AttributeValue const &', 'val')])
- return
-
def register_Ns3Ipv4AddressHelper_methods(root_module, cls):
## ipv4-address-helper.h: ns3::Ipv4AddressHelper::Ipv4AddressHelper(ns3::Ipv4AddressHelper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::Ipv4AddressHelper const &', 'arg0')])
@@ -572,6 +693,16 @@
cls.add_method('Add',
'void',
[param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## ipv4-interface-container.h: __gnu_cxx::__normal_iterator<const std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>*,std::vector<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>, std::allocator<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int> > > > ns3::Ipv4InterfaceContainer::Begin() const [member function]
+ cls.add_method('Begin',
+ '__gnu_cxx::__normal_iterator< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > const, std::vector< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > > >',
+ [],
+ is_const=True)
+ ## ipv4-interface-container.h: __gnu_cxx::__normal_iterator<const std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>*,std::vector<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int>, std::allocator<std::pair<ns3::Ptr<ns3::Ipv4>, unsigned int> > > > ns3::Ipv4InterfaceContainer::End() const [member function]
+ cls.add_method('End',
+ '__gnu_cxx::__normal_iterator< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > const, std::vector< std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int > > >',
+ [],
+ is_const=True)
## ipv4-interface-container.h: std::pair<ns3::Ptr<ns3::Ipv4>,unsigned int> ns3::Ipv4InterfaceContainer::Get(uint32_t i) const [member function]
cls.add_method('Get',
'std::pair< ns3::Ptr< ns3::Ipv4 >, unsigned int >',
@@ -1128,48 +1259,88 @@
cls.add_method('CreateFile',
'ns3::Ptr< ns3::PcapFileObject >',
[param('std::string', 'filename'), param('std::string', 'filemode'), param('uint32_t', 'dataLinkType'), param('uint32_t', 'snapLen', default_value='65535'), param('int32_t', 'tzCorrection', default_value='0')])
- ## pcap-helper.h: std::string ns3::PcapHelper::GetFilename(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
- cls.add_method('GetFilename',
+ ## pcap-helper.h: std::string ns3::PcapHelper::GetFilenameFromDevice(std::string prefix, ns3::Ptr<ns3::NetDevice> device, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromDevice',
'std::string',
[param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'useObjectNames', default_value='true')])
+ ## pcap-helper.h: std::string ns3::PcapHelper::GetFilenameFromInterfacePair(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface, bool useObjectNames=true) [member function]
+ cls.add_method('GetFilenameFromInterfacePair',
+ 'std::string',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface'), param('bool', 'useObjectNames', default_value='true')])
return
-def register_Ns3PcapUserHelper_methods(root_module, cls):
- ## pcap-user-helper.h: ns3::PcapUserHelper::PcapUserHelper() [constructor]
+def register_Ns3PcapUserHelperForDevice_methods(root_module, cls):
+ ## pcap-user-helper-for-device.h: ns3::PcapUserHelperForDevice::PcapUserHelperForDevice() [constructor]
cls.add_constructor([])
- ## pcap-user-helper.h: ns3::PcapUserHelper::PcapUserHelper(ns3::PcapUserHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PcapUserHelper const &', 'arg0')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
+ ## pcap-user-helper-for-device.h: ns3::PcapUserHelperForDevice::PcapUserHelperForDevice(ns3::PcapUserHelperForDevice const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PcapUserHelperForDevice const &', 'arg0')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
[param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string prefix, std::string ndName, bool promiscuous=false) [member function]
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, std::string ndName, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
[param('std::string', 'prefix'), param('std::string', 'ndName'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string filename, ns3::NetDeviceContainer d, bool promiscuous=false) [member function]
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, ns3::NetDeviceContainer d, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
- [param('std::string', 'filename'), param('ns3::NetDeviceContainer', 'd'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string filename, ns3::NodeContainer n, bool promiscuous=false) [member function]
+ [param('std::string', 'prefix'), param('ns3::NetDeviceContainer', 'd'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, ns3::NodeContainer n, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
- [param('std::string', 'filename'), param('ns3::NodeContainer', 'n'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid, bool promiscuous=false) [member function]
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcap(std::string prefix, uint32_t nodeid, uint32_t deviceid, bool promiscuous=false) [member function]
cls.add_method('EnablePcap',
'void',
- [param('std::string', 'filename'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcapAll(std::string filename, bool promiscuous=false) [member function]
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcapAll(std::string prefix, bool promiscuous=false) [member function]
cls.add_method('EnablePcapAll',
'void',
- [param('std::string', 'filename'), param('bool', 'promiscuous', default_value='false')])
- ## pcap-user-helper.h: void ns3::PcapUserHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous) [member function]
+ [param('std::string', 'prefix'), param('bool', 'promiscuous', default_value='false')])
+ ## pcap-user-helper-for-device.h: void ns3::PcapUserHelperForDevice::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous) [member function]
cls.add_method('EnablePcapInternal',
'void',
[param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous')],
is_pure_virtual=True, is_virtual=True)
return
+def register_Ns3PcapUserHelperForIpv4_methods(root_module, cls):
+ ## pcap-user-helper-for-ipv4.h: ns3::PcapUserHelperForIpv4::PcapUserHelperForIpv4() [constructor]
+ cls.add_constructor([])
+ ## pcap-user-helper-for-ipv4.h: ns3::PcapUserHelperForIpv4::PcapUserHelperForIpv4(ns3::PcapUserHelperForIpv4 const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::PcapUserHelperForIpv4 const &', 'arg0')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, std::string ipv4Name, uint32_t interface) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('std::string', 'ipv4Name'), param('uint32_t', 'interface')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, ns3::Ipv4InterfaceContainer c) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ipv4InterfaceContainer', 'c')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, ns3::NodeContainer n) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::NodeContainer', 'n')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcap(std::string prefix, uint32_t nodeid, uint32_t interface) [member function]
+ cls.add_method('EnablePcap',
+ 'void',
+ [param('std::string', 'prefix'), param('uint32_t', 'nodeid'), param('uint32_t', 'interface')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcapAll(std::string prefix) [member function]
+ cls.add_method('EnablePcapAll',
+ 'void',
+ [param('std::string', 'prefix')])
+ ## pcap-user-helper-for-ipv4.h: void ns3::PcapUserHelperForIpv4::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::Ipv4> ipv4, uint32_t interface) [member function]
+ cls.add_method('EnablePcapInternal',
+ 'void',
+ [param('std::string', 'prefix'), param('ns3::Ptr< ns3::Ipv4 >', 'ipv4'), param('uint32_t', 'interface')],
+ is_pure_virtual=True, is_virtual=True)
+ return
+
def register_Ns3Ping6Helper_methods(root_module, cls):
## ping6-helper.h: ns3::Ping6Helper::Ping6Helper(ns3::Ping6Helper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::Ping6Helper const &', 'arg0')])
@@ -1287,70 +1458,6 @@
[param('ns3::InternetStackHelper', 'stack')])
return
-def register_Ns3PointToPointHelper_methods(root_module, cls):
- ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper(ns3::PointToPointHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::PointToPointHelper const &', 'arg0')])
- ## point-to-point-helper.h: ns3::PointToPointHelper::PointToPointHelper() [constructor]
- cls.add_constructor([])
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')],
- is_static=True)
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NetDeviceContainer', 'd')],
- is_static=True)
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::NodeContainer c) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer', 'c')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr<ns3::Node> a, ns3::Ptr<ns3::Node> b) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'a'), param('ns3::Ptr< ns3::Node >', 'b')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(ns3::Ptr<ns3::Node> a, std::string bName) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'a'), param('std::string', 'bName')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aName, ns3::Ptr<ns3::Node> b) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'aName'), param('ns3::Ptr< ns3::Node >', 'b')])
- ## point-to-point-helper.h: ns3::NetDeviceContainer ns3::PointToPointHelper::Install(std::string aNode, std::string bNode) [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'aNode'), param('std::string', 'bNode')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelAttribute(std::string name, ns3::AttributeValue const & value) [member function]
- cls.add_method('SetChannelAttribute',
- 'void',
- [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::SetDeviceAttribute(std::string name, ns3::AttributeValue const & value) [member function]
- cls.add_method('SetDeviceAttribute',
- 'void',
- [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
- cls.add_method('SetQueue',
- 'void',
- [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
- ## point-to-point-helper.h: void ns3::PointToPointHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
- cls.add_method('EnablePcapInternal',
- 'void',
- [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')],
- visibility='private', is_virtual=True)
- return
-
def register_Ns3PointToPointStarHelper_methods(root_module, cls):
## point-to-point-star-helper.h: ns3::PointToPointStarHelper::PointToPointStarHelper(ns3::PointToPointStarHelper const & arg0) [copy constructor]
cls.add_constructor([param('ns3::PointToPointStarHelper const &', 'arg0')])
@@ -1683,150 +1790,6 @@
[param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
return
-def register_Ns3CsmaHelper_methods(root_module, cls):
- ## csma-helper.h: ns3::CsmaHelper::CsmaHelper(ns3::CsmaHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::CsmaHelper const &', 'arg0')])
- ## csma-helper.h: ns3::CsmaHelper::CsmaHelper() [constructor]
- cls.add_constructor([])
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')],
- is_static=True)
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NetDeviceContainer', 'd')],
- is_static=True)
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## csma-helper.h: static void ns3::CsmaHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string name) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'name')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::Ptr<ns3::Node> node, std::string channelName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node'), param('std::string', 'channelName')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'nodeName'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(std::string nodeName, std::string channelName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'nodeName'), param('std::string', 'channelName')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, ns3::Ptr<ns3::CsmaChannel> channel) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c'), param('ns3::Ptr< ns3::CsmaChannel >', 'channel')],
- is_const=True)
- ## csma-helper.h: ns3::NetDeviceContainer ns3::CsmaHelper::Install(ns3::NodeContainer const & c, std::string channelName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c'), param('std::string', 'channelName')],
- is_const=True)
- ## csma-helper.h: void ns3::CsmaHelper::SetChannelAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
- cls.add_method('SetChannelAttribute',
- 'void',
- [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
- ## csma-helper.h: void ns3::CsmaHelper::SetDeviceAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
- cls.add_method('SetDeviceAttribute',
- 'void',
- [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
- ## csma-helper.h: void ns3::CsmaHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
- cls.add_method('SetQueue',
- 'void',
- [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
- ## csma-helper.h: void ns3::CsmaHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
- cls.add_method('EnablePcapInternal',
- 'void',
- [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')],
- visibility='private', is_virtual=True)
- return
-
-def register_Ns3EmuHelper_methods(root_module, cls):
- ## emu-helper.h: ns3::EmuHelper::EmuHelper(ns3::EmuHelper const & arg0) [copy constructor]
- cls.add_constructor([param('ns3::EmuHelper const &', 'arg0')])
- ## emu-helper.h: ns3::EmuHelper::EmuHelper() [constructor]
- cls.add_constructor([])
- ## emu-helper.h: static void ns3::EmuHelper::EnableAscii(std::ostream & os, uint32_t nodeid, uint32_t deviceid) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('uint32_t', 'nodeid'), param('uint32_t', 'deviceid')],
- is_static=True)
- ## emu-helper.h: static void ns3::EmuHelper::EnableAscii(std::ostream & os, ns3::NetDeviceContainer d) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NetDeviceContainer', 'd')],
- is_static=True)
- ## emu-helper.h: static void ns3::EmuHelper::EnableAscii(std::ostream & os, ns3::NodeContainer n) [member function]
- cls.add_method('EnableAscii',
- 'void',
- [param('std::ostream &', 'os'), param('ns3::NodeContainer', 'n')],
- is_static=True)
- ## emu-helper.h: static void ns3::EmuHelper::EnableAsciiAll(std::ostream & os) [member function]
- cls.add_method('EnableAsciiAll',
- 'void',
- [param('std::ostream &', 'os')],
- is_static=True)
- ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::Ptr<ns3::Node> node) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::Ptr< ns3::Node >', 'node')],
- is_const=True)
- ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(std::string nodeName) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('std::string', 'nodeName')],
- is_const=True)
- ## emu-helper.h: ns3::NetDeviceContainer ns3::EmuHelper::Install(ns3::NodeContainer const & c) const [member function]
- cls.add_method('Install',
- 'ns3::NetDeviceContainer',
- [param('ns3::NodeContainer const &', 'c')],
- is_const=True)
- ## emu-helper.h: void ns3::EmuHelper::SetAttribute(std::string n1, ns3::AttributeValue const & v1) [member function]
- cls.add_method('SetAttribute',
- 'void',
- [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
- ## emu-helper.h: void ns3::EmuHelper::SetQueue(std::string type, std::string n1="", ns3::AttributeValue const & v1=ns3::EmptyAttributeValue(), std::string n2="", ns3::AttributeValue const & v2=ns3::EmptyAttributeValue(), std::string n3="", ns3::AttributeValue const & v3=ns3::EmptyAttributeValue(), std::string n4="", ns3::AttributeValue const & v4=ns3::EmptyAttributeValue()) [member function]
- cls.add_method('SetQueue',
- 'void',
- [param('std::string', 'type'), param('std::string', 'n1', default_value='""'), param('ns3::AttributeValue const &', 'v1', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n2', default_value='""'), param('ns3::AttributeValue const &', 'v2', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n3', default_value='""'), param('ns3::AttributeValue const &', 'v3', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n4', default_value='""'), param('ns3::AttributeValue const &', 'v4', default_value='ns3::EmptyAttributeValue()')])
- ## emu-helper.h: void ns3::EmuHelper::EnablePcapInternal(std::string prefix, ns3::Ptr<ns3::NetDevice> nd, bool promiscuous=false) [member function]
- cls.add_method('EnablePcapInternal',
- 'void',
- [param('std::string', 'prefix'), param('ns3::Ptr< ns3::NetDevice >', 'nd'), param('bool', 'promiscuous', default_value='false')],
- visibility='private', is_virtual=True)
- return
-
def register_Ns3Ipv4GlobalRoutingHelper_methods(root_module, cls):
## ipv4-global-routing-helper.h: ns3::Ipv4GlobalRoutingHelper::Ipv4GlobalRoutingHelper() [constructor]
cls.add_constructor([])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_node.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_node.py Fri Jan 22 12:44:53 2010 -0800
@@ -73,6 +73,44 @@
module.add_class('LlcSnapHeader', parent=root_module['ns3::Header'])
## queue.h: ns3::Queue [class]
module.add_class('Queue', parent=root_module['ns3::Object'])
+ ## radiotap-header.h: ns3::RadiotapHeader [class]
+ module.add_class('RadiotapHeader', parent=root_module['ns3::Header'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_NONE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_CFP'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_SHORT_PREAMBLE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_WEP'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_FRAGMENTED'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_FCS_INCLUDED'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_DATA_PADDING'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_BAD_FCS'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['FRAME_FLAG_SHORT_GUARD'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_NONE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_TURBO'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_CCK'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_OFDM'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_SPECTRUM_2GHZ'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_SPECTRUM_5GHZ'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_PASSIVE'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_DYNAMIC'], outer_class=root_module['ns3::RadiotapHeader'])
+ ## radiotap-header.h: ns3::RadiotapHeader [enumeration]
+ module.add_enum('', ['CHANNEL_FLAG_GFSK'], outer_class=root_module['ns3::RadiotapHeader'])
## simple-ref-count.h: ns3::SimpleRefCount<ns3::Ipv4MulticastRoute, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4MulticastRoute> > [class]
module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Ipv4MulticastRoute', 'ns3::empty', 'ns3::DefaultDeleter<ns3::Ipv4MulticastRoute>'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount'))
## simple-ref-count.h: ns3::SimpleRefCount<ns3::Ipv4Route, ns3::empty, ns3::DefaultDeleter<ns3::Ipv4Route> > [class]
@@ -302,6 +340,7 @@
register_Ns3Ipv6Header_methods(root_module, root_module['ns3::Ipv6Header'])
register_Ns3LlcSnapHeader_methods(root_module, root_module['ns3::LlcSnapHeader'])
register_Ns3Queue_methods(root_module, root_module['ns3::Queue'])
+ register_Ns3RadiotapHeader_methods(root_module, root_module['ns3::RadiotapHeader'])
register_Ns3Socket_methods(root_module, root_module['ns3::Socket'])
register_Ns3SocketAddressTag_methods(root_module, root_module['ns3::SocketAddressTag'])
register_Ns3SocketFactory_methods(root_module, root_module['ns3::SocketFactory'])
@@ -1864,6 +1903,110 @@
is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
return
+def register_Ns3RadiotapHeader_methods(root_module, cls):
+ ## radiotap-header.h: ns3::RadiotapHeader::RadiotapHeader(ns3::RadiotapHeader const & arg0) [copy constructor]
+ cls.add_constructor([param('ns3::RadiotapHeader const &', 'arg0')])
+ ## radiotap-header.h: ns3::RadiotapHeader::RadiotapHeader() [constructor]
+ cls.add_constructor([])
+ ## radiotap-header.h: uint32_t ns3::RadiotapHeader::Deserialize(ns3::Buffer::Iterator start) [member function]
+ cls.add_method('Deserialize',
+ 'uint32_t',
+ [param('ns3::Buffer::Iterator', 'start')],
+ is_virtual=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetAntennaNoisePower() const [member function]
+ cls.add_method('GetAntennaNoisePower',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetAntennaSignalPower() const [member function]
+ cls.add_method('GetAntennaSignalPower',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint16_t ns3::RadiotapHeader::GetChannelFlags() const [member function]
+ cls.add_method('GetChannelFlags',
+ 'uint16_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint16_t ns3::RadiotapHeader::GetChannelFrequency() const [member function]
+ cls.add_method('GetChannelFrequency',
+ 'uint16_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetFrameFlags() const [member function]
+ cls.add_method('GetFrameFlags',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: ns3::TypeId ns3::RadiotapHeader::GetInstanceTypeId() const [member function]
+ cls.add_method('GetInstanceTypeId',
+ 'ns3::TypeId',
+ [],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: uint8_t ns3::RadiotapHeader::GetRate() const [member function]
+ cls.add_method('GetRate',
+ 'uint8_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: uint32_t ns3::RadiotapHeader::GetSerializedSize() const [member function]
+ cls.add_method('GetSerializedSize',
+ 'uint32_t',
+ [],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: uint64_t ns3::RadiotapHeader::GetTsft() const [member function]
+ cls.add_method('GetTsft',
+ 'uint64_t',
+ [],
+ is_const=True)
+ ## radiotap-header.h: static ns3::TypeId ns3::RadiotapHeader::GetTypeId() [member function]
+ cls.add_method('GetTypeId',
+ 'ns3::TypeId',
+ [],
+ is_static=True)
+ ## radiotap-header.h: void ns3::RadiotapHeader::Print(std::ostream & os) const [member function]
+ cls.add_method('Print',
+ 'void',
+ [param('std::ostream &', 'os')],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: void ns3::RadiotapHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
+ cls.add_method('Serialize',
+ 'void',
+ [param('ns3::Buffer::Iterator', 'start')],
+ is_const=True, is_virtual=True)
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaNoisePower(int8_t noise) [member function]
+ cls.add_method('SetAntennaNoisePower',
+ 'void',
+ [param('int8_t', 'noise')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaNoisePower(double noise) [member function]
+ cls.add_method('SetAntennaNoisePower',
+ 'void',
+ [param('double', 'noise')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaSignalPower(int8_t signal) [member function]
+ cls.add_method('SetAntennaSignalPower',
+ 'void',
+ [param('int8_t', 'signal')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetAntennaSignalPower(double signal) [member function]
+ cls.add_method('SetAntennaSignalPower',
+ 'void',
+ [param('double', 'signal')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetChannelFrequencyAndFlags(uint16_t frequency, uint16_t flags) [member function]
+ cls.add_method('SetChannelFrequencyAndFlags',
+ 'void',
+ [param('uint16_t', 'frequency'), param('uint16_t', 'flags')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetFrameFlags(uint8_t flags) [member function]
+ cls.add_method('SetFrameFlags',
+ 'void',
+ [param('uint8_t', 'flags')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetRate(uint8_t rate) [member function]
+ cls.add_method('SetRate',
+ 'void',
+ [param('uint8_t', 'rate')])
+ ## radiotap-header.h: void ns3::RadiotapHeader::SetTsft(uint64_t tsft) [member function]
+ cls.add_method('SetTsft',
+ 'void',
+ [param('uint64_t', 'tsft')])
+ return
+
def register_Ns3Socket_methods(root_module, cls):
## socket.h: ns3::Socket::Socket(ns3::Socket const & arg0) [copy constructor]
cls.add_constructor([param('ns3::Socket const &', 'arg0')])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_point_to_point.py Fri Jan 22 12:44:53 2010 -0800
@@ -235,6 +235,11 @@
'ns3::Ptr< ns3::Node >',
[],
is_const=True, is_virtual=True)
+ ## point-to-point-net-device.h: ns3::Ptr<ns3::Queue> ns3::PointToPointNetDevice::GetQueue() const [member function]
+ cls.add_method('GetQueue',
+ 'ns3::Ptr< ns3::Queue >',
+ [],
+ is_const=True)
## point-to-point-net-device.h: static ns3::TypeId ns3::PointToPointNetDevice::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py Fri Jan 22 00:58:01 2010 -0800
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_wifi.py Fri Jan 22 12:44:53 2010 -0800
@@ -46,7 +46,7 @@
## wifi-mode.h: ns3::WifiMode [class]
module.add_class('WifiMode')
## wifi-mode.h: ns3::WifiMode::ModulationType [enumeration]
- module.add_enum('ModulationType', ['BPSK', 'DBPSK', 'DQPSK', 'QAM', 'UNKNOWN'], outer_class=root_module['ns3::WifiMode'])
+ module.add_enum('ModulationType', ['BPSK', 'QPSK', 'DBPSK', 'DQPSK', 'QAM', 'UNKNOWN'], outer_class=root_module['ns3::WifiMode'])
## wifi-mode.h: ns3::WifiModeFactory [class]
module.add_class('WifiModeFactory')
## wifi-phy.h: ns3::WifiPhyListener [class]
@@ -1093,6 +1093,11 @@
'ns3::WifiMode',
[param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('uint8_t', 'constellationSize'), param('ns3::WifiPhyStandard', 'standard')],
is_static=True)
+ ## wifi-mode.h: static ns3::WifiMode ns3::WifiModeFactory::CreateQpsk(std::string uniqueName, bool isMandatory, uint32_t bandwidth, uint32_t dataRate, uint32_t phyRate, ns3::WifiPhyStandard standard) [member function]
+ cls.add_method('CreateQpsk',
+ 'ns3::WifiMode',
+ [param('std::string', 'uniqueName'), param('bool', 'isMandatory'), param('uint32_t', 'bandwidth'), param('uint32_t', 'dataRate'), param('uint32_t', 'phyRate'), param('ns3::WifiPhyStandard', 'standard')],
+ is_static=True)
return
def register_Ns3WifiPhyListener_methods(root_module, cls):
--- a/examples/csma/csma-bridge-one-hop.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/csma/csma-bridge-one-hop.cc Fri Jan 22 12:44:53 2010 -0800
@@ -209,14 +209,14 @@
sink2.Start (Seconds (1.1));
sink2.Stop (Seconds (10.0));
+ NS_LOG_INFO ("Configure Tracing.");
+
//
// Configure tracing of all enqueue, dequeue, and NetDevice receive events.
// Trace output will be sent to the file "csma-bridge-one-hop.tr"
//
- NS_LOG_INFO ("Configure Tracing.");
- std::ofstream ascii;
- ascii.open ("csma-bridge-one-hop.tr");
- CsmaHelper::EnableAsciiAll (ascii);
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("csma-bridge-one-hop.tr"));
//
// Also configure some tcpdump traces; each interface will be traced.
--- a/examples/csma/csma-bridge.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/csma/csma-bridge.cc Fri Jan 22 12:44:53 2010 -0800
@@ -137,15 +137,14 @@
app = sink.Install (terminals.Get (0));
app.Start (Seconds (0.0));
+ NS_LOG_INFO ("Configure Tracing.");
//
// Configure tracing of all enqueue, dequeue, and NetDevice receive events.
// Trace output will be sent to the file "csma-bridge.tr"
//
- NS_LOG_INFO ("Configure Tracing.");
- std::ofstream ascii;
- ascii.open ("csma-bridge.tr");
- CsmaHelper::EnableAsciiAll (ascii);
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("csma-bridge.tr"));
//
// Also configure some tcpdump traces; each interface will be traced.
--- a/examples/csma/csma-broadcast.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/csma/csma-broadcast.cc Fri Jan 22 12:44:53 2010 -0800
@@ -107,14 +107,17 @@
app.Start (Seconds (1.0));
app.Stop (Seconds (10.0));
+ // Configure ascii tracing of all enqueue, dequeue, and NetDevice receive
+ // events on all devices. Trace output will be sent to the file
+ // "csma-one-subnet.tr"
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("csma-broadcast.tr"));
+
// Also configure some tcpdump traces; each interface will be traced
// The output files will be named
// csma-broadcast-<nodeId>-<interfaceId>.pcap
// and can be read by the "tcpdump -tt -r" command
csma.EnablePcapAll ("csma-broadcast", false);
- std::ofstream ascii;
- ascii.open ("csma-broadcast.tr", std::ios_base::binary | std::ios_base::out);
- CsmaHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/csma/csma-multicast.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/csma/csma-multicast.cc Fri Jan 22 12:44:53 2010 -0800
@@ -155,15 +155,13 @@
sinkC.Start (Seconds (1.0));
sinkC.Stop (Seconds (10.0));
- //
- // Configure tracing of all enqueue, dequeue, and NetDevice receive events.
NS_LOG_INFO ("Configure Tracing.");
//
+ // Configure tracing of all enqueue, dequeue, and NetDevice receive events.
// Ascii trace output will be sent to the file "csma-multicast.tr"
//
- std::ofstream ascii;
- ascii.open ("csma-multicast.tr",std::ios_base::binary | std::ios_base::out);
- CsmaHelper::EnableAsciiAll (ascii);
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("csma-multicast.tr"));
// Also configure some tcpdump traces; each interface will be traced.
// The output files will be named:
@@ -171,6 +169,7 @@
// and can be read by the "tcpdump -r" command (use "-tt" option to
// display timestamps correctly)
csma.EnablePcapAll ("csma-multicast", false);
+
//
// Now, do the actual simulation.
//
--- a/examples/csma/csma-one-subnet.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/csma/csma-one-subnet.cc Fri Jan 22 12:44:53 2010 -0800
@@ -114,22 +114,21 @@
app = sink.Install (nodes.Get (0));
app.Start (Seconds (0.0));
-//
-// Configure tracing of all enqueue, dequeue, and NetDevice receive events.
-// Trace output will be sent to the file "csma-one-subnet.tr"
+ NS_LOG_INFO ("Configure Tracing.");
//
- NS_LOG_INFO ("Configure Tracing.");
- std::ofstream ascii;
- ascii.open ("csma-one-subnet.tr", std::ios_base::binary | std::ios_base::out);
- CsmaHelper::EnableAsciiAll (ascii);
-
- csma.EnableAsciiAllXXX ("csma-one-subnet");
-
+// Configure ascii tracing of all enqueue, dequeue, and NetDevice receive
+// events on all devices. Trace output will be sent to the file
+// "csma-one-subnet.tr"
+//
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("csma-one-subnet.tr"));
//
// Also configure some tcpdump traces; each interface will be traced.
// The output files will be named:
-// csma-one-subnet-<nodeId>-<interfaceId>.pcap
+//
+// csma-one-subnet-<node ID>-<device's interface index>.pcap
+//
// and can be read by the "tcpdump -r" command (use "-tt" option to
// display timestamps correctly)
//
--- a/examples/csma/csma-packet-socket.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/csma/csma-packet-socket.cc Fri Jan 22 12:44:53 2010 -0800
@@ -116,9 +116,9 @@
// Configure tracing of all enqueue, dequeue, and NetDevice receive events
// Trace output will be sent to the csma-packet-socket.tr file
NS_LOG_INFO ("Configure Tracing.");
- std::ofstream os;
- os.open ("csma-packet-socket.tr", std::ios_base::binary | std::ios_base::out);
- csma.EnableAsciiAll (os);
+
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("csma-packet-socket.tr"));
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/error-model/simple-error-model.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/error-model/simple-error-model.cc Fri Jan 22 12:44:53 2010 -0800
@@ -166,10 +166,9 @@
pem->SetList (sampleList);
d0d2.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));
- std::ofstream ascii;
- ascii.open ("simple-error-model.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-error-model.tr"));
p2p.EnablePcapAll ("simple-error-model");
- PointToPointHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/ipv6/fragmentation-ipv6.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/ipv6/fragmentation-ipv6.cc Fri Jan 22 12:44:53 2010 -0800
@@ -150,10 +150,9 @@
apps.Start (Seconds (2.0));
apps.Stop (Seconds (20.0));
- std::ofstream ascii;
- ascii.open ("fragmentation-ipv6.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("fragmentation-ipv6.tr"));
csma.EnablePcapAll (std::string ("fragmentation-ipv6"), true);
- CsmaHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/ipv6/icmpv6-redirect.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/ipv6/icmpv6-redirect.cc Fri Jan 22 12:44:53 2010 -0800
@@ -173,10 +173,9 @@
apps.Start (Seconds (2.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("icmpv6-redirect.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("icmpv6-redirect.tr"));
csma.EnablePcapAll ("icmpv6-redirect", true);
- CsmaHelper::EnableAsciiAll (ascii);
/* Now, do the actual simulation. */
NS_LOG_INFO ("Run Simulation.");
--- a/examples/ipv6/loose-routing-ipv6.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/ipv6/loose-routing-ipv6.cc Fri Jan 22 12:44:53 2010 -0800
@@ -158,10 +158,9 @@
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("loose-routing-ipv6.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("loose-routing-ipv6.tr"));
csma.EnablePcapAll ("loose-routing-ipv6", true);
- CsmaHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/ipv6/ping6.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/ipv6/ping6.cc Fri Jan 22 12:44:53 2010 -0800
@@ -98,10 +98,9 @@
apps.Start (Seconds (2.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("ping6.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("ping6.tr"));
csma.EnablePcapAll (std::string ("ping6"), true);
- CsmaHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/ipv6/radvd-two-prefix.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/ipv6/radvd-two-prefix.cc Fri Jan 22 12:44:53 2010 -0800
@@ -208,10 +208,9 @@
/* at the end, RA addresses and routes should be cleared */
Simulator::Schedule (Seconds (10.0), &StackHelper::PrintRoutingTable, &stackHelper, n0);
- std::ofstream ascii;
- ascii.open ("radvd-two-prefix.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("radvd-two-prefix.tr"));
csma.EnablePcapAll (std::string ("radvd-two-prefix"), true);
- CsmaHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/ipv6/radvd.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/ipv6/radvd.cc Fri Jan 22 12:44:53 2010 -0800
@@ -143,10 +143,9 @@
apps.Start (Seconds (2.0));
apps.Stop (Seconds (7.0));
- std::ofstream ascii;
- ascii.open ("radvd.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("radvd.tr"));
csma.EnablePcapAll (std::string ("radvd"), true);
- CsmaHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/realtime/realtime-udp-echo.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/realtime/realtime-udp-echo.cc Fri Jan 22 12:44:53 2010 -0800
@@ -105,10 +105,9 @@
apps.Start (Seconds (2.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("realtime-udp-echo.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("realtime-udp-echo.tr"));
csma.EnablePcapAll ("realtime-udp-echo", false);
- CsmaHelper::EnableAsciiAll (ascii);
//
// Now, do the actual simulation.
--- a/examples/routing/dynamic-global-routing.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/dynamic-global-routing.cc Fri Jan 22 12:44:53 2010 -0800
@@ -191,7 +191,7 @@
AsciiTraceHelper ascii;
- Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("dynamic-global-routing.tr", "w");
+ Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("dynamic-global-routing.tr");
p2p.EnableAsciiAll (stream);
csma.EnableAsciiAll (stream);
internet.EnableAsciiAll (stream);
--- a/examples/routing/global-injection-slash32.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/global-injection-slash32.cc Fri Jan 22 12:44:53 2010 -0800
@@ -146,10 +146,9 @@
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("global-routing-injection32.tr", std::ios_base::binary | std::ios_base::out);
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("global-routing-injection32.tr"));
p2p.EnablePcapAll ("global-routing-injection32");
- PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Run ();
Simulator::Destroy ();
--- a/examples/routing/global-routing-slash32.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/global-routing-slash32.cc Fri Jan 22 12:44:53 2010 -0800
@@ -119,10 +119,9 @@
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("global-routing-slash32.tr", std::ios_base::binary | std::ios_base::out);
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("global-routing-slash32.tr"));
p2p.EnablePcapAll ("global-routing-slash32");
- PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Run ();
Simulator::Destroy ();
--- a/examples/routing/mixed-global-routing.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/mixed-global-routing.cc Fri Jan 22 12:44:53 2010 -0800
@@ -121,9 +121,9 @@
apps.Stop (Seconds (10.0));
AsciiTraceHelper ascii;
- Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("mixed-global-routing.tr", "w");
+ Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("mixed-global-routing.tr");
p2p.EnableAsciiAll (stream);
- csma,EnableAsciiAll (stream);
+ csma.EnableAsciiAll (stream);
p2p.EnablePcapAll ("mixed-global-routing");
csma.EnablePcapAll ("mixed-global-routing", false);
--- a/examples/routing/simple-alternate-routing.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/simple-alternate-routing.cc Fri Jan 22 12:44:53 2010 -0800
@@ -152,10 +152,9 @@
apps.Start (Seconds (1.1));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("simple-alternate-routing.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-alternate-routing.tr"));
p2p.EnablePcapAll ("simple-alternate-routing");
- PointToPointHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/routing/simple-global-routing.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/simple-global-routing.cc Fri Jan 22 12:44:53 2010 -0800
@@ -145,10 +145,9 @@
apps.Start (Seconds (1.1));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("simple-global-routing.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-global-routing.tr"));
p2p.EnablePcapAll ("simple-global-routing");
- PointToPointHelper::EnableAsciiAll (ascii);
// Flow Monitor
Ptr<FlowMonitor> flowmon;
--- a/examples/routing/simple-point-to-point-olsr.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/simple-point-to-point-olsr.cc Fri Jan 22 12:44:53 2010 -0800
@@ -157,10 +157,9 @@
apps.Start (Seconds (1.1));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("simple-point-to-point-olsr.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-point-to-point-olsr.tr"));
p2p.EnablePcapAll ("simple-point-to-point-olsr");
- PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Stop (Seconds (30));
--- a/examples/routing/simple-routing-ping6.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/simple-routing-ping6.cc Fri Jan 22 12:44:53 2010 -0800
@@ -151,10 +151,9 @@
apps.Start (Seconds (2.0));
apps.Stop (Seconds (20.0));
- std::ofstream ascii;
- ascii.open ("simple-routing-ping6.tr");
- csma.EnablePcapAll (std::string ("simple-routing-ping6"), true);
- CsmaHelper::EnableAsciiAll (ascii);
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("simple-routing-ping6.tr"));
+ csma.EnablePcapAll ("simple-routing-ping6", true);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/routing/static-routing-slash32.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/routing/static-routing-slash32.cc Fri Jan 22 12:44:53 2010 -0800
@@ -124,10 +124,9 @@
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("static-routing-slash32.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("static-routing-slash32.tr"));
p2p.EnablePcapAll ("static-routing-slash32");
- PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Run ();
Simulator::Destroy ();
--- a/examples/socket/socket-bound-static-routing.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/socket/socket-bound-static-routing.cc Fri Jan 22 12:44:53 2010 -0800
@@ -145,10 +145,9 @@
dstSocket->Bind (dst);
dstSocket->SetRecvCallback (MakeCallback (&dstSocketRecv));
- std::ofstream ascii;
- ascii.open ("socket-bound-static-routing.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("socket-bound-static-routing.tr"));
p2p.EnablePcapAll ("socket-bound-static-routing");
- PointToPointHelper::EnableAsciiAll (ascii);
LogComponentEnableAll (LOG_PREFIX_TIME);
LogComponentEnable ("SocketBoundRoutingExample", LOG_LEVEL_INFO);
--- a/examples/socket/socket-bound-tcp-static-routing.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/socket/socket-bound-tcp-static-routing.cc Fri Jan 22 12:44:53 2010 -0800
@@ -161,10 +161,9 @@
apps.Start (Seconds (0.0));
apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("socket-bound-tcp-static-routing.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("socket-bound-tcp-static-routing.tr"));
p2p.EnablePcapAll ("socket-bound-tcp-static-routing");
- PointToPointHelper::EnableAsciiAll (ascii);
LogComponentEnableAll (LOG_PREFIX_TIME);
LogComponentEnable ("SocketBoundTcpRoutingExample", LOG_LEVEL_INFO);
--- a/examples/tcp/tcp-large-transfer.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/tcp/tcp-large-transfer.cc Fri Jan 22 12:44:53 2010 -0800
@@ -168,9 +168,8 @@
//localSocket->SetAttribute("SndBufSize", UintegerValue(4096));
//Ask for ASCII and pcap traces of network traffic
- std::ofstream ascii;
- ascii.open ("tcp-large-transfer.tr");
- PointToPointHelper::EnableAsciiAll (ascii);
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("tcp-large-transfer.tr"));
p2p.EnablePcapAll ("tcp-large-transfer");
// Finally, set up the simulator to run. The 1000 second hard limit is a
--- a/examples/tcp/tcp-star-server.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/tcp/tcp-star-server.cc Fri Jan 22 12:44:53 2010 -0800
@@ -153,10 +153,9 @@
//configure tracing
- std::ofstream ascii;
- ascii.open ("tcp-star-server.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("tcp-star-server.tr"));
p2p.EnablePcapAll ("tcp-star-server");
- PointToPointHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/tunneling/virtual-net-device.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/tunneling/virtual-net-device.cc Fri Jan 22 12:44:53 2010 -0800
@@ -289,10 +289,9 @@
apps.Start (Seconds (1.1));
//apps.Stop (Seconds (10.0));
- std::ofstream ascii;
- ascii.open ("virtual-net-device.tr");
+ AsciiTraceHelper ascii;
+ p2p.EnableAsciiAll (ascii.CreateFileStream ("virtual-net-device.tr"));
p2p.EnablePcapAll ("virtual-net-device");
- PointToPointHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();
--- a/examples/udp/udp-echo.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/udp/udp-echo.cc Fri Jan 22 12:44:53 2010 -0800
@@ -118,10 +118,9 @@
client.SetFill(apps.Get (0), fill, sizeof(fill), 1024);
#endif
- std::ofstream ascii;
- ascii.open ("udp-echo.tr");
+ AsciiTraceHelper ascii;
+ csma.EnableAsciiAll (ascii.CreateFileStream ("udp-echo.tr"));
csma.EnablePcapAll ("udp-echo", false);
- CsmaHelper::EnableAsciiAll (ascii);
//
// Now, do the actual simulation.
--- a/examples/wireless/mixed-wireless.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/wireless/mixed-wireless.cc Fri Jan 22 12:44:53 2010 -0800
@@ -381,20 +381,21 @@
///////////////////////////////////////////////////////////////////////////
NS_LOG_INFO ("Configure Tracing.");
- std::ofstream ascii;
if (enableTracing == true)
{
- //
- // Let's set up some ns-2-like ascii traces, using another helper class
- //
- ascii.open ("mixed-wireless.tr");
- YansWifiPhyHelper::EnableAsciiAll (ascii);
- CsmaHelper::EnableAsciiAll (ascii);
- InternetStackHelper::EnableAsciiAll (ascii);
+ CsmaHelper csma;
+
+ //
+ // Let's set up some ns-2-like ascii traces, using another helper class
+ //
+ AsciiTraceHelper ascii;
+ Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("mixed-wireless.tr");
+ wifiPhy.EnableAsciiAll (stream);
+ csma.EnableAsciiAll (stream);
+ internet.EnableAsciiAll (stream);
// Let's do a pcap trace on the application source and sink, ifIndex 0
// Csma captures in non-promiscuous mode
- CsmaHelper csma;
#if 0
csma.EnablePcap ("mixed-wireless", appSource->GetId (), 0, false);
#else
--- a/examples/wireless/multirate.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/wireless/multirate.cc Fri Jan 22 12:44:53 2010 -0800
@@ -493,9 +493,8 @@
if (enableTracing)
{
- std::ofstream ascii;
- ascii.open ((GetOutputFileName() + ".tr").c_str());
- phy.EnableAsciiAll (ascii);
+ AsciiTraceHelper ascii;
+ phy.EnableAsciiAll (ascii.CreateFileStream (GetOutputFileName() + ".tr"));
}
Ptr<FlowMonitor> flowmon;
--- a/examples/wireless/wifi-simple-adhoc-grid.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/examples/wireless/wifi-simple-adhoc-grid.cc Fri Jan 22 12:44:53 2010 -0800
@@ -216,10 +216,10 @@
if (tracing == true)
{
+ AsciiTraceHelper ascii;
+ wifiPhy.EnableAsciiAll (ascii.CreateFileStream ("wifi-simple-adhoc-grid.tr"));
wifiPhy.EnablePcap ("wifi-simple-adhoc-grid", devices);
- std::ofstream ascii;
- ascii.open ("wifi-simple-adhoc-grid.tr");
- YansWifiPhyHelper::EnableAsciiAll (ascii);
+
// To do-- enable an IP-level trace that shows forwarding events only
}
--- a/src/helper/ascii-trace-helper.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/src/helper/ascii-trace-helper.cc Fri Jan 22 12:44:53 2010 -0800
@@ -52,9 +52,24 @@
NS_LOG_FUNCTION (filename << filemode);
std::ofstream *ofstream = new std::ofstream;
+ std::ios_base::openmode mode;
- ofstream->open (filename.c_str ());
- NS_ABORT_MSG_UNLESS (ofstream->is_open (), "Unable to Open " << filename << " for mode " << filemode);
+ if (filemode == "a")
+ {
+ mode = std::ios_base::out | std::ios_base::app;
+ }
+ else if (filemode == "w")
+ {
+ mode = std::ios_base::out | std::ios_base::trunc;
+ }
+ else
+ {
+ NS_ABORT_MSG ("AsciiTraceHelper::CreateFileStream(): Unexpected file mode");
+ }
+
+ ofstream->open (filename.c_str (), mode);
+ NS_ABORT_MSG_UNLESS (ofstream->is_open (), "AsciiTraceHelper::CreateFileStream(): Unable to Open " <<
+ filename << " for mode " << filemode);
Ptr<OutputStreamObject> streamObject = CreateObject<OutputStreamObject> ();
streamObject->SetStream (ofstream);
@@ -99,7 +114,7 @@
}
else
{
- oss << "n" << node->GetId ();
+ oss << node->GetId ();
}
oss << "-";
@@ -110,7 +125,7 @@
}
else
{
- oss << "d" << device->GetIfIndex ();
+ oss << device->GetIfIndex ();
}
oss << ".tr";
--- a/src/helper/ascii-trace-helper.h Fri Jan 22 00:58:01 2010 -0800
+++ b/src/helper/ascii-trace-helper.h Fri Jan 22 12:44:53 2010 -0800
@@ -81,7 +81,7 @@
* that can solve the problem so we use one of those to carry the stream
* around and deal with the lifetime issues.
*/
- Ptr<OutputStreamObject> CreateFileStream (std::string filename, std::string filemode);
+ Ptr<OutputStreamObject> CreateFileStream (std::string filename, std::string filemode = "w");
/**
* @brief Hook a trace source to the default enqueue operation trace sink that
--- a/src/helper/ascii-trace-user-helper-for-device.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/src/helper/ascii-trace-user-helper-for-device.cc Fri Jan 22 12:44:53 2010 -0800
@@ -65,7 +65,7 @@
AsciiTraceUserHelperForDevice::EnableAsciiImpl (Ptr<OutputStreamObject> stream, std::string prefix, std::string ndName)
{
Ptr<NetDevice> nd = Names::Find<NetDevice> (ndName);
- EnableAsciiImpl (stream, prefix, nd);
+ EnableAsciiInternal (stream, prefix, nd);
}
@@ -96,7 +96,7 @@
for (NetDeviceContainer::Iterator i = d.Begin (); i != d.End (); ++i)
{
Ptr<NetDevice> dev = *i;
- EnableAsciiImpl (stream, prefix, dev);
+ EnableAsciiInternal (stream, prefix, dev);
}
}
@@ -197,7 +197,7 @@
Ptr<NetDevice> nd = node->GetDevice (deviceid);
- EnableAsciiImpl (stream, prefix, nd);
+ EnableAsciiInternal (stream, prefix, nd);
return;
}
}
--- a/src/helper/ascii-trace-user-helper-for-ipv4.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/src/helper/ascii-trace-user-helper-for-ipv4.cc Fri Jan 22 12:44:53 2010 -0800
@@ -69,7 +69,7 @@
uint32_t interface)
{
Ptr<Ipv4> ipv4 = Names::Find<Ipv4> (ipv4Name);
- EnableAsciiImpl (stream, prefix, ipv4, interface);
+ EnableAsciiInternal (stream, prefix, ipv4, interface);
}
//
@@ -99,7 +99,7 @@
for (Ipv4InterfaceContainer::Iterator i = c.Begin (); i != c.End (); ++i)
{
std::pair<Ptr<Ipv4>, uint32_t> pair = *i;
- EnableAsciiImpl (stream, prefix, pair.first, pair.second);
+ EnableAsciiInternal (stream, prefix, pair.first, pair.second);
}
}
@@ -135,7 +135,7 @@
{
for (uint32_t j = 0; j < ipv4->GetNInterfaces (); ++j)
{
- EnableAsciiImpl (stream, prefix, ipv4, j);
+ EnableAsciiInternal (stream, prefix, ipv4, j);
}
}
}
@@ -200,7 +200,7 @@
Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
if (ipv4)
{
- EnableAsciiImpl (stream, prefix, ipv4, interface);
+ EnableAsciiInternal (stream, prefix, ipv4, interface);
}
return;
--- a/src/helper/pcap-helper.cc Fri Jan 22 00:58:01 2010 -0800
+++ b/src/helper/pcap-helper.cc Fri Jan 22 12:44:53 2010 -0800
@@ -102,7 +102,7 @@
}
else
{
- oss << "n" << node->GetId ();
+ oss << node->GetId ();
}
oss << "-";
@@ -113,7 +113,7 @@
}
else
{
- oss << "d" << device->GetIfIndex ();
+ oss << device->GetIfIndex ();
}
oss << ".pcap";