From 1a49ef98396f72f3c47da351e39bd9062a0f2f02 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 5 Jul 2011 18:30:43 +0100 Subject: [PATCH 001/202] Bug 1199 - waf install doesn't work on x86_64 --- src/config-store/wscript | 2 ++ src/wscript | 12 ++++++------ wscript | 5 +++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/config-store/wscript b/src/config-store/wscript index 79203ccc4..bdceb07cc 100644 --- a/src/config-store/wscript +++ b/src/config-store/wscript @@ -18,6 +18,8 @@ def configure(conf): def build(bld): + bld.install_files('${PREFIX}/include/ns3', '../../ns3/config-store-config.h') + module = bld.create_ns3_module('config-store', ['core', 'network']) module.source = [ 'model/attribute-iterator.cc', diff --git a/src/wscript b/src/wscript index 220ebabca..293c1ecbe 100644 --- a/src/wscript +++ b/src/wscript @@ -432,10 +432,11 @@ class ns3pcfile_task(Task.Task): includes = self.env['CPPPATH_%s' % dep] return [self.env['CPPPATH_ST'] % include for include in includes] - def _generate_pcfile(self, name, use, uselib_local, prefix, outfilename): + def _generate_pcfile(self, name, use, uselib_local, env, outfilename): outfile = open(outfilename, 'w') - includedir = os.path.join(prefix, 'include') - libdir = os.path.join(prefix, 'lib') + prefix = env.PREFIX + includedir = os.path.join(env.INCLUDEDIR, "ns3") + libdir = env.LIBDIR libs = self._self_libs(self.env, name, '${libdir}') for dep in use: libs = libs + self._lib(self.env, dep) @@ -463,7 +464,7 @@ Cflags: %s output_filename = self.outputs[0].bldpath(self.env) self._generate_pcfile(self.module.name, self.module.uselib, self.module.uselib_local, - self.env['PREFIX'], output_filename) + self.env, output_filename) class ns3pcfile_taskgen(TaskGen.task_gen): def __init__(self, *args, **kwargs): @@ -473,8 +474,7 @@ class ns3pcfile_taskgen(TaskGen.task_gen): output_node = self.path.find_or_declare(output_filename) assert output_node is not None, str(self) task = self.create_task('ns3pcfile', env=self.env) - self.bld.install_files(os.path.join('${PREFIX}', 'lib', 'pkgconfig'), - output_node) + self.bld.install_files('${LIBDIR}/pkgconfig', output_node) task.set_outputs([output_node]) task.module = self.module diff --git a/wscript b/wscript index b47897860..10203db7e 100644 --- a/wscript +++ b/wscript @@ -129,6 +129,7 @@ def set_options(opt): opt.tool_options('compiler_cc') opt.tool_options('compiler_cxx') opt.tool_options('cflags') + opt.tool_options('gnu_dirs') opt.add_option('--cwd', help=('Set the working directory for a program.'), @@ -270,6 +271,10 @@ def configure(conf): except Configure.ConfigurationError: pass conf.check_tool('command', ['waf-tools']) + conf.check_tool('gnu_dirs') + + #if os.path.exists('/usr/lib64'): + # conf.env.LIBDIR = os.path.join(conf.env.PREFIX, "lib64") # create the second environment, set the variant and set its name variant_env = conf.env.copy() From a8810665bee9cdfae6ebae6846d6520360e9fa4b Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 5 Jul 2011 18:46:56 +0100 Subject: [PATCH 002/202] Rescan lte bindings --- src/lte/bindings/callbacks_list.py | 2 +- src/lte/bindings/modulegen__gcc_ILP32.py | 91 +++++------------------- src/lte/bindings/modulegen__gcc_LP64.py | 91 +++++------------------- 3 files changed, 33 insertions(+), 151 deletions(-) diff --git a/src/lte/bindings/callbacks_list.py b/src/lte/bindings/callbacks_list.py index e6a9fe523..67be4b39c 100644 --- a/src/lte/bindings/callbacks_list.py +++ b/src/lte/bindings/callbacks_list.py @@ -1,9 +1,9 @@ callback_classes = [ + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff --git a/src/lte/bindings/modulegen__gcc_ILP32.py b/src/lte/bindings/modulegen__gcc_ILP32.py index a7e80934e..11ffb76f9 100644 --- a/src/lte/bindings/modulegen__gcc_ILP32.py +++ b/src/lte/bindings/modulegen__gcc_ILP32.py @@ -206,8 +206,6 @@ def register_types(module): module.add_class('PortRangeTlvValue', import_from_module='ns.wimax', parent=root_module['ns3::TlvValue']) ## wimax-tlv.h (module 'wimax'): ns3::PortRangeTlvValue::PortRange [struct] module.add_class('PortRange', import_from_module='ns.wimax', outer_class=root_module['ns3::PortRangeTlvValue']) - ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel [class] - module.add_class('PropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::Object']) ## wimax-tlv.h (module 'wimax'): ns3::ProtocolTlvValue [class] module.add_class('ProtocolTlvValue', import_from_module='ns.wimax', parent=root_module['ns3::TlvValue']) ## radio-bearer-instance.h (module 'lte'): ns3::RadioBearerInstance [class] @@ -216,8 +214,6 @@ def register_types(module): module.add_enum('BearerDirection', ['DIRECTION_TYPE_UL', 'DIRECTION_TYPE_DL'], outer_class=root_module['ns3::RadioBearerInstance']) ## radio-bearer-instance.h (module 'lte'): ns3::RadioBearerInstance::BearerType [enumeration] module.add_enum('BearerType', ['BEARER_TYPE_SRB1', 'BEARER_TYPE_SRB2', 'BEARER_TYPE_DRB'], outer_class=root_module['ns3::RadioBearerInstance']) - ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel [class] - module.add_class('RandomPropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationDelayModel']) ## rlc-entity.h (module 'lte'): ns3::RlcEntity [class] module.add_class('RlcEntity', parent=root_module['ns3::Object']) ## rrc-entity.h (module 'lte'): ns3::RrcEntity [class] @@ -298,8 +294,6 @@ def register_types(module): module.add_class('Channel', import_from_module='ns.network', parent=root_module['ns3::Object']) ## channel-realization.h (module 'lte'): ns3::ChannelRealization [class] module.add_class('ChannelRealization', parent=root_module['ns3::Object']) - ## propagation-delay-model.h (module 'propagation'): ns3::ConstantSpeedPropagationDelayModel [class] - module.add_class('ConstantSpeedPropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationDelayModel']) ## data-rate.h (module 'network'): ns3::DataRateChecker [class] module.add_class('DataRateChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## data-rate.h (module 'network'): ns3::DataRateValue [class] @@ -440,6 +434,9 @@ def register_types(module): module.add_container('std::list< ns3::PdcchMapIdealControlMessage::IdealPdcchRecord >', 'ns3::PdcchMapIdealControlMessage::IdealPdcchRecord', container_type='list') module.add_container('std::list< ns3::CqiIdealControlMessage::CqiFeedback >', 'ns3::CqiIdealControlMessage::CqiFeedback', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -470,18 +467,15 @@ def register_types(module): typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogTimePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogTimePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogTimePrinter&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') ## Register a nested module for the namespace FatalImpl @@ -597,10 +591,8 @@ def register_methods(root_module): register_Ns3ParetoVariable_methods(root_module, root_module['ns3::ParetoVariable']) register_Ns3PortRangeTlvValue_methods(root_module, root_module['ns3::PortRangeTlvValue']) register_Ns3PortRangeTlvValuePortRange_methods(root_module, root_module['ns3::PortRangeTlvValue::PortRange']) - register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel']) register_Ns3ProtocolTlvValue_methods(root_module, root_module['ns3::ProtocolTlvValue']) register_Ns3RadioBearerInstance_methods(root_module, root_module['ns3::RadioBearerInstance']) - register_Ns3RandomPropagationDelayModel_methods(root_module, root_module['ns3::RandomPropagationDelayModel']) register_Ns3RlcEntity_methods(root_module, root_module['ns3::RlcEntity']) register_Ns3RrcEntity_methods(root_module, root_module['ns3::RrcEntity']) register_Ns3SfVectorTlvValue_methods(root_module, root_module['ns3::SfVectorTlvValue']) @@ -636,7 +628,6 @@ def register_methods(root_module): register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue']) register_Ns3Channel_methods(root_module, root_module['ns3::Channel']) register_Ns3ChannelRealization_methods(root_module, root_module['ns3::ChannelRealization']) - register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, root_module['ns3::ConstantSpeedPropagationDelayModel']) register_Ns3DataRateChecker_methods(root_module, root_module['ns3::DataRateChecker']) register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue']) register_Ns3DiscreteTimeLossModel_methods(root_module, root_module['ns3::DiscreteTimeLossModel']) @@ -3646,23 +3637,6 @@ def register_Ns3PortRangeTlvValuePortRange_methods(root_module, cls): cls.add_instance_attribute('PortLow', 'uint16_t', is_const=False) return -def register_Ns3PropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel::PropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel::PropagationDelayModel(ns3::PropagationDelayModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PropagationDelayModel const &', 'arg0')]) - ## propagation-delay-model.h (module 'propagation'): ns3::Time ns3::PropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## propagation-delay-model.h (module 'propagation'): static ns3::TypeId ns3::PropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3ProtocolTlvValue_methods(root_module, cls): ## wimax-tlv.h (module 'wimax'): ns3::ProtocolTlvValue::ProtocolTlvValue(ns3::ProtocolTlvValue const & arg0) [copy constructor] cls.add_constructor([param('ns3::ProtocolTlvValue const &', 'arg0')]) @@ -3785,23 +3759,6 @@ def register_Ns3RadioBearerInstance_methods(root_module, cls): visibility='private', is_virtual=True) return -def register_Ns3RandomPropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel::RandomPropagationDelayModel(ns3::RandomPropagationDelayModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::RandomPropagationDelayModel const &', 'arg0')]) - ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel::RandomPropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h (module 'propagation'): ns3::Time ns3::RandomPropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_const=True, is_virtual=True) - ## propagation-delay-model.h (module 'propagation'): static ns3::TypeId ns3::RandomPropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3RlcEntity_methods(root_module, cls): ## rlc-entity.h (module 'lte'): ns3::RlcEntity::RlcEntity(ns3::RlcEntity const & arg0) [copy constructor] cls.add_constructor([param('ns3::RlcEntity const &', 'arg0')]) @@ -4921,32 +4878,6 @@ def register_Ns3ChannelRealization_methods(root_module, cls): [param('ns3::Ptr< ns3::ShadowingLossModel >', 'l')]) return -def register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h (module 'propagation'): ns3::ConstantSpeedPropagationDelayModel::ConstantSpeedPropagationDelayModel(ns3::ConstantSpeedPropagationDelayModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::ConstantSpeedPropagationDelayModel const &', 'arg0')]) - ## propagation-delay-model.h (module 'propagation'): ns3::ConstantSpeedPropagationDelayModel::ConstantSpeedPropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h (module 'propagation'): ns3::Time ns3::ConstantSpeedPropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_const=True, is_virtual=True) - ## propagation-delay-model.h (module 'propagation'): double ns3::ConstantSpeedPropagationDelayModel::GetSpeed() const [member function] - cls.add_method('GetSpeed', - 'double', - [], - is_const=True) - ## propagation-delay-model.h (module 'propagation'): static ns3::TypeId ns3::ConstantSpeedPropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## propagation-delay-model.h (module 'propagation'): void ns3::ConstantSpeedPropagationDelayModel::SetSpeed(double speed) [member function] - cls.add_method('SetSpeed', - 'void', - [param('double', 'speed')]) - return - def register_Ns3DataRateChecker_methods(root_module, cls): ## data-rate.h (module 'network'): ns3::DataRateChecker::DataRateChecker() [constructor] cls.add_constructor([]) @@ -6352,6 +6283,11 @@ def register_Ns3SpectrumChannel_methods(root_module, cls): cls.add_constructor([]) ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel::SpectrumChannel(ns3::SpectrumChannel const & arg0) [copy constructor] cls.add_constructor([param('ns3::SpectrumChannel const &', 'arg0')]) + ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_pure_virtual=True, is_virtual=True) ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', @@ -7058,6 +6994,11 @@ def register_Ns3SingleModelSpectrumChannel_methods(root_module, cls): cls.add_constructor([param('ns3::SingleModelSpectrumChannel const &', 'arg0')]) ## single-model-spectrum-channel.h (module 'spectrum'): ns3::SingleModelSpectrumChannel::SingleModelSpectrumChannel() [constructor] cls.add_constructor([]) + ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_virtual=True) ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', diff --git a/src/lte/bindings/modulegen__gcc_LP64.py b/src/lte/bindings/modulegen__gcc_LP64.py index a7e80934e..11ffb76f9 100644 --- a/src/lte/bindings/modulegen__gcc_LP64.py +++ b/src/lte/bindings/modulegen__gcc_LP64.py @@ -206,8 +206,6 @@ def register_types(module): module.add_class('PortRangeTlvValue', import_from_module='ns.wimax', parent=root_module['ns3::TlvValue']) ## wimax-tlv.h (module 'wimax'): ns3::PortRangeTlvValue::PortRange [struct] module.add_class('PortRange', import_from_module='ns.wimax', outer_class=root_module['ns3::PortRangeTlvValue']) - ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel [class] - module.add_class('PropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::Object']) ## wimax-tlv.h (module 'wimax'): ns3::ProtocolTlvValue [class] module.add_class('ProtocolTlvValue', import_from_module='ns.wimax', parent=root_module['ns3::TlvValue']) ## radio-bearer-instance.h (module 'lte'): ns3::RadioBearerInstance [class] @@ -216,8 +214,6 @@ def register_types(module): module.add_enum('BearerDirection', ['DIRECTION_TYPE_UL', 'DIRECTION_TYPE_DL'], outer_class=root_module['ns3::RadioBearerInstance']) ## radio-bearer-instance.h (module 'lte'): ns3::RadioBearerInstance::BearerType [enumeration] module.add_enum('BearerType', ['BEARER_TYPE_SRB1', 'BEARER_TYPE_SRB2', 'BEARER_TYPE_DRB'], outer_class=root_module['ns3::RadioBearerInstance']) - ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel [class] - module.add_class('RandomPropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationDelayModel']) ## rlc-entity.h (module 'lte'): ns3::RlcEntity [class] module.add_class('RlcEntity', parent=root_module['ns3::Object']) ## rrc-entity.h (module 'lte'): ns3::RrcEntity [class] @@ -298,8 +294,6 @@ def register_types(module): module.add_class('Channel', import_from_module='ns.network', parent=root_module['ns3::Object']) ## channel-realization.h (module 'lte'): ns3::ChannelRealization [class] module.add_class('ChannelRealization', parent=root_module['ns3::Object']) - ## propagation-delay-model.h (module 'propagation'): ns3::ConstantSpeedPropagationDelayModel [class] - module.add_class('ConstantSpeedPropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationDelayModel']) ## data-rate.h (module 'network'): ns3::DataRateChecker [class] module.add_class('DataRateChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## data-rate.h (module 'network'): ns3::DataRateValue [class] @@ -440,6 +434,9 @@ def register_types(module): module.add_container('std::list< ns3::PdcchMapIdealControlMessage::IdealPdcchRecord >', 'ns3::PdcchMapIdealControlMessage::IdealPdcchRecord', container_type='list') module.add_container('std::list< ns3::CqiIdealControlMessage::CqiFeedback >', 'ns3::CqiIdealControlMessage::CqiFeedback', container_type='list') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -470,18 +467,15 @@ def register_types(module): typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogTimePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogTimePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogTimePrinter&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') ## Register a nested module for the namespace FatalImpl @@ -597,10 +591,8 @@ def register_methods(root_module): register_Ns3ParetoVariable_methods(root_module, root_module['ns3::ParetoVariable']) register_Ns3PortRangeTlvValue_methods(root_module, root_module['ns3::PortRangeTlvValue']) register_Ns3PortRangeTlvValuePortRange_methods(root_module, root_module['ns3::PortRangeTlvValue::PortRange']) - register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel']) register_Ns3ProtocolTlvValue_methods(root_module, root_module['ns3::ProtocolTlvValue']) register_Ns3RadioBearerInstance_methods(root_module, root_module['ns3::RadioBearerInstance']) - register_Ns3RandomPropagationDelayModel_methods(root_module, root_module['ns3::RandomPropagationDelayModel']) register_Ns3RlcEntity_methods(root_module, root_module['ns3::RlcEntity']) register_Ns3RrcEntity_methods(root_module, root_module['ns3::RrcEntity']) register_Ns3SfVectorTlvValue_methods(root_module, root_module['ns3::SfVectorTlvValue']) @@ -636,7 +628,6 @@ def register_methods(root_module): register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue']) register_Ns3Channel_methods(root_module, root_module['ns3::Channel']) register_Ns3ChannelRealization_methods(root_module, root_module['ns3::ChannelRealization']) - register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, root_module['ns3::ConstantSpeedPropagationDelayModel']) register_Ns3DataRateChecker_methods(root_module, root_module['ns3::DataRateChecker']) register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue']) register_Ns3DiscreteTimeLossModel_methods(root_module, root_module['ns3::DiscreteTimeLossModel']) @@ -3646,23 +3637,6 @@ def register_Ns3PortRangeTlvValuePortRange_methods(root_module, cls): cls.add_instance_attribute('PortLow', 'uint16_t', is_const=False) return -def register_Ns3PropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel::PropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel::PropagationDelayModel(ns3::PropagationDelayModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::PropagationDelayModel const &', 'arg0')]) - ## propagation-delay-model.h (module 'propagation'): ns3::Time ns3::PropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## propagation-delay-model.h (module 'propagation'): static ns3::TypeId ns3::PropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3ProtocolTlvValue_methods(root_module, cls): ## wimax-tlv.h (module 'wimax'): ns3::ProtocolTlvValue::ProtocolTlvValue(ns3::ProtocolTlvValue const & arg0) [copy constructor] cls.add_constructor([param('ns3::ProtocolTlvValue const &', 'arg0')]) @@ -3785,23 +3759,6 @@ def register_Ns3RadioBearerInstance_methods(root_module, cls): visibility='private', is_virtual=True) return -def register_Ns3RandomPropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel::RandomPropagationDelayModel(ns3::RandomPropagationDelayModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::RandomPropagationDelayModel const &', 'arg0')]) - ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel::RandomPropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h (module 'propagation'): ns3::Time ns3::RandomPropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_const=True, is_virtual=True) - ## propagation-delay-model.h (module 'propagation'): static ns3::TypeId ns3::RandomPropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3RlcEntity_methods(root_module, cls): ## rlc-entity.h (module 'lte'): ns3::RlcEntity::RlcEntity(ns3::RlcEntity const & arg0) [copy constructor] cls.add_constructor([param('ns3::RlcEntity const &', 'arg0')]) @@ -4921,32 +4878,6 @@ def register_Ns3ChannelRealization_methods(root_module, cls): [param('ns3::Ptr< ns3::ShadowingLossModel >', 'l')]) return -def register_Ns3ConstantSpeedPropagationDelayModel_methods(root_module, cls): - ## propagation-delay-model.h (module 'propagation'): ns3::ConstantSpeedPropagationDelayModel::ConstantSpeedPropagationDelayModel(ns3::ConstantSpeedPropagationDelayModel const & arg0) [copy constructor] - cls.add_constructor([param('ns3::ConstantSpeedPropagationDelayModel const &', 'arg0')]) - ## propagation-delay-model.h (module 'propagation'): ns3::ConstantSpeedPropagationDelayModel::ConstantSpeedPropagationDelayModel() [constructor] - cls.add_constructor([]) - ## propagation-delay-model.h (module 'propagation'): ns3::Time ns3::ConstantSpeedPropagationDelayModel::GetDelay(ns3::Ptr a, ns3::Ptr b) const [member function] - cls.add_method('GetDelay', - 'ns3::Time', - [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], - is_const=True, is_virtual=True) - ## propagation-delay-model.h (module 'propagation'): double ns3::ConstantSpeedPropagationDelayModel::GetSpeed() const [member function] - cls.add_method('GetSpeed', - 'double', - [], - is_const=True) - ## propagation-delay-model.h (module 'propagation'): static ns3::TypeId ns3::ConstantSpeedPropagationDelayModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - ## propagation-delay-model.h (module 'propagation'): void ns3::ConstantSpeedPropagationDelayModel::SetSpeed(double speed) [member function] - cls.add_method('SetSpeed', - 'void', - [param('double', 'speed')]) - return - def register_Ns3DataRateChecker_methods(root_module, cls): ## data-rate.h (module 'network'): ns3::DataRateChecker::DataRateChecker() [constructor] cls.add_constructor([]) @@ -6352,6 +6283,11 @@ def register_Ns3SpectrumChannel_methods(root_module, cls): cls.add_constructor([]) ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel::SpectrumChannel(ns3::SpectrumChannel const & arg0) [copy constructor] cls.add_constructor([param('ns3::SpectrumChannel const &', 'arg0')]) + ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_pure_virtual=True, is_virtual=True) ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', @@ -7058,6 +6994,11 @@ def register_Ns3SingleModelSpectrumChannel_methods(root_module, cls): cls.add_constructor([param('ns3::SingleModelSpectrumChannel const &', 'arg0')]) ## single-model-spectrum-channel.h (module 'spectrum'): ns3::SingleModelSpectrumChannel::SingleModelSpectrumChannel() [constructor] cls.add_constructor([]) + ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_virtual=True) ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', From 2f907d942bc8097575a98a4d0f42bbc2b84a6808 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 5 Jul 2011 18:53:05 +0100 Subject: [PATCH 003/202] Bump required pybindgen version --- bindings/python/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/wscript b/bindings/python/wscript index a22c2ef3a..b56955c10 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -15,7 +15,7 @@ import Build import Utils ## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 785) +REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 790) REQUIRED_PYGCCXML_VERSION = (0, 9, 5) From 78782ea0a26bca9e1ddea21f0671a599de637c83 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 5 Jul 2011 19:16:47 +0100 Subject: [PATCH 004/202] Bug 1200 - ./waf install doesn't install Python bindings properly --- bindings/python/wscript | 1 + src/wscript | 1 + 2 files changed, 2 insertions(+) diff --git a/bindings/python/wscript b/bindings/python/wscript index b56955c10..0a3677d21 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -602,6 +602,7 @@ def build(bld): bld.new_task_gen(features='copy', source="ns__init__.py", target='ns/__init__.py') + bld.install_as('${PYTHONDIR}/ns/__init__.py', 'ns__init__.py') if env['ENABLE_PYTHON_BINDINGS'] and env['BINDINGS_TYPE'] in ('monolithic', 'both'): diff --git a/src/wscript b/src/wscript index 293c1ecbe..054362a98 100644 --- a/src/wscript +++ b/src/wscript @@ -354,6 +354,7 @@ def ns3_python_bindings(bld): pass pymod.env['CXXDEFINES'] = defines pymod.includes = 'bindings' + pymod.install_path = '${PYTHONDIR}/ns' return pymod From 47fb4802760bbbaa17bad4dc9ebb4904c43d6756 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 5 Jul 2011 19:25:18 +0100 Subject: [PATCH 005/202] Missing install of .py files --- src/wscript | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wscript b/src/wscript index 054362a98..74c4aa0cb 100644 --- a/src/wscript +++ b/src/wscript @@ -300,6 +300,7 @@ def ns3_python_bindings(bld): source=("bindings/%s.py" % (module_py_name,)), target=('%s/%s.py' % (module_target_dir, module_py_name))) extension_name = '_%s' % (module_py_name,) + bld.install_files('${PYTHONDIR}/ns', ["bindings/%s.py" % (module_py_name,)]) else: extension_name = module_py_name From 67409231fa88f543caa4cec745f07120392c0e3e Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Tue, 5 Jul 2011 13:27:30 -0700 Subject: [PATCH 006/202] Bug 1120 - NS_LOG environment variable not working with test.py --- doc/manual/source/test-framework.rst | 15 ++++++--------- .../model/single-model-spectrum-channel.h | 1 + 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/doc/manual/source/test-framework.rst b/doc/manual/source/test-framework.rst index 39b04ce46..9c29c05ad 100644 --- a/doc/manual/source/test-framework.rst +++ b/doc/manual/source/test-framework.rst @@ -459,19 +459,16 @@ and determine if the tests have executed to completion in a reasonable time. Running Tests +++++++++++++ -Tests are typically run using the high level ``test.py`` program. They -can also be run manually using a low level test-runner executable directly -from ``waf``. +Tests are typically run using the high level ``test.py`` program. To get a list of the available command-line options, run ``test.py --help`` + -Running Tests Under the Test Runner Executable -********************************************** +Debugging Tests +*************** -The test-runner is the bridge from generic Python code to |ns3| code. -It is written in C++ and uses the automatic test discovery process in the +The debugging of the test programs is best performed running the low-level test-runner program. The test-runner is the bridge from generic Python code to |ns3| code. It is written in C++ and uses the automatic test discovery process in the |ns3| code to find and allow execution of all of the various tests. -Although it may not be used directly very often, it is good to understand how -``test.py`` actually runs the various tests. +The main reason why ``test.py`` is not suitable for debugging is that it is not allowed for logging to be turned on using the ``NS_LOG`` environmental variable when test.py runs. This limitation does not apply to the test-runner executable. Hence, if you want to see logging output from your tests, you have to run them using the test-runner directly. In order to execute the test-runner, you run it like any other ns-3 executable -- using ``waf``. To get a list of available options, you can type:: diff --git a/src/spectrum/model/single-model-spectrum-channel.h b/src/spectrum/model/single-model-spectrum-channel.h index a3fb15010..ea6bc6692 100644 --- a/src/spectrum/model/single-model-spectrum-channel.h +++ b/src/spectrum/model/single-model-spectrum-channel.h @@ -23,6 +23,7 @@ #include +#include namespace ns3 { From f91c663c931ce2e24f98e80d4e7e5cd3e826c654 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Tue, 5 Jul 2011 16:53:34 -0700 Subject: [PATCH 007/202] Cast some double arguments to uint64_t --- src/spectrum/test/spectrum-ideal-phy-test.cc | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/spectrum/test/spectrum-ideal-phy-test.cc b/src/spectrum/test/spectrum-ideal-phy-test.cc index 8f01bb838..df4575b4d 100644 --- a/src/spectrum/test/spectrum-ideal-phy-test.cc +++ b/src/spectrum/test/spectrum-ideal-phy-test.cc @@ -177,7 +177,7 @@ SpectrumIdealPhyTestCase::DoRun (void) OnOffHelper onoff ("ns3::PacketSocketFactory", Address (socket)); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (250))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); - onoff.SetAttribute ("DataRate", DataRateValue (DataRate (1.2*phyRate))); + onoff.SetAttribute ("DataRate", DataRateValue (DataRate (static_cast (1.2*phyRate)))); onoff.SetAttribute ("PacketSize", UintegerValue (pktSize)); ApplicationContainer apps = onoff.Install (c.Get (0)); @@ -221,22 +221,22 @@ SpectrumIdealPhyTestSuite::SpectrumIdealPhyTestSuite () for (double snr = 0.01; snr <= 10 ; snr *= 2) { double achievableRate = g_bandwidth*log2(1+snr); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.1, true, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.5, true, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.95, true, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*1.05, false, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*2, false, "ns3::SingleModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*4, false, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.1), true, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.5), true, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.95), true, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*1.05), false, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*2), false, "ns3::SingleModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*4), false, "ns3::SingleModelSpectrumChannel")); } for (double snr = 0.01; snr <= 10 ; snr *= 10) { double achievableRate = g_bandwidth*log2(1+snr); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.1, true, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.5, true, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*0.95, true, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*1.05, false, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*2, false, "ns3::MultiModelSpectrumChannel")); - AddTestCase (new SpectrumIdealPhyTestCase (snr, achievableRate*4, false, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.1), true, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.5), true, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*0.95), true, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*1.05), false, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*2), false, "ns3::MultiModelSpectrumChannel")); + AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast (achievableRate*4), false, "ns3::MultiModelSpectrumChannel")); } } From 7fc5fc50f2d9410cdd94b48745821a6dbb6705ac Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 6 Jul 2011 18:51:12 -0400 Subject: [PATCH 008/202] bug 1091: replace virtual method with callbacks. --- src/network/model/node.cc | 40 +++++++++++++++++++++++++++++++++++---- src/network/model/node.h | 33 ++++++++++++++++++++++++-------- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/src/network/model/node.cc b/src/network/model/node.cc index 2aeb676a6..19244390d 100644 --- a/src/network/model/node.cc +++ b/src/network/model/node.cc @@ -154,6 +154,7 @@ Node::GetNApplications (void) const void Node::DoDispose () { + m_deviceAdditionListeners.clear (); m_handlers.clear (); for (std::vector >::iterator i = m_devices.begin (); i != m_devices.end (); i++) @@ -192,10 +193,6 @@ Node::DoStart (void) Object::DoStart (); } -void -Node::NotifyDeviceAdded (Ptr device) -{} - void Node::RegisterProtocolHandler (ProtocolHandler handler, uint16_t protocolType, @@ -298,5 +295,40 @@ Node::ReceiveFromDevice (Ptr device, Ptr packet, uint16 } return found; } +void +Node::RegisterDeviceAdditionListener (DeviceAdditionListener listener) +{ + m_deviceAdditionListeners.push_back (listener); + // and, then, notify the new listener about all existing devices. + for (std::vector >::const_iterator i = m_devices.begin (); + i != m_devices.end (); ++i) + { + listener (*i); + } +} +void +Node::UnregisterDeviceAdditionListener (DeviceAdditionListener listener) +{ + for (DeviceAdditionListenerList::iterator i = m_deviceAdditionListeners.begin (); + i != m_deviceAdditionListeners.end (); i++) + { + if ((*i).IsEqual (listener)) + { + m_deviceAdditionListeners.erase (i); + break; + } + } +} + +void +Node::NotifyDeviceAdded (Ptr device) +{ + for (DeviceAdditionListenerList::iterator i = m_deviceAdditionListeners.begin (); + i != m_deviceAdditionListeners.end (); i++) + { + (*i) (device); + } +} + } //namespace ns3 diff --git a/src/network/model/node.h b/src/network/model/node.h index 5b3794531..a67d70487 100644 --- a/src/network/model/node.h +++ b/src/network/model/node.h @@ -174,6 +174,27 @@ public: */ void UnregisterProtocolHandler (ProtocolHandler handler); + /** + * A callback invoked whenever a device is added to a node. + */ + typedef Callback > DeviceAdditionListener; + /** + * \param listener the listener to add + * + * Add a new listener to the list of listeners for the device-added + * event. When a new listener is added, it is notified of the existance + * of all already-added devices to make discovery of devices easier. + */ + void RegisterDeviceAdditionListener (DeviceAdditionListener listener); + /** + * \param listener the listener to remove + * + * Remove an existing listener from the list of listeners for the + * device-added event. + */ + void UnregisterDeviceAdditionListener (DeviceAdditionListener listener); + + /** * \returns true if checksums are enabled, false otherwise. @@ -190,13 +211,7 @@ protected: virtual void DoDispose (void); virtual void DoStart (void); private: - - /** - * \param device the device added to this Node. - * - * This method is invoked whenever a user calls Node::AddDevice. - */ - virtual void NotifyDeviceAdded (Ptr device); + void NotifyDeviceAdded (Ptr device); bool NonPromiscReceiveFromDevice (Ptr device, Ptr, uint16_t protocol, const Address &from); bool PromiscReceiveFromDevice (Ptr device, Ptr, uint16_t protocol, const Address &from, const Address &to, NetDevice::PacketType packetType); @@ -212,12 +227,14 @@ private: bool promiscuous; }; typedef std::vector ProtocolHandlerList; + typedef std::vector DeviceAdditionListenerList; + uint32_t m_id; // Node id for this node uint32_t m_sid; // System id for this node std::vector > m_devices; std::vector > m_applications; ProtocolHandlerList m_handlers; - + DeviceAdditionListenerList m_deviceAdditionListeners; }; } //namespace ns3 From 7271e9fa6f6f7e994961568ff46fa0f0639c523c Mon Sep 17 00:00:00 2001 From: Vedran Miletic Date: Thu, 7 Jul 2011 04:31:52 -0400 Subject: [PATCH 009/202] bug 1203: Inconsistently named ifndef/define macros in ns-3 headers --- src/aodv/helper/aodv-helper.h | 8 +++++--- src/aodv/model/aodv-dpd.h | 6 +++--- src/aodv/model/aodv-id-cache.h | 6 +++--- src/aodv/test/aodv-regression.h | 7 ++++--- src/aodv/test/bug-772.h | 7 ++++--- src/aodv/test/loopback.h | 6 +++--- src/applications/model/bulk-send-application.h | 7 +++---- src/applications/model/onoff-application.h | 7 +++---- src/applications/model/packet-loss-counter.h | 6 +++--- src/applications/model/packet-sink.h | 6 +++--- src/applications/model/udp-client.h | 6 +++--- src/applications/model/udp-echo-client.h | 7 +++---- src/applications/model/udp-echo-server.h | 6 +++--- src/applications/model/udp-server.h | 6 +++--- src/applications/model/udp-trace-client.h | 7 ++++--- src/click/helper/click-internet-stack-helper.h | 2 +- src/click/model/ipv4-click-routing.h | 8 ++++---- src/click/model/ipv4-l3-click-protocol.h | 4 ++-- src/core/model/log.h | 6 +++--- src/core/model/random-variable.h | 7 +++---- src/core/model/ref-count-base.h | 6 +++--- src/core/model/unix-fd-reader.h | 3 +-- src/csma/model/backoff.h | 3 +-- src/csma/model/csma-net-device.h | 2 +- src/dsdv/doc/dsdv.h | 7 ++++--- src/dsdv/helper/dsdv-helper.h | 8 +++++--- src/dsdv/model/dsdv-packet-queue.h | 7 ++++--- src/dsdv/model/dsdv-packet.h | 8 +++++--- src/dsdv/model/dsdv-routing-protocol.h | 8 +++++--- src/dsdv/model/dsdv-rtable.h | 7 ++++--- src/emu/model/emu-encode-decode.h | 2 +- src/emu/model/emu-net-device.h | 3 +-- src/energy/model/li-ion-energy-source.h | 6 +++--- src/energy/model/simple-device-energy-model.h | 7 ++++--- src/flow-monitor/model/flow-classifier.h | 7 +++---- src/flow-monitor/model/flow-monitor.h | 6 +++--- src/flow-monitor/model/flow-probe.h | 7 +++---- src/flow-monitor/model/histogram.h | 7 +++---- src/flow-monitor/model/ipv4-flow-classifier.h | 7 +++---- src/flow-monitor/model/ipv4-flow-probe.h | 7 +++---- src/internet/model/ipv4-packet-info-tag.h | 7 +++---- src/internet/model/ipv6-packet-info-tag.h | 6 +++--- src/internet/model/pending-data.h | 6 +++--- src/internet/model/rtt-estimator.h | 8 +++----- src/internet/model/sim_errno.h | 6 +++--- src/internet/model/sim_interface.h | 8 +++++--- src/internet/model/tcp-rx-buffer.h | 6 +++--- src/internet/model/tcp-socket.h | 4 ++-- src/internet/model/tcp-tx-buffer.h | 6 +++--- src/internet/model/udp-socket.h | 4 ++-- src/lte/model/bearer-qos-parameters.h | 6 +++--- src/lte/model/ue-record.h | 6 +++--- src/mesh/helper/flame/flame-installer.h | 6 +++--- src/mesh/model/dot11s/ie-dot11s-peer-management.h | 7 ++++--- src/mesh/model/dot11s/peer-link.h | 9 ++++++--- .../model/dot11s/peer-management-protocol-mac.h | 7 ++++--- src/mesh/model/mesh-wifi-beacon.h | 7 +++---- src/mesh/model/mesh-wifi-interface-mac-plugin.h | 7 ++++--- src/mesh/model/mesh-wifi-interface-mac.h | 7 ++++--- src/mesh/test/dot11s/pmp-regression.h | 3 ++- src/network/model/application.h | 7 ++++--- src/network/model/nix-vector.h | 6 +++--- src/network/model/socket.h | 8 +++----- src/network/utils/inet6-socket-address.h | 3 +-- src/network/utils/output-stream-wrapper.h | 2 +- src/network/utils/pcap-file-wrapper.h | 2 +- src/network/utils/sequence-number.h | 6 +++--- .../model/ipv4-nix-vector-routing.h | 7 ++++--- src/olsr/model/olsr-repositories.h | 6 +++--- src/olsr/model/olsr-routing-protocol.h | 7 +++---- src/olsr/model/olsr-state.h | 6 +++--- src/olsr/test/bug780-test.h | 8 +++++--- src/olsr/test/hello-regression-test.h | 8 +++++--- src/olsr/test/tc-regression-test.h | 8 +++++--- .../model/point-to-point-net-device.h | 3 +-- .../model/cost231-propagation-loss-model.h | 6 +++--- src/spectrum/model/aloha-noack-net-device.h | 2 +- src/spectrum/model/non-communicating-net-device.h | 2 +- src/stats/model/basic-data-calculators.h | 6 +++--- src/stats/model/data-calculator.h | 6 +++--- src/stats/model/data-collector.h | 6 +++--- src/stats/model/data-output-interface.h | 6 +++--- src/stats/model/omnet-data-output.h | 6 +++--- src/stats/model/packet-data-calculators.h | 6 +++--- src/stats/model/sqlite-data-output.h | 6 +++--- src/stats/model/time-data-calculators.h | 6 +++--- src/tap-bridge/model/tap-encode-decode.h | 2 +- src/topology-read/model/inet-topology-reader.h | 6 +++--- src/topology-read/model/orbis-topology-reader.h | 7 +++---- .../model/rocketfuel-topology-reader.h | 6 +++--- src/topology-read/model/topology-reader.h | 6 +++--- src/uan/examples/uan-cw-example.h | 6 +++--- src/uan/examples/uan-rc-example.h | 6 +++--- src/uan/helper/uan-helper.h | 8 +++----- src/uan/model/uan-address.h | 6 +++--- src/uan/model/uan-channel.h | 6 +++--- src/uan/model/uan-header-common.h | 6 +++--- src/uan/model/uan-header-rc.h | 6 +++--- src/uan/model/uan-mac-aloha.h | 6 +++--- src/uan/model/uan-mac-cw.h | 6 +++--- src/uan/model/uan-mac-rc-gw.h | 6 +++--- src/uan/model/uan-mac-rc.h | 6 +++--- src/uan/model/uan-mac.h | 6 +++--- src/uan/model/uan-net-device.h | 6 +++--- src/uan/model/uan-noise-model-default.h | 6 +++--- src/uan/model/uan-noise-model.h | 6 +++--- src/uan/model/uan-phy-dual.h | 6 +++--- src/uan/model/uan-phy-gen.h | 6 +++--- src/uan/model/uan-phy.h | 6 +++--- src/uan/model/uan-prop-model-ideal.h | 7 ++++--- src/uan/model/uan-prop-model-thorp.h | 6 +++--- src/uan/model/uan-prop-model.h | 6 +++--- src/uan/model/uan-transducer-hd.h | 6 +++--- src/uan/model/uan-transducer.h | 8 +++++--- src/uan/model/uan-tx-mode.h | 6 +++--- src/wimax/model/bvec.h | 9 ++++++--- src/wimax/model/cs-parameters.h | 8 +++++--- src/wimax/model/default-traces.h | 6 +++--- src/wimax/model/ipcs-classifier-record.h | 6 +++--- src/wimax/model/ipcs-classifier.h | 7 ++++--- src/wimax/model/simple-ofdm-send-param.h | 9 +++++---- src/wimax/model/snr-to-block-error-rate-manager.h | 6 +++--- src/wimax/model/snr-to-block-error-rate-record.h | 7 ++++--- src/wimax/model/wimax-tlv.h | 13 ++++++------- 124 files changed, 390 insertions(+), 371 deletions(-) diff --git a/src/aodv/helper/aodv-helper.h b/src/aodv/helper/aodv-helper.h index c5cf9d16d..376461577 100644 --- a/src/aodv/helper/aodv-helper.h +++ b/src/aodv/helper/aodv-helper.h @@ -17,8 +17,9 @@ * * Authors: Pavel Boyko , written after OlsrHelper by Mathieu Lacage */ -#ifndef AODVHELPER_H_ -#define AODVHELPER_H_ + +#ifndef AODV_HELPER_H +#define AODV_HELPER_H #include "ns3/object-factory.h" #include "ns3/node.h" @@ -67,4 +68,5 @@ private: }; } -#endif /* AODVHELPER_H_ */ + +#endif /* AODV_HELPER_H */ diff --git a/src/aodv/model/aodv-dpd.h b/src/aodv/model/aodv-dpd.h index b0b9461c1..6f886ae5c 100644 --- a/src/aodv/model/aodv-dpd.h +++ b/src/aodv/model/aodv-dpd.h @@ -20,8 +20,8 @@ * Pavel Boyko */ -#ifndef DUPLICATEPACKETDETECTION_H_ -#define DUPLICATEPACKETDETECTION_H_ +#ifndef AODV_DPD_H +#define AODV_DPD_H #include "aodv-id-cache.h" #include "ns3/nstime.h" @@ -59,4 +59,4 @@ private: } } -#endif +#endif /* AODV_DPD_H */ diff --git a/src/aodv/model/aodv-id-cache.h b/src/aodv/model/aodv-id-cache.h index 0471d7dfe..559827a98 100644 --- a/src/aodv/model/aodv-id-cache.h +++ b/src/aodv/model/aodv-id-cache.h @@ -26,8 +26,8 @@ * Pavel Boyko */ -#ifndef IDCACHE_H_ -#define IDCACHE_H_ +#ifndef AODV_ID_CACHE_H +#define AODV_ID_CACHE_H #include "ns3/ipv4-address.h" #include "ns3/simulator.h" @@ -83,4 +83,4 @@ private: } } -#endif /* IDCACHE_H_ */ +#endif /* AODV_ID_CACHE_H */ diff --git a/src/aodv/test/aodv-regression.h b/src/aodv/test/aodv-regression.h index 9584c0173..4ebf18431 100644 --- a/src/aodv/test/aodv-regression.h +++ b/src/aodv/test/aodv-regression.h @@ -18,8 +18,8 @@ * Authors: Pavel Boyko */ -#ifndef AODVREGRESSION_H_ -#define AODVREGRESSION_H_ +#ifndef AODV_REGRESSION_H +#define AODV_REGRESSION_H #include "ns3/test.h" #include "ns3/nstime.h" @@ -191,4 +191,5 @@ private: } } -#endif /* AODVREGRESSION_H_ */ + +#endif /* AODV_REGRESSION_H */ diff --git a/src/aodv/test/bug-772.h b/src/aodv/test/bug-772.h index f98993ecc..203a26f8e 100644 --- a/src/aodv/test/bug-772.h +++ b/src/aodv/test/bug-772.h @@ -18,8 +18,8 @@ * Authors: Pavel Boyko */ -#ifndef BUG702TEST_H_ -#define BUG702TEST_H_ +#ifndef BUG_772_H +#define BUG_772_H #include "ns3/test.h" #include "ns3/nstime.h" @@ -76,4 +76,5 @@ private: } } -#endif /* BUG702TEST_H_ */ + +#endif /* BUG_772_H */ diff --git a/src/aodv/test/loopback.h b/src/aodv/test/loopback.h index bf1377cd4..bb4c5397a 100644 --- a/src/aodv/test/loopback.h +++ b/src/aodv/test/loopback.h @@ -18,8 +18,8 @@ * Authors: Pavel Boyko */ -#ifndef LOOPBACK_H_ -#define LOOPBACK_H_ +#ifndef AODV_LOOPBACK_H +#define AODV_LOOPBACK_H #include "ns3/test.h" #include @@ -42,4 +42,4 @@ struct LoopbackTestCase : public TestCase } } -#endif /* LOOPBACK_H_ */ +#endif /* AODV_LOOPBACK_H */ diff --git a/src/applications/model/bulk-send-application.h b/src/applications/model/bulk-send-application.h index 615333058..8713974c1 100644 --- a/src/applications/model/bulk-send-application.h +++ b/src/applications/model/bulk-send-application.h @@ -18,8 +18,8 @@ * Author: George F. Riley */ -#ifndef __bulksend_application_h__ -#define __bulksend_application_h__ +#ifndef BULK_SEND_APPLICATION_H +#define BULK_SEND_APPLICATION_H #include "ns3/address.h" #include "ns3/application.h" @@ -103,5 +103,4 @@ private: } // namespace ns3 -#endif - +#endif /* BULK_SEND_APPLICATION_H */ diff --git a/src/applications/model/onoff-application.h b/src/applications/model/onoff-application.h index 8cfc0c5d2..6a153b6fe 100644 --- a/src/applications/model/onoff-application.h +++ b/src/applications/model/onoff-application.h @@ -22,8 +22,8 @@ // George F. Riley, Georgia Tech, Spring 2007 // Adapted from ApplicationOnOff in GTNetS. -#ifndef __onoff_application_h__ -#define __onoff_application_h__ +#ifndef ONOFF_APPLICATION_H +#define ONOFF_APPLICATION_H #include "ns3/address.h" #include "ns3/application.h" @@ -158,5 +158,4 @@ private: } // namespace ns3 -#endif - +#endif /* ONOFF_APPLICATION_H */ diff --git a/src/applications/model/packet-loss-counter.h b/src/applications/model/packet-loss-counter.h index c44af898e..78afaf2d1 100644 --- a/src/applications/model/packet-loss-counter.h +++ b/src/applications/model/packet-loss-counter.h @@ -19,9 +19,9 @@ * * */ -#ifndef _PACKET_LOSS_COUNTER_H_ -#define _PACKET_LOSS_COUNTER_H_ +#ifndef PACKET_LOSS_COUNTER_H +#define PACKET_LOSS_COUNTER_H #include "ns3/application.h" #include "ns3/event-id.h" @@ -53,4 +53,4 @@ private: }; } -#endif /* PACKETLOSSCOUNTER_H_ */ +#endif /* PACKET_LOSS_COUNTER_H */ diff --git a/src/applications/model/packet-sink.h b/src/applications/model/packet-sink.h index d3b32f1af..477ba82ff 100644 --- a/src/applications/model/packet-sink.h +++ b/src/applications/model/packet-sink.h @@ -18,8 +18,8 @@ * Author: Tom Henderson (tomhend@u.washington.edu) */ -#ifndef __packet_sink_h__ -#define __packet_sink_h__ +#ifndef PACKET_SINK_H +#define PACKET_SINK_H #include "ns3/application.h" #include "ns3/event-id.h" @@ -114,5 +114,5 @@ private: } // namespace ns3 -#endif +#endif /* PACKET_SINK_H */ diff --git a/src/applications/model/udp-client.h b/src/applications/model/udp-client.h index e262d9cc5..b713804b8 100644 --- a/src/applications/model/udp-client.h +++ b/src/applications/model/udp-client.h @@ -20,8 +20,8 @@ * */ -#ifndef __UDP_CLIENT_H__ -#define __UDP_CLIENT_H__ +#ifndef UDP_CLIENT_H +#define UDP_CLIENT_H #include "ns3/application.h" #include "ns3/event-id.h" @@ -82,4 +82,4 @@ private: } // namespace ns3 -#endif // __UDP_CLIENT_H__ +#endif /* UDP_CLIENT_H */ diff --git a/src/applications/model/udp-echo-client.h b/src/applications/model/udp-echo-client.h index 16a8d0145..89ac13b1e 100644 --- a/src/applications/model/udp-echo-client.h +++ b/src/applications/model/udp-echo-client.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __UDP_ECHO_CLIENT_H__ -#define __UDP_ECHO_CLIENT_H__ +#ifndef UDP_ECHO_CLIENT_H +#define UDP_ECHO_CLIENT_H #include "ns3/application.h" #include "ns3/event-id.h" @@ -151,5 +151,4 @@ private: } // namespace ns3 -#endif // __UDP_ECHO_CLIENT_H__ - +#endif /* UDP_ECHO_CLIENT_H */ diff --git a/src/applications/model/udp-echo-server.h b/src/applications/model/udp-echo-server.h index 7715761c3..e44b1da61 100644 --- a/src/applications/model/udp-echo-server.h +++ b/src/applications/model/udp-echo-server.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __UDP_ECHO_SERVER_H__ -#define __UDP_ECHO_SERVER_H__ +#ifndef UDP_ECHO_SERVER_H +#define UDP_ECHO_SERVER_H #include "ns3/application.h" #include "ns3/event-id.h" @@ -64,5 +64,5 @@ private: } // namespace ns3 -#endif // __UDP_ECHO_SERVER_H__ +#endif /* UDP_ECHO_SERVER_H */ diff --git a/src/applications/model/udp-server.h b/src/applications/model/udp-server.h index 42dd7ce21..8ee4d365a 100644 --- a/src/applications/model/udp-server.h +++ b/src/applications/model/udp-server.h @@ -20,8 +20,8 @@ * */ -#ifndef __UDP_SERVER_H__ -#define __UDP_SERVER_H__ +#ifndef UDP_SERVER_H +#define UDP_SERVER_H #include "ns3/application.h" #include "ns3/event-id.h" @@ -91,4 +91,4 @@ private: } // namespace ns3 -#endif // __UDP_SERVER_H__ +#endif /* UDP_SERVER_H */ diff --git a/src/applications/model/udp-trace-client.h b/src/applications/model/udp-trace-client.h index 705953e65..090001e1b 100644 --- a/src/applications/model/udp-trace-client.h +++ b/src/applications/model/udp-trace-client.h @@ -19,14 +19,15 @@ * */ -#ifndef __UDP_TRACE_CLIENT__ -#define __UDP_TRACE_CLIENT__ +#ifndef UDP_TRACE_CLIENT_H +#define UDP_TRACE_CLIENT_H #include "ns3/application.h" #include "ns3/event-id.h" #include "ns3/ptr.h" #include "ns3/ipv4-address.h" #include + namespace ns3 { class Socket; @@ -132,4 +133,4 @@ private: } // namespace ns3 -#endif // __UDP_TRACE_CLIENT__ +#endif /* UDP_TRACE_CLIENT_H */ diff --git a/src/click/helper/click-internet-stack-helper.h b/src/click/helper/click-internet-stack-helper.h index a01e4d7e0..e1da930e8 100644 --- a/src/click/helper/click-internet-stack-helper.h +++ b/src/click/helper/click-internet-stack-helper.h @@ -228,4 +228,4 @@ private: #endif /* CLICK_INTERNET_STACK_HELPER_H */ -#endif // NS3_CLICK +#endif /* NS3_CLICK */ diff --git a/src/click/model/ipv4-click-routing.h b/src/click/model/ipv4-click-routing.h index 75ccce184..0fafbb124 100644 --- a/src/click/model/ipv4-click-routing.h +++ b/src/click/model/ipv4-click-routing.h @@ -18,8 +18,8 @@ * Authors: Lalith Suresh */ -#ifndef __IPV4_CLICK_ROUTING_H__ -#define __IPV4_CLICK_ROUTING_H__ +#ifndef IPV4_CLICK_ROUTING_H +#define IPV4_CLICK_ROUTING_H #include "ns3/object.h" #include "ns3/packet.h" @@ -243,9 +243,9 @@ private: bool m_nonDefaultName; Ptr m_ipv4; -#endif // NS3_CLICK +#endif /* NS3_CLICK */ }; } // namespace ns3 -#endif // __IPV4_CLICK_ROUTING_H__ +#endif /* IPV4_CLICK_ROUTING_H */ diff --git a/src/click/model/ipv4-l3-click-protocol.h b/src/click/model/ipv4-l3-click-protocol.h index ae5c43fbe..2b7d821a8 100644 --- a/src/click/model/ipv4-l3-click-protocol.h +++ b/src/click/model/ipv4-l3-click-protocol.h @@ -262,9 +262,9 @@ private: std::vector m_promiscDeviceList; -#endif // NS3_CLICK +#endif /* NS3_CLICK */ }; } // namespace ns3 -#endif // IPV4_L3_CLICK_ROUTING_H +#endif /* IPV4_L3_CLICK_ROUTING_H */ diff --git a/src/core/model/log.h b/src/core/model/log.h index 944f76fec..8b60b8ea7 100644 --- a/src/core/model/log.h +++ b/src/core/model/log.h @@ -18,8 +18,8 @@ * Author: Mathieu Lacage */ -#ifndef __LOG_H__ -#define __LOG_H__ +#ifndef LOG_H +#define LOG_H #include #include @@ -400,4 +400,4 @@ public: } // namespace ns3 -#endif // __LOG_H__ +#endif /* LOG_H */ diff --git a/src/core/model/random-variable.h b/src/core/model/random-variable.h index 3241c05ed..1b9bcefe0 100644 --- a/src/core/model/random-variable.h +++ b/src/core/model/random-variable.h @@ -19,8 +19,8 @@ // Author: Hadi Arbabi // -#ifndef __random_variable_h -#define __random_variable_h +#ifndef NS3_RANDOM_VARIABLE_H +#define NS3_RANDOM_VARIABLE_H #include #include @@ -817,5 +817,4 @@ ATTRIBUTE_ACCESSOR_DEFINE (RandomVariable); } // namespace ns3 - -#endif +#endif /* NS3_RANDOM_VARIABLE_H */ diff --git a/src/core/model/ref-count-base.h b/src/core/model/ref-count-base.h index a464b3c5b..ae4be6baf 100644 --- a/src/core/model/ref-count-base.h +++ b/src/core/model/ref-count-base.h @@ -20,8 +20,8 @@ * Authors: Gustavo Carneiro , * Mathieu Lacage */ -#ifndef __REF_COUNT_BASE_H__ -#define __REF_COUNT_BASE_H__ +#ifndef REF_COUNT_BASE_H +#define REF_COUNT_BASE_H #include "simple-ref-count.h" @@ -45,4 +45,4 @@ public: } // namespace ns3 -#endif /* __REF_COUNT_BASE_H__*/ +#endif /* REF_COUNT_BASE_H */ diff --git a/src/core/model/unix-fd-reader.h b/src/core/model/unix-fd-reader.h index 4f86b1fde..c642cf5ed 100644 --- a/src/core/model/unix-fd-reader.h +++ b/src/core/model/unix-fd-reader.h @@ -1,5 +1,4 @@ /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ - /* * Copyright (c) 2010 The Boeing Company * @@ -110,4 +109,4 @@ private: } // namespace ns3 -#endif // UNIX_FD_READER_H +#endif /* UNIX_FD_READER_H */ diff --git a/src/csma/model/backoff.h b/src/csma/model/backoff.h index 8639b910a..20f3f5ae0 100644 --- a/src/csma/model/backoff.h +++ b/src/csma/model/backoff.h @@ -98,5 +98,4 @@ private: } // namespace ns3 -#endif // BACKOFF_H - +#endif /* BACKOFF_H */ diff --git a/src/csma/model/csma-net-device.h b/src/csma/model/csma-net-device.h index cd63fa41b..170362f78 100644 --- a/src/csma/model/csma-net-device.h +++ b/src/csma/model/csma-net-device.h @@ -712,4 +712,4 @@ private: }; // namespace ns3 -#endif // CSMA_NET_DEVICE_H +#endif /* CSMA_NET_DEVICE_H */ diff --git a/src/dsdv/doc/dsdv.h b/src/dsdv/doc/dsdv.h index d90f1bc22..ddc90ff89 100644 --- a/src/dsdv/doc/dsdv.h +++ b/src/dsdv/doc/dsdv.h @@ -29,8 +29,9 @@ * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI), * US Department of Defense (DoD), and ITTC at The University of Kansas. */ -#ifndef DSDV_H_ -#define DSDV_H_ + +#ifndef DSDV_H +#define DSDV_H /** * \defgroup dsdv DSDV Routing @@ -40,4 +41,4 @@ * library document. */ -#endif /* DSDV_H_ */ +#endif /* DSDV_H */ diff --git a/src/dsdv/helper/dsdv-helper.h b/src/dsdv/helper/dsdv-helper.h index 92c9837a8..70d5e0e03 100644 --- a/src/dsdv/helper/dsdv-helper.h +++ b/src/dsdv/helper/dsdv-helper.h @@ -28,8 +28,9 @@ * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI), * US Department of Defense (DoD), and ITTC at The University of Kansas. */ -#ifndef DSDVHELPER_H_ -#define DSDVHELPER_H_ + +#ifndef DSDV_HELPER_H +#define DSDV_HELPER_H #include "ns3/object-factory.h" #include "ns3/node.h" @@ -76,4 +77,5 @@ private: }; } -#endif /* DSDVHELPER_H_ */ + +#endif /* DSDV_HELPER_H */ diff --git a/src/dsdv/model/dsdv-packet-queue.h b/src/dsdv/model/dsdv-packet-queue.h index cbd641add..fb4558e63 100644 --- a/src/dsdv/model/dsdv-packet-queue.h +++ b/src/dsdv/model/dsdv-packet-queue.h @@ -28,8 +28,9 @@ * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI), * US Department of Defense (DoD), and ITTC at The University of Kansas. */ -#ifndef __DSDV_PACKETQUEUE_H__ -#define __DSDV_PACKETQUEUE_H__ + +#ifndef DSDV_PACKETQUEUE_H +#define DSDV_PACKETQUEUE_H #include #include "ns3/ipv4-routing-protocol.h" @@ -196,4 +197,4 @@ private: }; } } -#endif /* __DSDV_PACKETQUEUE_H__ */ +#endif /* DSDV_PACKETQUEUE_H */ diff --git a/src/dsdv/model/dsdv-packet.h b/src/dsdv/model/dsdv-packet.h index bb3e2e7e8..09679fc50 100644 --- a/src/dsdv/model/dsdv-packet.h +++ b/src/dsdv/model/dsdv-packet.h @@ -28,8 +28,9 @@ * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI), * US Department of Defense (DoD), and ITTC at The University of Kansas. */ -#ifndef DSDVPACKET_H_ -#define DSDVPACKET_H_ + +#ifndef DSDV_PACKET_H +#define DSDV_PACKET_H #include #include "ns3/header.h" @@ -108,4 +109,5 @@ static inline std::ostream & operator<< (std::ostream& os, const DsdvHeader & pa } } } -#endif /* DSDVPACKET_H_ */ + +#endif /* DSDV_PACKET_H */ diff --git a/src/dsdv/model/dsdv-routing-protocol.h b/src/dsdv/model/dsdv-routing-protocol.h index d47d76336..ff9cb58a7 100644 --- a/src/dsdv/model/dsdv-routing-protocol.h +++ b/src/dsdv/model/dsdv-routing-protocol.h @@ -29,8 +29,9 @@ * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI), * US Department of Defense (DoD), and ITTC at The University of Kansas. */ -#ifndef DSDVROUTINGPROTOCOL_H_ -#define DSDVROUTINGPROTOCOL_H_ + +#ifndef DSDV_ROUTING_PROTOCOL_H +#define DSDV_ROUTING_PROTOCOL_H #include "dsdv-rtable.h" #include "dsdv-packet-queue.h" @@ -192,4 +193,5 @@ private: } } -#endif /* DSDVROUTINGPROTOCOL_H_ */ + +#endif /* DSDV_ROUTING_PROTOCOL_H */ diff --git a/src/dsdv/model/dsdv-rtable.h b/src/dsdv/model/dsdv-rtable.h index 1c8b19f88..87c5b9652 100644 --- a/src/dsdv/model/dsdv-rtable.h +++ b/src/dsdv/model/dsdv-rtable.h @@ -28,8 +28,9 @@ * NSF grant CNS-1050226 (Multilayer Network Resilience Analysis and Experimentation on GENI), * US Department of Defense (DoD), and ITTC at The University of Kansas. */ -#ifndef __DSDV_RTABLE_H__ -#define __DSDV_RTABLE_H__ + +#ifndef DSDV_RTABLE_H +#define DSDV_RTABLE_H #include #include @@ -345,4 +346,4 @@ private: }; } } -#endif /*__DSDV_RTABLE_H__ */ +#endif /* DSDV_RTABLE_H */ diff --git a/src/emu/model/emu-encode-decode.h b/src/emu/model/emu-encode-decode.h index f41012344..ad0ea07db 100644 --- a/src/emu/model/emu-encode-decode.h +++ b/src/emu/model/emu-encode-decode.h @@ -29,5 +29,5 @@ bool EmuStringToBuffer (std::string s, uint8_t *buffer, uint32_t *len); } // namespace ns3 -#endif // EMU_ENCODE_DECODE_H +#endif /* EMU_ENCODE_DECODE_H */ diff --git a/src/emu/model/emu-net-device.h b/src/emu/model/emu-net-device.h index 38b4613d5..36409082f 100644 --- a/src/emu/model/emu-net-device.h +++ b/src/emu/model/emu-net-device.h @@ -537,5 +537,4 @@ private: } // namespace ns3 -#endif // EMU_NET_DEVICE_H - +#endif /* EMU_NET_DEVICE_H */ diff --git a/src/energy/model/li-ion-energy-source.h b/src/energy/model/li-ion-energy-source.h index 8a48aec5b..ccca05b4d 100644 --- a/src/energy/model/li-ion-energy-source.h +++ b/src/energy/model/li-ion-energy-source.h @@ -18,8 +18,8 @@ * Author: Andrea Sacco */ -#ifndef LI_ION_ENERGY_SOURCE -#define LI_ION_ENERGY_SOURCE +#ifndef LI_ION_ENERGY_SOURCE_H +#define LI_ION_ENERGY_SOURCE_H #include "ns3/traced-value.h" #include "ns3/energy-source.h" @@ -201,4 +201,4 @@ private: } // namespace ns3 -#endif /* LI_ION_ENERGY_SOURCE */ +#endif /* LI_ION_ENERGY_SOURCE_H */ diff --git a/src/energy/model/simple-device-energy-model.h b/src/energy/model/simple-device-energy-model.h index 04587333d..ff74c1450 100644 --- a/src/energy/model/simple-device-energy-model.h +++ b/src/energy/model/simple-device-energy-model.h @@ -4,8 +4,9 @@ * Created on: 09/ago/2010 * Author: socket */ -#ifndef SIMPLE_DEVICE_ENERGY_MODEL_H_ -#define SIMPLE_DEVICE_ENERGY_MODEL_H_ + +#ifndef SIMPLE_DEVICE_ENERGY_MODEL_H +#define SIMPLE_DEVICE_ENERGY_MODEL_H #include "ns3/device-energy-model.h" #include "ns3/nstime.h" @@ -105,4 +106,4 @@ private: } // namespace ns3 -#endif /* SIMPLE_DEVICE_ENERGY_MODEL_H_ */ +#endif /* SIMPLE_DEVICE_ENERGY_MODEL_H */ diff --git a/src/flow-monitor/model/flow-classifier.h b/src/flow-monitor/model/flow-classifier.h index 53a83a218..33fad683e 100644 --- a/src/flow-monitor/model/flow-classifier.h +++ b/src/flow-monitor/model/flow-classifier.h @@ -18,8 +18,8 @@ // Author: Gustavo J. A. M. Carneiro // -#ifndef __FLOW_CLASSIFIER_H__ -#define __FLOW_CLASSIFIER_H__ +#ifndef FLOW_CLASSIFIER_H +#define FLOW_CLASSIFIER_H #include "ns3/simple-ref-count.h" #include @@ -62,5 +62,4 @@ protected: } // namespace ns3 -#endif - +#endif /* FLOW_CLASSIFIER_H */ diff --git a/src/flow-monitor/model/flow-monitor.h b/src/flow-monitor/model/flow-monitor.h index 64877ff79..5ba1960a3 100644 --- a/src/flow-monitor/model/flow-monitor.h +++ b/src/flow-monitor/model/flow-monitor.h @@ -18,8 +18,8 @@ // Author: Gustavo J. A. M. Carneiro // -#ifndef __FLOW_MONITOR_H__ -#define __FLOW_MONITOR_H__ +#ifndef FLOW_MONITOR_H +#define FLOW_MONITOR_H #include #include @@ -243,5 +243,5 @@ private: } // namespace ns3 -#endif +#endif /* FLOW_MONITOR_H */ diff --git a/src/flow-monitor/model/flow-probe.h b/src/flow-monitor/model/flow-probe.h index f317da6a2..30790989c 100644 --- a/src/flow-monitor/model/flow-probe.h +++ b/src/flow-monitor/model/flow-probe.h @@ -18,8 +18,8 @@ // Author: Gustavo J. A. M. Carneiro // -#ifndef __FLOW_PROBE_H__ -#define __FLOW_PROBE_H__ +#ifndef FLOW_PROBE_H +#define FLOW_PROBE_H #include #include @@ -87,5 +87,4 @@ protected: } // namespace ns3 -#endif - +#endif /* FLOW_PROBE_H */ diff --git a/src/flow-monitor/model/histogram.h b/src/flow-monitor/model/histogram.h index 935376b7a..34d4c715c 100644 --- a/src/flow-monitor/model/histogram.h +++ b/src/flow-monitor/model/histogram.h @@ -18,8 +18,8 @@ // Author: Pedro Fortuna // -#ifndef __NS3_HISTOGRAM_H__ -#define __NS3_HISTOGRAM_H__ +#ifndef NS3_HISTOGRAM_H +#define NS3_HISTOGRAM_H #include #include @@ -60,5 +60,4 @@ private: } // namespace ns3 -#endif - +#endif /* NS3_HISTOGRAM_H */ diff --git a/src/flow-monitor/model/ipv4-flow-classifier.h b/src/flow-monitor/model/ipv4-flow-classifier.h index cea7f8343..da1a2e3c1 100644 --- a/src/flow-monitor/model/ipv4-flow-classifier.h +++ b/src/flow-monitor/model/ipv4-flow-classifier.h @@ -18,8 +18,8 @@ // Author: Gustavo J. A. M. Carneiro // -#ifndef __IPV4_FLOW_CLASSIFIER_H__ -#define __IPV4_FLOW_CLASSIFIER_H__ +#ifndef IPV4_FLOW_CLASSIFIER_H +#define IPV4_FLOW_CLASSIFIER_H #include #include @@ -74,5 +74,4 @@ bool operator == (const Ipv4FlowClassifier::FiveTuple &t1, const Ipv4FlowClassif } // namespace ns3 -#endif - +#endif /* IPV4_FLOW_CLASSIFIER_H */ diff --git a/src/flow-monitor/model/ipv4-flow-probe.h b/src/flow-monitor/model/ipv4-flow-probe.h index e48d9ca87..bcfc70428 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.h +++ b/src/flow-monitor/model/ipv4-flow-probe.h @@ -18,8 +18,8 @@ // Author: Gustavo J. A. M. Carneiro // -#ifndef __IPV4_FLOW_PROBE_H__ -#define __IPV4_FLOW_PROBE_H__ +#ifndef IPV4_FLOW_PROBE_H +#define IPV4_FLOW_PROBE_H #include "ns3/flow-probe.h" #include "ns3/ipv4-flow-classifier.h" @@ -82,5 +82,4 @@ private: } // namespace ns3 -#endif - +#endif /* IPV4_FLOW_PROBE_H */ diff --git a/src/internet/model/ipv4-packet-info-tag.h b/src/internet/model/ipv4-packet-info-tag.h index 50f288683..f243c5c9d 100644 --- a/src/internet/model/ipv4-packet-info-tag.h +++ b/src/internet/model/ipv4-packet-info-tag.h @@ -18,8 +18,8 @@ * Authors: Hajime Tazaki */ -#ifndef __IPV4_PACKET_INFO_TAG_H__ -#define __IPV4_PACKET_INFO_TAG_H__ +#ifndef IPV4_PACKET_INFO_TAG_H +#define IPV4_PACKET_INFO_TAG_H #include "ns3/tag.h" #include "ns3/ipv4-address.h" @@ -86,5 +86,4 @@ private: }; } //namespace ns3 -#endif /* __IPV4_PACKET_INFO_TAG_H__ */ - +#endif /* IPV4_PACKET_INFO_TAG_H */ diff --git a/src/internet/model/ipv6-packet-info-tag.h b/src/internet/model/ipv6-packet-info-tag.h index 099afed3f..cb60a3515 100644 --- a/src/internet/model/ipv6-packet-info-tag.h +++ b/src/internet/model/ipv6-packet-info-tag.h @@ -18,8 +18,8 @@ * Authors: Hajime Tazaki */ -#ifndef __IPV6_PACKET_INFO_TAG_H__ -#define __IPV6_PACKET_INFO_TAG_H__ +#ifndef IPV6_PACKET_INFO_TAG_H +#define IPV6_PACKET_INFO_TAG_H #include "ns3/tag.h" #include "ns3/ipv6-address.h" @@ -91,5 +91,5 @@ private: }; } //namespace ns3 -#endif /* __IPV6_PACKET_INFO_TAG_H__ */ +#endif /* IPV6_PACKET_INFO_TAG_H */ diff --git a/src/internet/model/pending-data.h b/src/internet/model/pending-data.h index 50ced4e30..fef6bdb9d 100644 --- a/src/internet/model/pending-data.h +++ b/src/internet/model/pending-data.h @@ -21,8 +21,8 @@ // Georgia Tech Network Simulator - Data Descriptors // George F. Riley. Georgia Tech, Spring 2002 -#ifndef __datapdu_h__ -#define __datapdu_h__ +#ifndef PENDING_DATA_H +#define PENDING_DATA_H #include "ns3/packet.h" #include "pending-data.h" @@ -114,5 +114,5 @@ public: }; } //namepsace ns3 -#endif +#endif /* PENDING_DATA_H */ diff --git a/src/internet/model/rtt-estimator.h b/src/internet/model/rtt-estimator.h index 24dac25a3..cb9c5e248 100644 --- a/src/internet/model/rtt-estimator.h +++ b/src/internet/model/rtt-estimator.h @@ -22,8 +22,8 @@ // George F. Riley. Georgia Tech, Spring 2002 -#ifndef __rtt_estimator_h__ -#define __rtt_estimator_h__ +#ifndef RTT_ESTIMATOR_H +#define RTT_ESTIMATOR_H #include #include "ns3/sequence-number.h" @@ -114,7 +114,5 @@ public: int64x64_t variance; // Current variance }; } //namespace ns3 -#endif - - +#endif /* RTT_ESTIMATOR_H */ diff --git a/src/internet/model/sim_errno.h b/src/internet/model/sim_errno.h index d130dbcc0..06db4ce2d 100644 --- a/src/internet/model/sim_errno.h +++ b/src/internet/model/sim_errno.h @@ -1,5 +1,5 @@ -#ifndef NETWORK_SIMULATION_CRADLE_ERR_H_ -#define NETWORK_SIMULATION_CRADLE_ERR_H_ +#ifndef NSC_SIM_ERRNO_H +#define NSC_SIM_ERRNO_H // list of network stack errors that may happen in a simulation, // and can be handled by the simulator in a sane way. @@ -32,4 +32,4 @@ enum nsc_errno { NSC_ETIMEDOUT = -140, }; -#endif +#endif /* NSC_SIM_ERRNO_H */ diff --git a/src/internet/model/sim_interface.h b/src/internet/model/sim_interface.h index 271360bb5..3c70ce980 100644 --- a/src/internet/model/sim_interface.h +++ b/src/internet/model/sim_interface.h @@ -1,5 +1,4 @@ -#ifndef __SIM_INTERFACE_H__ -#define __SIM_INTERFACE_H__ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* Network Simulation Cradle Copyright (C) 2003-2005 Sam Jansen @@ -20,6 +19,9 @@ */ +#ifndef NSC_SIM_INTERFACE_H +#define NSC_SIM_INTERFACE_H + #define NSC_VERSION 0x000500 struct INetStack @@ -197,4 +199,4 @@ typedef INetStack *(*FCreateStack)(ISendCallback *, IInterruptCallback *, #define CREATE_STACK_FUNC(a,b,c) extern "C" INetStack *nsc_create_stack ( \ ISendCallback *a, IInterruptCallback *b, FRandom c) -#endif +#endif /* NSC_SIM_INTERFACE_H */ diff --git a/src/internet/model/tcp-rx-buffer.h b/src/internet/model/tcp-rx-buffer.h index ee30df7f1..f84d94896 100644 --- a/src/internet/model/tcp-rx-buffer.h +++ b/src/internet/model/tcp-rx-buffer.h @@ -18,8 +18,8 @@ * Author: Adrian Sai-wah Tam */ -#ifndef __TCP_RX_BUFFER_H__ -#define __TCP_RX_BUFFER_H__ +#ifndef TCP_RX_BUFFER_H +#define TCP_RX_BUFFER_H #include #include "ns3/traced-value.h" @@ -86,4 +86,4 @@ public: } //namepsace ns3 -#endif /* __TCP_RX_BUFFER_H__ */ +#endif /* TCP_RX_BUFFER_H */ diff --git a/src/internet/model/tcp-socket.h b/src/internet/model/tcp-socket.h index 31f4e0409..f1c08200d 100644 --- a/src/internet/model/tcp-socket.h +++ b/src/internet/model/tcp-socket.h @@ -20,8 +20,8 @@ * Mathieu Lacage */ -#ifndef __TCP_SOCKET_H__ -#define __TCP_SOCKET_H__ +#ifndef TCP_SOCKET_H +#define TCP_SOCKET_H #include "ns3/socket.h" #include "ns3/traced-callback.h" diff --git a/src/internet/model/tcp-tx-buffer.h b/src/internet/model/tcp-tx-buffer.h index 776590272..8e155c380 100644 --- a/src/internet/model/tcp-tx-buffer.h +++ b/src/internet/model/tcp-tx-buffer.h @@ -18,8 +18,8 @@ * Author: Adrian Sai-wah Tam */ -#ifndef __TCP_TX_BUFFER_H__ -#define __TCP_TX_BUFFER_H__ +#ifndef TCP_TX_BUFFER_H +#define TCP_TX_BUFFER_H #include #include "ns3/traced-value.h" @@ -118,4 +118,4 @@ private: } // namepsace ns3 -#endif +#endif /* TCP_TX_BUFFER_H */ diff --git a/src/internet/model/udp-socket.h b/src/internet/model/udp-socket.h index 29661608d..d3257f691 100644 --- a/src/internet/model/udp-socket.h +++ b/src/internet/model/udp-socket.h @@ -20,8 +20,8 @@ * Mathieu Lacage */ -#ifndef __UDP_SOCKET_H__ -#define __UDP_SOCKET_H__ +#ifndef UDP_SOCKET_H +#define UDP_SOCKET_H #include "ns3/socket.h" #include "ns3/traced-callback.h" diff --git a/src/lte/model/bearer-qos-parameters.h b/src/lte/model/bearer-qos-parameters.h index eb61c3536..c1b1ee612 100644 --- a/src/lte/model/bearer-qos-parameters.h +++ b/src/lte/model/bearer-qos-parameters.h @@ -18,8 +18,8 @@ * Author: Giuseppe Piro */ -#ifndef BEARER_QOS_PARAMETERS_H_ -#define BEARER_QOS_PARAMETERS_H_ +#ifndef BEARER_QOS_PARAMETERS_H +#define BEARER_QOS_PARAMETERS_H #include "ns3/object.h" @@ -156,4 +156,4 @@ private: } -#endif /* BEARER_QOS_PARAMETERS_H_ */ +#endif /* BEARER_QOS_PARAMETERS_H */ diff --git a/src/lte/model/ue-record.h b/src/lte/model/ue-record.h index a4c797b01..3f6324e9e 100644 --- a/src/lte/model/ue-record.h +++ b/src/lte/model/ue-record.h @@ -18,8 +18,8 @@ * Author: Giuseppe Piro */ -#ifndef UE_RECORD_H_ -#define UE_RECORD_H_ +#ifndef UE_RECORD_H +#define UE_RECORD_H #include "ns3/net-device.h" #include "ns3/object.h" @@ -118,4 +118,4 @@ private: } ; // namespace ns3 -#endif /* UE_RECORD_H_ */ +#endif /* UE_RECORD_H */ diff --git a/src/mesh/helper/flame/flame-installer.h b/src/mesh/helper/flame/flame-installer.h index 1cb29731b..d86c9af2b 100644 --- a/src/mesh/helper/flame/flame-installer.h +++ b/src/mesh/helper/flame/flame-installer.h @@ -18,8 +18,8 @@ * Authors: Kirill Andreev */ -#ifndef FLAME_STACK_INSTALLER_H -#define FLAME_STACK_INSTALLER_H +#ifndef FLAME_INSTALLER_H +#define FLAME_INSTALLER_H #include "ns3/mesh-stack-installer.h" @@ -75,5 +75,5 @@ public: } //namespace ns3 -#endif // FLAME_STACK_INSTALLER_H +#endif /* FLAME_INSTALLER_H */ diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.h b/src/mesh/model/dot11s/ie-dot11s-peer-management.h index a97c66f5b..676a07ab9 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peer-management.h +++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.h @@ -19,8 +19,8 @@ * Aleksey Kovalenko */ -#ifndef MESH_PEER_MAN_ELEMENT -#define MESH_PEER_MAN_ELEMENT +#ifndef IE_DOT11S_PEER_MANAGEMENT_H +#define IE_DOT11S_PEER_MANAGEMENT_H #include "ns3/mesh-information-element-vector.h" @@ -98,4 +98,5 @@ bool operator== (const IePeerManagement & a, const IePeerManagement & b); std::ostream &operator << (std::ostream &os, const IePeerManagement &peerMan); } // namespace dot11s } //namespace ns3 -#endif + +#endif /* IE_DOT11S_PEER_MANAGEMENT_H */ diff --git a/src/mesh/model/dot11s/peer-link.h b/src/mesh/model/dot11s/peer-link.h index c33267705..3f3a3a052 100644 --- a/src/mesh/model/dot11s/peer-link.h +++ b/src/mesh/model/dot11s/peer-link.h @@ -19,8 +19,8 @@ * Aleksey Kovalenko */ -#ifndef PEERLLINK_H_ -#define PEERLLINK_H_ +#ifndef PEER_LINK_H +#define PEER_LINK_H #include "ns3/nstime.h" #include "ns3/object.h" @@ -30,8 +30,10 @@ #include "ns3/ie-dot11s-beacon-timing.h" #include "ns3/ie-dot11s-peer-management.h" #include "ns3/ie-dot11s-configuration.h" + namespace ns3 { namespace dot11s { + class PeerManagementProtocolMac; /** * \ingroup dot11s @@ -258,4 +260,5 @@ private: } // namespace dot11s } //namespace ns3 -#endif /* PEERLLINK_H_ */ + +#endif /* PEER_LINK_H */ diff --git a/src/mesh/model/dot11s/peer-management-protocol-mac.h b/src/mesh/model/dot11s/peer-management-protocol-mac.h index 319afe385..5dd40d041 100644 --- a/src/mesh/model/dot11s/peer-management-protocol-mac.h +++ b/src/mesh/model/dot11s/peer-management-protocol-mac.h @@ -18,8 +18,8 @@ * Author: Kirill Andreev */ -#ifndef PEER_MANAGER_MAC_PLUGIN_H_ -#define PEER_MANAGER_MAC_PLUGIN_H_ +#ifndef PEER_MANAGEMENT_PROTOCOL_MAC_H +#define PEER_MANAGEMENT_PROTOCOL_MAC_H #include "ns3/mesh-wifi-interface-mac-plugin.h" @@ -131,5 +131,6 @@ private: } // namespace dot11s } //namespace ns3 -#endif + +#endif /* PEER_MANAGEMENT_PROTOCOL_MAC_H */ diff --git a/src/mesh/model/mesh-wifi-beacon.h b/src/mesh/model/mesh-wifi-beacon.h index 9f0d983a6..4f6265581 100644 --- a/src/mesh/model/mesh-wifi-beacon.h +++ b/src/mesh/model/mesh-wifi-beacon.h @@ -18,8 +18,8 @@ * Author: Pavel Boyko */ -#ifndef MESHWIFIBEACON_H_ -#define MESHWIFIBEACON_H_ +#ifndef MESH_WIFI_BEACON_H +#define MESH_WIFI_BEACON_H #include "ns3/object.h" #include "ns3/packet.h" @@ -72,5 +72,4 @@ private: } - -#endif /* MESHWIFIBEACON_H_ */ +#endif /* MESH_WIFI_BEACON_H */ diff --git a/src/mesh/model/mesh-wifi-interface-mac-plugin.h b/src/mesh/model/mesh-wifi-interface-mac-plugin.h index 1070e15e6..f51bb552f 100644 --- a/src/mesh/model/mesh-wifi-interface-mac-plugin.h +++ b/src/mesh/model/mesh-wifi-interface-mac-plugin.h @@ -18,8 +18,8 @@ * Author: Pavel Boyko */ -#ifndef MESHWIFIINTERFACEMACPLUGIN_H_ -#define MESHWIFIINTERFACEMACPLUGIN_H_ +#ifndef MESH_WIFI_INTERFACE_MAC_PLUGIN_H +#define MESH_WIFI_INTERFACE_MAC_PLUGIN_H #include "ns3/wifi-mac-header.h" #include "ns3/packet.h" @@ -68,4 +68,5 @@ public: }; } // namespace ns3 -#endif /* MESHWIFIINTERFACEMACPLUGIN_H_ */ + +#endif /* MESH_WIFI_INTERFACE_MAC_PLUGIN_H */ diff --git a/src/mesh/model/mesh-wifi-interface-mac.h b/src/mesh/model/mesh-wifi-interface-mac.h index 500d5b7c8..cbfad3586 100644 --- a/src/mesh/model/mesh-wifi-interface-mac.h +++ b/src/mesh/model/mesh-wifi-interface-mac.h @@ -19,8 +19,8 @@ * Pavel Boyko */ -#ifndef MESHWIFIINTERFACEMAC_H_ -#define MESHWIFIINTERFACEMAC_H_ +#ifndef MESH_WIFI_INTERFACE_MAC_H +#define MESH_WIFI_INTERFACE_MAC_H #include #include @@ -34,6 +34,7 @@ #include "ns3/mesh-wifi-interface-mac-plugin.h" #include "ns3/event-id.h" #include "qos-utils.h" + namespace ns3 { class WifiMacHeader; @@ -189,4 +190,4 @@ private: } // namespace ns3 -#endif /* MESHWIFIINTERFACEMAC_H_ */ +#endif /* MESH_WIFI_INTERFACE_MAC_H */ diff --git a/src/mesh/test/dot11s/pmp-regression.h b/src/mesh/test/dot11s/pmp-regression.h index 48a4a4504..071ca29fc 100644 --- a/src/mesh/test/dot11s/pmp-regression.h +++ b/src/mesh/test/dot11s/pmp-regression.h @@ -17,6 +17,7 @@ * * Authors: Pavel Boyko */ + #ifndef PMP_REGRESSION_H #define PMP_REGRESSION_H #include "ns3/test.h" @@ -58,5 +59,5 @@ private: void CheckResults (); void DoRun (); }; -#endif // PMP_REGRESSION_H +#endif /* PMP_REGRESSION_H */ diff --git a/src/network/model/application.h b/src/network/model/application.h index 1eeeb6f08..246d56fe0 100644 --- a/src/network/model/application.h +++ b/src/network/model/application.h @@ -18,8 +18,8 @@ * Author: George F. Riley */ -#ifndef __APPLICATION_H__ -#define __APPLICATION_H__ +#ifndef APPLICATION_H +#define APPLICATION_H #include "ns3/event-id.h" #include "ns3/nstime.h" @@ -131,4 +131,5 @@ protected: }; } //namespace ns3 -#endif + +#endif /* APPLICATION_H */ diff --git a/src/network/model/nix-vector.h b/src/network/model/nix-vector.h index 4c00472ff..b1bc0bb42 100644 --- a/src/network/model/nix-vector.h +++ b/src/network/model/nix-vector.h @@ -18,8 +18,8 @@ * Authors: Josh Pelkey */ -#ifndef __NIX_VECTOR_H__ -#define __NIX_VECTOR_H__ +#ifndef NIX_VECTOR_H +#define NIX_VECTOR_H #include "ns3/ptr.h" #include "ns3/simple-ref-count.h" @@ -185,4 +185,4 @@ private: }; } // namespace ns3 -#endif +#endif /* NIX_VECTOR_H */ diff --git a/src/network/model/socket.h b/src/network/model/socket.h index b10fa63bf..0ef0b64c9 100644 --- a/src/network/model/socket.h +++ b/src/network/model/socket.h @@ -20,8 +20,8 @@ * Mathieu Lacage */ -#ifndef __SOCKET_H__ -#define __SOCKET_H__ +#ifndef NS3_SOCKET_H +#define NS3_SOCKET_H #include "ns3/callback.h" #include "ns3/ptr.h" @@ -688,6 +688,4 @@ private: } //namespace ns3 -#endif /* SOCKET_H */ - - +#endif /* NS3_SOCKET_H */ diff --git a/src/network/utils/inet6-socket-address.h b/src/network/utils/inet6-socket-address.h index 55580e514..47c1abdeb 100644 --- a/src/network/utils/inet6-socket-address.h +++ b/src/network/utils/inet6-socket-address.h @@ -18,7 +18,7 @@ * Author: Sebastien Vincent */ -#ifndef INET6_SOCKET_ADDRESS_H +#ifndef INET6_SOCKET_ADDRESS_H #define INET6_SOCKET_ADDRESS_H #include @@ -139,4 +139,3 @@ private: } /* namespace ns3 */ #endif /* INET6_SOCKET_ADDRESS_H */ - diff --git a/src/network/utils/output-stream-wrapper.h b/src/network/utils/output-stream-wrapper.h index eeec58891..ba3916969 100644 --- a/src/network/utils/output-stream-wrapper.h +++ b/src/network/utils/output-stream-wrapper.h @@ -90,4 +90,4 @@ private: } //namespace ns3 -#endif // OUTPUT_STREAM_WRAPPER_H +#endif /* OUTPUT_STREAM_WRAPPER_H */ diff --git a/src/network/utils/pcap-file-wrapper.h b/src/network/utils/pcap-file-wrapper.h index 7a3b2f771..239689313 100644 --- a/src/network/utils/pcap-file-wrapper.h +++ b/src/network/utils/pcap-file-wrapper.h @@ -201,4 +201,4 @@ private: } //namespace ns3 -#endif // PCAP_FILE_WRAPPER_H +#endif /* PCAP_FILE_WRAPPER_H */ diff --git a/src/network/utils/sequence-number.h b/src/network/utils/sequence-number.h index d935ea8fe..b06a591d0 100644 --- a/src/network/utils/sequence-number.h +++ b/src/network/utils/sequence-number.h @@ -18,8 +18,8 @@ // Author: Gustavo J. A. M. Carneiro // -#ifndef __NS3_SEQ_NUM_H__ -#define __NS3_SEQ_NUM_H__ +#ifndef NS3_SEQ_NUM_H +#define NS3_SEQ_NUM_H #include #include @@ -293,6 +293,6 @@ typedef SequenceNumber SequenceNumber16; } // namespace ns3 -#endif +#endif /* NS3_SEQ_NUM_H */ diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h index e56696e8e..d652d6f3b 100644 --- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h +++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h @@ -18,8 +18,8 @@ * Authors: Josh Pelkey */ -#ifndef __IPV4_NIX_VECTOR_ROUTING_H__ -#define __IPV4_NIX_VECTOR_ROUTING_H__ +#ifndef IPV4_NIX_VECTOR_ROUTING_H +#define IPV4_NIX_VECTOR_ROUTING_H #include @@ -167,4 +167,5 @@ private: uint32_t m_totalNeighbors; }; } // namespace ns3 -#endif + +#endif /* IPV4_NIX_VECTOR_ROUTING_H */ diff --git a/src/olsr/model/olsr-repositories.h b/src/olsr/model/olsr-repositories.h index a9dcc56c5..f6b9a8d0a 100644 --- a/src/olsr/model/olsr-repositories.h +++ b/src/olsr/model/olsr-repositories.h @@ -25,8 +25,8 @@ /// \brief Here are defined all data structures needed by an OLSR node. /// -#ifndef __OLSR_REPOSITORIES_H__ -#define __OLSR_REPOSITORIES_H__ +#ifndef OLSR_REPOSITORIES_H +#define OLSR_REPOSITORIES_H #include #include @@ -301,4 +301,4 @@ namespace ns3 { namespace olsr { }}; // namespace ns3, olsr -#endif /* __OLSR_REPOSITORIES_H__ */ +#endif /* OLSR_REPOSITORIES_H */ diff --git a/src/olsr/model/olsr-routing-protocol.h b/src/olsr/model/olsr-routing-protocol.h index 485fb5a73..cf8aeb02c 100644 --- a/src/olsr/model/olsr-routing-protocol.h +++ b/src/olsr/model/olsr-routing-protocol.h @@ -20,9 +20,8 @@ * Gustavo J. A. M. Carneiro */ - -#ifndef __OLSR_AGENT_IMPL_H__ -#define __OLSR_AGENT_IMPL_H__ +#ifndef OLSR_AGENT_IMPL_H +#define OLSR_AGENT_IMPL_H #include "olsr-header.h" #include "ns3/test.h" @@ -306,4 +305,4 @@ private: } } // namespace ns3 -#endif +#endif /* OLSR_AGENT_IMPL_H */ diff --git a/src/olsr/model/olsr-state.h b/src/olsr/model/olsr-state.h index f6e147704..406229a8b 100644 --- a/src/olsr/model/olsr-state.h +++ b/src/olsr/model/olsr-state.h @@ -22,8 +22,8 @@ /// \brief This header file declares and defines internal state of an OLSR node. -#ifndef __OLSR_STATE_H__ -#define __OLSR_STATE_H__ +#ifndef OLSR_STATE_H +#define OLSR_STATE_H #include "olsr-repositories.h" @@ -177,4 +177,4 @@ public: } // namespace ns3 -#endif +#endif /* OLSR_STATE_H */ diff --git a/src/olsr/test/bug780-test.h b/src/olsr/test/bug780-test.h index 1bbc8d7d8..a9b9d947c 100644 --- a/src/olsr/test/bug780-test.h +++ b/src/olsr/test/bug780-test.h @@ -16,8 +16,9 @@ * Authors: Pavel Boyko */ -#ifndef BUG780_REGRESSIONTEST_H_ -#define BUG780_REGRESSIONTEST_H_ +#ifndef BUG780_TEST_H +#define BUG780_TEST_H + #include "ns3/test.h" #include "ns3/nstime.h" #include "ns3/node-container.h" @@ -46,4 +47,5 @@ private: } } -#endif + +#endif /* BUG780_TEST_H */ diff --git a/src/olsr/test/hello-regression-test.h b/src/olsr/test/hello-regression-test.h index eff24bc3f..9b7e623e9 100644 --- a/src/olsr/test/hello-regression-test.h +++ b/src/olsr/test/hello-regression-test.h @@ -18,8 +18,9 @@ * Authors: Pavel Boyko */ -#ifndef HELLOREGRESSIONTEST_H_ -#define HELLOREGRESSIONTEST_H_ +#ifndef HELLO_REGRESSION_TEST_H +#define HELLO_REGRESSION_TEST_H + #include "ns3/test.h" #include "ns3/nstime.h" #include "ns3/node-container.h" @@ -66,4 +67,5 @@ private: } } -#endif /* HELLOREGRESSIONTEST_H_ */ + +#endif /* HELLO_REGRESSION_TEST_H */ diff --git a/src/olsr/test/tc-regression-test.h b/src/olsr/test/tc-regression-test.h index d9fe2fcf1..a444305fb 100644 --- a/src/olsr/test/tc-regression-test.h +++ b/src/olsr/test/tc-regression-test.h @@ -18,8 +18,9 @@ * Authors: Pavel Boyko */ -#ifndef TCREGRESSIONTEST_H_ -#define TCREGRESSIONTEST_H_ +#ifndef TC_REGRESSION_TEST_H +#define TC_REGRESSION_TEST_H + #include "ns3/test.h" #include "ns3/nstime.h" #include "ns3/node-container.h" @@ -93,4 +94,5 @@ private: } } -#endif /* TCREGRESSIONTEST_H_ */ + +#endif /* TC_REGRESSION_TEST_H */ diff --git a/src/point-to-point/model/point-to-point-net-device.h b/src/point-to-point/model/point-to-point-net-device.h index 0cf37d149..0ba45c6ac 100644 --- a/src/point-to-point/model/point-to-point-net-device.h +++ b/src/point-to-point/model/point-to-point-net-device.h @@ -468,5 +468,4 @@ private: } // namespace ns3 -#endif // POINT_TO_POINT_NET_DEVICE_H - +#endif /* POINT_TO_POINT_NET_DEVICE_H */ diff --git a/src/propagation/model/cost231-propagation-loss-model.h b/src/propagation/model/cost231-propagation-loss-model.h index baf881137..0b02559f7 100644 --- a/src/propagation/model/cost231-propagation-loss-model.h +++ b/src/propagation/model/cost231-propagation-loss-model.h @@ -19,8 +19,8 @@ * */ -#ifndef COST231_PROPAGATION_LOSS_MODEL_H_ -#define COST231_PROPAGATION_LOSS_MODEL_H_ +#ifndef COST231_PROPAGATION_LOSS_MODEL_H +#define COST231_PROPAGATION_LOSS_MODEL_H #include "ns3/nstime.h" #include "ns3/propagation-loss-model.h" @@ -92,4 +92,4 @@ private: } -#endif /* COST231PROPAGATIONMODEL_H_ */ +#endif /* COST231PROPAGATIONMODEL_H */ diff --git a/src/spectrum/model/aloha-noack-net-device.h b/src/spectrum/model/aloha-noack-net-device.h index 3be964af8..2a2465d69 100644 --- a/src/spectrum/model/aloha-noack-net-device.h +++ b/src/spectrum/model/aloha-noack-net-device.h @@ -227,4 +227,4 @@ private: } // namespace ns3 -#endif // ALOHA_NOACK_NET_DEVICE_H +#endif /* ALOHA_NOACK_NET_DEVICE_H */ diff --git a/src/spectrum/model/non-communicating-net-device.h b/src/spectrum/model/non-communicating-net-device.h index 809f43bfb..00d7d3227 100644 --- a/src/spectrum/model/non-communicating-net-device.h +++ b/src/spectrum/model/non-communicating-net-device.h @@ -134,4 +134,4 @@ private: } // namespace ns3 -#endif // NON_COMMUNICATING_NET_DEVICE_H +#endif /* NON_COMMUNICATING_NET_DEVICE_H */ diff --git a/src/stats/model/basic-data-calculators.h b/src/stats/model/basic-data-calculators.h index 5d028e991..75dd5c291 100644 --- a/src/stats/model/basic-data-calculators.h +++ b/src/stats/model/basic-data-calculators.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __BASIC_DATA_CALCULATORS_H__ -#define __BASIC_DATA_CALCULATORS_H__ +#ifndef BASIC_DATA_CALCULATORS_H +#define BASIC_DATA_CALCULATORS_H #include "data-calculator.h" #include "data-output-interface.h" @@ -263,4 +263,4 @@ CounterCalculator::Output (DataOutputCallback &callback) const }; -#endif // __BASIC_DATA_CALCULATORS_H__ +#endif /* BASIC_DATA_CALCULATORS_H */ diff --git a/src/stats/model/data-calculator.h b/src/stats/model/data-calculator.h index 155d390cf..ccebdbdb0 100644 --- a/src/stats/model/data-calculator.h +++ b/src/stats/model/data-calculator.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __DATA_CALCULATOR_H__ -#define __DATA_CALCULATOR_H__ +#ifndef DATA_CALCULATOR_H +#define DATA_CALCULATOR_H #include "ns3/object.h" #include "ns3/nstime.h" @@ -124,4 +124,4 @@ private: }; -#endif // __DATA_CALCULATOR_H__ +#endif /* DATA_CALCULATOR_H */ diff --git a/src/stats/model/data-collector.h b/src/stats/model/data-collector.h index f53124300..b96e353d9 100644 --- a/src/stats/model/data-collector.h +++ b/src/stats/model/data-collector.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __DATA_COLLECTOR_H__ -#define __DATA_COLLECTOR_H__ +#ifndef DATA_COLLECTOR_H +#define DATA_COLLECTOR_H #include #include @@ -89,4 +89,4 @@ private: // end namespace ns3 }; -#endif // __DATA_COLLECTOR_H__ +#endif /* DATA_COLLECTOR_H */ diff --git a/src/stats/model/data-output-interface.h b/src/stats/model/data-output-interface.h index 256fe6188..a97bd098a 100644 --- a/src/stats/model/data-output-interface.h +++ b/src/stats/model/data-output-interface.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __DATA_OUTPUT_INTERFACE_H__ -#define __DATA_OUTPUT_INTERFACE_H__ +#ifndef DATA_OUTPUT_INTERFACE_H +#define DATA_OUTPUT_INTERFACE_H #include "ns3/object.h" #include "ns3/nstime.h" @@ -91,4 +91,4 @@ public: }; -#endif // __DATA_OUTPUT_INTERFACE_H__ +#endif /* DATA_OUTPUT_INTERFACE_H */ diff --git a/src/stats/model/omnet-data-output.h b/src/stats/model/omnet-data-output.h index 4cf2b4d8c..0e6ef0e5b 100644 --- a/src/stats/model/omnet-data-output.h +++ b/src/stats/model/omnet-data-output.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __OMNET_DATA_OUTPUT_H__ -#define __OMNET_DATA_OUTPUT_H__ +#ifndef OMNET_DATA_OUTPUT_H +#define OMNET_DATA_OUTPUT_H #include "ns3/nstime.h" @@ -85,4 +85,4 @@ private: }; -#endif // __OMNET_DATA_OUTPUT_H__ +#endif /* OMNET_DATA_OUTPUT_H */ diff --git a/src/stats/model/packet-data-calculators.h b/src/stats/model/packet-data-calculators.h index 9874f0b6a..d6c72b167 100644 --- a/src/stats/model/packet-data-calculators.h +++ b/src/stats/model/packet-data-calculators.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __PACKET_DATA_CALCULATORS_H__ -#define __PACKET_DATA_CALCULATORS_H__ +#ifndef PACKET_DATA_CALCULATORS_H +#define PACKET_DATA_CALCULATORS_H #include "ns3/packet.h" #include "ns3/mac48-address.h" @@ -73,4 +73,4 @@ protected: }; -#endif // __PACKET_DATA_CALCULATORS_H__ +#endif /* PACKET_DATA_CALCULATORS_H */ diff --git a/src/stats/model/sqlite-data-output.h b/src/stats/model/sqlite-data-output.h index 8aa106af3..c4562ea6d 100644 --- a/src/stats/model/sqlite-data-output.h +++ b/src/stats/model/sqlite-data-output.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __SQLITE_DATA_OUTPUT_H__ -#define __SQLITE_DATA_OUTPUT_H__ +#ifndef SQLITE_DATA_OUTPUT_H +#define SQLITE_DATA_OUTPUT_H #include "ns3/nstime.h" @@ -94,4 +94,4 @@ private: }; -#endif // __SQLITE_DATA_OUTPUT_H__ +#endif /* SQLITE_DATA_OUTPUT_H */ diff --git a/src/stats/model/time-data-calculators.h b/src/stats/model/time-data-calculators.h index 74f6de236..82351e769 100644 --- a/src/stats/model/time-data-calculators.h +++ b/src/stats/model/time-data-calculators.h @@ -18,8 +18,8 @@ * Author: Joe Kopena (tjkopena@cs.drexel.edu) */ -#ifndef __TIME_DATA_CALCULATORS_H__ -#define __TIME_DATA_CALCULATORS_H__ +#ifndef TIME_DATA_CALCULATORS_H +#define TIME_DATA_CALCULATORS_H #include "ns3/nstime.h" @@ -61,4 +61,4 @@ protected: }; -#endif // __TIME_DATA_CALCULATORS_H__ +#endif /* TIME_DATA_CALCULATORS_H */ diff --git a/src/tap-bridge/model/tap-encode-decode.h b/src/tap-bridge/model/tap-encode-decode.h index dba82717b..5e9a1cf6e 100644 --- a/src/tap-bridge/model/tap-encode-decode.h +++ b/src/tap-bridge/model/tap-encode-decode.h @@ -29,5 +29,5 @@ bool TapStringToBuffer (std::string s, uint8_t *buffer, uint32_t *len); } // namespace ns3 -#endif // TAP_ENCODE_DECODE_H +#endif /* TAP_ENCODE_DECODE_H */ diff --git a/src/topology-read/model/inet-topology-reader.h b/src/topology-read/model/inet-topology-reader.h index e9c31ed81..3c7613ba3 100644 --- a/src/topology-read/model/inet-topology-reader.h +++ b/src/topology-read/model/inet-topology-reader.h @@ -19,8 +19,8 @@ * Author: Valerio Sartini (valesar@gmail.com) */ -#ifndef __INET_TOPOLOGY_READER_H__ -#define __INET_TOPOLOGY_READER_H__ +#ifndef INET_TOPOLOGY_READER_H +#define INET_TOPOLOGY_READER_H #include "ns3/nstime.h" @@ -76,4 +76,4 @@ private: }; -#endif // __INET_TOPOLOGY_READER_H__ +#endif /* INET_TOPOLOGY_READER_H */ diff --git a/src/topology-read/model/orbis-topology-reader.h b/src/topology-read/model/orbis-topology-reader.h index 9afe2a9bc..50faf8f90 100644 --- a/src/topology-read/model/orbis-topology-reader.h +++ b/src/topology-read/model/orbis-topology-reader.h @@ -19,8 +19,8 @@ * Author: Valerio Sartini (valesar@gmail.com) */ -#ifndef __ORBIS_TOPOLOGY_READER_H__ -#define __ORBIS_TOPOLOGY_READER_H__ +#ifndef ORBIS_TOPOLOGY_READER_H +#define ORBIS_TOPOLOGY_READER_H #include "ns3/nstime.h" @@ -71,6 +71,5 @@ private: }; -#endif // __ORBIS_TOPOLOGY_READER_H__ - +#endif /* ORBIS_TOPOLOGY_READER_H */ diff --git a/src/topology-read/model/rocketfuel-topology-reader.h b/src/topology-read/model/rocketfuel-topology-reader.h index 105791db7..c43716ba0 100644 --- a/src/topology-read/model/rocketfuel-topology-reader.h +++ b/src/topology-read/model/rocketfuel-topology-reader.h @@ -18,8 +18,8 @@ * Author: Hajime Tazaki (tazaki@sfc.wide.ad.jp) */ -#ifndef __ROCKETFUEL_TOPOLOGY_READER_H__ -#define __ROCKETFUEL_TOPOLOGY_READER_H__ +#ifndef ROCKETFUEL_TOPOLOGY_READER_H +#define ROCKETFUEL_TOPOLOGY_READER_H #include "ns3/nstime.h" @@ -84,6 +84,6 @@ private: }; -#endif // __ROCKETFUEL_TOPOLOGY_READER_H__ +#endif /* ROCKETFUEL_TOPOLOGY_READER_H */ diff --git a/src/topology-read/model/topology-reader.h b/src/topology-read/model/topology-reader.h index a23617e17..352f6a362 100644 --- a/src/topology-read/model/topology-reader.h +++ b/src/topology-read/model/topology-reader.h @@ -19,8 +19,8 @@ * Author: Valerio Sartini (valesar@gmail.com) */ -#ifndef __TOPOLOGY_READER_H__ -#define __TOPOLOGY_READER_H__ +#ifndef TOPOLOGY_READER_H +#define TOPOLOGY_READER_H #include #include @@ -197,4 +197,4 @@ private: }; -#endif // __TOPOLOGY_READER_H__ +#endif /* TOPOLOGY_READER_H */ diff --git a/src/uan/examples/uan-cw-example.h b/src/uan/examples/uan-cw-example.h index e7b8637fd..87de21ae6 100644 --- a/src/uan/examples/uan-cw-example.h +++ b/src/uan/examples/uan-cw-example.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANCWEXAMPLE_H -#define UANCWEXAMPLE_H +#ifndef UAN_CW_EXAMPLE_H +#define UAN_CW_EXAMPLE_H #include "ns3/network-module.h" #include "ns3/tools-module.h" @@ -64,4 +64,4 @@ public: Experiment (); }; -#endif //UANCWEXAMPLE_H +#endif /* UAN_CW_EXAMPLE_H */ diff --git a/src/uan/examples/uan-rc-example.h b/src/uan/examples/uan-rc-example.h index edb9c1f6a..a1b310383 100644 --- a/src/uan/examples/uan-rc-example.h +++ b/src/uan/examples/uan-rc-example.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANRCEXAMPLE_H -#define UANRCEXAMPLE_H +#ifndef UAN_RC_EXAMPLE_H +#define UAN_RC_EXAMPLE_H #include "ns3/network-module.h" #include "ns3/tools-module.h" @@ -61,4 +61,4 @@ public: }; -#endif //UANRCEXAMPLE_H +#endif /* UAN_RC_EXAMPLE_H */ diff --git a/src/uan/helper/uan-helper.h b/src/uan/helper/uan-helper.h index 2cbf7c41c..810878dbd 100644 --- a/src/uan/helper/uan-helper.h +++ b/src/uan/helper/uan-helper.h @@ -15,12 +15,10 @@ * along with this program. If not, see . * * Author: Leonard Tracy - * - * */ -#ifndef UANHELPER_H_ -#define UANHELPER_H_ +#ifndef UAN_HELPER_H +#define UAN_HELPER_H #include #include "ns3/attribute.h" @@ -226,4 +224,4 @@ private: } // end namespace ns3 -#endif /* UANHELPER_H_ */ +#endif /* UAN_HELPER_H */ diff --git a/src/uan/model/uan-address.h b/src/uan/model/uan-address.h index 0cc931c67..5fa6b3651 100644 --- a/src/uan/model/uan-address.h +++ b/src/uan/model/uan-address.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANADDRESS_H -#define UANADDRESS_H +#ifndef UAN_ADDRESS_H +#define UAN_ADDRESS_H #include "ns3/address.h" #include @@ -126,4 +126,4 @@ std::istream& operator>> (std::istream& is, UanAddress & address); } // namespace ns3 -#endif // UANADDRESS_H +#endif /* UAN_ADDRESS_H */ diff --git a/src/uan/model/uan-channel.h b/src/uan/model/uan-channel.h index 948961f75..19062099d 100644 --- a/src/uan/model/uan-channel.h +++ b/src/uan/model/uan-channel.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANCHANNEL_H -#define UANCHANNEL_H +#ifndef UAN_CHANNEL_H +#define UAN_CHANNEL_H #include "ns3/net-device.h" #include "ns3/channel.h" @@ -112,4 +112,4 @@ protected: } -#endif // UANCHANNEL_H +#endif /* UAN_CHANNEL_H */ diff --git a/src/uan/model/uan-header-common.h b/src/uan/model/uan-header-common.h index 9428b3ed5..7988d2f27 100644 --- a/src/uan/model/uan-header-common.h +++ b/src/uan/model/uan-header-common.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANHEADERCOMMON_H -#define UANHEADERCOMMON_H +#ifndef UAN_HEADER_COMMON_H +#define UAN_HEADER_COMMON_H #include "ns3/header.h" #include "ns3/nstime.h" @@ -93,4 +93,4 @@ private: } -#endif // UANHEADERCOMMON_H +#endif /* UAN_HEADER_COMMON_H */ diff --git a/src/uan/model/uan-header-rc.h b/src/uan/model/uan-header-rc.h index 3dbe58272..7be3c27e0 100644 --- a/src/uan/model/uan-header-rc.h +++ b/src/uan/model/uan-header-rc.h @@ -19,8 +19,8 @@ */ -#ifndef UANHEADERRC_H -#define UANHEADERRC_H +#ifndef UAN_HEADER_RC_H +#define UAN_HEADER_RC_H #include "ns3/header.h" #include "ns3/nstime.h" @@ -372,4 +372,4 @@ private: } -#endif // UANHEADERRC_H +#endif /* UAN_HEADER_RC_H */ diff --git a/src/uan/model/uan-mac-aloha.h b/src/uan/model/uan-mac-aloha.h index 2c586f408..9ea79ed76 100644 --- a/src/uan/model/uan-mac-aloha.h +++ b/src/uan/model/uan-mac-aloha.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANMACALOHA_H -#define UANMACALOHA_H +#ifndef UAN_MAC_ALOHA_H +#define UAN_MAC_ALOHA_H #include "uan-mac.h" #include "uan-address.h" @@ -82,4 +82,4 @@ protected: } -#endif // UANMACALOHA_H +#endif /* UAN_MAC_ALOHA_H */ diff --git a/src/uan/model/uan-mac-cw.h b/src/uan/model/uan-mac-cw.h index 5d9acba97..e5822e047 100644 --- a/src/uan/model/uan-mac-cw.h +++ b/src/uan/model/uan-mac-cw.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANMACCW_H -#define UANMACCW_H +#ifndef UAN_MAC_CW_H +#define UAN_MAC_CW_H #include "ns3/uan-mac.h" #include "ns3/nstime.h" @@ -126,4 +126,4 @@ protected: } -#endif // UANMACCW_H +#endif /* UAN_MAC_CW_H */ diff --git a/src/uan/model/uan-mac-rc-gw.h b/src/uan/model/uan-mac-rc-gw.h index d3b417028..013f326f8 100644 --- a/src/uan/model/uan-mac-rc-gw.h +++ b/src/uan/model/uan-mac-rc-gw.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANMACRCGW_H -#define UANMACRCGW_H +#ifndef UAN_MAC_RC_GW_H +#define UAN_MAC_RC_GW_H #include "uan-mac.h" #include "uan-address.h" @@ -164,4 +164,4 @@ bool operator < (UanAddress &a, UanAddress &b); } -#endif // UANMACRCGW_H +#endif /* UAN_MAC_RC_GW_H */ diff --git a/src/uan/model/uan-mac-rc.h b/src/uan/model/uan-mac-rc.h index 0cafc6b30..9b793d57c 100644 --- a/src/uan/model/uan-mac-rc.h +++ b/src/uan/model/uan-mac-rc.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANMACRC_H -#define UANMACRC_H +#ifndef UAN_MAC_RC_H +#define UAN_MAC_RC_H #include "uan-mac.h" #include "uan-address.h" @@ -214,4 +214,4 @@ protected: } -#endif // UANMACRC_H +#endif /* UAN_MAC_RC_H */ diff --git a/src/uan/model/uan-mac.h b/src/uan/model/uan-mac.h index d2de3051c..38ebf8526 100644 --- a/src/uan/model/uan-mac.h +++ b/src/uan/model/uan-mac.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANMAC_H -#define UANMAC_H +#ifndef UAN_MAC_H +#define UAN_MAC_H #include "ns3/address.h" #include "ns3/object.h" @@ -93,4 +93,4 @@ public: } -#endif // UANMAC_H +#endif /* UAN_MAC_H */ diff --git a/src/uan/model/uan-net-device.h b/src/uan/model/uan-net-device.h index b10c2170c..625fe7e35 100644 --- a/src/uan/model/uan-net-device.h +++ b/src/uan/model/uan-net-device.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANNETDEVICE_H -#define UANNETDEVICE_H +#ifndef UAN_NET_DEVICE_H +#define UAN_NET_DEVICE_H #include "ns3/net-device.h" #include "ns3/pointer.h" @@ -154,4 +154,4 @@ protected: } // namespace ns3 -#endif // UANNETDEVICE_H +#endif /* UAN_NET_DEVICE_H */ diff --git a/src/uan/model/uan-noise-model-default.h b/src/uan/model/uan-noise-model-default.h index bd806d30b..26dffcfee 100644 --- a/src/uan/model/uan-noise-model-default.h +++ b/src/uan/model/uan-noise-model-default.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANNOISEMODELDEFAULT_H -#define UANNOISEMODELDEFAULT_H +#ifndef UAN_NOISE_MODEL_DEFAULT_H +#define UAN_NOISE_MODEL_DEFAULT_H #include "ns3/uan-noise-model.h" #include "ns3/attribute.h" @@ -63,4 +63,4 @@ private: } -#endif // UANNOISEMODELDEFAULT_H +#endif /* UAN_NOISE_MODEL_DEFAULT_H */ diff --git a/src/uan/model/uan-noise-model.h b/src/uan/model/uan-noise-model.h index 2d635c052..19143f18e 100644 --- a/src/uan/model/uan-noise-model.h +++ b/src/uan/model/uan-noise-model.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANNOISEMODEL_H -#define UANNOISEMODEL_H +#ifndef UAN_NOISE_MODEL_H +#define UAN_NOISE_MODEL_H #include "ns3/object.h" @@ -44,4 +44,4 @@ public: } // namespace ns3 -#endif // UANNOISEMODEL_H +#endif /* UAN_NOISE_MODEL_H */ diff --git a/src/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h index 2f7fc70e3..51857b357 100644 --- a/src/uan/model/uan-phy-dual.h +++ b/src/uan/model/uan-phy-dual.h @@ -19,8 +19,8 @@ * Andrea Sacco */ -#ifndef UANPHYDUAL_H -#define UANPHYDUAL_H +#ifndef UAN_PHY_DUAL_H +#define UAN_PHY_DUAL_H #include "ns3/uan-phy.h" @@ -279,4 +279,4 @@ protected: } -#endif // UANPHYDUAL_H +#endif /* UAN_PHY_DUAL_H */ diff --git a/src/uan/model/uan-phy-gen.h b/src/uan/model/uan-phy-gen.h index a1d34ea53..e5cf59b82 100644 --- a/src/uan/model/uan-phy-gen.h +++ b/src/uan/model/uan-phy-gen.h @@ -19,8 +19,8 @@ * Andrea Sacco */ -#ifndef UANPHYGEN_H -#define UANPHYGEN_H +#ifndef UAN_PHY_GEN_H +#define UAN_PHY_GEN_H #include "uan-phy.h" @@ -261,4 +261,4 @@ protected: } // namespace ns3 -#endif // UANPHYGEN_H +#endif /* UAN_PHY_GEN_H */ diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index 08d8ecb73..dae7bc87d 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -20,8 +20,8 @@ */ -#ifndef UANPHY_H -#define UANPHY_H +#ifndef UAN_PHY_H +#define UAN_PHY_H #include "ns3/object.h" #include "ns3/uan-mac.h" @@ -378,4 +378,4 @@ public: } -#endif // UANPHY_H +#endif /* UAN_PHY_H */ diff --git a/src/uan/model/uan-prop-model-ideal.h b/src/uan/model/uan-prop-model-ideal.h index e1b7d2271..95ce969a6 100644 --- a/src/uan/model/uan-prop-model-ideal.h +++ b/src/uan/model/uan-prop-model-ideal.h @@ -18,12 +18,13 @@ * Author: Leonard Tracy */ -#ifndef UANPROPMODELIDEAL_H_ -#define UANPROPMODELIDEAL_H_ +#ifndef UAN_PROP_MODEL_IDEAL_H +#define UAN_PROP_MODEL_IDEAL_H #include "uan-prop-model.h" #include "ns3/mobility-model.h" #include "ns3/nstime.h" + namespace ns3 { /** @@ -47,4 +48,4 @@ public: } -#endif /*UANPROPMODELIDEAL_H_*/ +#endif /* UAN_PROP_MODEL_IDEAL_H */ diff --git a/src/uan/model/uan-prop-model-thorp.h b/src/uan/model/uan-prop-model-thorp.h index 94437c149..49e29d7ff 100644 --- a/src/uan/model/uan-prop-model-thorp.h +++ b/src/uan/model/uan-prop-model-thorp.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANPROPMODELTHORP_H_ -#define UANPROPMODELTHORP_H_ +#ifndef UAN_PROP_MODEL_THORP_H +#define UAN_PROP_MODEL_THORP_H #include "uan-prop-model.h" @@ -51,4 +51,4 @@ private: } -#endif /* UANPROPMODELTHORP_H_ */ +#endif /* UAN_PROP_MODEL_THORP_H */ diff --git a/src/uan/model/uan-prop-model.h b/src/uan/model/uan-prop-model.h index 224366400..826acfcc0 100644 --- a/src/uan/model/uan-prop-model.h +++ b/src/uan/model/uan-prop-model.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANPROPMODEL_H_ -#define UANPROPMODEL_H_ +#ifndef UAN_PROP_MODEL_H +#define UAN_PROP_MODEL_H #include "ns3/object.h" #include "ns3/mobility-model.h" @@ -251,4 +251,4 @@ public: } -#endif /*UANPROPMODEL_H_*/ +#endif /* UAN_PROP_MODEL_H */ diff --git a/src/uan/model/uan-transducer-hd.h b/src/uan/model/uan-transducer-hd.h index fa676acb0..74721f918 100644 --- a/src/uan/model/uan-transducer-hd.h +++ b/src/uan/model/uan-transducer-hd.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANTRANSDUCERHD_H_ -#define UANTRANSDUCERHD_H_ +#ifndef UAN_TRANSDUCER_HD_H +#define UAN_TRANSDUCER_HD_H #include "uan-transducer.h" #include "ns3/simulator.h" @@ -69,4 +69,4 @@ protected: } -#endif /*UANTRANSDUCERSIMPLE_H_*/ +#endif /* UAN_TRANSDUCER_HD_H */ diff --git a/src/uan/model/uan-transducer.h b/src/uan/model/uan-transducer.h index 984f80c48..3c4763b5d 100644 --- a/src/uan/model/uan-transducer.h +++ b/src/uan/model/uan-transducer.h @@ -17,8 +17,9 @@ * * Author: Leonard Tracy */ -#ifndef UANTRANSDUCER_H_ -#define UANTRANSDUCER_H_ + +#ifndef UAN_TRANSDUCER_H +#define UAN_TRANSDUCER_H #include "ns3/object.h" #include "ns3/packet.h" @@ -26,6 +27,7 @@ #include "ns3/uan-prop-model.h" #include + namespace ns3 { class UanPhy; @@ -195,4 +197,4 @@ public: } // namespace ns3 -#endif /*UANTRANSDUCER_H_*/ +#endif /* UAN_TRANSDUCER_H */ diff --git a/src/uan/model/uan-tx-mode.h b/src/uan/model/uan-tx-mode.h index 4cb45b7f4..2fa14e161 100644 --- a/src/uan/model/uan-tx-mode.h +++ b/src/uan/model/uan-tx-mode.h @@ -18,8 +18,8 @@ * Author: Leonard Tracy */ -#ifndef UANTXMODE_H -#define UANTXMODE_H +#ifndef UAN_TX_MODE_H +#define UAN_TX_MODE_H #include "ns3/object.h" #include @@ -205,4 +205,4 @@ ATTRIBUTE_HELPER_HEADER (UanModesList); } // namespace ns3 -#endif // UANTXMODE_H +#endif /* UAN_TX_MODE_H */ diff --git a/src/wimax/model/bvec.h b/src/wimax/model/bvec.h index 63e755147..446a3bcf0 100644 --- a/src/wimax/model/bvec.h +++ b/src/wimax/model/bvec.h @@ -18,11 +18,14 @@ * Author: Mohamed Amine Ismail * */ -#ifndef BVEC_H_ -#define BVEC_H_ + +#ifndef BVEC_H +#define BVEC_H + #include namespace ns3 { typedef std::vector bvec; } -#endif /* BVEC_H_ */ + +#endif /* BVEC_H */ diff --git a/src/wimax/model/cs-parameters.h b/src/wimax/model/cs-parameters.h index 67385ec1a..fd4e5c7c0 100644 --- a/src/wimax/model/cs-parameters.h +++ b/src/wimax/model/cs-parameters.h @@ -20,10 +20,12 @@ * */ +#ifndef WIMAX_CS_PARAMETERS_H +#define WIMAX_CS_PARAMETERS_H + #include "ipcs-classifier-record.h" #include "wimax-tlv.h" -#ifndef CSPARAMETERS_H_ -#define CSPARAMETERS_H_ + namespace ns3 { /** @@ -76,4 +78,4 @@ private: }; } -#endif /* CSPARAMETERS_H_ */ +#endif /* WIMAX_CS_PARAMETERS_H */ diff --git a/src/wimax/model/default-traces.h b/src/wimax/model/default-traces.h index fe1bd1145..b8ab593d9 100644 --- a/src/wimax/model/default-traces.h +++ b/src/wimax/model/default-traces.h @@ -33,8 +33,8 @@ -#ifndef DEFAULTTRACES_H_ -#define DEFAULTTRACES_H_ +#ifndef WIMAX_DEFAULT_TRACES_H +#define WIMAX_DEFAULT_TRACES_H double modulation0[6][29] = { @@ -831,4 +831,4 @@ double modulation6[6][626] = { 0.01943 } }; -#endif /* DEFAULTTRACES_H_ */ +#endif /* WIMAX_DEFAULT_TRACES_H */ diff --git a/src/wimax/model/ipcs-classifier-record.h b/src/wimax/model/ipcs-classifier-record.h index edfafffbf..071cef42b 100644 --- a/src/wimax/model/ipcs-classifier-record.h +++ b/src/wimax/model/ipcs-classifier-record.h @@ -19,8 +19,8 @@ * */ -#ifndef IPCS_CLASSIFIER_RECORD_H_ -#define IPCS_CLASSIFIER_RECORD_H_ +#ifndef IPCS_CLASSIFIER_RECORD_H +#define IPCS_CLASSIFIER_RECORD_H #include #include "ns3/ipv4-address.h" @@ -168,4 +168,4 @@ private: } ; // namespace ns3 -#endif /* IPCS_CLASSIFIER_RECORD2_H_ */ +#endif /* IPCS_CLASSIFIER_RECORD_H */ diff --git a/src/wimax/model/ipcs-classifier.h b/src/wimax/model/ipcs-classifier.h index cd07cf4bb..2ad52e122 100644 --- a/src/wimax/model/ipcs-classifier.h +++ b/src/wimax/model/ipcs-classifier.h @@ -19,8 +19,9 @@ * */ -#ifndef IPCSCLASSIFIER_H_ -#define IPCSCLASSIFIER_H_ +#ifndef IPCS_CLASSIFIER_H +#define IPCS_CLASSIFIER_H + #include #include #include "ss-service-flow-manager.h" @@ -50,4 +51,4 @@ public: } ; // namespace ns3 -#endif /* IPCSCLASSIFIER_H_ */ +#endif /* IPCS_CLASSIFIER_H */ diff --git a/src/wimax/model/simple-ofdm-send-param.h b/src/wimax/model/simple-ofdm-send-param.h index f60f6c724..d3500f967 100644 --- a/src/wimax/model/simple-ofdm-send-param.h +++ b/src/wimax/model/simple-ofdm-send-param.h @@ -19,15 +19,15 @@ * */ +#ifndef SIMPLE_OFDM_SEND_PARAM_H +#define SIMPLE_OFDM_SEND_PARAM_H + #include #include "wimax-channel.h" #include "bvec.h" #include "wimax-phy.h" #include "ns3/propagation-loss-model.h" -#ifndef SIMPLEOFDMSENDPARAM_H_ -#define SIMPLEOFDMSENDPARAM_H_ - namespace ns3 { /** @@ -121,4 +121,5 @@ private: }; } // namespace ns3 -#endif /* SIMPLEOFDMSENDPARAM_H_ */ + +#endif /* SIMPLE_OFDM_SEND_PARAM_H */ diff --git a/src/wimax/model/snr-to-block-error-rate-manager.h b/src/wimax/model/snr-to-block-error-rate-manager.h index e4cc74195..e3e6915a5 100644 --- a/src/wimax/model/snr-to-block-error-rate-manager.h +++ b/src/wimax/model/snr-to-block-error-rate-manager.h @@ -20,8 +20,8 @@ */ -#ifndef SNRTOBLOCKERRORRATEMANAGER_H_ -#define SNRTOBLOCKERRORRATEMANAGER_H_ +#ifndef SNR_TO_BLOCK_ERROR_RATE_MANAGER_H +#define SNR_TO_BLOCK_ERROR_RATE_MANAGER_H #include "ns3/snr-to-block-error-rate-record.h" #include @@ -101,4 +101,4 @@ private: }; } -#endif /* SNRTOBLOCKERRORRATEMANAGER_H_ */ +#endif /* SNR_TO_BLOCK_ERROR_RATE_MANAGER_H */ diff --git a/src/wimax/model/snr-to-block-error-rate-record.h b/src/wimax/model/snr-to-block-error-rate-record.h index 797894c7c..ed808bd58 100644 --- a/src/wimax/model/snr-to-block-error-rate-record.h +++ b/src/wimax/model/snr-to-block-error-rate-record.h @@ -19,8 +19,9 @@ * */ -#ifndef SNRTOBLOCKERRORRATERECORD_H_ -#define SNRTOBLOCKERRORRATERECORD_H_ +#ifndef SNR_TO_BLOCK_ERROR_RATE_RECORD_H +#define SNR_TO_BLOCK_ERROR_RATE_RECORD_H + namespace ns3 { /** @@ -109,4 +110,4 @@ private: } -#endif /* SNRTOBLOCKERRORRATE_H_ */ +#endif /* SNR_TO_BLOCK_ERROR_RATE_RECORD_H */ diff --git a/src/wimax/model/wimax-tlv.h b/src/wimax/model/wimax-tlv.h index 493805e70..9d4ae2ccf 100644 --- a/src/wimax/model/wimax-tlv.h +++ b/src/wimax/model/wimax-tlv.h @@ -19,6 +19,11 @@ * */ +#ifndef WIMAX_TLV_H +#define WIMAX_TLV_H + +#define WIMAX_TLV_EXTENDED_LENGTH_MASK 0x80 + #include "ns3/ipv4-address.h" #include #include "ns3/log.h" @@ -27,12 +32,6 @@ #include "ns3/header.h" #include -#ifndef WIMAXTLV_H_ -#define WIMAXTLV_H_ -#define WIMAX_TLV_EXTENDED_LENGTH_MASK 0x80 - - - namespace ns3 { /** @@ -372,4 +371,4 @@ private: } -#endif /* TLV_H_ */ +#endif /* WIMAX_TLV_H */ From 591ac8f81fb68fade80d41583f53db340beaf576 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Thu, 7 Jul 2011 12:58:27 +0100 Subject: [PATCH 010/202] waf: copy the ns3module_taskgen add_objects attribute to the library --- src/wscript | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wscript b/src/wscript index 74c4aa0cb..44194b1df 100644 --- a/src/wscript +++ b/src/wscript @@ -173,6 +173,8 @@ class ns3module_taskgen(TaskGen.task_gen): module.includes = self.includes if hasattr(self, "is_ns3_module"): module.is_ns3_module = self.is_ns3_module + if hasattr(self, 'add_objects'): + module.add_objects = self.add_objects module.is_static = static module.vnum = wutils.VNUM From 7f5cba627bbcbd62f7b4801f338b2e70b71e40d9 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Thu, 7 Jul 2011 15:39:44 +0200 Subject: [PATCH 011/202] fixed Bug 1208 - Spectrum module example causing valgrind errors --- .../adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc index 44f143db3..f0f7d1cd1 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc @@ -61,7 +61,7 @@ PhyRxEndOkTrace (std::string context, Ptr p) int main (int argc, char** argv) { CommandLine cmd; - double lossDb; + double lossDb = 150; double txPowerW = 0.1; uint64_t phyRate = 500000; uint32_t pktSize = 1000; From b6c0a89090d61a57d3d95dcbe2be5a05a6cf0e1e Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 7 Jul 2011 06:52:07 -0700 Subject: [PATCH 012/202] clarify CreateSocket() doxygen --- src/network/model/socket.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/model/socket.h b/src/network/model/socket.h index 0ef0b64c9..30ea808b0 100644 --- a/src/network/model/socket.h +++ b/src/network/model/socket.h @@ -94,12 +94,12 @@ public: /** * This method wraps the creation of sockets that is performed - * by a socket factory on a given node based on a TypeId. + * on a given node by a SocketFactory specified by TypeId. * * \return A smart pointer to a newly created socket. * * \param node The node on which to create the socket - * \param tid The TypeId of the socket to create + * \param tid The TypeId of a SocketFactory class to use */ static Ptr CreateSocket (Ptr node, TypeId tid); /** From 058354b7e42ef86e9621cbe9f1ab1a0e1c6b8e9a Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 7 Jul 2011 06:52:32 -0700 Subject: [PATCH 013/202] fix TCP documentation --- src/internet/doc/tcp.rst | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/src/internet/doc/tcp.rst b/src/internet/doc/tcp.rst index 6e380145e..b8a1c8042 100644 --- a/src/internet/doc/tcp.rst +++ b/src/internet/doc/tcp.rst @@ -98,20 +98,42 @@ To configure behavior of TCP, a number of parameters are exported through the :cpp:class:`TcpSocket`. For example, the maximum segment size is a settable attribute. +To set the default socket type before any internet stack-related objects are +created, one may put the following statement at the top of the simulation +program::: + + Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue ("ns3::TcpTahoe")); + For users who wish to have a pointer to the actual socket (so that socket operations like Bind(), setting socket options, etc. can be done on a per-socket basis), Tcp sockets can be created by using the -``Socket::CreateSocket()`` method and passing in the TypeId -corresponding to the type of socket desired; e.g.::: +``Socket::CreateSocket()`` method. The TypeId passed to CreateSocket() +must be of type :cpp:class:`ns3::SocketFactory`, so configuring the underlying +socket type must be done by twiddling the attribute associated with the +underlying TcpL4Protocol object. The easiest way to get at this would be +through the attribute configuration system. In the below example, +the Node container "n0n1" is accessed +to get the zeroth element, and a socket is created on this node::: - // Create the socket if not already created - TypeId tid = TypeId::LookupByName ("ns3::TcpTahoe"); - Ptr localSocket = Socket::CreateSocket (node, tid); + // Create and bind the socket... + TypeId tid = TypeId::LookupByName ("ns3::TcpTahoe"); + Config::Set ("/NodeList/*/$ns3::TcpL4Protocol/SocketType", TypeIdValue (tid)); + Ptr localSocket = + Socket::CreateSocket (n0n1.Get (0), TcpSocketFactory::GetTypeId ()); -The parameter ``tid`` controls the TypeId of the actual TCP Socket -implementation that is instantiated. This way, the application can be written -generically and different socket implementations can be swapped out by -specifying the TypeId. +Above, the "*" wild card for node number is passed to the attribute +configuration system, so that all future sockets on all nodes are set to +Tahoe, not just on node 'n0n1.Get (0)'. If one wants to limit it to just +the specified node, one would have to do something like::: + + // Create and bind the socket... + TypeId tid = TypeId::LookupByName ("ns3::TcpTahoe"); + std::stringstream nodeId; + nodeId << n0n1.Get (0)->GetId (); + std::string specificNode = "/NodeList/" + nodeId.str () + "/$ns3::TcpL4Protocol/SocketType"; + Config::Set (specificNode, TypeIdValue (tid)); + Ptr localSocket = + Socket::CreateSocket (n0n1.Get (0), TcpSocketFactory::GetTypeId ()); Once a TCP socket is created, one will want to follow conventional socket logic and either connect() and send() (for a TCP client) or bind(), listen(), and From ac721283e9d4b9fe4d5e6ecd03b776f4b8fac0e3 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Thu, 7 Jul 2011 16:20:13 +0200 Subject: [PATCH 014/202] minor improvements to one of the spectrum example programs --- ...ideal-phy-matrix-propagation-loss-model.cc | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc index f0f7d1cd1..b1e8eba30 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc @@ -65,11 +65,13 @@ int main (int argc, char** argv) double txPowerW = 0.1; uint64_t phyRate = 500000; uint32_t pktSize = 1000; + double simDuration = 0.5; cmd.AddValue ("verbose", "Print trace information if true", g_verbose); cmd.AddValue ("lossDb", "link loss in dB", lossDb); cmd.AddValue ("txPowerW", "txPower in Watts", txPowerW); cmd.AddValue ("phyRate", "PHY rate in bps", phyRate); cmd.AddValue ("pktSize", "packet size in bytes", pktSize); + cmd.AddValue ("simDuration", "duration of the simulation in seconds", simDuration); cmd.Parse (argc, argv); NodeContainer c; @@ -130,20 +132,26 @@ int main (int argc, char** argv) ApplicationContainer apps = onoff.Install (c.Get (0)); apps.Start (Seconds (0.0)); - apps.Stop (Seconds (10.0)); + apps.Stop (Seconds (simDuration)); Config::Connect ("/NodeList/*/DeviceList/*/Phy/RxEndOk", MakeCallback (&PhyRxEndOkTrace)); g_rxBytes = 0; - Simulator::Stop (Seconds (10.0001)); + Simulator::Stop (Seconds (simDuration + 0.000001)); Simulator::Run (); - double throughputBps = (g_rxBytes * 8.0) / 10.0; - std::cerr << "throughput: " << std::setw (20) << std::fixed << throughputBps << " bps" << std::endl; - std::cerr << "phy rate : " << std::setw (20) << std::fixed << phyRate*1.0 << " bps" << std::endl; - double rxPowerW = txPowerW / (pow (10.0, lossDb/10.0)); - double capacity = 20e6*log2 (1.0 + (rxPowerW/20.0e6)/noisePsdValue); - std::cerr << "shannon capacity: " << std::setw (20) << std::fixed << capacity << " bps" << std::endl; + if (g_verbose) + { + double throughputBps = (g_rxBytes * 8.0) / simDuration; + std::cout << "throughput: " << throughputBps << std::endl; + std::cout << "throughput: " << std::setw (20) << std::fixed << throughputBps << " bps" << std::endl; + std::cout << "phy rate : " << std::setw (20) << std::fixed << phyRate*1.0 << " bps" << std::endl; + double rxPowerW = txPowerW / (pow (10.0, lossDb/10.0)); + double capacity = 20e6*log2 (1.0 + (rxPowerW/20.0e6)/noisePsdValue); + std::cout << "shannon capacity: " << std::setw (20) << std::fixed << capacity << " bps" << std::endl; + + } + Simulator::Destroy (); From 42162c123a8c736d0e0f3a651aad3889d3d36447 Mon Sep 17 00:00:00 2001 From: John Abraham Date: Fri, 8 Jul 2011 06:04:37 -0400 Subject: [PATCH 015/202] Bug 1172 Implement trivial XML output feature for Animation Interface --- .../helper/animation-interface-helper.cc | 89 +++ .../helper/animation-interface-helper.h | 193 ++++++ src/netanim/model/animation-interface.cc | 630 +++++++++++++++++- src/netanim/model/animation-interface.h | 222 ++++-- src/netanim/wscript | 39 +- 5 files changed, 1073 insertions(+), 100 deletions(-) create mode 100644 src/netanim/helper/animation-interface-helper.cc create mode 100644 src/netanim/helper/animation-interface-helper.h diff --git a/src/netanim/helper/animation-interface-helper.cc b/src/netanim/helper/animation-interface-helper.cc new file mode 100644 index 000000000..3cfb4c7c7 --- /dev/null +++ b/src/netanim/helper/animation-interface-helper.cc @@ -0,0 +1,89 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: John Abraham + */ + +// Animation Interface helpers + +#include "ns3/animation-interface-helper.h" +#include "ns3/log.h" + +#include + +NS_LOG_COMPONENT_DEFINE ("AnimationInterfaceHelper"); + +namespace ns3 { +AnimPacketInfo::AnimPacketInfo() + : m_txnd (0), m_nRx (0), m_nRxEnd (0), m_fbTx (0), m_lbTx (0), + transmitter_loc (Vector (0,0,0)) +{ +} + +AnimPacketInfo::AnimPacketInfo(Ptr nd, const Time& fbTx, + const Time& lbTx, Vector txLoc) + : m_txnd (nd), m_nRx (0), m_nRxEnd (0), + m_fbTx (fbTx.GetSeconds ()), m_lbTx (lbTx.GetSeconds ()), transmitter_loc (txLoc), + reception_range (0) +{ +} + +void AnimPacketInfo::ProcessRxBegin (Ptr nd, const Time& fbRx, + Vector rxLoc) +{ + m_rx[nd->GetNode ()->GetId ()] = AnimRxInfo (fbRx,nd); + m_nRx++; + reception_range = std::max (reception_range,CalculateDistance (transmitter_loc,rxLoc)); +} + +bool AnimPacketInfo::ProcessRxEnd (Ptr nd, const Time& lbRx) + +{ + uint32_t NodeId = nd->GetNode ()->GetId (); + // Find the RxInfo + if (m_rx.find(NodeId) != m_rx.end ()) + { + // Check if the NetDevice matches. A node may have several NetDevices + if (m_rx[NodeId].m_rxnd != nd) + { + return false; + } + m_rx[NodeId].m_lbRx = lbRx.GetSeconds (); + firstlastbitDelta = m_rx[NodeId].m_lbRx - m_rx[NodeId].m_fbRx; + m_nRxEnd++; + if (m_nRxEnd == m_nRx) + { + return true; + } + return false; // Still more RxEnd notifications expected + } + NS_ASSERT ("Received RxEnd notification but RxInfo never existed"); + return false; // Still more rxEnd expected +} + +void AnimPacketInfo::ProcessRxDrop (Ptr nd) +{ + if (m_rx.find (nd->GetNode ()->GetId ()) == m_rx.end()) + { + NS_LOG_DEBUG ("Received RxDrop notification"); + return; + } + // Remove any entry for which an RxBegin notification was received + m_rx.erase (m_rx.find (nd->GetNode ()->GetId ())); + m_nRx--; +} + + +} // namespace ns3 diff --git a/src/netanim/helper/animation-interface-helper.h b/src/netanim/helper/animation-interface-helper.h new file mode 100644 index 000000000..7179c0e81 --- /dev/null +++ b/src/netanim/helper/animation-interface-helper.h @@ -0,0 +1,193 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: John Abraham + */ + +// Animation Interface helpers + +#ifndef _ANIMATION_INTERFACE_HELPER_H_ +#define _ANIMATION_INTERFACE_HELPER_H_ + +#include "ns3/node.h" +#include "ns3/mobility-model.h" +#include "ns3/packet.h" +#include "ns3/simulator.h" +#include +#include + +namespace ns3 { + + +/** + * \ingroup netanim + * + * \brief AnimRxInfo helper class + * + * This helper class keeps of wireless packets received + * including info about the first bit received time, + * last bit received time and NetDevice received on + * It is intended only for use by the AnimationInterface + * class. + * + */ + +class AnimRxInfo +{ +public: + + /** + * \brief Default constructor + * + */ + AnimRxInfo () {}; + + /** + * \brief Constructor + * \param First-bit Receive time + * \param Ptr to NetDevice used for reception + * + */ + AnimRxInfo (const Time& fbRx, Ptr nd) + : m_fbRx (fbRx.GetSeconds ()), m_lbRx (0), m_rxnd (nd) {} + + /* + * First bit receive time + */ + double m_fbRx; + + /* + * Last bit receive time + */ + double m_lbRx; + + /* + * Ptr to receiving Net Device + */ + Ptr m_rxnd; +}; + +/** + * \ingroup netanim + * + * \brief AnimPacketInfo helper class + * + * This helper class keeps of wireless packets transmitted and + * received + * including info about the last bit transmit time, first bit + * transmit time, location of the transmitter and + * NetDevice transmited on + * It is intended only for use by the AnimationInterface + * class. + * + */ + +class AnimPacketInfo + +{ +public: + + /** + * \brief Default constructor + */ + AnimPacketInfo (); + + /** + * \brief Constructor + * \param Ptr to NetDevice transmitted on + * \param First bit transmit time + * \param Last bit transmit time + * \param Transmitter Location + * + */ + AnimPacketInfo(Ptr nd, + const Time& fbTx, const Time& lbTx,Vector txLoc); + + /** + * Ptr to NetDevice used for transmission + */ + Ptr m_txnd; + + /** + * Number of receivers + */ + uint32_t m_nRx; + + /** + * Number of RxEnd trace callbacks + */ + uint32_t m_nRxEnd; + + /** + * First bit transmission time + */ + double m_fbTx; + + /** + * Last bit transmission time + */ + double m_lbTx; + + /** + * Transmitter's location + */ + Vector transmitter_loc; + + /** + * Receptiion range + */ + double reception_range; + + /** + * Collection of receivers + */ + std::map m_rx; + + /** + * \brief Process RxBegin notifications + * \param Ptr to NetDevice where packet was received + * \param First bit receive time + * \param Location of the transmitter + * + */ + void ProcessRxBegin (Ptr nd, const Time& fbRx, + Vector rxLoc); + + /** + * \brief Process RxEnd notifications + * \param Ptr to NetDevice where packet was received + * \param First bit receive time + * + */ + bool ProcessRxEnd (Ptr nd, const Time& fbRx); + + /** + * \brief Process RxDrop notifications + * \param Ptr to NetDevice where packet was dropped on reception + * + */ + void ProcessRxDrop (Ptr nd); + + /** + * \brief Time delta between First bit Rx and Last bit Rx + * + */ + double firstlastbitDelta; + +}; + +} // namespace ns3 + +#endif diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index 0f94c6502..1eb566260 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -14,12 +14,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: George F. Riley + * Modified by: John Abraham */ // Interface between ns3 and the network animator #include #include +#include +#include +#include +#include // Socket related includes #if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H) @@ -37,36 +42,65 @@ #include "ns3/mobility-model.h" #include "ns3/packet.h" #include "ns3/simulator.h" - -using namespace std; +#include "ns3/animation-interface-helper.h" NS_LOG_COMPONENT_DEFINE ("AnimationInterface"); namespace ns3 { AnimationInterface::AnimationInterface () - : m_fHandle (STDOUT_FILENO), m_model (0) + : m_fHandle (STDOUT_FILENO), m_xml (false), mobilitypollinterval (Seconds(0.25)), + usingSockets (false), mport (0), outputfilename (""), + OutputFileSet (false), ServerPortSet (false) +{ +} + +AnimationInterface::AnimationInterface (const std::string fn, bool usingXML) + : m_fHandle (STDOUT_FILENO), m_xml (usingXML), mobilitypollinterval (Seconds(0.25)), + usingSockets (false), mport (0), outputfilename (fn), + OutputFileSet (false), ServerPortSet (false) +{ +} + +AnimationInterface::AnimationInterface (const uint16_t port, bool usingXML) + : m_fHandle (STDOUT_FILENO), m_xml (usingXML), mobilitypollinterval (Seconds(0.25)), + usingSockets (true), mport (port), outputfilename (""), + OutputFileSet (false), ServerPortSet (false) { } AnimationInterface::~AnimationInterface () { + StopAnimation (); +} + +void AnimationInterface::SetXMLOutput () +{ + NS_LOG_INFO ("XML output set"); + m_xml = true; } bool AnimationInterface::SetOutputFile (const std::string& fn) { + if (OutputFileSet) + return true; FILE* f = fopen (fn.c_str (), "w"); if (!f) { + NS_FATAL_ERROR ("Unable to open Animation output file"); return false; // Can't open } m_fHandle = fileno (f); // Set the file handle + usingSockets = false; + OutputFileSet = true; return true; } bool AnimationInterface::SetServerPort (uint16_t port) { #if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H) + if (ServerPortSet) + return; int s = socket (AF_INET, SOCK_STREAM, 0); struct sockaddr_in addr; addr.sin_family = AF_INET; @@ -85,28 +119,129 @@ bool AnimationInterface::SetServerPort (uint16_t port) // set the linger socket option int t = 1; setsockopt (s, SOL_SOCKET, SO_LINGER, &t, sizeof(t)); + usingSockets = true; + ServerPortSet = true; return true; #endif return false; // never reached unless the above is disabled // which is done to support a platform like MinGW } +bool AnimationInterface::WifiPacketIsPending (uint64_t Uid) +{ + return (pendingWifiPackets.find (Uid) != pendingWifiPackets.end ()); +} + + +bool AnimationInterface::WimaxPacketIsPending (uint64_t Uid) +{ + return (pendingWimaxPackets.find (Uid) != pendingWimaxPackets.end ()); +} + +void AnimationInterface::SetMobilityPollInterval (Time t) +{ + mobilitypollinterval = t; +} + +Vector AnimationInterface::UpdatePosition (Ptr n) +{ + Ptr loc = n->GetObject (); + Vector v(0,0,0); + if (!loc) + { + return v; + } + if (loc) + { + v = loc->GetPosition (); + } + nodeLocation[n->GetId ()] = v; + return v; +} + +Vector AnimationInterface::UpdatePosition (Ptr n, Vector v) +{ + nodeLocation[n->GetId ()] = v; + return v; +} + +Vector AnimationInterface::GetPosition (Ptr n) +{ + #ifdef NS_LOG + if (nodeLocation.find (n->GetId()) == nodeLocation.end ()) + { + NS_FATAL_ERROR ("Node:" <GetId() << " not found in Location table"); + } + #endif + return nodeLocation[n->GetId ()]; +} + void AnimationInterface::StartAnimation () { + if (usingSockets) + { + SetServerPort (mport); + } + else + { + SetOutputFile (outputfilename); + } + + // Find the min/max x/y for the xml topology element + topo_minX = 0; + topo_minY = 0; + topo_maxX = 1000; + topo_maxY = 1000; + bool first = true; + for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) + { + Ptr n = *i; + Vector v = UpdatePosition (n); + if (first) + { + topo_minX = v.x; + topo_minY = v.y; + topo_maxX = v.x; + topo_maxY = v.y; + first = false; + } + else + { + topo_minX = std::min (topo_minX, v.x); + topo_minY = std::min (topo_minY, v.y); + topo_maxX = std::max (topo_maxX, v.x); + topo_maxY = std::max (topo_maxY, v.y); + } + } + + AddMargin (); + if (m_xml) + { // output the xml headers + std::ostringstream oss; + oss << GetXMLOpen_anim (0); + oss << GetPreamble (); + oss << GetXMLOpen_topology (topo_minX,topo_minY,topo_maxX,topo_maxY); + WriteN (m_fHandle, oss.str ()); + } // Dump the topology for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) { Ptr n = *i; - Ptr loc = n->GetObject (); - if (loc) + std::ostringstream oss; + if (m_xml) + { + Vector v = GetPosition (n); + oss << GetXMLOpenClose_node (0,n->GetId (),v.x,v.y); + } + else { // Location exists, dump it - Vector v = loc->GetPosition (); - ostringstream oss; + Vector v = GetPosition (n); oss << "0.0 N " << n->GetId () - << " " << v.x << " " << v.y << endl; - WriteN (m_fHandle, oss.str ().c_str (), oss.str ().length ()); + << " " << v.x << " " << v.y << std::endl; } + + WriteN (m_fHandle, oss.str ().c_str (), oss.str ().length ()); } // Now dump the p2p links for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) @@ -117,13 +252,15 @@ void AnimationInterface::StartAnimation () for (uint32_t i = 0; i < nDev; ++i) { Ptr dev = n->GetDevice (i); + NS_ASSERT (dev); Ptr ch = dev->GetChannel (); if (!ch) { - continue; // No channel, can't be p2p device + NS_LOG_DEBUG ("No channel can't be a p2p device"); + continue; } - string channelType = ch->GetInstanceTypeId ().GetName (); - if (channelType == string ("ns3::PointToPointChannel")) + std::string channelType = ch->GetInstanceTypeId ().GetName (); + if (channelType == std::string ("ns3::PointToPointChannel")) { // Since these are duplex links, we only need to dump // if srcid < dstid uint32_t nChDev = ch->GetNDevices (); @@ -133,41 +270,100 @@ void AnimationInterface::StartAnimation () uint32_t n2Id = chDev->GetNode ()->GetId (); if (n1Id < n2Id) { // ouptut the p2p link - ostringstream oss; - oss << "0.0 L " << n1Id << " " << n2Id << endl; - WriteN (m_fHandle, oss.str ().c_str (), - oss.str ().length ()); + std::ostringstream oss; + if (m_xml) + { + oss << GetXMLOpenClose_link (0,n1Id,0,n2Id); + } + else + { + oss << "0.0 L " << n1Id << " " << n2Id << std::endl; + } + WriteN (m_fHandle, oss.str ()); + } } } else { - NS_FATAL_ERROR ("Net animation currently only supports point-to-point links."); + //NS_FATAL_ERROR ("Net animation currently only supports point-to-point links."); } } } + if (m_xml) + { + WriteN (m_fHandle, GetXMLClose ("topology")); + Simulator::Schedule (mobilitypollinterval, &AnimationInterface::MobilityAutoCheck, this); + } - // Connect the callback for packet tx events + // Connect the callbacks Config::Connect ("/ChannelList/*/TxRxPointToPoint", MakeCallback (&AnimationInterface::DevTxTrace, this)); + Config::Connect ("NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyTxBegin", + MakeCallback (&AnimationInterface::WifiPhyTxBeginTrace, this)); + Config::Connect ("NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyTxEnd", + MakeCallback (&AnimationInterface::WifiPhyTxEndTrace, this)); + Config::Connect ("NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyRxBegin", + MakeCallback (&AnimationInterface::WifiPhyRxBeginTrace, this)); + Config::Connect ("NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyRxEnd", + MakeCallback (&AnimationInterface::WifiPhyRxEndTrace, this)); + Config::Connect ("NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyRxDrop", + MakeCallback (&AnimationInterface::WifiPhyRxDropTrace, this)); + Config::ConnectWithoutContext ("/NodeList/*/$ns3::MobilityModel/CourseChange", + MakeCallback (&AnimationInterface::MobilityCourseChangeTrace, this)); + Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Tx", + MakeCallback (&AnimationInterface::WimaxTxTrace, this)); + Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Rx", + MakeCallback (&AnimationInterface::WimaxRxTrace, this)); + + + } void AnimationInterface::StopAnimation () { + NS_LOG_INFO ("Stopping Animation"); if (m_fHandle > 0) { + if (m_xml) + { // Terminate the anim element + WriteN (m_fHandle, GetXMLClose ("anim")); + } close (m_fHandle); + m_fHandle = 0; } } +int AnimationInterface::WriteN (int h, const std::string& st) +{ + return WriteN (h, st.c_str (), st.length ()); +} + // Private methods +void AnimationInterface::AddMargin () +{ + // Compute width/height, and add a small margin + double w = topo_maxX - topo_minX; + double h = topo_maxY - topo_minY; + topo_minX -= w * 0.05; + topo_minY -= h * 0.05; + topo_maxX = topo_minX + w * 1.5; + topo_maxY = topo_minY + h * 1.5; +} +void AnimationInterface::RecalcTopoBounds (Vector v) +{ + topo_minX = std::min (topo_minX, v.x); + topo_minY = std::min (topo_minY, v.y); + topo_maxX = std::max (topo_maxX, v.x); + topo_maxY = std::max (topo_maxY, v.y); +} + int AnimationInterface::WriteN (int h, const char* data, uint32_t count) { // Write count bytes to h from data uint32_t nLeft = count; const char* p = data; uint32_t written = 0; - while (nLeft) { int n = write (h, p, nLeft); @@ -182,19 +378,399 @@ int AnimationInterface::WriteN (int h, const char* data, uint32_t count) return written; } +void AnimationInterface::WriteDummyPacket () +{ + Time now = Simulator::Now (); + std::ostringstream oss; + double fbTx = now.GetSeconds (); + double lbTx = now.GetSeconds (); + double fbRx = now.GetSeconds (); + double lbRx = now.GetSeconds (); + if (m_xml) + { + oss << GetXMLOpen_packet (0,0,fbTx,lbTx); + oss << GetXMLOpenClose_rx (0,0,fbRx,lbRx); + oss << GetXMLClose ("packet"); + } + WriteN (m_fHandle, oss.str ()); + + +} void AnimationInterface::DevTxTrace (std::string context, Ptr p, Ptr tx, Ptr rx, Time txTime, Time rxTime) { + NS_ASSERT (tx); + NS_ASSERT (rx); Time now = Simulator::Now (); - ostringstream oss; - oss << now.GetSeconds () << " P " - << tx->GetNode ()->GetId () << " " - << rx->GetNode ()->GetId () << " " - << (now + txTime).GetSeconds () << " " // last bit tx time - << (now + rxTime - txTime).GetSeconds () << " " // first bit rx time - << (now + rxTime).GetSeconds () << endl; // last bit rx time - WriteN (m_fHandle, oss.str ().c_str (), oss.str ().length ()); + std::ostringstream oss; + double fbTx = now.GetSeconds (); + double lbTx = (now + txTime).GetSeconds (); + double fbRx = (now + rxTime - txTime).GetSeconds (); + double lbRx = (now + rxTime).GetSeconds (); + if (m_xml) + { + oss << GetXMLOpen_packet (0,tx->GetNode ()->GetId (),fbTx,lbTx); + oss << GetXMLOpenClose_rx (0,rx->GetNode ()->GetId (),fbRx,lbRx); + oss << GetXMLClose ("packet"); + } + else + { + oss << std::setprecision (10); + oss << now.GetSeconds () << " P " + << tx->GetNode ()->GetId () << " " + << rx->GetNode ()->GetId () << " " + << (now + txTime).GetSeconds () << " " // last bit tx time + << (now + rxTime - txTime).GetSeconds () << " " // first bit rx time + << (now + rxTime).GetSeconds () << std::endl; // last bit rx time + } + WriteN (m_fHandle, oss.str ()); } + +Ptr +AnimationInterface::GetNetDeviceFromContext (std::string context) +{ + // Use "NodeList/*/DeviceList/*/ as reference + // where element [1] is the Node Id + // element [2] is the NetDevice Id + + std::vector elements = GetElementsFromContext (context); + Ptr n = NodeList::GetNode (atoi (elements[1].c_str ())); + NS_ASSERT (n); + return n->GetDevice (atoi (elements[3].c_str ())); +} + +void AnimationInterface::WifiPhyTxBeginTrace (std::string context, + Ptr p) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + Ptr n = ndev->GetNode (); + NS_ASSERT (n); + // Add a new pending wireless + uint64_t Uid = p->GetUid (); + NS_LOG_INFO ("TxBeginTrace for packet:" << Uid); + pendingWifiPackets[Uid] = + AnimPacketInfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n)); +} + +void AnimationInterface::WifiPhyTxEndTrace (std::string context, + Ptr p) +{ +} + +void AnimationInterface::WifiPhyTxDropTrace (std::string context, + Ptr p) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + // Erase pending wifi + uint64_t Uid = p->GetUid (); + NS_LOG_INFO ("TxDropTrace for packet:" << Uid); + NS_ASSERT (WifiPacketIsPending (Uid) == true); + pendingWifiPackets.erase (pendingWifiPackets.find (Uid)); +} + + +void AnimationInterface::WifiPhyRxBeginTrace (std::string context, + Ptr p) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + Ptr n = ndev->GetNode (); + NS_ASSERT (n); + uint64_t Uid = p->GetUid (); + NS_LOG_INFO ("RxBeginTrace for packet:" << Uid); + NS_ASSERT (WifiPacketIsPending (Uid) == true); + pendingWifiPackets[Uid].ProcessRxBegin (ndev, Simulator::Now (), UpdatePosition (n)); +} + + +void AnimationInterface::WifiPhyRxEndTrace (std::string context, + Ptr p) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + uint64_t Uid = p->GetUid (); + NS_ASSERT (WifiPacketIsPending (Uid) == true); + AnimPacketInfo& pkt = pendingWifiPackets[Uid]; + if (pkt.ProcessRxEnd (ndev, Simulator::Now ())) + { + NS_LOG_INFO ("RxEndTrace for packet:" << Uid << " complete"); + OutputWirelessPacket (Uid, pkt); + pendingWifiPackets.erase (pendingWifiPackets.find (Uid));; + } +} + + +void AnimationInterface::WifiPhyRxDropTrace (std::string context, + Ptr p) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + uint64_t Uid = p->GetUid (); + NS_LOG_INFO ("RxDropTrace for packet:"<< Uid); + //NS_ASSERT (WifiPacketIsPending (Uid) == true); + pendingWifiPackets[Uid].ProcessRxDrop (ndev); +} + +void AnimationInterface::WimaxTxTrace (std::string context, Ptr p, const Mac48Address & m) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + Ptr n = ndev->GetNode (); + NS_ASSERT (n); + uint64_t Uid = p->GetUid (); + NS_LOG_INFO ("WimaxTxTrace for packet:" << Uid); + pendingWimaxPackets[Uid] = + AnimPacketInfo (ndev, Simulator::Now (), Simulator::Now () + Seconds (0.0001), UpdatePosition (n)); + //HACK:TODO 0.0001 is used until Wimax implements TxBegin and TxEnd traces +} + + +void AnimationInterface::WimaxRxTrace (std::string context, Ptr p, const Mac48Address & m) +{ + Ptr ndev = GetNetDeviceFromContext (context); + NS_ASSERT (ndev); + Ptr n = ndev->GetNode (); + NS_ASSERT (n); + uint64_t Uid = p->GetUid (); + NS_ASSERT (WimaxPacketIsPending (Uid) == true); + AnimPacketInfo& pktinfo = pendingWimaxPackets[Uid]; + pktinfo.ProcessRxBegin (ndev, Simulator::Now (), UpdatePosition (n)); + pktinfo.ProcessRxEnd (ndev, Simulator::Now () + Seconds (0.0001)); + //HACK:TODO 0.0001 is used until Wimax implements RxBegin and RxEnd traces + NS_LOG_INFO ("WimaxRxTrace for packet:" << Uid); + OutputWirelessPacket (Uid, pktinfo); + +} + +void AnimationInterface::MobilityCourseChangeTrace (Ptr mobility) + +{ + Ptr n = mobility->GetObject (); + if (!n) return; + if (!mobility) return; + Vector v ; + v = mobility->GetPosition (); + UpdatePosition (n,v); + RecalcTopoBounds (v); + std::ostringstream oss; + oss << GetXMLOpen_topology (topo_minX,topo_minY,topo_maxX,topo_maxY); + oss << GetXMLOpenClose_node (0,n->GetId (),v.x,v.y); + oss << GetXMLClose ("topology"); + WriteN (m_fHandle, oss.str ()); + WriteDummyPacket (); +} + +bool AnimationInterface::NodeHasMoved (Ptr n, Vector newLocation) +{ + Vector oldLocation = GetPosition (n); + if ((ceil(oldLocation.x) == ceil(newLocation.x)) && + (ceil(oldLocation.y) == ceil(newLocation.y))) + { + + return false; + } + else + { + return true; + } +} + +void AnimationInterface::MobilityAutoCheck () +{ + std::ostringstream oss; + oss << GetXMLOpen_topology (topo_minX,topo_minY,topo_maxX,topo_maxY); + for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) + { + Ptr n = *i; + if (!n) continue; + Ptr mobility = n->GetObject (); + if (!mobility) continue; + Vector newLocation = mobility->GetPosition (); + if (!NodeHasMoved (n, newLocation)) + { + continue; //Location has not changed + } + UpdatePosition (n, newLocation); + RecalcTopoBounds (newLocation); + oss << GetXMLOpenClose_node (0,n->GetId (),newLocation.x,newLocation.y); + } + oss << GetXMLClose ("topology"); + WriteN (m_fHandle, oss.str ()); + WriteDummyPacket (); + if (!Simulator::IsFinished ()) + { + Simulator::Schedule (mobilitypollinterval, &AnimationInterface::MobilityAutoCheck, this); + } +} + + +// Helper to output a wireless packet. +// For now, only the XML interface is supported + + +std::string AnimationInterface::GetPreamble () +{ + std::string s = + "\n\ + \n"; +return s; +} +void AnimationInterface::OutputWirelessPacket (uint32_t uid, AnimPacketInfo& pktInfo) +{ + if (!m_xml) return; + std::ostringstream oss; + RxInfoIterator p; + uint32_t nodeId = pktInfo.m_txnd->GetNode ()->GetId (); + + // double lbTx = pktInfo.m_lbTx; //This is not yet implemented + // HACK: TODO figure out lbTx from the delta of the first Rx packet + // Ideally all Phy interfaces should have implemented TxEnd notifications + // But currently that is not the case + + double lbTx = pktInfo.firstlastbitDelta + pktInfo.m_fbTx; + oss << GetXMLOpen_wpacket (0,nodeId,pktInfo.m_fbTx,lbTx,pktInfo.reception_range); + + // Now add each rx + for (p = pktInfo.m_rx.begin (); p != pktInfo.m_rx.end (); p++) + { + AnimRxInfo& rx = p->second; + uint32_t rxId = rx.m_rxnd->GetNode ()->GetId (); + if ((rx.m_lbRx - rx.m_fbRx) != pktInfo.firstlastbitDelta) + { + //TODO: how to handle this case elegantly? + continue; + } + if (rx.m_lbRx) + { + oss << GetXMLOpenClose_rx (0,rxId,rx.m_fbRx,rx.m_lbRx); + } + } + oss << GetXMLClose ("wpacket"); + WriteN (m_fHandle, oss.str ()); +} + + +// XML Private Helpers + +std::string AnimationInterface::GetXMLOpen_anim (uint32_t lp) +{ + std::ostringstream oss; + oss <<"\n"; + return oss.str (); +} +std::string AnimationInterface::GetXMLOpen_topology (double minX,double minY,double maxX,double maxY) +{ + std::ostringstream oss; + oss << "" << std::endl; + return oss.str (); + +} + +std::string AnimationInterface::GetXMLOpenClose_node (uint32_t lp,uint32_t id,double locX,double locY) +{ + std::ostringstream oss; + oss <<"\n"; + return oss.str (); +} +std::string AnimationInterface::GetXMLOpenClose_link (uint32_t fromLp,uint32_t fromId, uint32_t toLp, uint32_t toId) +{ + std::ostringstream oss; + oss << "" << std::endl; + return oss.str (); +} + + +std::string AnimationInterface::GetXMLOpen_packet (uint32_t fromLp,uint32_t fromId, double fbTx, double lbTx) +{ + std::ostringstream oss; + oss << std::setprecision (10); + oss << ""; + return oss.str (); +} + +std::string AnimationInterface::GetXMLOpen_wpacket (uint32_t fromLp,uint32_t fromId, double fbTx, double lbTx, double range) +{ + std::ostringstream oss; + oss << std::setprecision (10); + oss << "" << std::endl; + return oss.str (); + +} + +std::string AnimationInterface::GetXMLOpenClose_rx (uint32_t toLp, uint32_t toId, double fbRx, double lbRx) +{ + std::ostringstream oss; + oss << std::setprecision (10); + oss << "" << std::endl; + return oss.str (); +} + +std::vector AnimationInterface::GetElementsFromContext (std::string context) +{ + std::vector elements; + size_t pos1=0, pos2; + while (pos1 != context.npos) + { + pos1 = context.find ("/",pos1); + pos2 = context.find ("/",pos1+1); + elements.push_back (context.substr (pos1+1,pos2-(pos1+1))); + pos1 = pos2; + pos2 = context.npos; + } + return elements; +} + + } // namespace ns3 diff --git a/src/netanim/model/animation-interface.h b/src/netanim/model/animation-interface.h index 6ad30fd23..a484c3543 100644 --- a/src/netanim/model/animation-interface.h +++ b/src/netanim/model/animation-interface.h @@ -1,4 +1,3 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -14,6 +13,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: George F. Riley + * Modified by: John Abraham */ // Interface between ns3 and the network animator @@ -22,18 +22,21 @@ #define ANIMATION_INTERFACE__H #include - +#include +#include #include "ns3/ptr.h" #include "ns3/net-device.h" #include "ns3/nstime.h" #include "ns3/log.h" #include "ns3/node-list.h" - +#include "ns3/simulator.h" +#include "ns3/config.h" +#include "ns3/animation-interface-helper.h" +#include "ns3/mac48-address.h" namespace ns3 { class NetModel; - /** * \defgroup netanim Netanim * @@ -51,70 +54,181 @@ class NetModel; class AnimationInterface { public: -/** - * @brief Construct the animator interface. No arguments needed. - */ + + /** + * \brief Construct the animator interface. No arguments needed. + */ AnimationInterface (); -/** - * @brief Destructor for the animator interface. - */ + + /** + * \brief Destructor for the animator interface. + */ ~AnimationInterface (); -/** - * @brief Specify that animation commands are to be written - * to the specified output file. - * - * This call is used to write the animation information to a text - * file that can later be used as input to the network animator tool. - * - * @param fn The name of the output file. - * @returns true if successful open. - */ + + /** + * \brief Constructor + * \param Filename for the trace file used by the Animator + * \param Set to true if XML output traces are required + * + */ + AnimationInterface (const std::string filename, bool usingXML = true); + + /** + * \brief Constructor + * \param Port on which ns-3 should listen to for connection from the + * external netanim application + * \param Set to true if XML output traces are required + * + */ + AnimationInterface (uint16_t port, bool usingXML = true); + + /** + * \brief Specify that animation commands are to be written + * to the specified output file. + * + * This call is used to write the animation information to a text + * file that can later be used as input to the network animator tool. + * + * \param fn The name of the output file. + * \returns true if successful open. + */ bool SetOutputFile (const std::string& fn); -/** - * @brief Specify that animation commands are to be written to - * a socket. - * - * This call is used to set the ns3 process in server mode, waiting - * for a TCP connection from the animator. This call will not - * return until the animator connects in, or if the bind to the - * specified port fails. - * - * @param port Port number to bind to. - * @returns true if connection created, false if bind failed. - */ + /** + * \brief Specify that animation commands are to be written + * in XML format. + * + * \returns none + */ + void SetXMLOutput (); + + /** + * \brief Specify that animation commands are to be written to + * a socket. + * + * This call is used to set the ns3 process in server mode, waiting + * for a TCP connection from the animator. This call will not + * return until the animator connects in, or if the bind to the + * specified port fails. + * + * \param port Port number to bind to. + * \returns true if connection created, false if bind failed. + */ bool SetServerPort (uint16_t port); -/** - * @brief Writes the topology information and sets up the appropriate - * animation packet tx callback - * - * Writes the topology information to the appropriate output, depending - * on prior calls to SetOutputFile, SetServerPort, or SetInternalAnimation. - * Then creates the callbacks needed for the animator to start processing - * packets. - * - */ + /** + * \brief Writes the topology information and sets up the appropriate + * animation packet tx callback + * + * Writes the topology information to the appropriate output, depending + * on prior calls to SetOutputFile, SetServerPort, or SetInternalAnimation. + * Then creates the callbacks needed for the animator to start processing + * packets. + * + */ void StartAnimation (); -/** - * @brief Closes the interface to the animator. - * - */ + /** + * \brief Closes the interface to the animator. + * + */ void StopAnimation (); + /** + * \brief Set mobility poll interval:WARNING: setting a low interval can + * cause slowness + * + * \param Time interval between fetching mobility/position information + * Default: 0.25s + * + */ + void SetMobilityPollInterval (Time t); private: - // Packet tx animation callback - void DevTxTrace (std::string context, Ptr p, - Ptr tx, Ptr rx, - Time txTime, Time rxTime); + + int m_fHandle; // File handle for output (-1 if none) + bool m_xml; // True if xml format desired + Time mobilitypollinterval; + bool usingSockets; + uint16_t mport; + std::string outputfilename; + bool OutputFileSet; + bool ServerPortSet; + void DevTxTrace (std::string context, + Ptr p, + Ptr tx, + Ptr rx, + Time txTime, + Time rxTime); + void WifiPhyTxBeginTrace (std::string context, + Ptr p); + void WifiPhyTxEndTrace (std::string context, + Ptr p); + void WifiPhyTxDropTrace (std::string context, + Ptr p); + void WifiPhyRxBeginTrace (std::string context, + Ptr p); + void WifiPhyRxEndTrace (std::string context, + Ptr p); + void WifiPhyRxDropTrace (std::string context, + Ptr p); + + void WimaxTxTrace (std::string context, + Ptr p, + const Mac48Address &); + void WimaxRxTrace (std::string context, + Ptr p, + const Mac48Address &); + void MobilityCourseChangeTrace (Ptr mob); + + typedef std::map ::iterator RxInfoIterator; + // Write specified amount of data to the specified handle int WriteN (int, const char*, uint32_t); -private: - int m_fHandle; // File handle for output (-1 if none) - NetModel* m_model; // If non nil, points to the internal network model - // for the interlan animator + + // Write a string to the specified handle; + int WriteN (int, const std::string&); + + //Helpers to output xml wireless packet + void OutputWirelessPacket (uint32_t, AnimPacketInfo&); + void MobilityAutoCheck (); + std::map pendingWifiPackets; + std::map pendingWimaxPackets; + bool WifiPacketIsPending (uint64_t Uid); + bool WimaxPacketIsPending (uint64_t Uid); + + std::map nodeLocation; + Vector GetPosition (Ptr n); + Vector UpdatePosition (Ptr n); + Vector UpdatePosition (Ptr n, Vector v); + void WriteDummyPacket (); + bool NodeHasMoved (Ptr n, Vector newLocation); + void AddMargin (); + + // Recalculate topology bounds + void RecalcTopoBounds (Vector v); + + // Path helper + std::vector GetElementsFromContext (std::string context); + Ptr GetNetDeviceFromContext (std::string context); + + // XML helpers + std::string GetPreamble (void); + // Topology element dimensions + double topo_minX; + double topo_minY; + double topo_maxX; + double topo_maxY; + + std::string GetXMLOpen_anim (uint32_t lp); + std::string GetXMLOpen_topology (double minX,double minY,double maxX,double maxY); + std::string GetXMLOpenClose_node (uint32_t lp,uint32_t id,double locX,double locY); + std::string GetXMLOpenClose_link (uint32_t fromLp,uint32_t fromId, uint32_t toLp, uint32_t toId); + std::string GetXMLOpen_packet (uint32_t fromLp,uint32_t fromId, double fbTx, double lbTx); + std::string GetXMLOpenClose_rx (uint32_t toLp, uint32_t toId, double fbRx, double lbRx); + std::string GetXMLOpen_wpacket (uint32_t fromLp,uint32_t fromId, double fbTx, double lbTx, double range); + std::string GetXMLClose (std::string name) {return "\n"; } + }; } #endif diff --git a/src/netanim/wscript b/src/netanim/wscript index d9360f1fc..2d1ce3dd1 100644 --- a/src/netanim/wscript +++ b/src/netanim/wscript @@ -1,25 +1,26 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- +## -*-Mode : python; py-indent-offset : 4; indent-tabs-mode : nil; coding : utf-8; -*- -def build(bld): - module = bld.create_ns3_module('netanim', ['internet', 'mobility']) - module.includes = '.' - module.source = [ - 'model/animation-interface.cc', - ] +def build (bld) : + module = bld.create_ns3_module ('netanim', ['internet', 'mobility', 'wimax', 'wifi']) + module.includes = '.' + module.source = [ + 'model/animation-interface.cc', + 'helper/animation-interface-helper.cc', + ] - headers = bld.new_task_gen('ns3header') - headers.module = 'netanim' - headers.source = [ - 'model/animation-interface.h', - ] + headers = bld.new_task_gen ('ns3header') + headers.module = 'netanim' + headers.source = [ + 'model/animation-interface.h', + 'helper/animation-interface-helper.h', + ] - if (bld.env['ENABLE_EXAMPLES']): - bld.add_subdirs('examples') + if (bld.env['ENABLE_EXAMPLES']) : + bld.add_subdirs ('examples') - bld.ns3_python_bindings() + bld.ns3_python_bindings () - -def configure(conf): - conf.check(header_name='sys/socket.h', define_name='HAVE_SYS_SOCKET_H') - conf.check(header_name='netinet/in.h', define_name='HAVE_NETINET_IN_H') +def configure (conf) : + conf.check (header_name='sys/socket.h', define_name='HAVE_SYS_SOCKET_H') + conf.check (header_name='netinet/in.h', define_name='HAVE_NETINET_IN_H') From 145ecf96696dc355ff413b372c4189b329ef439c Mon Sep 17 00:00:00 2001 From: Lalith Suresh Date: Sat, 9 Jul 2011 17:05:12 +0530 Subject: [PATCH 016/202] Bug 1209: ns-3-click fails to build on Fedora 15 when tests are enabled --- src/click/test/ipv4-click-routing-test.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/click/test/ipv4-click-routing-test.cc b/src/click/test/ipv4-click-routing-test.cc index 330ad0d25..5e1a24945 100644 --- a/src/click/test/ipv4-click-routing-test.cc +++ b/src/click/test/ipv4-click-routing-test.cc @@ -97,6 +97,9 @@ ClickIfidFromNameTest::DoRun () ret = simclick_sim_command (click->m_simNode, SIMCLICK_IFID_FROM_NAME, "eth1"); NS_TEST_EXPECT_MSG_EQ (ret, -1, "No eth1 on node"); + + // Cast ret to void to work around set-but-unused warnings from compilers + (void) ret; } class ClickIpMacAddressFromNameTest : public TestCase @@ -149,6 +152,9 @@ ClickIpMacAddressFromNameTest::DoRun () NS_TEST_EXPECT_MSG_EQ (strcmp (buf, "00:00:00:00:00:00"), 0, "tun0 has IP 127.0.0.1"); delete [] buf; + + // Cast ret to void to work around set-but-unused warnings from compilers + (void) ret; } class ClickTrivialTest : public TestCase @@ -191,6 +197,9 @@ ClickTrivialTest::DoRun () NS_TEST_EXPECT_MSG_EQ (ret, 0, "eth1 does not exist, so return 0"); delete [] buf; + + // Cast ret to void to work around set-but-unused warnings from compilers + (void) ret; } class ClickIfidFromNameTestSuite : public TestSuite From 3ab8b373af000faca861f46dadf9af0b72eff2dc Mon Sep 17 00:00:00 2001 From: John Abraham Date: Sun, 10 Jul 2011 13:20:34 -0400 Subject: [PATCH 017/202] Bug 1172 Special case handling for duplicates,forwards and some doxygen fixes --- .../helper/animation-interface-helper.cc | 72 ++-- .../helper/animation-interface-helper.h | 125 ++++--- src/netanim/model/animation-interface.cc | 317 +++++++++++------- src/netanim/model/animation-interface.h | 117 ++++++- 4 files changed, 416 insertions(+), 215 deletions(-) diff --git a/src/netanim/helper/animation-interface-helper.cc b/src/netanim/helper/animation-interface-helper.cc index 3cfb4c7c7..e8b052146 100644 --- a/src/netanim/helper/animation-interface-helper.cc +++ b/src/netanim/helper/animation-interface-helper.cc @@ -27,62 +27,58 @@ NS_LOG_COMPONENT_DEFINE ("AnimationInterfaceHelper"); namespace ns3 { AnimPacketInfo::AnimPacketInfo() - : m_txnd (0), m_nRx (0), m_nRxEnd (0), m_fbTx (0), m_lbTx (0), - transmitter_loc (Vector (0,0,0)) + : m_txnd (0), m_fbTx (0), m_lbTx (0), + m_txLoc (Vector (0,0,0)) { } -AnimPacketInfo::AnimPacketInfo(Ptr nd, const Time& fbTx, +AnimPacketInfo::AnimPacketInfo(Ptr txnd, const Time& fbTx, const Time& lbTx, Vector txLoc) - : m_txnd (nd), m_nRx (0), m_nRxEnd (0), - m_fbTx (fbTx.GetSeconds ()), m_lbTx (lbTx.GetSeconds ()), transmitter_loc (txLoc), - reception_range (0) + : m_txnd (txnd), m_fbTx (fbTx.GetSeconds ()), m_lbTx (lbTx.GetSeconds ()), + m_txLoc (txLoc) { } -void AnimPacketInfo::ProcessRxBegin (Ptr nd, const Time& fbRx, - Vector rxLoc) +void AnimPacketInfo::ProcessRxBegin (Ptr nd, const Time& fbRx) { - m_rx[nd->GetNode ()->GetId ()] = AnimRxInfo (fbRx,nd); - m_nRx++; - reception_range = std::max (reception_range,CalculateDistance (transmitter_loc,rxLoc)); + m_rx[nd->GetNode ()->GetId ()] = AnimRxInfo (fbRx, nd, 0); } -bool AnimPacketInfo::ProcessRxEnd (Ptr nd, const Time& lbRx) - +bool AnimPacketInfo::ProcessRxEnd (Ptr nd, const Time& lbRx, Vector rxLoc) { uint32_t NodeId = nd->GetNode ()->GetId (); // Find the RxInfo - if (m_rx.find(NodeId) != m_rx.end ()) - { - // Check if the NetDevice matches. A node may have several NetDevices - if (m_rx[NodeId].m_rxnd != nd) - { - return false; - } - m_rx[NodeId].m_lbRx = lbRx.GetSeconds (); - firstlastbitDelta = m_rx[NodeId].m_lbRx - m_rx[NodeId].m_fbRx; - m_nRxEnd++; - if (m_nRxEnd == m_nRx) - { - return true; - } - return false; // Still more RxEnd notifications expected + if (m_rx.find (NodeId) == m_rx.end ()) + { + return false; + } + AnimRxInfo& rxInfo = m_rx[NodeId]; + // Check if the NetDevice matches. A node may have several NetDevices + if (rxInfo.m_rxnd != nd) + { + return false; } - NS_ASSERT ("Received RxEnd notification but RxInfo never existed"); - return false; // Still more rxEnd expected + rxInfo.rxRange = CalculateDistance (m_txLoc, rxLoc); + rxInfo.m_lbRx = lbRx.GetSeconds (); + firstlastbitDelta = rxInfo.m_lbRx - rxInfo.m_fbRx; + return true; +} + +AnimRxInfo AnimPacketInfo::GetRxInfo (Ptr nd) +{ + uint32_t NodeId = nd->GetNode ()->GetId (); + NS_ASSERT (m_rx.find (NodeId) != m_rx.end ()); + return m_rx[NodeId]; +} + +void AnimPacketInfo::RemoveRxInfo (Ptr nd) +{ + uint32_t NodeId = nd->GetNode ()->GetId (); + m_rx.erase (m_rx.find (NodeId)); } void AnimPacketInfo::ProcessRxDrop (Ptr nd) { - if (m_rx.find (nd->GetNode ()->GetId ()) == m_rx.end()) - { - NS_LOG_DEBUG ("Received RxDrop notification"); - return; - } - // Remove any entry for which an RxBegin notification was received - m_rx.erase (m_rx.find (nd->GetNode ()->GetId ())); - m_nRx--; } diff --git a/src/netanim/helper/animation-interface-helper.h b/src/netanim/helper/animation-interface-helper.h index 7179c0e81..89f7b1bab 100644 --- a/src/netanim/helper/animation-interface-helper.h +++ b/src/netanim/helper/animation-interface-helper.h @@ -56,27 +56,43 @@ public: /** * \brief Constructor - * \param First-bit Receive time - * \param Ptr to NetDevice used for reception + * \param fbRx First-bit Receive time + * \param nd NetDevice where packet was received + * \param rxRange Reception range * */ - AnimRxInfo (const Time& fbRx, Ptr nd) - : m_fbRx (fbRx.GetSeconds ()), m_lbRx (0), m_rxnd (nd) {} + AnimRxInfo (const Time& fbRx, Ptr nd ,double rxRange) + : m_fbRx (fbRx.GetSeconds ()), m_lbRx (0), m_rxnd (nd), + rxRange (rxRange) {} - /* - * First bit receive time + /** + * \brief First bit receive time + * \param m_fbRx First bit receive time + * */ double m_fbRx; - /* - * Last bit receive time + /** + * \brief Last bit receive time + * \param m_lbRx Last bit receive time + * */ double m_lbRx; - /* - * Ptr to receiving Net Device + /** + * \brief Ptr to receiving NetDevice + * \param m_rxnd Ptr to receiving NetDevice + * */ Ptr m_rxnd; + + /** + * \brief Reception range + * \param rxRange Reception range + * + */ + double rxRange; + }; /** @@ -101,88 +117,99 @@ public: /** * \brief Default constructor + * */ AnimPacketInfo (); /** * \brief Constructor - * \param Ptr to NetDevice transmitted on - * \param First bit transmit time - * \param Last bit transmit time - * \param Transmitter Location + * \param tx_nd Ptr to NetDevice that is transmitting + * \param fbTx First bit transmit time + * \param lbTx Last bit transmit time + * \param txLoc Transmitter Location * */ - AnimPacketInfo(Ptr nd, - const Time& fbTx, const Time& lbTx,Vector txLoc); - + AnimPacketInfo(Ptr tx_nd, const Time& fbTx, const Time& lbTx,Vector txLoc); + /** - * Ptr to NetDevice used for transmission - */ - Ptr m_txnd; - - /** - * Number of receivers - */ - uint32_t m_nRx; + * \brief Ptr to NetDevice that is transmitting + * \param m_txnd NetDevice that is transmitting + * + */ + Ptr m_txnd; /** - * Number of RxEnd trace callbacks - */ - uint32_t m_nRxEnd; - - /** - * First bit transmission time + * \brief First bit transmission time + * \param m_fbTx First bit transmission time + * */ double m_fbTx; /** - * Last bit transmission time + * \brief Last bit transmission time + * \param m_lbTx Last bit transmission time + * */ double m_lbTx; /** - * Transmitter's location + * \brief Transmitter's location + * \param m_txLoc Transmitter's Location + * */ - Vector transmitter_loc; + Vector m_txLoc; - /** - * Receptiion range - */ - double reception_range; /** - * Collection of receivers + * \brief Collection of receivers + * \param m_rx Collection of receivers + * */ std::map m_rx; /** * \brief Process RxBegin notifications - * \param Ptr to NetDevice where packet was received - * \param First bit receive time - * \param Location of the transmitter + * \param nd Ptr to NetDevice where packet was received + * \param fbRx First bit receive time * */ - void ProcessRxBegin (Ptr nd, const Time& fbRx, - Vector rxLoc); + void ProcessRxBegin (Ptr nd, const Time& fbRx); /** * \brief Process RxEnd notifications - * \param Ptr to NetDevice where packet was received - * \param First bit receive time + * \param nd Ptr to NetDevice where packet was received + * \param fbRx First bit receive time + * \param rxLoc Location of receiver + * \returns true if RxEnd notification was expected and processed * */ - bool ProcessRxEnd (Ptr nd, const Time& fbRx); + bool ProcessRxEnd (Ptr nd, const Time& fbRx, Vector rxLoc); /** * \brief Process RxDrop notifications - * \param Ptr to NetDevice where packet was dropped on reception + * \param nd Ptr to NetDevice where packet was dropped on reception * */ void ProcessRxDrop (Ptr nd); + + /** + * \brief GetRxInfo + * \param nd Ptr to NetDevice where packet was received + * \returns AnimRxInfo object + * + */ + AnimRxInfo GetRxInfo (Ptr nd); + + /** + * \brief RemoveRxInfo + * \param nd Ptr to NetDevice where packet was received + * + */ + void RemoveRxInfo (Ptr nd); /** * \brief Time delta between First bit Rx and Last bit Rx - * + * \param firstlastbitDelta Time delta between First bit Rx and Last bit Rx */ double firstlastbitDelta; diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index 1eb566260..93ea2c12f 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -43,6 +43,8 @@ #include "ns3/packet.h" #include "ns3/simulator.h" #include "ns3/animation-interface-helper.h" +#include "ns3/wifi-mac-header.h" +#include "ns3/wimax-mac-header.h" NS_LOG_COMPONENT_DEFINE ("AnimationInterface"); @@ -51,21 +53,21 @@ namespace ns3 { AnimationInterface::AnimationInterface () : m_fHandle (STDOUT_FILENO), m_xml (false), mobilitypollinterval (Seconds(0.25)), usingSockets (false), mport (0), outputfilename (""), - OutputFileSet (false), ServerPortSet (false) + OutputFileSet (false), ServerPortSet (false), gAnimUid (0) { } AnimationInterface::AnimationInterface (const std::string fn, bool usingXML) : m_fHandle (STDOUT_FILENO), m_xml (usingXML), mobilitypollinterval (Seconds(0.25)), usingSockets (false), mport (0), outputfilename (fn), - OutputFileSet (false), ServerPortSet (false) + OutputFileSet (false), ServerPortSet (false), gAnimUid (0) { } AnimationInterface::AnimationInterface (const uint16_t port, bool usingXML) : m_fHandle (STDOUT_FILENO), m_xml (usingXML), mobilitypollinterval (Seconds(0.25)), usingSockets (true), mport (port), outputfilename (""), - OutputFileSet (false), ServerPortSet (false) + OutputFileSet (false), ServerPortSet (false), gAnimUid (0) { } @@ -127,15 +129,15 @@ bool AnimationInterface::SetServerPort (uint16_t port) // which is done to support a platform like MinGW } -bool AnimationInterface::WifiPacketIsPending (uint64_t Uid) +bool AnimationInterface::WifiPacketIsPending (uint64_t AnimUid) { - return (pendingWifiPackets.find (Uid) != pendingWifiPackets.end ()); + return (pendingWifiPackets.find (AnimUid) != pendingWifiPackets.end ()); } -bool AnimationInterface::WimaxPacketIsPending (uint64_t Uid) +bool AnimationInterface::WimaxPacketIsPending (uint64_t AnimUid) { - return (pendingWimaxPackets.find (Uid) != pendingWimaxPackets.end ()); + return (pendingWimaxPackets.find (AnimUid) != pendingWimaxPackets.end ()); } void AnimationInterface::SetMobilityPollInterval (Time t) @@ -146,15 +148,15 @@ void AnimationInterface::SetMobilityPollInterval (Time t) Vector AnimationInterface::UpdatePosition (Ptr n) { Ptr loc = n->GetObject (); - Vector v(0,0,0); - if (!loc) - { - return v; - } + Vector v(100,100,0); if (loc) { v = loc->GetPosition (); } + else + { + NS_LOG_WARN ( "Node:" << n->GetId () << " Does not have a mobility model"); + } nodeLocation[n->GetId ()] = v; return v; } @@ -190,28 +192,17 @@ void AnimationInterface::StartAnimation () // Find the min/max x/y for the xml topology element topo_minX = 0; topo_minY = 0; - topo_maxX = 1000; - topo_maxY = 1000; - bool first = true; + topo_maxX = 0; + topo_maxY = 0; for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) { Ptr n = *i; + NS_LOG_INFO ("Update Position for Node: " << n->GetId ()); Vector v = UpdatePosition (n); - if (first) - { - topo_minX = v.x; - topo_minY = v.y; - topo_maxX = v.x; - topo_maxY = v.y; - first = false; - } - else - { - topo_minX = std::min (topo_minX, v.x); - topo_minY = std::min (topo_minY, v.y); - topo_maxX = std::max (topo_maxX, v.x); - topo_maxY = std::max (topo_maxY, v.y); - } + topo_minX = std::min (topo_minX, v.x); + topo_minY = std::min (topo_minY, v.y); + topo_maxX = std::max (topo_maxX, v.x); + topo_maxY = std::max (topo_maxY, v.y); } AddMargin (); @@ -223,6 +214,7 @@ void AnimationInterface::StartAnimation () oss << GetXMLOpen_topology (topo_minX,topo_minY,topo_maxX,topo_maxY); WriteN (m_fHandle, oss.str ()); } + NS_LOG_INFO ("Setting topology for "< > AnimationInterface::RecalcTopoBounds () +{ + std::vector < Ptr > MovedNodes; + for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) + { + Ptr n = *i; + NS_ASSERT (n); + Ptr mobility = n->GetObject (); + Vector newLocation; + if (!mobility) + { + newLocation = GetPosition (n); + } + else + { + newLocation = mobility->GetPosition (); + } + if (!NodeHasMoved (n, newLocation)) + { + continue; //Location has not changed + } + else + { + UpdatePosition (n, newLocation); + RecalcTopoBounds (newLocation); + MovedNodes.push_back (n); + } + } + return MovedNodes; +} + void AnimationInterface::RecalcTopoBounds (Vector v) { + double oldminX = topo_minX; + double oldminY = topo_minY; + double oldmaxX = topo_maxX; + double oldmaxY = topo_maxY; topo_minX = std::min (topo_minX, v.x); topo_minY = std::min (topo_minY, v.y); topo_maxX = std::max (topo_maxX, v.x); topo_maxY = std::max (topo_maxY, v.y); + + if ((topo_minX != oldminX) || (topo_minY != oldminY) || + (topo_maxX != oldmaxX) || (topo_maxY != oldmaxY)) + { + AddMargin (); + } } int AnimationInterface::WriteN (int h, const char* data, uint32_t count) @@ -441,6 +477,32 @@ AnimationInterface::GetNetDeviceFromContext (std::string context) return n->GetDevice (atoi (elements[3].c_str ())); } +void AnimationInterface::AddPendingWifiPacket (uint64_t AnimUid, AnimPacketInfo &pktinfo) +{ + NS_ASSERT (pktinfo.m_txnd); + pendingWifiPackets[AnimUid] = pktinfo; +} + +void AnimationInterface::AddPendingWimaxPacket (uint64_t AnimUid, AnimPacketInfo &pktinfo) +{ + NS_ASSERT (pktinfo.m_txnd); + pendingWimaxPackets[AnimUid] = pktinfo; +} + + +uint64_t AnimationInterface::GetAnimUidFromPacket (Ptr p) +{ + AnimByteTag tag; + if (p->FindFirstMatchingByteTag (tag)) + { + return tag.Get (); + } + else + { + return 0; + } +} + void AnimationInterface::WifiPhyTxBeginTrace (std::string context, Ptr p) { @@ -449,10 +511,13 @@ void AnimationInterface::WifiPhyTxBeginTrace (std::string context, Ptr n = ndev->GetNode (); NS_ASSERT (n); // Add a new pending wireless - uint64_t Uid = p->GetUid (); - NS_LOG_INFO ("TxBeginTrace for packet:" << Uid); - pendingWifiPackets[Uid] = - AnimPacketInfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n)); + gAnimUid++; + NS_LOG_INFO ("TxBeginTrace for packet:" << gAnimUid); + AnimByteTag tag; + tag.Set (gAnimUid); + p->AddByteTag (tag); + AnimPacketInfo pktinfo (ndev, Simulator::Now (), Simulator::Now (), UpdatePosition (n)); + AddPendingWifiPacket (gAnimUid, pktinfo); } void AnimationInterface::WifiPhyTxEndTrace (std::string context, @@ -466,10 +531,10 @@ void AnimationInterface::WifiPhyTxDropTrace (std::string context, Ptr ndev = GetNetDeviceFromContext (context); NS_ASSERT (ndev); // Erase pending wifi - uint64_t Uid = p->GetUid (); - NS_LOG_INFO ("TxDropTrace for packet:" << Uid); - NS_ASSERT (WifiPacketIsPending (Uid) == true); - pendingWifiPackets.erase (pendingWifiPackets.find (Uid)); + uint64_t AnimUid = GetAnimUidFromPacket (p); + NS_LOG_INFO ("TxDropTrace for packet:" << AnimUid); + NS_ASSERT (WifiPacketIsPending (AnimUid) == true); + pendingWifiPackets.erase (pendingWifiPackets.find (AnimUid)); } @@ -478,12 +543,10 @@ void AnimationInterface::WifiPhyRxBeginTrace (std::string context, { Ptr ndev = GetNetDeviceFromContext (context); NS_ASSERT (ndev); - Ptr n = ndev->GetNode (); - NS_ASSERT (n); - uint64_t Uid = p->GetUid (); - NS_LOG_INFO ("RxBeginTrace for packet:" << Uid); - NS_ASSERT (WifiPacketIsPending (Uid) == true); - pendingWifiPackets[Uid].ProcessRxBegin (ndev, Simulator::Now (), UpdatePosition (n)); + uint64_t AnimUid = GetAnimUidFromPacket (p); + NS_LOG_INFO ("RxBeginTrace for packet:" << AnimUid); + NS_ASSERT (WifiPacketIsPending (AnimUid) == true); + pendingWifiPackets[AnimUid].ProcessRxBegin (ndev, Simulator::Now ()); } @@ -492,14 +555,17 @@ void AnimationInterface::WifiPhyRxEndTrace (std::string context, { Ptr ndev = GetNetDeviceFromContext (context); NS_ASSERT (ndev); - uint64_t Uid = p->GetUid (); - NS_ASSERT (WifiPacketIsPending (Uid) == true); - AnimPacketInfo& pkt = pendingWifiPackets[Uid]; - if (pkt.ProcessRxEnd (ndev, Simulator::Now ())) + Ptr n = ndev->GetNode (); + NS_ASSERT (n); + uint64_t AnimUid = GetAnimUidFromPacket (p); + NS_ASSERT (WifiPacketIsPending (AnimUid) == true); + AnimPacketInfo& pktInfo = pendingWifiPackets[AnimUid]; + if (pktInfo.ProcessRxEnd (ndev, Simulator::Now (), UpdatePosition (n))) { - NS_LOG_INFO ("RxEndTrace for packet:" << Uid << " complete"); - OutputWirelessPacket (Uid, pkt); - pendingWifiPackets.erase (pendingWifiPackets.find (Uid));; + AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev); + NS_LOG_INFO ("RxEndTrace for packet:" << AnimUid << " complete"); + OutputWirelessPacket (pktInfo, pktrxInfo); + pktInfo.RemoveRxInfo (ndev); } } @@ -507,12 +573,6 @@ void AnimationInterface::WifiPhyRxEndTrace (std::string context, void AnimationInterface::WifiPhyRxDropTrace (std::string context, Ptr p) { - Ptr ndev = GetNetDeviceFromContext (context); - NS_ASSERT (ndev); - uint64_t Uid = p->GetUid (); - NS_LOG_INFO ("RxDropTrace for packet:"<< Uid); - //NS_ASSERT (WifiPacketIsPending (Uid) == true); - pendingWifiPackets[Uid].ProcessRxDrop (ndev); } void AnimationInterface::WimaxTxTrace (std::string context, Ptr p, const Mac48Address & m) @@ -521,11 +581,14 @@ void AnimationInterface::WimaxTxTrace (std::string context, Ptr p, NS_ASSERT (ndev); Ptr n = ndev->GetNode (); NS_ASSERT (n); - uint64_t Uid = p->GetUid (); - NS_LOG_INFO ("WimaxTxTrace for packet:" << Uid); - pendingWimaxPackets[Uid] = - AnimPacketInfo (ndev, Simulator::Now (), Simulator::Now () + Seconds (0.0001), UpdatePosition (n)); - //HACK:TODO 0.0001 is used until Wimax implements TxBegin and TxEnd traces + gAnimUid++; + NS_LOG_INFO ("WimaxTxTrace for packet:" << gAnimUid); + AnimPacketInfo pktinfo (ndev, Simulator::Now (), Simulator::Now () + Seconds (0.001), UpdatePosition (n)); + //TODO 0.0001 is used until Wimax implements TxBegin and TxEnd traces + AnimByteTag tag; + tag.Set (gAnimUid); + p->AddByteTag (tag); + AddPendingWimaxPacket (gAnimUid, pktinfo); } @@ -535,25 +598,30 @@ void AnimationInterface::WimaxRxTrace (std::string context, Ptr p, NS_ASSERT (ndev); Ptr n = ndev->GetNode (); NS_ASSERT (n); - uint64_t Uid = p->GetUid (); - NS_ASSERT (WimaxPacketIsPending (Uid) == true); - AnimPacketInfo& pktinfo = pendingWimaxPackets[Uid]; - pktinfo.ProcessRxBegin (ndev, Simulator::Now (), UpdatePosition (n)); - pktinfo.ProcessRxEnd (ndev, Simulator::Now () + Seconds (0.0001)); - //HACK:TODO 0.0001 is used until Wimax implements RxBegin and RxEnd traces - NS_LOG_INFO ("WimaxRxTrace for packet:" << Uid); - OutputWirelessPacket (Uid, pktinfo); - + uint64_t AnimUid = GetAnimUidFromPacket (p); + NS_ASSERT (WimaxPacketIsPending (AnimUid) == true); + AnimPacketInfo& pktInfo = pendingWimaxPackets[AnimUid]; + pktInfo.ProcessRxBegin (ndev, Simulator::Now ()); + pktInfo.ProcessRxEnd (ndev, Simulator::Now () + Seconds (0.001), UpdatePosition (n)); + //TODO 0.001 is used until Wimax implements RxBegin and RxEnd traces + AnimRxInfo pktrxInfo = pktInfo.GetRxInfo (ndev); + OutputWirelessPacket (pktInfo, pktrxInfo); } void AnimationInterface::MobilityCourseChangeTrace (Ptr mobility) { Ptr n = mobility->GetObject (); - if (!n) return; - if (!mobility) return; + NS_ASSERT (n); Vector v ; - v = mobility->GetPosition (); + if (!mobility) + { + v = GetPosition (n); + } + else + { + v = mobility->GetPosition (); + } UpdatePosition (n,v); RecalcTopoBounds (v); std::ostringstream oss; @@ -581,22 +649,15 @@ bool AnimationInterface::NodeHasMoved (Ptr n, Vector newLocation) void AnimationInterface::MobilityAutoCheck () { + std::vector > MovedNodes = RecalcTopoBounds (); std::ostringstream oss; oss << GetXMLOpen_topology (topo_minX,topo_minY,topo_maxX,topo_maxY); - for (NodeList::Iterator i = NodeList::Begin (); i != NodeList::End (); ++i) + for (uint32_t i = 0; i < MovedNodes.size (); i++) { - Ptr n = *i; - if (!n) continue; - Ptr mobility = n->GetObject (); - if (!mobility) continue; - Vector newLocation = mobility->GetPosition (); - if (!NodeHasMoved (n, newLocation)) - { - continue; //Location has not changed - } - UpdatePosition (n, newLocation); - RecalcTopoBounds (newLocation); - oss << GetXMLOpenClose_node (0,n->GetId (),newLocation.x,newLocation.y); + Ptr n = MovedNodes [i]; + NS_ASSERT (n); + Vector v = GetPosition (n); + oss << GetXMLOpenClose_node (0,n->GetId (), v.x, v.y); } oss << GetXMLClose ("topology"); WriteN (m_fHandle, oss.str ()); @@ -653,41 +714,24 @@ std::string AnimationInterface::GetPreamble () \n"; return s; } -void AnimationInterface::OutputWirelessPacket (uint32_t uid, AnimPacketInfo& pktInfo) + +void AnimationInterface::OutputWirelessPacket (AnimPacketInfo &pktInfo, AnimRxInfo pktrxInfo) { - if (!m_xml) return; + NS_ASSERT (m_xml); std::ostringstream oss; - RxInfoIterator p; + NS_ASSERT (pktInfo.m_txnd); uint32_t nodeId = pktInfo.m_txnd->GetNode ()->GetId (); - // double lbTx = pktInfo.m_lbTx; //This is not yet implemented - // HACK: TODO figure out lbTx from the delta of the first Rx packet - // Ideally all Phy interfaces should have implemented TxEnd notifications - // But currently that is not the case + double lbTx = pktInfo.firstlastbitDelta + pktInfo.m_fbTx; + oss << GetXMLOpen_wpacket (0, nodeId, pktInfo.m_fbTx, lbTx, pktrxInfo.rxRange); - double lbTx = pktInfo.firstlastbitDelta + pktInfo.m_fbTx; - oss << GetXMLOpen_wpacket (0,nodeId,pktInfo.m_fbTx,lbTx,pktInfo.reception_range); + uint32_t rxId = pktrxInfo.m_rxnd->GetNode ()->GetId (); + oss << GetXMLOpenClose_rx (0, rxId, pktrxInfo.m_fbRx, pktrxInfo.m_lbRx); - // Now add each rx - for (p = pktInfo.m_rx.begin (); p != pktInfo.m_rx.end (); p++) - { - AnimRxInfo& rx = p->second; - uint32_t rxId = rx.m_rxnd->GetNode ()->GetId (); - if ((rx.m_lbRx - rx.m_fbRx) != pktInfo.firstlastbitDelta) - { - //TODO: how to handle this case elegantly? - continue; - } - if (rx.m_lbRx) - { - oss << GetXMLOpenClose_rx (0,rxId,rx.m_fbRx,rx.m_lbRx); - } - } oss << GetXMLClose ("wpacket"); WriteN (m_fHandle, oss.str ()); } - // XML Private Helpers std::string AnimationInterface::GetXMLOpen_anim (uint32_t lp) @@ -772,5 +816,52 @@ std::vector AnimationInterface::GetElementsFromContext (std::string return elements; } +TypeId +AnimByteTag::GetTypeId (void) +{ + static TypeId tid = TypeId ("ns3::AnimByteTag") + .SetParent () + .AddConstructor () + ; + return tid; +} +TypeId +AnimByteTag::GetInstanceTypeId (void) const +{ + return GetTypeId (); +} + +uint32_t +AnimByteTag::GetSerializedSize (void) const +{ + return sizeof (uint64_t); +} +void +AnimByteTag::Serialize (TagBuffer i) const +{ + i.WriteU64 (m_AnimUid); +} +void +AnimByteTag::Deserialize (TagBuffer i) +{ + m_AnimUid = i.ReadU64 (); +} +void +AnimByteTag::Print (std::ostream &os) const +{ + os << "AnimUid=" << m_AnimUid; +} +void +AnimByteTag::Set (uint64_t AnimUid) +{ + m_AnimUid = AnimUid; +} + +uint64_t +AnimByteTag::Get (void) const +{ + return m_AnimUid; +} + } // namespace ns3 diff --git a/src/netanim/model/animation-interface.h b/src/netanim/model/animation-interface.h index a484c3543..aa6e61cf1 100644 --- a/src/netanim/model/animation-interface.h +++ b/src/netanim/model/animation-interface.h @@ -36,7 +36,6 @@ namespace ns3 { -class NetModel; /** * \defgroup netanim Netanim * @@ -57,27 +56,29 @@ public: /** * \brief Construct the animator interface. No arguments needed. + * */ AnimationInterface (); /** * \brief Destructor for the animator interface. + * */ ~AnimationInterface (); /** * \brief Constructor - * \param Filename for the trace file used by the Animator - * \param Set to true if XML output traces are required + * \param filename The Filename for the trace file used by the Animator + * \param usingXML Set to true if XML output traces are required * */ AnimationInterface (const std::string filename, bool usingXML = true); /** * \brief Constructor - * \param Port on which ns-3 should listen to for connection from the + * \param port Port on which ns-3 should listen to for connection from the * external netanim application - * \param Set to true if XML output traces are required + * \param usingXML Set to true if XML output traces are required * */ AnimationInterface (uint16_t port, bool usingXML = true); @@ -91,6 +92,7 @@ public: * * \param fn The name of the output file. * \returns true if successful open. + * */ bool SetOutputFile (const std::string& fn); @@ -99,6 +101,7 @@ public: * in XML format. * * \returns none + * */ void SetXMLOutput (); @@ -113,6 +116,7 @@ public: * * \param port Port number to bind to. * \returns true if connection created, false if bind failed. + * */ bool SetServerPort (uint16_t port); @@ -138,14 +142,14 @@ public: * \brief Set mobility poll interval:WARNING: setting a low interval can * cause slowness * - * \param Time interval between fetching mobility/position information + * \param t Time interval between fetching mobility/position information * Default: 0.25s * */ void SetMobilityPollInterval (Time t); private: - + int m_fHandle; // File handle for output (-1 if none) bool m_xml; // True if xml format desired Time mobilitypollinterval; @@ -172,7 +176,6 @@ private: Ptr p); void WifiPhyRxDropTrace (std::string context, Ptr p); - void WimaxTxTrace (std::string context, Ptr p, const Mac48Address &); @@ -181,8 +184,6 @@ private: const Mac48Address &); void MobilityCourseChangeTrace (Ptr mob); - typedef std::map ::iterator RxInfoIterator; - // Write specified amount of data to the specified handle int WriteN (int, const char*, uint32_t); @@ -190,13 +191,21 @@ private: int WriteN (int, const std::string&); //Helpers to output xml wireless packet - void OutputWirelessPacket (uint32_t, AnimPacketInfo&); + void OutputWirelessPacket (AnimPacketInfo& pktInfo, AnimRxInfo pktrxInfo); void MobilityAutoCheck (); - std::map pendingWifiPackets; - std::map pendingWimaxPackets; - bool WifiPacketIsPending (uint64_t Uid); - bool WimaxPacketIsPending (uint64_t Uid); + uint64_t gAnimUid ; // Packet unique identifier used by Animtion + + std::map pendingWifiPackets; + void AddPendingWifiPacket (uint64_t AnimUid, AnimPacketInfo&); + bool WifiPacketIsPending (uint64_t AnimUid); + + std::map pendingWimaxPackets; + void AddPendingWimaxPacket (uint64_t AnimUid, AnimPacketInfo&); + bool WimaxPacketIsPending (uint64_t AnimUid); + + uint64_t GetAnimUidFromPacket (Ptr ); + std::map nodeLocation; Vector GetPosition (Ptr n); Vector UpdatePosition (Ptr n); @@ -207,6 +216,7 @@ private: // Recalculate topology bounds void RecalcTopoBounds (Vector v); + std::vector < Ptr > RecalcTopoBounds (); // Path helper std::vector GetElementsFromContext (std::string context); @@ -230,6 +240,83 @@ private: std::string GetXMLClose (std::string name) {return "\n"; } }; + +/** + * \ingroup netanim + * + * \brief Byte tag using by Anim to uniquely identify packets + * + * When Anim receives a Tx Notification we tag the packet with a unique global uint64_t identifier + * before recording Tx information + * When Anim receives Rx notifications the tag is used to retrieve Tx information recorded earlier + * + */ + +class AnimByteTag : public Tag +{ +public: + + /** + * \brief Get Type Id + * \returns Type Id + * + */ + static TypeId GetTypeId (void); + + /** + * \brief Get Instance Type Id + * \returns Type Id + * + */ + virtual TypeId GetInstanceTypeId (void) const; + + /** + * \brief Get Serialized Size + * \returns Serialized Size (i.e size of uint64_t) + * + */ + virtual uint32_t GetSerializedSize (void) const; + + /** + * \brief Serialize function + * \param i Tag Buffer + * + */ + virtual void Serialize (TagBuffer i) const; + + /** + * \brief Deserialize function + * \param i Tag Buffer + * + */ + virtual void Deserialize (TagBuffer i); + + /** + * \brief Print tag info + * \param os Reference of ostream object + * + */ + virtual void Print (std::ostream &os) const; + + /** + * \brief Set global Uid in tag + * \param AnimUid global Uid + * + */ + void Set (uint64_t AnimUid); + + /** + * \brief Get Uid in tag + * \returns Uid in tag + * + */ + uint64_t Get (void) const; + +private: + + uint64_t m_AnimUid; +}; + } #endif From 51c97a2cd8ad227b0f76f922646f4e7c86488d98 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Mon, 11 Jul 2011 14:24:59 +0100 Subject: [PATCH 018/202] Bug 1200 - ./waf install doesn't install Python bindings properly --- bindings/python/wscript | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bindings/python/wscript b/bindings/python/wscript index 0a3677d21..f8212b061 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -22,6 +22,8 @@ REQUIRED_PYGCCXML_VERSION = (0, 9, 5) from TaskGen import feature, after import Task, ccroot +from python import _get_python_variables # this comes from wafadmin/Tools/python.py + @feature('pch') @after('apply_link') @@ -113,6 +115,19 @@ def configure(conf): conf.report_optional_feature("python", "Python Bindings", False, str(ex)) return + + # alternative code to computing PYTHONDIR, that is more correct than the one in waf 1.5.16 + if 'PYTHONDIR' in conf.environ: + pydir = conf.environ['PYTHONDIR'] + else: + (pydir,) = _get_python_variables(conf.env['PYTHON'], + ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']], + ['from distutils.sysconfig import get_python_lib']) + if hasattr(conf, 'define'): # conf.define is added by the C tool, so may not exist + conf.define('PYTHONDIR', pydir) + conf.env['PYTHONDIR'] = pydir + + # -fvisibility=hidden optimization if (conf.env['CXX_NAME'] == 'gcc' and [int(x) for x in conf.env['CC_VERSION']] >= [4,0,0] and conf.check_compilation_flag('-fvisibility=hidden')): From fda662438e354c4512202b2ebf0f034f710cbdff Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 12 Jul 2011 11:02:40 +0100 Subject: [PATCH 019/202] Bug 1200 again: fix pyext install path on fedora x86_64 --- bindings/python/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/wscript b/bindings/python/wscript index f8212b061..f0a84d51c 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -121,7 +121,7 @@ def configure(conf): pydir = conf.environ['PYTHONDIR'] else: (pydir,) = _get_python_variables(conf.env['PYTHON'], - ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']], + ["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r)" % conf.env['PREFIX']], ['from distutils.sysconfig import get_python_lib']) if hasattr(conf, 'define'): # conf.define is added by the C tool, so may not exist conf.define('PYTHONDIR', pydir) From b60dcf6fda29b45be80ec63066a79269cd981214 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Tue, 12 Jul 2011 11:11:18 -0700 Subject: [PATCH 020/202] Removed bench-event-collector.cc --- utils/bench-event-collector.cc | 35 ---------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 utils/bench-event-collector.cc diff --git a/utils/bench-event-collector.cc b/utils/bench-event-collector.cc deleted file mode 100644 index 2e3110476..000000000 --- a/utils/bench-event-collector.cc +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include -#include -#include "ns3/event-collector.h" -#include "ns3/simulator.h" - -using namespace ns3; - -void Foo () -{ - -} - -int main (int argc, char *argv[]) -{ - EventCollector events; - - if (argc < 3) - { - std::cerr << "usage: bench-event-collector NUM_EVENTS NUM_REPETITIONS" << std::endl; - return 1; - } - int numEvents = atoi (argv[1]); - int numRepetitions = atoi (argv[2]); - - for (int repetition = 0; repetition < numRepetitions; ++repetition) - { - for (int n = 0; n < numEvents; ++n) - { - events.Track (Simulator::Schedule (Simulator::Now (), Foo)); - } - Simulator::Run (); - } -} - From 6e08749a57b80855bc295459565fb572c1c374e4 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Fri, 8 Jul 2011 21:09:22 +0200 Subject: [PATCH 021/202] Support to IPv4 fragmentation --- src/flow-monitor/model/ipv4-flow-probe.cc | 4 + src/flow-monitor/model/ipv4-flow-probe.h | 1 + src/internet/model/ipv4-l3-protocol.cc | 355 +++++++++++++++- src/internet/model/ipv4-l3-protocol.h | 112 +++++ src/internet/test/error-channel.cc | 153 +++++++ src/internet/test/error-channel.h | 92 ++++ src/internet/test/error-net-device.cc | 254 ++++++++++++ src/internet/test/error-net-device.h | 117 ++++++ src/internet/test/ipv4-fragmentation-test.cc | 415 +++++++++++++++++++ src/internet/wscript | 3 + 10 files changed, 1497 insertions(+), 9 deletions(-) create mode 100644 src/internet/test/error-channel.cc create mode 100644 src/internet/test/error-channel.h create mode 100644 src/internet/test/error-net-device.cc create mode 100644 src/internet/test/error-net-device.h create mode 100644 src/internet/test/ipv4-fragmentation-test.cc diff --git a/src/flow-monitor/model/ipv4-flow-probe.cc b/src/flow-monitor/model/ipv4-flow-probe.cc index d12b8d502..d34d0ad9b 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.cc +++ b/src/flow-monitor/model/ipv4-flow-probe.cc @@ -307,6 +307,10 @@ Ipv4FlowProbe::DropLogger (const Ipv4Header &ipHeader, Ptr ipPaylo myReason = DROP_ROUTE_ERROR; NS_LOG_DEBUG ("DROP_ROUTE_ERROR"); break; + case Ipv4L3Protocol::DROP_FRAGMENT_TIMEOUT: + myReason = DROP_FRAGMENT_TIMEOUT; + NS_LOG_DEBUG ("DROP_FRAGMENT_TIMEOUT"); + break; default: myReason = DROP_INVALID_REASON; diff --git a/src/flow-monitor/model/ipv4-flow-probe.h b/src/flow-monitor/model/ipv4-flow-probe.h index bcfc70428..73eec6b3b 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.h +++ b/src/flow-monitor/model/ipv4-flow-probe.h @@ -63,6 +63,7 @@ public: DROP_INTERFACE_DOWN, /**< Interface is down so can not send packet */ DROP_ROUTE_ERROR, /**< Route error */ + DROP_FRAGMENT_TIMEOUT, /**< Fragment timeout exceeded */ DROP_INVALID_REASON, }; diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index d29b387c9..acc404159 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -59,6 +59,11 @@ Ipv4L3Protocol::GetTypeId (void) UintegerValue (64), MakeUintegerAccessor (&Ipv4L3Protocol::m_defaultTtl), MakeUintegerChecker ()) + .AddAttribute ("FragmentExpirationTimeout", + "When this timeout expires, the fragments will be cleared from the buffer.", + TimeValue (Seconds (30)), + MakeTimeAccessor (&Ipv4L3Protocol::m_fragmentExpirationTimeout), + MakeTimeChecker ()) .AddTraceSource ("Tx", "Send ipv4 packet to outgoing interface.", MakeTraceSourceAccessor (&Ipv4L3Protocol::m_txTrace)) .AddTraceSource ("Rx", "Receive ipv4 packet from incoming interface.", @@ -199,6 +204,23 @@ Ipv4L3Protocol::DoDispose (void) m_sockets.clear (); m_node = 0; m_routingProtocol = 0; + + for (MapFragments_t::iterator it = m_fragments.begin (); it != m_fragments.end (); it++) + { + it->second = 0; + } + + for (MapFragmentsTimers_t::iterator it = m_fragmentsTimers.begin (); it != m_fragmentsTimers.end (); it++) + { + if (it->second.IsRunning ()) + { + it->second.Cancel (); + } + } + + m_fragments.clear (); + m_fragmentsTimers.clear (); + Object::DoDispose (); } @@ -695,17 +717,26 @@ Ipv4L3Protocol::SendRealOut (Ptr route, Ptr outInterface = GetInterface (interface); NS_LOG_LOGIC ("Send via NetDevice ifIndex " << outDev->GetIfIndex () << " ipv4InterfaceIndex " << interface); - NS_ASSERT_MSG (packet->GetSize () <= outInterface->GetDevice ()->GetMtu (), - "Packet size " << packet->GetSize () << " exceeds device MTU " - << outInterface->GetDevice ()->GetMtu () - << " for IPv4; fragmentation not supported"); - if (!route->GetGateway ().IsEqual (Ipv4Address ("0.0.0.0"))) + if (!route->GetGateway ().IsEqual (Ipv4Address ("0.0.0.0"))) { if (outInterface->IsUp ()) { NS_LOG_LOGIC ("Send to gateway " << route->GetGateway ()); - m_txTrace (packet, m_node->GetObject (), interface); - outInterface->Send (packet, route->GetGateway ()); + if ( packet->GetSize () > outInterface->GetDevice ()->GetMtu () ) + { + std::list > listFragments; + DoFragmentation (packet, outInterface->GetDevice ()->GetMtu (), listFragments); + for ( std::list >::iterator it = listFragments.begin (); it != listFragments.end (); it++ ) + { + m_txTrace (*it, m_node->GetObject (), interface); + outInterface->Send (*it, route->GetGateway ()); + } + } + else + { + m_txTrace (packet, m_node->GetObject (), interface); + outInterface->Send (packet, route->GetGateway ()); + } } else { @@ -720,8 +751,22 @@ Ipv4L3Protocol::SendRealOut (Ptr route, if (outInterface->IsUp ()) { NS_LOG_LOGIC ("Send to destination " << ipHeader.GetDestination ()); - m_txTrace (packet, m_node->GetObject (), interface); - outInterface->Send (packet, ipHeader.GetDestination ()); + if ( packet->GetSize () > outInterface->GetDevice ()->GetMtu () ) + { + std::list > listFragments; + DoFragmentation (packet, outInterface->GetDevice ()->GetMtu (), listFragments); + for ( std::list >::iterator it = listFragments.begin (); it != listFragments.end (); it++ ) + { + NS_LOG_LOGIC ("Sending fragment " << **it ); + m_txTrace (*it, m_node->GetObject (), interface); + outInterface->Send (*it, ipHeader.GetDestination ()); + } + } + else + { + m_txTrace (packet, m_node->GetObject (), interface); + outInterface->Send (packet, ipHeader.GetDestination ()); + } } else { @@ -802,6 +847,19 @@ Ipv4L3Protocol::LocalDeliver (Ptr packet, Ipv4Header const&ip, uin { NS_LOG_FUNCTION (this << packet << &ip); Ptr p = packet->Copy (); // need to pass a non-const packet up + Ipv4Header ipHeader = ip; + + if ( !ipHeader.IsLastFragment () || ipHeader.GetFragmentOffset () != 0 ) + { + NS_LOG_LOGIC ("Received a fragment, processing " << *p ); + bool isPacketComplete; + isPacketComplete = ProcessFragment (p, ipHeader, iif); + if ( isPacketComplete == false) + { + return; + } + NS_LOG_LOGIC ("Got last fragment, Packet is complete " << *p ); + } m_localDeliverTrace (ip, packet, iif); @@ -1057,4 +1115,283 @@ Ipv4L3Protocol::RouteInputError (Ptr p, const Ipv4Header & ipHeade m_dropTrace (ipHeader, p, DROP_ROUTE_ERROR, m_node->GetObject (), 0); } +void +Ipv4L3Protocol::DoFragmentation (Ptr packet, uint32_t outIfaceMtu, std::list >& listFragments) +{ + // BEWARE: here we do assume that the header options are not present. + // a much more complex handling is necessary in case there are options. + // If (when) IPv4 option headers will be implemented, the following code shall be changed. + // Of course also the reassemby code shall be changed as well. + + NS_LOG_FUNCTION (this << *packet << " - MTU: " << outIfaceMtu); + + Ptr p = packet->Copy (); + + Ipv4Header ipv4Header; + p->RemoveHeader (ipv4Header); + + NS_ASSERT_MSG( (ipv4Header.GetSerializedSize() == 5*4), + "IPv4 fragmentation implementation only works without option headers." ); + + uint16_t offset = 0; + bool moreFragment = true; + uint32_t currentFragmentablePartSize = 0; + + // IPv4 fragments are all 8 bytes aligned but the last. + // The IP payload size is: + // floor( ( outIfaceMtu - ipv4Header.GetSerializedSize() ) /8 ) *8 + uint32_t fragmentSize = (outIfaceMtu - ipv4Header.GetSerializedSize () ) & ~uint32_t (0x7); + + NS_LOG_LOGIC ("Fragmenting - Target Size: " << fragmentSize ); + + do + { + Ipv4Header fragmentHeader = ipv4Header; + + if (p->GetSize () > offset + fragmentSize ) + { + moreFragment = true; + currentFragmentablePartSize = fragmentSize; + fragmentHeader.SetMoreFragments (); + } + else + { + moreFragment = false; + currentFragmentablePartSize = p->GetSize () - offset; + fragmentHeader.SetLastFragment (); + } + + NS_LOG_LOGIC ("Fragment creation - " << offset << ", " << currentFragmentablePartSize ); + Ptr fragment = p->CreateFragment (offset, currentFragmentablePartSize); + NS_LOG_LOGIC ("Fragment created - " << offset << ", " << fragment->GetSize () ); + + fragmentHeader.SetFragmentOffset (offset); + fragmentHeader.SetPayloadSize (currentFragmentablePartSize); + + NS_LOG_LOGIC ("Fragment check - " << fragmentHeader.GetFragmentOffset () ); + + NS_LOG_LOGIC ("New fragment Header " << fragmentHeader); + fragment->AddHeader (fragmentHeader); + + std::ostringstream oss; + fragment->Print (oss); + + NS_LOG_LOGIC ("New fragment " << *fragment); + + listFragments.push_back (fragment); + + offset += currentFragmentablePartSize; + + } + while (moreFragment); + + return; +} + +bool +Ipv4L3Protocol::ProcessFragment (Ptr& packet, Ipv4Header& ipHeader, uint32_t iif) +{ + NS_LOG_FUNCTION (this << packet << " " << ipHeader << " " << iif); + + uint64_t addressCombination = uint64_t (ipHeader.GetSource ().Get ()) << 32 & uint64_t (ipHeader.GetDestination ().Get ()); + uint32_t idProto = uint32_t (ipHeader.GetIdentification ()) << 16 & uint32_t (ipHeader.GetProtocol ()); + std::pair key; + bool ret = false; + Ptr p = packet->Copy (); + + key.first = addressCombination; + key.second = idProto; + + Ptr fragments; + + MapFragments_t::iterator it = m_fragments.find (key); + if (it == m_fragments.end ()) + { + fragments = Create (); + m_fragments.insert (std::make_pair (key, fragments)); + m_fragmentsTimers[key] = Simulator::Schedule (m_fragmentExpirationTimeout, + &Ipv4L3Protocol::HandleFragmentsTimeout, this, + key, ipHeader, iif); + } + else + { + fragments = it->second; + } + + NS_LOG_LOGIC ("Adding fragment - Size: " << packet->GetSize ( ) << " - Offset: " << (ipHeader.GetFragmentOffset ()) ); + + fragments->AddFragment (p, ipHeader.GetFragmentOffset (), !ipHeader.IsLastFragment () ); + + if ( fragments->IsEntire () ) + { + packet = fragments->GetPacket (); + fragments = 0; + m_fragments.erase (key); + if (m_fragmentsTimers[key].IsRunning ()) + { + NS_LOG_LOGIC ("Stopping WaitFragmentsTimer at " << Simulator::Now ().GetSeconds () << " due to complete packet"); + m_fragmentsTimers[key].Cancel (); + } + m_fragmentsTimers.erase (key); + ret = true; + } + + return ret; +} + +Ipv4L3Protocol::Fragments::Fragments () + : m_moreFragment (0) +{ +} + +Ipv4L3Protocol::Fragments::~Fragments () +{ +} + +void +Ipv4L3Protocol::Fragments::AddFragment (Ptr fragment, uint16_t fragmentOffset, bool moreFragment) +{ + NS_LOG_FUNCTION (this << fragment << " " << fragmentOffset << " " << moreFragment); + + std::list, uint16_t> >::iterator it; + + for (it = m_fragments.begin (); it != m_fragments.end (); it++) + { + if (it->second > fragmentOffset) + { + break; + } + } + + if (it == m_fragments.end ()) + { + m_moreFragment = moreFragment; + } + + m_fragments.insert (it, std::make_pair, uint16_t> (fragment, fragmentOffset)); +} + +bool +Ipv4L3Protocol::Fragments::IsEntire () const +{ + NS_LOG_FUNCTION (this); + + bool ret = !m_moreFragment && m_fragments.size () > 0; + + if (ret) + { + uint16_t lastEndOffset = 0; + + for (std::list, uint16_t> >::const_iterator it = m_fragments.begin (); it != m_fragments.end (); it++) + { + // overlapping fragments do exist + NS_LOG_LOGIC ("Checking overlaps " << lastEndOffset << " - " << it->second ); + + if (lastEndOffset < it->second) + { + ret = false; + break; + } + // fragments might overlap in strange ways + uint16_t fragmentEnd = it->first->GetSize () + it->second; + lastEndOffset = std::max ( lastEndOffset, fragmentEnd ); + } + } + + return ret; +} + +Ptr +Ipv4L3Protocol::Fragments::GetPacket () const +{ + NS_LOG_FUNCTION (this); + + std::list, uint16_t> >::const_iterator it = m_fragments.begin (); + + Ptr p = Create (); + uint16_t lastEndOffset = 0; + + for ( it = m_fragments.begin (); it != m_fragments.end (); it++) + { + if ( lastEndOffset > it->second ) + { + // The fragments are overlapping. + // We do not overwrite the "old" with the "new" because we do not know when each arrived. + // This is different from what Linux does. + // It is not possible to emulate a fragmentation attack. + uint32_t newStart = lastEndOffset - it->second; + if ( it->first->GetSize () > newStart ) + { + uint32_t newSize = it->first->GetSize () - newStart; + Ptr tempFragment = it->first->CreateFragment (newStart, newSize); + p->AddAtEnd (tempFragment); + } + } + else + { + NS_LOG_LOGIC ("Adding: " << *(it->first) ); + p->AddAtEnd (it->first); + } + lastEndOffset = p->GetSize (); + } + + return p; +} + +Ptr +Ipv4L3Protocol::Fragments::GetPartialPacket () const +{ + std::list, uint16_t> >::const_iterator it = m_fragments.begin (); + + Ptr p = Create (); + uint16_t lastEndOffset = 0; + + if ( m_fragments.begin ()->second > 0 ) + { + return p; + } + + for ( it = m_fragments.begin (); it != m_fragments.end (); it++) + { + if ( lastEndOffset > it->second ) + { + uint32_t newStart = lastEndOffset - it->second; + uint32_t newSize = it->first->GetSize () - newStart; + Ptr tempFragment = it->first->CreateFragment (newStart, newSize); + p->AddAtEnd (tempFragment); + } + else if ( lastEndOffset == it->second ) + { + NS_LOG_LOGIC ("Adding: " << *(it->first) ); + p->AddAtEnd (it->first); + } + lastEndOffset = p->GetSize (); + } + + return p; +} + +void +Ipv4L3Protocol::HandleFragmentsTimeout (std::pair key, Ipv4Header & ipHeader, uint32_t iif) +{ + NS_LOG_FUNCTION (this); + + MapFragments_t::iterator it = m_fragments.find (key); + Ptr packet = it->second->GetPartialPacket (); + + // if we have at least 8 bytes, we can send an ICMP. + if ( packet->GetSize () > 8 ) + { + Ptr icmp = GetIcmp (); + icmp->SendTimeExceededTtl (ipHeader, packet); + } + m_dropTrace (ipHeader, packet, DROP_FRAGMENT_TIMEOUT, m_node->GetObject (), iif); + + // clear the buffers + it->second = 0; + + m_fragments.erase (key); + m_fragmentsTimers.erase (key); +} + } //namespace ns3 diff --git a/src/internet/model/ipv4-l3-protocol.h b/src/internet/model/ipv4-l3-protocol.h index 4d9466624..609076e89 100644 --- a/src/internet/model/ipv4-l3-protocol.h +++ b/src/internet/model/ipv4-l3-protocol.h @@ -22,6 +22,7 @@ #define IPV4_L3_PROTOCOL_H #include +#include #include #include #include "ns3/ipv4-address.h" @@ -31,6 +32,8 @@ #include "ns3/traced-callback.h" #include "ns3/ipv4-header.h" #include "ns3/ipv4-routing-protocol.h" +#include "ns3/nstime.h" +#include "ns3/simulator.h" namespace ns3 { @@ -63,6 +66,13 @@ class Icmpv4L4Protocol; * and LocalDeliver trace sources are slightly higher-level and pass * around the Ipv4Header as an explicit parameter and not as part of * the packet. + * + * IP fragmentation and reassembly is handled at this level. + * At the moment the fragmentation does not handle IP option headers, + * and in particular the ones that shall not be fragmented. + * Moreover, the actual implementation does not mimic exactly the Linux + * kernel. Hence it is not possible, for instance, to test a fragmentation + * attack. */ class Ipv4L3Protocol : public Ipv4 { @@ -84,6 +94,7 @@ public: DROP_BAD_CHECKSUM, /**< Bad checksum */ DROP_INTERFACE_DOWN, /**< Interface is down so can not send packet */ DROP_ROUTE_ERROR, /**< Route error */ + DROP_FRAGMENT_TIMEOUT /**< Fragment timeout exceeded */ }; void SetNode (Ptr node); @@ -246,9 +257,39 @@ private: uint32_t AddIpv4Interface (Ptr interface); void SetupLoopback (void); + + /** + * \brief Get ICMPv4 protocol. + * \return Icmpv4L4Protocol pointer + */ Ptr GetIcmp (void) const; bool IsUnicast (Ipv4Address ad, Ipv4Mask interfaceMask) const; + /** + * \brief Fragment a packet + * \param packet the packet + * \param outIfaceMtu the MTU of the interface + * \param listFragments the list of fragments + */ + void DoFragmentation (Ptr packet, uint32_t outIfaceMtu, std::list >& listFragments); + + /** + * \brief Process a packet fragment + * \param packet the packet + * \param fragmentSize the size of the fragment + * \param iif Input Interface + * \return true is the fragment completed the packet + */ + bool ProcessFragment (Ptr& packet, Ipv4Header & ipHeader, uint32_t iif); + + /** + * \brief Process the timeout for packet fragments + * \param key representing the packet fragments + * \param ipHeader the IP header of the original packet + * \param iif Input Interface + */ + void HandleFragmentsTimeout ( std::pair key, Ipv4Header & ipHeader, uint32_t iif); + typedef std::vector > Ipv4InterfaceList; typedef std::list > SocketList; typedef std::list > L4List_t; @@ -274,6 +315,77 @@ private: Ptr m_routingProtocol; SocketList m_sockets; + + /** + * \class Fragments + * \brief A Set of Fragment belonging to the same packet (src, dst, identification and proto) + */ + class Fragments : public SimpleRefCount + { +public: + /** + * \brief Constructor. + */ + Fragments (); + + /** + * \brief Destructor. + */ + ~Fragments (); + + /** + * \brief Add a fragment. + * \param fragment the fragment + * \param fragmentOffset the offset of the fragment + * \param moreFragment the bit "More Fragment" + */ + void AddFragment (Ptr fragment, uint16_t fragmentOffset, bool moreFragment); + + /** + * \brief If all fragments have been added. + * \returns true if the packet is entire + */ + bool IsEntire () const; + + /** + * \brief Get the entire packet. + * \return the entire packet + */ + Ptr GetPacket () const; + + /** + * \brief Get the complete part of the packet. + * \return the part we have comeplete + */ + Ptr GetPartialPacket () const; + +private: + /** + * \brief True if other fragments will be sent. + */ + bool m_moreFragment; + + /** + * \brief The current fragments. + */ + std::list, uint16_t> > m_fragments; + + /** + * \brief Number of references. + */ + mutable uint32_t m_refCount; + }; + + typedef std::map< std::pair, Ptr > MapFragments_t; + typedef std::map< std::pair, EventId > MapFragmentsTimers_t; + + /** + * \brief The hash of fragmented packets. + */ + MapFragments_t m_fragments; + Time m_fragmentExpirationTimeout; + MapFragmentsTimers_t m_fragmentsTimers; + }; } // Namespace ns3 diff --git a/src/internet/test/error-channel.cc b/src/internet/test/error-channel.cc new file mode 100644 index 000000000..9721beac8 --- /dev/null +++ b/src/internet/test/error-channel.cc @@ -0,0 +1,153 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2011 Universita' di Firenze, Italy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tommaso Pecorella + */ +#include "error-channel.h" +#include "error-net-device.h" +#include "ns3/simulator.h" +#include "ns3/packet.h" +#include "ns3/node.h" +#include "ns3/log.h" + +NS_LOG_COMPONENT_DEFINE ("ErrorChannel"); + +namespace ns3 { + +NS_OBJECT_ENSURE_REGISTERED (ErrorChannel); + +TypeId +ErrorChannel::GetTypeId (void) +{ + static TypeId tid = TypeId ("ns3::ErrorChannel") + .SetParent () + .AddConstructor () + ; + return tid; +} + +ErrorChannel::ErrorChannel () +{ + jumping = false; + jumpingState = 0; +} + +void +ErrorChannel::SetJumpingTime(Time delay) +{ + jumpingTime = delay; +} + +void +ErrorChannel::SetJumpingMode(bool mode) +{ + jumping = mode; + jumpingState = 0; +} + +void +ErrorChannel::Send (Ptr p, uint16_t protocol, + Mac48Address to, Mac48Address from, + Ptr sender) +{ + NS_LOG_FUNCTION (p << protocol << to << from << sender); + for (std::vector >::const_iterator i = m_devices.begin (); i != m_devices.end (); ++i) + { + Ptr tmp = *i; + if (tmp == sender) + { + continue; + } + if( !jumping || jumpingState%2 ) + { + Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), Seconds (0), + &ErrorNetDevice::Receive, tmp, p->Copy (), protocol, to, from); + jumpingState++; + } + else + { + Simulator::ScheduleWithContext (tmp->GetNode ()->GetId (), jumpingTime, + &ErrorNetDevice::Receive, tmp, p->Copy (), protocol, to, from); + jumpingState++; + } + } +} + +void +ErrorChannel::Add (Ptr device) +{ + m_devices.push_back (device); +} + +uint32_t +ErrorChannel::GetNDevices (void) const +{ + return m_devices.size (); +} +Ptr +ErrorChannel::GetDevice (uint32_t i) const +{ + return m_devices[i]; +} + +NS_OBJECT_ENSURE_REGISTERED (ErrorModel); + +TypeId BinaryErrorModel::GetTypeId (void) +{ + static TypeId tid = TypeId ("ns3::BinaryErrorModel") + .SetParent () + .AddConstructor () + ; + return tid; +} + +BinaryErrorModel::BinaryErrorModel () +{ + counter = 0; +} + +BinaryErrorModel::~BinaryErrorModel () +{ +} + + +bool +BinaryErrorModel::DoCorrupt (Ptr p) +{ + if (!IsEnabled ()) + { + return false; + } + bool ret = counter%2; + counter++; + return ret; +} + +void +BinaryErrorModel::Reset (void) +{ + DoReset(); +} + +void +BinaryErrorModel::DoReset (void) +{ + counter = 0; +} + + +} // namespace ns3 diff --git a/src/internet/test/error-channel.h b/src/internet/test/error-channel.h new file mode 100644 index 000000000..ae41dad3b --- /dev/null +++ b/src/internet/test/error-channel.h @@ -0,0 +1,92 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2011 Universita' di Firenze, Italy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tommaso Pecorella + */ +#ifndef ERROR_CHANNEL_H +#define ERROR_CHANNEL_H + +#include "ns3/channel.h" +#include "ns3/error-model.h" +#include "ns3/mac48-address.h" +#include "ns3/nstime.h" +#include + +namespace ns3 { + +class ErrorNetDevice; +class Packet; + +/** + * \ingroup channel + * \brief A Error channel, introducing deterministic delays on even/odd packets. Used for testing + */ +class ErrorChannel : public Channel +{ +public: + static TypeId GetTypeId (void); + ErrorChannel (); + + void Send (Ptr p, uint16_t protocol, Mac48Address to, Mac48Address from, + Ptr sender); + + void Add (Ptr device); + + // inherited from ns3::Channel + virtual uint32_t GetNDevices (void) const; + virtual Ptr GetDevice (uint32_t i) const; + + /** + * \brief Set the delay for the odd packets (even ones are not delayed) + * \param delay Delay for the odd packets. + */ + void SetJumpingTime(Time delay); + + /** + * \brief Set if the odd packets are delayed (even ones are not delayed ever) + * \param mode true if the odd packets should be delayed. + */ +void SetJumpingMode(bool mode); + +private: + std::vector > m_devices; + Time jumpingTime; + uint8_t jumpingState; + bool jumping; + +}; + +class BinaryErrorModel : public ErrorModel +{ +public: + static TypeId GetTypeId (void); + + BinaryErrorModel (); + virtual ~BinaryErrorModel (); + void Reset (void); + +private: + virtual bool DoCorrupt (Ptr p); + virtual void DoReset (void); + + uint8_t counter; + +}; + +} // namespace ns3 + +#endif /* ERROR_CHANNEL_H */ diff --git a/src/internet/test/error-net-device.cc b/src/internet/test/error-net-device.cc new file mode 100644 index 000000000..4bc001950 --- /dev/null +++ b/src/internet/test/error-net-device.cc @@ -0,0 +1,254 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2011 Universita' di Firenze, Italy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tommaso Pecorella + */ +#include "error-net-device.h" +#include "error-channel.h" +#include "ns3/node.h" +#include "ns3/packet.h" +#include "ns3/log.h" +#include "ns3/pointer.h" +#include "ns3/error-model.h" +#include "ns3/trace-source-accessor.h" + +NS_LOG_COMPONENT_DEFINE ("ErrorNetDevice"); + +namespace ns3 { + +NS_OBJECT_ENSURE_REGISTERED (ErrorNetDevice); + +TypeId +ErrorNetDevice::GetTypeId (void) +{ + static TypeId tid = TypeId ("ns3::ErrorNetDevice") + .SetParent () + .AddConstructor () + .AddAttribute ("ReceiveErrorModel", + "The receiver error model used to simulate packet loss", + PointerValue (), + MakePointerAccessor (&ErrorNetDevice::m_receiveErrorModel), + MakePointerChecker ()) + .AddTraceSource ("PhyRxDrop", + "Trace source indicating a packet has been dropped by the device during reception", + MakeTraceSourceAccessor (&ErrorNetDevice::m_phyRxDropTrace)) + ; + return tid; +} + +ErrorNetDevice::ErrorNetDevice () + : m_channel (0), + m_node (0), + m_mtu (0xffff), + m_ifIndex (0) +{} + +void +ErrorNetDevice::Receive (Ptr packet, uint16_t protocol, + Mac48Address to, Mac48Address from) +{ + NS_LOG_FUNCTION (packet << protocol << to << from); + NetDevice::PacketType packetType; + + if (m_receiveErrorModel && m_receiveErrorModel->IsCorrupt (packet) ) + { + m_phyRxDropTrace (packet); + return; + } + + if (to == m_address) + { + packetType = NetDevice::PACKET_HOST; + } + else if (to.IsBroadcast ()) + { + packetType = NetDevice::PACKET_HOST; + } + else if (to.IsGroup ()) + { + packetType = NetDevice::PACKET_MULTICAST; + } + else + { + packetType = NetDevice::PACKET_OTHERHOST; + } + m_rxCallback (this, packet, protocol, from); + if (!m_promiscCallback.IsNull ()) + { + m_promiscCallback (this, packet, protocol, from, to, packetType); + } +} + +void +ErrorNetDevice::SetChannel (Ptr channel) +{ + m_channel = channel; + m_channel->Add (this); +} + +void +ErrorNetDevice::SetReceiveErrorModel (Ptr em) +{ + m_receiveErrorModel = em; +} + +void +ErrorNetDevice::SetIfIndex(const uint32_t index) +{ + m_ifIndex = index; +} +uint32_t +ErrorNetDevice::GetIfIndex(void) const +{ + return m_ifIndex; +} +Ptr +ErrorNetDevice::GetChannel (void) const +{ + return m_channel; +} +void +ErrorNetDevice::SetAddress (Address address) +{ + m_address = Mac48Address::ConvertFrom(address); +} +Address +ErrorNetDevice::GetAddress (void) const +{ + // + // Implicit conversion from Mac48Address to Address + // + return m_address; +} +bool +ErrorNetDevice::SetMtu (const uint16_t mtu) +{ + m_mtu = mtu; + return true; +} +uint16_t +ErrorNetDevice::GetMtu (void) const +{ + return m_mtu; +} +bool +ErrorNetDevice::IsLinkUp (void) const +{ + return true; +} +void +ErrorNetDevice::AddLinkChangeCallback (Callback callback) +{} +bool +ErrorNetDevice::IsBroadcast (void) const +{ + return true; +} +Address +ErrorNetDevice::GetBroadcast (void) const +{ + return Mac48Address ("ff:ff:ff:ff:ff:ff"); +} +bool +ErrorNetDevice::IsMulticast (void) const +{ + return false; +} +Address +ErrorNetDevice::GetMulticast (Ipv4Address multicastGroup) const +{ + return Mac48Address::GetMulticast (multicastGroup); +} + +Address ErrorNetDevice::GetMulticast (Ipv6Address addr) const +{ + return Mac48Address::GetMulticast (addr); +} + +bool +ErrorNetDevice::IsPointToPoint (void) const +{ + return false; +} + +bool +ErrorNetDevice::IsBridge (void) const +{ + return false; +} + +bool +ErrorNetDevice::Send(Ptr packet, const Address& dest, uint16_t protocolNumber) +{ + NS_LOG_FUNCTION (packet << dest << protocolNumber); + Mac48Address to = Mac48Address::ConvertFrom (dest); + m_channel->Send (packet, protocolNumber, to, m_address, this); + return true; +} +bool +ErrorNetDevice::SendFrom(Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber) +{ + Mac48Address to = Mac48Address::ConvertFrom (dest); + Mac48Address from = Mac48Address::ConvertFrom (source); + m_channel->Send (packet, protocolNumber, to, from, this); + return true; +} + +Ptr +ErrorNetDevice::GetNode (void) const +{ + return m_node; +} +void +ErrorNetDevice::SetNode (Ptr node) +{ + m_node = node; +} +bool +ErrorNetDevice::NeedsArp (void) const +{ + return false; +} +void +ErrorNetDevice::SetReceiveCallback (NetDevice::ReceiveCallback cb) +{ + m_rxCallback = cb; +} + +void +ErrorNetDevice::DoDispose (void) +{ + m_channel = 0; + m_node = 0; + m_receiveErrorModel = 0; + NetDevice::DoDispose (); +} + + +void +ErrorNetDevice::SetPromiscReceiveCallback (PromiscReceiveCallback cb) +{ + m_promiscCallback = cb; +} + +bool +ErrorNetDevice::SupportsSendFrom (void) const +{ + return true; +} + +} // namespace ns3 diff --git a/src/internet/test/error-net-device.h b/src/internet/test/error-net-device.h new file mode 100644 index 000000000..bc8206bbc --- /dev/null +++ b/src/internet/test/error-net-device.h @@ -0,0 +1,117 @@ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2011 Universita' di Firenze, Italy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tommaso Pecorella + */ +#ifndef ERROR_NET_DEVICE_H +#define ERROR_NET_DEVICE_H + +#include "ns3/net-device.h" +#include "ns3/mac48-address.h" +#include +#include +#include "ns3/traced-callback.h" + +namespace ns3 { + +class ErrorChannel; +class Node; +class ErrorModel; + +/** + * \ingroup netdevice + * + * This device does not have a helper and assumes 48-bit mac addressing; + * the default address assigned to each device is zero, so you must + * assign a real address to use it. There is also the possibility to + * add an ErrorModel if you want to force losses on the device. + * + * \brief Error net device for Error things and testing + */ +class ErrorNetDevice : public NetDevice +{ +public: + static TypeId GetTypeId (void); + ErrorNetDevice (); + + void Receive (Ptr packet, uint16_t protocol, Mac48Address to, Mac48Address from); + void SetChannel (Ptr channel); + + /** + * Attach a receive ErrorModel to the ErrorNetDevice. + * + * The ErrorNetDevice may optionally include an ErrorModel in + * the packet receive chain. + * + * \see ErrorModel + * \param em Ptr to the ErrorModel. + */ + void SetReceiveErrorModel(Ptr em); + + // inherited from NetDevice base class. + virtual void SetIfIndex(const uint32_t index); + virtual uint32_t GetIfIndex(void) const; + virtual Ptr GetChannel (void) const; + virtual void SetAddress (Address address); + virtual Address GetAddress (void) const; + virtual bool SetMtu (const uint16_t mtu); + virtual uint16_t GetMtu (void) const; + virtual bool IsLinkUp (void) const; + virtual void AddLinkChangeCallback (Callback callback); + virtual bool IsBroadcast (void) const; + virtual Address GetBroadcast (void) const; + virtual bool IsMulticast (void) const; + virtual Address GetMulticast (Ipv4Address multicastGroup) const; + virtual bool IsPointToPoint (void) const; + virtual bool IsBridge (void) const; + virtual bool Send(Ptr packet, const Address& dest, uint16_t protocolNumber); + virtual bool SendFrom(Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber); + virtual Ptr GetNode (void) const; + virtual void SetNode (Ptr node); + virtual bool NeedsArp (void) const; + virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb); + + virtual Address GetMulticast (Ipv6Address addr) const; + + virtual void SetPromiscReceiveCallback (PromiscReceiveCallback cb); + virtual bool SupportsSendFrom (void) const; + +protected: + virtual void DoDispose (void); +private: + Ptr m_channel; + NetDevice::ReceiveCallback m_rxCallback; + NetDevice::PromiscReceiveCallback m_promiscCallback; + Ptr m_node; + uint16_t m_mtu; + uint32_t m_ifIndex; + Mac48Address m_address; + Ptr m_receiveErrorModel; + /** + * The trace source fired when the phy layer drops a packet it has received + * due to the error model being active. Although ErrorNetDevice doesn't + * really have a Phy model, we choose this trace source name for alignment + * with other trace sources. + * + * \see class CallBackTraceSource + */ + TracedCallback > m_phyRxDropTrace; +}; + +} // namespace ns3 + +#endif /* Error_NET_DEVICE_H */ diff --git a/src/internet/test/ipv4-fragmentation-test.cc b/src/internet/test/ipv4-fragmentation-test.cc new file mode 100644 index 000000000..db5930316 --- /dev/null +++ b/src/internet/test/ipv4-fragmentation-test.cc @@ -0,0 +1,415 @@ +/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* + * Copyright (c) 2011 Universita' di Firenze, Italy + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Tommaso Pecorella + */ +/** + * This is the test code for ipv4-l3protocol.cc (only the fragmentation and reassembly part). + */ +#define NS3_LOG_ENABLE 1 + +#include "ns3/test.h" +#include "ns3/config.h" +#include "ns3/uinteger.h" +#include "ns3/socket-factory.h" +#include "ns3/ipv4-raw-socket-factory.h" +#include "ns3/udp-socket-factory.h" +#include "ns3/simulator.h" +#include "error-channel.h" +#include "error-net-device.h" +#include "ns3/drop-tail-queue.h" +#include "ns3/socket.h" +#include "ns3/udp-socket.h" + +#include "ns3/log.h" +#include "ns3/node.h" +#include "ns3/inet-socket-address.h" +#include "ns3/boolean.h" + +#include "ns3/arp-l3-protocol.h" +#include "ns3/ipv4-l3-protocol.h" +#include "ns3/icmpv4-l4-protocol.h" +#include "ns3/ipv4-list-routing.h" +#include "ns3/ipv4-static-routing.h" +#include "ns3/udp-l4-protocol.h" + +#include +#include +#include + +namespace ns3 { + +class UdpSocketImpl; + +static void +AddInternetStack (Ptr node) +{ + //ARP + Ptr arp = CreateObject (); + node->AggregateObject(arp); + //IPV4 + Ptr ipv4 = CreateObject (); + //Routing for Ipv4 + Ptr ipv4Routing = CreateObject (); + ipv4->SetRoutingProtocol (ipv4Routing); + Ptr ipv4staticRouting = CreateObject (); + ipv4Routing->AddRoutingProtocol (ipv4staticRouting, 0); + node->AggregateObject(ipv4); + //ICMP + Ptr icmp = CreateObject (); + node->AggregateObject(icmp); + // //Ipv4Raw + Ptr udp = CreateObject (); + node->AggregateObject(udp); +} + + +class Ipv4FragmentationTest: public TestCase +{ + Ptr m_sentPacketClient; + Ptr m_receivedPacketClient; + Ptr m_receivedPacketServer; + + + Ptr m_socketServer; + Ptr m_socketClient; + uint32_t m_dataSize; + uint8_t *m_data; + uint32_t m_size; + uint8_t m_icmpType; + +public: + virtual void DoRun (void); + Ipv4FragmentationTest (); + ~Ipv4FragmentationTest (); + + // server part + void StartServer (Ptr ServerNode); + void HandleReadServer (Ptr socket); + + // client part + void StartClient (Ptr ClientNode); + void HandleReadClient (Ptr socket); + void HandleReadIcmpClient (Ipv4Address icmpSource, uint8_t icmpTtl, uint8_t icmpType, + uint8_t icmpCode,uint32_t icmpInfo); + + void SetFill (uint8_t *fill, uint32_t fillSize, uint32_t dataSize); + Ptr SendClient (void); + +}; + + +Ipv4FragmentationTest::Ipv4FragmentationTest () + : TestCase ("Verify the IPv4 layer 3 protocol fragmentation and reassembly") +{ + m_socketServer = 0; + m_data = 0; + m_dataSize = 0; +} + +Ipv4FragmentationTest::~Ipv4FragmentationTest () +{ + if ( m_data ) + { + delete[] m_data; + } + m_data = 0; + m_dataSize = 0; +} + + +void +Ipv4FragmentationTest::StartServer (Ptr ServerNode) +{ + + if (m_socketServer == 0) + { + TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); + m_socketServer = Socket::CreateSocket (ServerNode, tid); + InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), 9); + m_socketServer->Bind (local); + Ptr udpSocket = DynamicCast (m_socketServer); + if (udpSocket) + { + // equivalent to setsockopt (MCAST_JOIN_GROUP) + udpSocket->MulticastJoinGroup (0, Ipv4Address ("10.0.0.1")); + } + } + + m_socketServer->SetRecvCallback(MakeCallback(&Ipv4FragmentationTest::HandleReadServer, this)); +} + +void +Ipv4FragmentationTest::HandleReadServer (Ptr socket) +{ + Ptr packet; + Address from; + while (packet = socket->RecvFrom (from)) + { + if (InetSocketAddress::IsMatchingType (from)) + { + packet->RemoveAllPacketTags (); + packet->RemoveAllByteTags (); + + m_receivedPacketServer = packet->Copy(); + } + } +} + +void +Ipv4FragmentationTest::StartClient (Ptr ClientNode) +{ + + if (m_socketClient == 0) + { + TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); + m_socketClient = Socket::CreateSocket (ClientNode, tid); + m_socketClient->Bind (); + m_socketClient->Connect (InetSocketAddress (Ipv4Address ("10.0.0.1"), 9)); + CallbackValue cbValue = MakeCallback(&Ipv4FragmentationTest::HandleReadIcmpClient, this); + m_socketClient->SetAttribute ("IcmpCallback", cbValue); + } + + m_socketClient->SetRecvCallback(MakeCallback(&Ipv4FragmentationTest::HandleReadClient, this)); +} + +void +Ipv4FragmentationTest::HandleReadClient (Ptr socket) +{ + Ptr packet; + Address from; + while (packet = socket->RecvFrom (from)) + { + if (InetSocketAddress::IsMatchingType (from)) + { + m_receivedPacketClient = packet->Copy(); + } + } +} + +void +Ipv4FragmentationTest::HandleReadIcmpClient (Ipv4Address icmpSource, + uint8_t icmpTtl, uint8_t icmpType, + uint8_t icmpCode, uint32_t icmpInfo) +{ + m_icmpType = icmpType; +} + +void +Ipv4FragmentationTest::SetFill (uint8_t *fill, uint32_t fillSize, uint32_t dataSize) +{ + if (dataSize != m_dataSize) + { + delete [] m_data; + m_data = new uint8_t [dataSize]; + m_dataSize = dataSize; + } + + if (fillSize >= dataSize) + { + memcpy (m_data, fill, dataSize); + return; + } + + uint32_t filled = 0; + while (filled + fillSize < dataSize) + { + memcpy (&m_data[filled], fill, fillSize); + filled += fillSize; + } + + memcpy(&m_data[filled], fill, dataSize - filled); + + m_size = dataSize; +} + +Ptr Ipv4FragmentationTest::SendClient (void) +{ + Ptr p; + if (m_dataSize) + { + p = Create (m_data, m_dataSize); + } + else + { + p = Create (m_size); + } + m_socketClient->Send (p); + + return p; +} + +void +Ipv4FragmentationTest::DoRun (void) +{ + // set the arp cache to something quite high + // we shouldn't need because the NetDevice used doesn't need arp, but still + Config::SetDefault ("ns3::ArpCache::PendingQueueSize", UintegerValue (100)); + + // Create topology + + // Receiver Node + Ptr serverNode = CreateObject (); + AddInternetStack (serverNode); + Ptr serverDev; + Ptr serverDevErrorModel = CreateObject (); + { + serverDev = CreateObject (); + serverDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ())); + serverDev->SetMtu(1500); + serverDev->SetReceiveErrorModel(serverDevErrorModel); + serverDevErrorModel->Disable(); + serverNode->AddDevice (serverDev); + Ptr ipv4 = serverNode->GetObject (); + uint32_t netdev_idx = ipv4->AddInterface (serverDev); + Ipv4InterfaceAddress ipv4Addr = Ipv4InterfaceAddress (Ipv4Address ("10.0.0.1"), Ipv4Mask (0xffff0000U)); + ipv4->AddAddress (netdev_idx, ipv4Addr); + ipv4->SetUp (netdev_idx); + } + StartServer(serverNode); + + // Sender Node + Ptr clientNode = CreateObject (); + AddInternetStack (clientNode); + Ptr clientDev; + Ptr clientDevErrorModel = CreateObject (); + { + clientDev = CreateObject (); + clientDev->SetAddress (Mac48Address::ConvertFrom (Mac48Address::Allocate ())); + clientDev->SetMtu(1000); + clientDev->SetReceiveErrorModel(clientDevErrorModel); + clientDevErrorModel->Disable(); + clientNode->AddDevice (clientDev); + Ptr ipv4 = clientNode->GetObject (); + uint32_t netdev_idx = ipv4->AddInterface (clientDev); + Ipv4InterfaceAddress ipv4Addr = Ipv4InterfaceAddress (Ipv4Address ("10.0.0.2"), Ipv4Mask (0xffff0000U)); + ipv4->AddAddress (netdev_idx, ipv4Addr); + ipv4->SetUp (netdev_idx); + } + StartClient(clientNode); + + // link the two nodes + Ptr channel = CreateObject (); + serverDev->SetChannel (channel); + clientDev->SetChannel (channel); + channel->SetJumpingTime(Seconds(0.5)); + + + // some small packets, some rather big ones + uint32_t packetSizes[5] = {1000, 2000, 5000, 10000, 65000}; + + // using the alphabet + uint8_t fillData[78]; + for ( uint32_t k=48; k<=125; k++ ) + { + fillData[k-48] = k; + } + + // First test: normal channel, no errors, no delays + for( int i= 0; i<5; i++) + { + uint32_t packetSize = packetSizes[i]; + + SetFill (fillData, 78, packetSize); + + m_receivedPacketServer = Create (); + Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0), + &Ipv4FragmentationTest::SendClient, this); + Simulator::Run (); + + uint8_t recvBuffer[65000]; + + uint16_t recvSize = m_receivedPacketServer->GetSize (); + + NS_TEST_EXPECT_MSG_EQ (recvSize, packetSizes[i], "Packet size not correct"); + + m_receivedPacketServer->CopyData(recvBuffer, 65000); + NS_TEST_EXPECT_MSG_EQ (memcmp(m_data, recvBuffer, m_receivedPacketServer->GetSize ()), + 0, "Packet content differs"); + } + + // Second test: normal channel, no errors, delays each 2 packets. + // Each other fragment will arrive out-of-order. + // The packets should be received correctly since reassembly will reorder the fragments. + channel->SetJumpingMode(true); + for( int i= 0; i<5; i++) + { + uint32_t packetSize = packetSizes[i]; + + SetFill (fillData, 78, packetSize); + + m_receivedPacketServer = Create (); + Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0), + &Ipv4FragmentationTest::SendClient, this); + Simulator::Run (); + + uint8_t recvBuffer[65000]; + + uint16_t recvSize = m_receivedPacketServer->GetSize (); + + NS_TEST_EXPECT_MSG_EQ (recvSize, packetSizes[i], "Packet size not correct"); + + m_receivedPacketServer->CopyData(recvBuffer, 65000); + NS_TEST_EXPECT_MSG_EQ (memcmp(m_data, recvBuffer, m_receivedPacketServer->GetSize ()), + 0, "Packet content differs"); + } + channel->SetJumpingMode(false); + + // Third test: normal channel, some errors, no delays. + // The reassembly procedure should fire a timeout after 30 seconds (as specified in the RFCs). + // Upon the timeout, the fragments received so far are discarded and an ICMP should be sent back + // to the sender (if the first fragment has been received). + // In this test case the first fragment is received, so we do expect an ICMP. + // Client -> Server : errors enabled + // Server -> Client : errors disabled (we want to have back the ICMP) + clientDevErrorModel->Disable(); + serverDevErrorModel->Enable(); + for( int i= 1; i<5; i++) + { + uint32_t packetSize = packetSizes[i]; + + SetFill (fillData, 78, packetSize); + + // reset the model, we want to receive the very first fragment. + serverDevErrorModel->Reset(); + + m_receivedPacketServer = Create (); + m_icmpType = 0; + Simulator::ScheduleWithContext (m_socketClient->GetNode ()->GetId (), Seconds (0), + &Ipv4FragmentationTest::SendClient, this); + Simulator::Run (); + + uint16_t recvSize = m_receivedPacketServer->GetSize (); + + NS_TEST_EXPECT_MSG_EQ ((recvSize == 0), true, "Server got a packet, something wrong"); + NS_TEST_EXPECT_MSG_EQ ((m_icmpType == 11), true, "Client did not receive ICMP::TIME_EXCEEDED"); + } + + + Simulator::Destroy (); +} +//----------------------------------------------------------------------------- +class Ipv4FragmentationTestSuite : public TestSuite +{ +public: + Ipv4FragmentationTestSuite () : TestSuite ("ipv4-fragmentation", UNIT) + { + AddTestCase (new Ipv4FragmentationTest); + } +} g_ipv4fragmentationTestSuite; + +}; // namespace ns3 diff --git a/src/internet/wscript b/src/internet/wscript index 54ffed463..554b975fa 100644 --- a/src/internet/wscript +++ b/src/internet/wscript @@ -193,6 +193,9 @@ def build(bld): 'test/ipv4-list-routing-test-suite.cc', 'test/ipv4-packet-info-tag-test-suite.cc', 'test/ipv4-raw-test.cc', + 'test/ipv4-fragmentation-test.cc', + 'test/error-channel.cc', + 'test/error-net-device.cc', 'test/ipv4-test.cc', 'test/ipv6-extension-header-test-suite.cc', 'test/ipv6-list-routing-test-suite.cc', From bca178602395077c3152dd79ec64e383980223db Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sat, 9 Jul 2011 03:22:59 +0200 Subject: [PATCH 022/202] IPv6 fragmentation enhancements --- src/internet/model/ipv6-extension.cc | 67 +++++++++++++++++++++++++++- src/internet/model/ipv6-extension.h | 45 +++++++++++++++++++ 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/internet/model/ipv6-extension.cc b/src/internet/model/ipv6-extension.cc index 7cf48e299..096fa4472 100644 --- a/src/internet/model/ipv6-extension.cc +++ b/src/internet/model/ipv6-extension.cc @@ -343,6 +343,10 @@ uint8_t Ipv6ExtensionFragment::Process (Ptr& packet, uint8_t offset, Ipv { fragments = Create (); m_fragments.insert (std::make_pair (fragmentsId, fragments)); + EventId timeout = Simulator::Schedule (Seconds(60), + &Ipv6ExtensionFragment::HandleFragmentsTimeout, this, + fragmentsId, fragments, ipv6Header); + fragments->SetTimeoutEventId (timeout); } else { @@ -361,12 +365,13 @@ uint8_t Ipv6ExtensionFragment::Process (Ptr& packet, uint8_t offset, Ipv if (fragments->IsEntire ()) { packet = fragments->GetPacket (); + fragments->CancelTimeout(); + m_fragments.erase(fragmentsId); isDropped = false; } else { - NS_LOG_LOGIC ("Fragment. Drop!"); - m_dropTrace (packet); + // the fragment is not "dropped", but Ipv6L3Protocol::LocalDeliver must stop processing it. isDropped = true; } @@ -539,6 +544,24 @@ void Ipv6ExtensionFragment::GetFragments (Ptr packet, uint32_t maxFragme unfragmentablePart.clear (); } + +void Ipv6ExtensionFragment::HandleFragmentsTimeout (std::pair fragmentsId, Ptr fragments, Ipv6Header & ipHeader) +{ + Ptr packet = fragments->GetPartialPacket (); + + // if we have at least 8 bytes, we can send an ICMP. + if ( packet->GetSize () > 8 ) + { + + Ptr icmp = GetNode()->GetObject (); + icmp->SendErrorTimeExceeded (packet, ipHeader.GetSourceAddress (), Icmpv6Header::ICMPV6_FRAGTIME); + } + m_dropTrace (packet); + + // clear the buffers + m_fragments.erase(fragmentsId); +} + Ipv6ExtensionFragment::Fragments::Fragments () : m_moreFragment (0) { @@ -608,6 +631,46 @@ Ptr Ipv6ExtensionFragment::Fragments::GetPacket () const return p; } +Ptr Ipv6ExtensionFragment::Fragments::GetPartialPacket () const +{ + Ptr p; + + if ( m_unfragmentable ) + { + p = m_unfragmentable->Copy (); + } + else + { + return p; + } + + uint16_t lastEndOffset = 0; + + for (std::list, uint16_t> >::const_iterator it = m_fragments.begin (); it != m_fragments.end (); it++) + { + if (lastEndOffset != it->second) + { + break; + } + p->AddAtEnd (it->first); + lastEndOffset += it->first->GetSize (); + } + + return p; +} + +void Ipv6ExtensionFragment::Fragments::SetTimeoutEventId (EventId event) +{ + m_timeoutEventId = event; + return; +} + +void Ipv6ExtensionFragment::Fragments::CancelTimeout() +{ + m_timeoutEventId.Cancel (); + return; +} + NS_OBJECT_ENSURE_REGISTERED (Ipv6ExtensionRouting); diff --git a/src/internet/model/ipv6-extension.h b/src/internet/model/ipv6-extension.h index 3d2d8e4dc..6fe662055 100644 --- a/src/internet/model/ipv6-extension.h +++ b/src/internet/model/ipv6-extension.h @@ -319,6 +319,22 @@ public: */ Ptr GetPacket () const; + /** + * \brief Get the packet parts so far received. + * \return the partial packet + */ + Ptr GetPartialPacket () const; + + /** + * \brief Set the Timeout EventId. + */ + void SetTimeoutEventId (EventId event); + + /** + * \brief Cancel the timeout event + */ + void CancelTimeout (); + private: /** * \brief If other fragments will be sent. @@ -339,8 +355,37 @@ private: * \brief Number of references. */ mutable uint32_t m_refCount; + + /** + * \brief Timeout handler event + */ + EventId m_timeoutEventId; }; + /** + * \brief Process the timeout for packet fragments + * \param key representing the packet fragments + * \param ipHeader the IP header of the original packet + * \param iif Input Interface + */ + void HandleFragmentsTimeout (std::pair key, Ptr fragments, Ipv6Header & ipHeader); + + /** + * \brief Get the packet parts so far received. + * \return the partial packet + */ + Ptr GetPartialPacket () const; + + /** + * \brief Set the Timeout EventId. + */ + void SetTimeoutEventId (EventId event); + + /** + * \brief Cancel the timeout event + */ + void CancelTimeout (); + typedef std::map, Ptr > MapFragments_t; /** From 3635e3d74488e153896939f7a7cf1eaea9caf05c Mon Sep 17 00:00:00 2001 From: John Abraham Date: Sun, 17 Jul 2011 08:01:33 -0400 Subject: [PATCH 023/202] Missing header files since modularization for socket cases --- src/netanim/model/animation-interface.cc | 30 ++++++++++++++---------- src/netanim/wscript | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index 93ea2c12f..486865d93 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -19,6 +19,20 @@ // Interface between ns3 and the network animator + +// ns3 includes +#include "ns3/animation-interface.h" +#include "ns3/netanim-config.h" +#include "ns3/channel.h" +#include "ns3/config.h" +#include "ns3/node.h" +#include "ns3/mobility-model.h" +#include "ns3/packet.h" +#include "ns3/simulator.h" +#include "ns3/animation-interface-helper.h" +#include "ns3/wifi-mac-header.h" +#include "ns3/wimax-mac-header.h" + #include #include #include @@ -34,18 +48,6 @@ #include #endif -// ns3 includes -#include "ns3/animation-interface.h" -#include "ns3/channel.h" -#include "ns3/config.h" -#include "ns3/node.h" -#include "ns3/mobility-model.h" -#include "ns3/packet.h" -#include "ns3/simulator.h" -#include "ns3/animation-interface-helper.h" -#include "ns3/wifi-mac-header.h" -#include "ns3/wimax-mac-header.h" - NS_LOG_COMPONENT_DEFINE ("AnimationInterface"); namespace ns3 { @@ -102,7 +104,9 @@ bool AnimationInterface::SetServerPort (uint16_t port) { #if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H) if (ServerPortSet) - return; + { + return true; + } int s = socket (AF_INET, SOCK_STREAM, 0); struct sockaddr_in addr; addr.sin_family = AF_INET; diff --git a/src/netanim/wscript b/src/netanim/wscript index 2d1ce3dd1..22f86dcd4 100644 --- a/src/netanim/wscript +++ b/src/netanim/wscript @@ -23,4 +23,5 @@ def build (bld) : def configure (conf) : conf.check (header_name='sys/socket.h', define_name='HAVE_SYS_SOCKET_H') conf.check (header_name='netinet/in.h', define_name='HAVE_NETINET_IN_H') + conf.write_config_header ('ns3/netanim-config.h', top=True) From 7cd6de55ce2136849b040fd6651e0d47bfd46021 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Tue, 19 Jul 2011 09:21:47 -0700 Subject: [PATCH 024/202] fix coding standard link --- doc/codingstd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/codingstd.txt b/doc/codingstd.txt index 31b5b9d23..0f328eb50 100644 --- a/doc/codingstd.txt +++ b/doc/codingstd.txt @@ -1,2 +1,2 @@ The project coding style document is maintained at: -http://www.nsnam.org/codingstyle.html +http://www.nsnam.org/developers/contributing-code/coding-style/ From 45417886ca94f306bdc1dfd709bba657da885e0a Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Tue, 19 Jul 2011 09:22:30 -0700 Subject: [PATCH 025/202] fix contributing code link --- doc/contributing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing.txt b/doc/contributing.txt index f9a1afdb5..efd9fc62a 100644 --- a/doc/contributing.txt +++ b/doc/contributing.txt @@ -4,4 +4,4 @@ Contributing to the ns-3 project ns-3 is a free, open source software project that welcomes contributions from users worldwide. Please see the following web page for how to contribute: -http://www.nsnam.org/contributing.html +http://www.nsnam.org/developers/contributing-code/ From 3d77ba8272d0a6436a618567905a3899c1b544d6 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 19 Jul 2011 19:49:51 +0100 Subject: [PATCH 026/202] Upgrade pybindgen --- bindings/python/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/wscript b/bindings/python/wscript index f0a84d51c..59ee5a0ef 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -15,7 +15,7 @@ import Build import Utils ## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 790) +REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 792) REQUIRED_PYGCCXML_VERSION = (0, 9, 5) From bd5f42cc13b84f433508e66ceef97804b8fc9c07 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Tue, 19 Jul 2011 19:50:05 +0100 Subject: [PATCH 027/202] Rescan api of the internet module --- src/internet/bindings/modulegen__gcc_ILP32.py | 289 +++++++++--------- src/internet/bindings/modulegen__gcc_LP64.py | 289 +++++++++--------- 2 files changed, 292 insertions(+), 286 deletions(-) diff --git a/src/internet/bindings/modulegen__gcc_ILP32.py b/src/internet/bindings/modulegen__gcc_ILP32.py index c4f3c5732..7d1a23ce2 100644 --- a/src/internet/bindings/modulegen__gcc_ILP32.py +++ b/src/internet/bindings/modulegen__gcc_ILP32.py @@ -209,7 +209,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -451,7 +451,7 @@ def register_types(module): ## event-impl.h (module 'core'): ns3::EventImpl [class] module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) ## global-router-interface.h (module 'internet'): ns3::GlobalRouter [class] - module.add_class('GlobalRouter', is_singleton=True, parent=root_module['ns3::Object']) + module.add_class('GlobalRouter', destructor_visibility='private', parent=root_module['ns3::Object']) ## icmpv6-header.h (module 'internet'): ns3::Icmpv6DestinationUnreachable [class] module.add_class('Icmpv6DestinationUnreachable', parent=root_module['ns3::Icmpv6Header']) ## icmpv6-header.h (module 'internet'): ns3::Icmpv6Echo [class] @@ -467,7 +467,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol']) + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -6184,10 +6184,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -9138,29 +9138,18 @@ def register_Ns3Ipv4Interface_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -9169,102 +9158,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -9275,36 +9193,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -9315,26 +9315,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -11428,10 +11428,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -11446,11 +11454,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/internet/bindings/modulegen__gcc_LP64.py b/src/internet/bindings/modulegen__gcc_LP64.py index c4f3c5732..7d1a23ce2 100644 --- a/src/internet/bindings/modulegen__gcc_LP64.py +++ b/src/internet/bindings/modulegen__gcc_LP64.py @@ -209,7 +209,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -451,7 +451,7 @@ def register_types(module): ## event-impl.h (module 'core'): ns3::EventImpl [class] module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) ## global-router-interface.h (module 'internet'): ns3::GlobalRouter [class] - module.add_class('GlobalRouter', is_singleton=True, parent=root_module['ns3::Object']) + module.add_class('GlobalRouter', destructor_visibility='private', parent=root_module['ns3::Object']) ## icmpv6-header.h (module 'internet'): ns3::Icmpv6DestinationUnreachable [class] module.add_class('Icmpv6DestinationUnreachable', parent=root_module['ns3::Icmpv6Header']) ## icmpv6-header.h (module 'internet'): ns3::Icmpv6Echo [class] @@ -467,7 +467,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol']) + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -6184,10 +6184,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -9138,29 +9138,18 @@ def register_Ns3Ipv4Interface_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -9169,102 +9158,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -9275,36 +9193,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -9315,26 +9315,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -11428,10 +11428,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -11446,11 +11454,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): From 5fbd0a133d092811a4bb69b1cbf7201af4355d65 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 20 Jul 2011 12:43:03 +0100 Subject: [PATCH 028/202] Bump pybindgen version to pull another bug fix --- bindings/python/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/wscript b/bindings/python/wscript index 59ee5a0ef..6b185fc2a 100644 --- a/bindings/python/wscript +++ b/bindings/python/wscript @@ -15,7 +15,7 @@ import Build import Utils ## https://launchpad.net/pybindgen/ -REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 792) +REQUIRED_PYBINDGEN_VERSION = (0, 15, 0, 794) REQUIRED_PYGCCXML_VERSION = (0, 9, 5) From 913d2d976757b33cb21f85508af8ca0e71529c44 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 20 Jul 2011 16:02:19 +0100 Subject: [PATCH 029/202] Update python unit tests to new API --- utils/python-unit-tests.py | 100 ++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/utils/python-unit-tests.py b/utils/python-unit-tests.py index fcd011952..8c791bf5d 100644 --- a/utils/python-unit-tests.py +++ b/utils/python-unit-tests.py @@ -1,68 +1,74 @@ import unittest -import ns3 +from ns.core import Simulator, Seconds, Config, int64x64_t +import ns.core +import ns.network +import ns.internet +import ns.mobility +import ns.csma + class TestSimulator(unittest.TestCase): def testScheduleNow(self): def callback(args): self._args_received = args - self._cb_time = ns3.Simulator.Now() - ns3.Simulator.Destroy() + self._cb_time = Simulator.Now() + Simulator.Destroy() self._args_received = None self._cb_time = None - ns3.Simulator.ScheduleNow(callback, "args") - ns3.Simulator.Run() + Simulator.ScheduleNow(callback, "args") + Simulator.Run() self.assertEqual(self._args_received, "args") self.assertEqual(self._cb_time.GetSeconds(), 0.0) def testSchedule(self): def callback(args): self._args_received = args - self._cb_time = ns3.Simulator.Now() - ns3.Simulator.Destroy() + self._cb_time = Simulator.Now() + Simulator.Destroy() self._args_received = None self._cb_time = None - ns3.Simulator.Schedule(ns3.Seconds(123), callback, "args") - ns3.Simulator.Run() + Simulator.Schedule(Seconds(123), callback, "args") + Simulator.Run() self.assertEqual(self._args_received, "args") self.assertEqual(self._cb_time.GetSeconds(), 123.0) def testScheduleDestroy(self): def callback(args): self._args_received = args - self._cb_time = ns3.Simulator.Now() - ns3.Simulator.Destroy() + self._cb_time = Simulator.Now() + Simulator.Destroy() self._args_received = None self._cb_time = None def null(): pass - ns3.Simulator.Schedule(ns3.Seconds(123), null) - ns3.Simulator.ScheduleDestroy(callback, "args") - ns3.Simulator.Run() - ns3.Simulator.Destroy() + Simulator.Schedule(Seconds(123), null) + Simulator.ScheduleDestroy(callback, "args") + Simulator.Run() + Simulator.Destroy() self.assertEqual(self._args_received, "args") self.assertEqual(self._cb_time.GetSeconds(), 123.0) def testTimeComparison(self): - self.assert_(ns3.Seconds(123) == ns3.Seconds(123)) - self.assert_(ns3.Seconds(123) >= ns3.Seconds(123)) - self.assert_(ns3.Seconds(123) <= ns3.Seconds(123)) - self.assert_(ns3.Seconds(124) > ns3.Seconds(123)) - self.assert_(ns3.Seconds(123) < ns3.Seconds(124)) + self.assert_(Seconds(123) == Seconds(123)) + self.assert_(Seconds(123) >= Seconds(123)) + self.assert_(Seconds(123) <= Seconds(123)) + self.assert_(Seconds(124) > Seconds(123)) + self.assert_(Seconds(123) < Seconds(124)) def testTimeNumericOperations(self): - self.assertEqual(ns3.Seconds(10) + ns3.Seconds(5), ns3.Seconds(15)) - self.assertEqual(ns3.Seconds(10) - ns3.Seconds(5), ns3.Seconds(5)) - - v1 = ns3.Scalar(5)*ns3.Seconds(10) - self.assertEqual(v1, ns3.Seconds(50)) + self.assertEqual(Seconds(10) + Seconds(5), Seconds(15)) + self.assertEqual(Seconds(10) - Seconds(5), Seconds(5)) + + v1 = int64x64_t(5.0)*int64x64_t(10) + self.assertEqual(v1, int64x64_t(50)) def testConfig(self): - ns3.Config.SetDefault("ns3::OnOffApplication::PacketSize", ns3.UintegerValue(123)) + Config.SetDefault("ns3::OnOffApplication::PacketSize", ns.core.UintegerValue(123)) # hm.. no Config.Get? def testSocket(self): - node = ns3.Node() - internet = ns3.InternetStackHelper() + node = ns.network.Node() + internet = ns.internet.InternetStackHelper() internet.Install(node) self._received_packet = None @@ -70,14 +76,14 @@ class TestSimulator(unittest.TestCase): assert self._received_packet is None self._received_packet = socket.Recv() - sink = ns3.Socket.CreateSocket(node, ns3.TypeId.LookupByName("ns3::UdpSocketFactory")) - sink.Bind(ns3.InetSocketAddress(ns3.Ipv4Address.GetAny(), 80)) + sink = ns.network.Socket.CreateSocket(node, ns.core.TypeId.LookupByName("ns3::UdpSocketFactory")) + sink.Bind(ns.network.InetSocketAddress(ns.network.Ipv4Address.GetAny(), 80)) sink.SetRecvCallback(rx_callback) - source = ns3.Socket.CreateSocket(node, ns3.TypeId.LookupByName("ns3::UdpSocketFactory")) - source.SendTo(ns3.Packet(19), 0, ns3.InetSocketAddress(ns3.Ipv4Address("127.0.0.1"), 80)) + source = ns.network.Socket.CreateSocket(node, ns.core.TypeId.LookupByName("ns3::UdpSocketFactory")) + source.SendTo(ns.network.Packet(19), 0, ns.network.InetSocketAddress(ns.network.Ipv4Address("127.0.0.1"), 80)) - ns3.Simulator.Run() + Simulator.Run() self.assert_(self._received_packet is not None) self.assertEqual(self._received_packet.GetSize(), 19) @@ -87,30 +93,30 @@ class TestSimulator(unittest.TestCase): ## Yes, I know, the GetAttribute interface for Python is ## horrible, we should fix this soon, I hope. ## - queue = ns3.DropTailQueue() + queue = ns.network.DropTailQueue() - queue.SetAttribute("MaxPackets", ns3.UintegerValue(123456)) + queue.SetAttribute("MaxPackets", ns.core.UintegerValue(123456)) - limit = ns3.UintegerValue() + limit = ns.core.UintegerValue() queue.GetAttribute("MaxPackets", limit) self.assertEqual(limit.Get(), 123456) ## -- object pointer values - mobility = ns3.RandomWaypointMobilityModel() - ptr = ns3.PointerValue() + mobility = ns.mobility.RandomWaypointMobilityModel() + ptr = ns.core.PointerValue() mobility.GetAttribute("PositionAllocator", ptr) self.assertEqual(ptr.GetObject(), None) - pos = ns3.ListPositionAllocator() - mobility.SetAttribute("PositionAllocator", ns3.PointerValue(pos)) + pos = ns.mobility.ListPositionAllocator() + mobility.SetAttribute("PositionAllocator", ns.core.PointerValue(pos)) - ptr = ns3.PointerValue() + ptr = ns.core.PointerValue() mobility.GetAttribute("PositionAllocator", ptr) self.assert_(ptr.GetObject() is not None) def testIdentity(self): - csma = ns3.CsmaNetDevice() - channel = ns3.CsmaChannel() + csma = ns.csma.CsmaNetDevice() + channel = ns.csma.CsmaChannel() csma.Attach(channel) c1 = csma.GetChannel() @@ -119,13 +125,13 @@ class TestSimulator(unittest.TestCase): self.assert_(c1 is c2) def testTypeId(self): - typeId1 = ns3.TypeId.LookupByNameFailSafe("ns3::UdpSocketFactory") + typeId1 = ns.core.TypeId.LookupByNameFailSafe("ns3::UdpSocketFactory") self.assertEqual(typeId1.GetName (), "ns3::UdpSocketFactory") - self.assertRaises(KeyError, ns3.TypeId.LookupByNameFailSafe, "__InvalidTypeName__") + self.assertRaises(KeyError, ns.core.TypeId.LookupByNameFailSafe, "__InvalidTypeName__") def testCommandLine(self): - cmd = ns3.CommandLine() + cmd = ns.core.CommandLine() cmd.AddValue("Test1", "this is a test option") cmd.AddValue("Test2", "this is a test option") cmd.AddValue("Test3", "this is a test option", variable="test_xxx") @@ -146,7 +152,7 @@ class TestSimulator(unittest.TestCase): self.assertEqual(foo.test_foo, "xpto") def testSubclass(self): - class MyNode(ns3.Node): + class MyNode(ns.network.Node): def __init__(self): super(MyNode, self).__init__() From 4cf581619eee81a51881fbcdd640595f5fd815d6 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 20 Jul 2011 16:02:32 +0100 Subject: [PATCH 030/202] Rescan all python bindings for all modules --- scratch/scratch-simulator.cc | 5 + src/aodv/bindings/modulegen__gcc_ILP32.py | 313 +-- src/aodv/bindings/modulegen__gcc_LP64.py | 313 +-- .../bindings/modulegen__gcc_ILP32.py | 21 +- .../bindings/modulegen__gcc_LP64.py | 21 +- .../bindings/modulegen__gcc_ILP32.py | 18 - .../bindings/modulegen__gcc_LP64.py | 18 - src/core/bindings/modulegen__gcc_ILP32.py | 2 +- src/core/bindings/modulegen__gcc_LP64.py | 2 +- src/core/bindings/scan-header.h | 21 +- src/csma/bindings/modulegen__gcc_ILP32.py | 15 +- src/csma/bindings/modulegen__gcc_LP64.py | 15 +- src/dsdv/bindings/modulegen__gcc_ILP32.py | 295 +-- src/dsdv/bindings/modulegen__gcc_LP64.py | 295 +-- src/emu/bindings/modulegen__gcc_ILP32.py | 15 +- src/emu/bindings/modulegen__gcc_LP64.py | 15 +- src/energy/bindings/modulegen__gcc_ILP32.py | 45 +- src/energy/bindings/modulegen__gcc_LP64.py | 45 +- .../bindings/modulegen__gcc_ILP32.py | 388 ++-- .../bindings/modulegen__gcc_LP64.py | 388 ++-- src/lte/bindings/modulegen__gcc_ILP32.py | 13 +- src/lte/bindings/modulegen__gcc_LP64.py | 13 +- src/mesh/bindings/modulegen__gcc_ILP32.py | 57 +- src/mesh/bindings/modulegen__gcc_LP64.py | 57 +- src/mobility/bindings/modulegen__gcc_ILP32.py | 13 +- src/mobility/bindings/modulegen__gcc_LP64.py | 13 +- src/mpi/bindings/modulegen__gcc_ILP32.py | 5 + src/mpi/bindings/modulegen__gcc_LP64.py | 5 + src/netanim/bindings/callbacks_list.py | 1 + src/netanim/bindings/modulegen__gcc_ILP32.py | 1850 +++++++++++++++++ src/netanim/bindings/modulegen__gcc_LP64.py | 1850 +++++++++++++++++ src/network/bindings/modulegen__gcc_ILP32.py | 27 +- src/network/bindings/modulegen__gcc_LP64.py | 27 +- .../bindings/modulegen__gcc_ILP32.py | 25 +- .../bindings/modulegen__gcc_LP64.py | 25 +- src/olsr/bindings/modulegen__gcc_ILP32.py | 27 +- src/olsr/bindings/modulegen__gcc_LP64.py | 27 +- .../bindings/modulegen__gcc_ILP32.py | 295 +-- .../bindings/modulegen__gcc_LP64.py | 295 +-- .../bindings/modulegen__gcc_ILP32.py | 15 +- .../bindings/modulegen__gcc_LP64.py | 15 +- src/spectrum/bindings/callbacks_list.py | 2 +- src/spectrum/bindings/modulegen__gcc_ILP32.py | 365 +++- src/spectrum/bindings/modulegen__gcc_LP64.py | 365 +++- src/stats/bindings/modulegen__gcc_ILP32.py | 2 +- src/stats/bindings/modulegen__gcc_LP64.py | 2 +- .../bindings/modulegen__gcc_ILP32.py | 13 +- .../bindings/modulegen__gcc_LP64.py | 13 +- src/tools/bindings/modulegen__gcc_ILP32.py | 2 +- src/tools/bindings/modulegen__gcc_LP64.py | 2 +- .../bindings/modulegen__gcc_ILP32.py | 13 +- .../bindings/modulegen__gcc_LP64.py | 13 +- src/uan/bindings/modulegen__gcc_ILP32.py | 15 +- src/uan/bindings/modulegen__gcc_LP64.py | 15 +- .../bindings/modulegen__gcc_ILP32.py | 471 +++-- .../bindings/modulegen__gcc_LP64.py | 471 +++-- src/wifi/bindings/modulegen__gcc_ILP32.py | 13 +- src/wifi/bindings/modulegen__gcc_LP64.py | 13 +- src/wimax/bindings/modulegen__gcc_ILP32.py | 15 +- src/wimax/bindings/modulegen__gcc_LP64.py | 15 +- 60 files changed, 6983 insertions(+), 1742 deletions(-) diff --git a/scratch/scratch-simulator.cc b/scratch/scratch-simulator.cc index f11de3ccd..8cc67567e 100644 --- a/scratch/scratch-simulator.cc +++ b/scratch/scratch-simulator.cc @@ -23,5 +23,10 @@ using namespace ns3; int main (int argc, char *argv[]) { + Time t1 = Seconds (2); + + int64x64_t t2 = 10*t1; + + NS_LOG_UNCOND ("Scratch Simulator"); } diff --git a/src/aodv/bindings/modulegen__gcc_ILP32.py b/src/aodv/bindings/modulegen__gcc_ILP32.py index ef76d570a..234dd3cd9 100644 --- a/src/aodv/bindings/modulegen__gcc_ILP32.py +++ b/src/aodv/bindings/modulegen__gcc_ILP32.py @@ -123,7 +123,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -241,7 +241,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -297,6 +297,7 @@ def register_types(module): ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -482,8 +483,8 @@ def register_methods(root_module): return def register_Ns3Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## address.h (module 'network'): ns3::Address::Address() [constructor] @@ -1052,8 +1053,8 @@ def register_Ns3IntToType__6_methods(root_module, cls): return def register_Ns3Ipv4Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] @@ -1321,8 +1322,8 @@ def register_Ns3Ipv4RoutingHelper_methods(root_module, cls): return def register_Ns3Ipv6Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor] @@ -1533,8 +1534,8 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): return def register_Ns3Mac48Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] @@ -2248,8 +2249,8 @@ def register_Ns3TimerImpl_methods(root_module, cls): return def register_Ns3TypeId_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor] @@ -2462,6 +2463,8 @@ def register_Ns3Empty_methods(root_module, cls): return def register_Ns3Int64x64_t_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right')) @@ -2513,9 +2516,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right')) cls.add_output_stream_operator() @@ -2746,10 +2747,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3339,12 +3340,12 @@ def register_Ns3SocketSetDontFragmentTag_methods(root_module, cls): return def register_Ns3Time_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_binary_comparison_operator('!=') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') @@ -4642,29 +4643,18 @@ def register_Ns3Ipv4Interface_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -4673,102 +4663,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -4779,36 +4698,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -4819,26 +4820,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4933,10 +4934,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -5412,10 +5418,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5430,11 +5444,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/aodv/bindings/modulegen__gcc_LP64.py b/src/aodv/bindings/modulegen__gcc_LP64.py index ef76d570a..234dd3cd9 100644 --- a/src/aodv/bindings/modulegen__gcc_LP64.py +++ b/src/aodv/bindings/modulegen__gcc_LP64.py @@ -123,7 +123,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -241,7 +241,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -297,6 +297,7 @@ def register_types(module): ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -482,8 +483,8 @@ def register_methods(root_module): return def register_Ns3Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## address.h (module 'network'): ns3::Address::Address() [constructor] @@ -1052,8 +1053,8 @@ def register_Ns3IntToType__6_methods(root_module, cls): return def register_Ns3Ipv4Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv4-address.h (module 'network'): ns3::Ipv4Address::Ipv4Address(ns3::Ipv4Address const & arg0) [copy constructor] @@ -1321,8 +1322,8 @@ def register_Ns3Ipv4RoutingHelper_methods(root_module, cls): return def register_Ns3Ipv6Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## ipv6-address.h (module 'network'): ns3::Ipv6Address::Ipv6Address() [constructor] @@ -1533,8 +1534,8 @@ def register_Ns3Ipv6Prefix_methods(root_module, cls): return def register_Ns3Mac48Address_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] @@ -2248,8 +2249,8 @@ def register_Ns3TimerImpl_methods(root_module, cls): return def register_Ns3TypeId_methods(root_module, cls): - cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('<') cls.add_output_stream_operator() cls.add_binary_comparison_operator('==') ## type-id.h (module 'core'): ns3::TypeId::TypeId(char const * name) [constructor] @@ -2462,6 +2463,8 @@ def register_Ns3Empty_methods(root_module, cls): return def register_Ns3Int64x64_t_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long unsigned int const', 'right')) cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('unsigned int const', 'right')) @@ -2513,9 +2516,7 @@ def register_Ns3Int64x64_t_methods(root_module, cls): cls.add_binary_numeric_operator('/', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('ns3::int64x64_t const &', 'right')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_binary_comparison_operator('!=') cls.add_inplace_numeric_operator('*=', param('ns3::int64x64_t const &', 'right')) - cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right')) cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right')) cls.add_output_stream_operator() @@ -2746,10 +2747,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3339,12 +3340,12 @@ def register_Ns3SocketSetDontFragmentTag_methods(root_module, cls): return def register_Ns3Time_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('>') - cls.add_binary_comparison_operator('!=') - cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right')) cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right')) cls.add_output_stream_operator() cls.add_binary_comparison_operator('<=') @@ -4642,29 +4643,18 @@ def register_Ns3Ipv4Interface_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -4673,102 +4663,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -4779,36 +4698,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -4819,26 +4820,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4933,10 +4934,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -5412,10 +5418,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5430,11 +5444,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/applications/bindings/modulegen__gcc_ILP32.py b/src/applications/bindings/modulegen__gcc_ILP32.py index ecf2b21c9..903b10901 100644 --- a/src/applications/bindings/modulegen__gcc_ILP32.py +++ b/src/applications/bindings/modulegen__gcc_ILP32.py @@ -155,7 +155,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -439,6 +439,9 @@ def register_types(module): module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::Socket > >', 'ns3::Ptr< ns3::Socket >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::RadvdPrefix > >', 'ns3::Ptr< ns3::RadvdPrefix >', container_type='list') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&') @@ -454,9 +457,6 @@ def register_types(module): typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -6303,10 +6303,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -6321,11 +6329,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/applications/bindings/modulegen__gcc_LP64.py b/src/applications/bindings/modulegen__gcc_LP64.py index ecf2b21c9..903b10901 100644 --- a/src/applications/bindings/modulegen__gcc_LP64.py +++ b/src/applications/bindings/modulegen__gcc_LP64.py @@ -155,7 +155,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -439,6 +439,9 @@ def register_types(module): module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::Socket > >', 'ns3::Ptr< ns3::Socket >', container_type='list') module.add_container('std::list< ns3::Ptr< ns3::RadvdPrefix > >', 'ns3::Ptr< ns3::RadvdPrefix >', container_type='list') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&') @@ -454,9 +457,6 @@ def register_types(module): typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -6303,10 +6303,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -6321,11 +6329,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/config-store/bindings/modulegen__gcc_ILP32.py b/src/config-store/bindings/modulegen__gcc_ILP32.py index ba2b395cc..930505c2a 100644 --- a/src/config-store/bindings/modulegen__gcc_ILP32.py +++ b/src/config-store/bindings/modulegen__gcc_ILP32.py @@ -24,8 +24,6 @@ def register_types(module): module.add_class('CallbackBase', import_from_module='ns.core') ## file-config.h (module 'config-store'): ns3::FileConfig [class] module.add_class('FileConfig', allow_subclassing=True) - ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h (module 'config-store'): ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## object-base.h (module 'core'): ns3::ObjectBase [class] @@ -84,7 +82,6 @@ def register_types_ns3_FatalImpl(module): def register_methods(root_module): register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3FileConfig_methods(root_module, root_module['ns3::FileConfig']) - register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) @@ -153,21 +150,6 @@ def register_Ns3FileConfig_methods(root_module, cls): is_pure_virtual=True, is_virtual=True) return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h (module 'config-store'): void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h (module 'config-store'): void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h (module 'config-store'): ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/src/config-store/bindings/modulegen__gcc_LP64.py b/src/config-store/bindings/modulegen__gcc_LP64.py index ba2b395cc..930505c2a 100644 --- a/src/config-store/bindings/modulegen__gcc_LP64.py +++ b/src/config-store/bindings/modulegen__gcc_LP64.py @@ -24,8 +24,6 @@ def register_types(module): module.add_class('CallbackBase', import_from_module='ns.core') ## file-config.h (module 'config-store'): ns3::FileConfig [class] module.add_class('FileConfig', allow_subclassing=True) - ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore [class] - module.add_class('GtkConfigStore') ## file-config.h (module 'config-store'): ns3::NoneFileConfig [class] module.add_class('NoneFileConfig', parent=root_module['ns3::FileConfig']) ## object-base.h (module 'core'): ns3::ObjectBase [class] @@ -84,7 +82,6 @@ def register_types_ns3_FatalImpl(module): def register_methods(root_module): register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) register_Ns3FileConfig_methods(root_module, root_module['ns3::FileConfig']) - register_Ns3GtkConfigStore_methods(root_module, root_module['ns3::GtkConfigStore']) register_Ns3NoneFileConfig_methods(root_module, root_module['ns3::NoneFileConfig']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) @@ -153,21 +150,6 @@ def register_Ns3FileConfig_methods(root_module, cls): is_pure_virtual=True, is_virtual=True) return -def register_Ns3GtkConfigStore_methods(root_module, cls): - ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore::GtkConfigStore(ns3::GtkConfigStore const & arg0) [copy constructor] - cls.add_constructor([param('ns3::GtkConfigStore const &', 'arg0')]) - ## gtk-config-store.h (module 'config-store'): ns3::GtkConfigStore::GtkConfigStore() [constructor] - cls.add_constructor([]) - ## gtk-config-store.h (module 'config-store'): void ns3::GtkConfigStore::ConfigureAttributes() [member function] - cls.add_method('ConfigureAttributes', - 'void', - []) - ## gtk-config-store.h (module 'config-store'): void ns3::GtkConfigStore::ConfigureDefaults() [member function] - cls.add_method('ConfigureDefaults', - 'void', - []) - return - def register_Ns3NoneFileConfig_methods(root_module, cls): ## file-config.h (module 'config-store'): ns3::NoneFileConfig::NoneFileConfig(ns3::NoneFileConfig const & arg0) [copy constructor] cls.add_constructor([param('ns3::NoneFileConfig const &', 'arg0')]) diff --git a/src/core/bindings/modulegen__gcc_ILP32.py b/src/core/bindings/modulegen__gcc_ILP32.py index 70c8398ed..732cd024a 100644 --- a/src/core/bindings/modulegen__gcc_ILP32.py +++ b/src/core/bindings/modulegen__gcc_ILP32.py @@ -83,7 +83,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True) + module.add_class('Simulator', destructor_visibility='private') ## system-condition.h (module 'core'): ns3::SystemCondition [class] module.add_class('SystemCondition') ## system-mutex.h (module 'core'): ns3::SystemMutex [class] diff --git a/src/core/bindings/modulegen__gcc_LP64.py b/src/core/bindings/modulegen__gcc_LP64.py index bde932ebb..b15d3355c 100644 --- a/src/core/bindings/modulegen__gcc_LP64.py +++ b/src/core/bindings/modulegen__gcc_LP64.py @@ -83,7 +83,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True) + module.add_class('Simulator', destructor_visibility='private') ## system-condition.h (module 'core'): ns3::SystemCondition [class] module.add_class('SystemCondition') ## system-mutex.h (module 'core'): ns3::SystemMutex [class] diff --git a/src/core/bindings/scan-header.h b/src/core/bindings/scan-header.h index f8295599c..4d0689a2d 100644 --- a/src/core/bindings/scan-header.h +++ b/src/core/bindings/scan-header.h @@ -17,7 +17,7 @@ __dummy_function_to_force_template_instantiation (Ptr obj, TypeId typeId static inline void __dummy_function_to_force_template_instantiation_v2 () { - Time t1, t2, t3; + Time t1 = Seconds (1), t2 = Seconds (2), t3 = Seconds (3); t1 = t2 + t3; t1 = t2 - t3; t1 < t2; @@ -26,6 +26,25 @@ __dummy_function_to_force_template_instantiation_v2 () t1 != t2; t1 >= t2; t1 > t2; + + + int64x64_t s1(2), s2(3), s3; + s1 = s2 + s3; + s1 = s2 - s3; + s1 < s2; + s1 <= s2; + s1 == s2; + s1 != s2; + s1 >= s2; + s1 > s2; + + + + + s3 = t1*s1; + s3 = t1/s1; + s3 = s1*t1; + s3 = t1/t2; } } diff --git a/src/csma/bindings/modulegen__gcc_ILP32.py b/src/csma/bindings/modulegen__gcc_ILP32.py index 5d22d8d22..b92e5b700 100644 --- a/src/csma/bindings/modulegen__gcc_ILP32.py +++ b/src/csma/bindings/modulegen__gcc_ILP32.py @@ -115,7 +115,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -4215,10 +4215,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4233,11 +4241,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/csma/bindings/modulegen__gcc_LP64.py b/src/csma/bindings/modulegen__gcc_LP64.py index 5d22d8d22..b92e5b700 100644 --- a/src/csma/bindings/modulegen__gcc_LP64.py +++ b/src/csma/bindings/modulegen__gcc_LP64.py @@ -115,7 +115,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -4215,10 +4215,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4233,11 +4241,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/dsdv/bindings/modulegen__gcc_ILP32.py b/src/dsdv/bindings/modulegen__gcc_ILP32.py index ec2b0ed62..b3de1a71c 100644 --- a/src/dsdv/bindings/modulegen__gcc_ILP32.py +++ b/src/dsdv/bindings/modulegen__gcc_ILP32.py @@ -117,7 +117,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -221,7 +221,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -272,6 +272,7 @@ def register_types(module): module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -2614,10 +2615,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3866,29 +3867,18 @@ def register_Ns3Ipv4Interface_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -3897,102 +3887,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -4003,36 +3922,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -4043,26 +4044,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4157,10 +4158,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4596,10 +4602,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4614,11 +4628,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/dsdv/bindings/modulegen__gcc_LP64.py b/src/dsdv/bindings/modulegen__gcc_LP64.py index ec2b0ed62..b3de1a71c 100644 --- a/src/dsdv/bindings/modulegen__gcc_LP64.py +++ b/src/dsdv/bindings/modulegen__gcc_LP64.py @@ -117,7 +117,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -221,7 +221,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -272,6 +272,7 @@ def register_types(module): module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -2614,10 +2615,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3866,29 +3867,18 @@ def register_Ns3Ipv4Interface_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -3897,102 +3887,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -4003,36 +3922,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -4043,26 +4044,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4157,10 +4158,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4596,10 +4602,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4614,11 +4628,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/emu/bindings/modulegen__gcc_ILP32.py b/src/emu/bindings/modulegen__gcc_ILP32.py index 7af22c3e1..2df350cb3 100644 --- a/src/emu/bindings/modulegen__gcc_ILP32.py +++ b/src/emu/bindings/modulegen__gcc_ILP32.py @@ -109,7 +109,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## system-mutex.h (module 'core'): ns3::SystemMutex [class] module.add_class('SystemMutex', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] @@ -4106,10 +4106,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4124,11 +4132,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/emu/bindings/modulegen__gcc_LP64.py b/src/emu/bindings/modulegen__gcc_LP64.py index 7af22c3e1..2df350cb3 100644 --- a/src/emu/bindings/modulegen__gcc_LP64.py +++ b/src/emu/bindings/modulegen__gcc_LP64.py @@ -109,7 +109,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## system-mutex.h (module 'core'): ns3::SystemMutex [class] module.add_class('SystemMutex', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] @@ -4106,10 +4106,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4124,11 +4132,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/energy/bindings/modulegen__gcc_ILP32.py b/src/energy/bindings/modulegen__gcc_ILP32.py index 905b05b65..69b2f151a 100644 --- a/src/energy/bindings/modulegen__gcc_ILP32.py +++ b/src/energy/bindings/modulegen__gcc_ILP32.py @@ -2919,11 +2919,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'double', [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) const [member function] + ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] cls.add_method('CalculateTxDuration', 'ns3::Time', [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], - is_pure_virtual=True, is_const=True, is_virtual=True) + is_static=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function] cls.add_method('ConfigureStandard', 'void', @@ -3144,6 +3144,26 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::WifiMode', [], is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function] + cls.add_method('GetPayloadDurationMicroSeconds', + 'uint32_t', + [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderMode', + 'ns3::WifiMode', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpPreambleDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetStateDuration() [member function] cls.add_method('GetStateDuration', 'ns3::Time', @@ -3194,12 +3214,12 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'bool', [], is_pure_virtual=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] - cls.add_method('NotifyPromiscSniffRx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] + cls.add_method('NotifyMonitorSniffRx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')]) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] - cls.add_method('NotifyPromiscSniffTx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] + cls.add_method('NotifyMonitorSniffTx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr packet) [member function] @@ -4270,10 +4290,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4288,11 +4316,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/energy/bindings/modulegen__gcc_LP64.py b/src/energy/bindings/modulegen__gcc_LP64.py index 905b05b65..69b2f151a 100644 --- a/src/energy/bindings/modulegen__gcc_LP64.py +++ b/src/energy/bindings/modulegen__gcc_LP64.py @@ -2919,11 +2919,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'double', [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) const [member function] + ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] cls.add_method('CalculateTxDuration', 'ns3::Time', [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], - is_pure_virtual=True, is_const=True, is_virtual=True) + is_static=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function] cls.add_method('ConfigureStandard', 'void', @@ -3144,6 +3144,26 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::WifiMode', [], is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function] + cls.add_method('GetPayloadDurationMicroSeconds', + 'uint32_t', + [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderMode', + 'ns3::WifiMode', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpPreambleDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetStateDuration() [member function] cls.add_method('GetStateDuration', 'ns3::Time', @@ -3194,12 +3214,12 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'bool', [], is_pure_virtual=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] - cls.add_method('NotifyPromiscSniffRx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] + cls.add_method('NotifyMonitorSniffRx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')]) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] - cls.add_method('NotifyPromiscSniffTx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] + cls.add_method('NotifyMonitorSniffTx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr packet) [member function] @@ -4270,10 +4290,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4288,11 +4316,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/flow-monitor/bindings/modulegen__gcc_ILP32.py b/src/flow-monitor/bindings/modulegen__gcc_ILP32.py index c41823738..152c7b794 100644 --- a/src/flow-monitor/bindings/modulegen__gcc_ILP32.py +++ b/src/flow-monitor/bindings/modulegen__gcc_ILP32.py @@ -90,6 +90,8 @@ def register_types(module): module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simulator.h (module 'core'): ns3::Simulator [class] + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -199,11 +201,11 @@ def register_types(module): ## ipv4-flow-probe.h (module 'flow-monitor'): ns3::Ipv4FlowProbe [class] module.add_class('Ipv4FlowProbe', parent=root_module['ns3::FlowProbe']) ## ipv4-flow-probe.h (module 'flow-monitor'): ns3::Ipv4FlowProbe::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_QUEUE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe']) + module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_QUEUE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -259,6 +261,7 @@ def register_types(module): module.add_container('std::map< unsigned int, ns3::FlowMonitor::FlowStats >', ('unsigned int', 'ns3::FlowMonitor::FlowStats'), container_type='map') module.add_container('std::vector< ns3::Ptr< ns3::FlowProbe > >', 'ns3::Ptr< ns3::FlowProbe >', container_type='vector') module.add_container('std::map< unsigned int, ns3::FlowProbe::FlowStats >', ('unsigned int', 'ns3::FlowProbe::FlowStats'), container_type='map') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') typehandlers.add_type_alias('uint32_t', 'ns3::FlowPacketId') typehandlers.add_type_alias('uint32_t*', 'ns3::FlowPacketId*') typehandlers.add_type_alias('uint32_t&', 'ns3::FlowPacketId&') @@ -307,6 +310,7 @@ def register_methods(root_module): register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) + register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) @@ -1796,6 +1800,96 @@ def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods is_static=True) return +def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) + ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static ns3::Ptr ns3::Simulator::GetImplementation() [member function] + cls.add_method('GetImplementation', + 'ns3::Ptr< ns3::SimulatorImpl >', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] + cls.add_method('RunOneEvent', + 'void', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + cls.add_method('SetImplementation', + 'void', + [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::ObjectFactory', 'schedulerFactory')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time const &', 'time')], + is_static=True) + return + def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -2369,10 +2463,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3784,29 +3878,18 @@ def register_Ns3Ipv4FlowProbe_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -3815,102 +3898,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -3921,36 +3933,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -3961,26 +4055,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4075,10 +4169,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4514,10 +4613,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4532,11 +4639,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/flow-monitor/bindings/modulegen__gcc_LP64.py b/src/flow-monitor/bindings/modulegen__gcc_LP64.py index 8854a9d97..9192a7a3b 100644 --- a/src/flow-monitor/bindings/modulegen__gcc_LP64.py +++ b/src/flow-monitor/bindings/modulegen__gcc_LP64.py @@ -90,6 +90,8 @@ def register_types(module): module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simulator.h (module 'core'): ns3::Simulator [class] + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -199,11 +201,11 @@ def register_types(module): ## ipv4-flow-probe.h (module 'flow-monitor'): ns3::Ipv4FlowProbe [class] module.add_class('Ipv4FlowProbe', parent=root_module['ns3::FlowProbe']) ## ipv4-flow-probe.h (module 'flow-monitor'): ns3::Ipv4FlowProbe::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_QUEUE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe']) + module.add_enum('DropReason', ['DROP_NO_ROUTE', 'DROP_TTL_EXPIRE', 'DROP_BAD_CHECKSUM', 'DROP_QUEUE', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT', 'DROP_INVALID_REASON'], outer_class=root_module['ns3::Ipv4FlowProbe']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -259,6 +261,7 @@ def register_types(module): module.add_container('std::map< unsigned int, ns3::FlowMonitor::FlowStats >', ('unsigned int', 'ns3::FlowMonitor::FlowStats'), container_type='map') module.add_container('std::vector< ns3::Ptr< ns3::FlowProbe > >', 'ns3::Ptr< ns3::FlowProbe >', container_type='vector') module.add_container('std::map< unsigned int, ns3::FlowProbe::FlowStats >', ('unsigned int', 'ns3::FlowProbe::FlowStats'), container_type='map') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') typehandlers.add_type_alias('uint32_t', 'ns3::FlowPacketId') typehandlers.add_type_alias('uint32_t*', 'ns3::FlowPacketId*') typehandlers.add_type_alias('uint32_t&', 'ns3::FlowPacketId&') @@ -307,6 +310,7 @@ def register_methods(root_module): register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) + register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) @@ -1796,6 +1800,96 @@ def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods is_static=True) return +def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) + ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static ns3::Ptr ns3::Simulator::GetImplementation() [member function] + cls.add_method('GetImplementation', + 'ns3::Ptr< ns3::SimulatorImpl >', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] + cls.add_method('RunOneEvent', + 'void', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + cls.add_method('SetImplementation', + 'void', + [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::ObjectFactory', 'schedulerFactory')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time const &', 'time')], + is_static=True) + return + def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -2369,10 +2463,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3784,29 +3878,18 @@ def register_Ns3Ipv4FlowProbe_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -3815,102 +3898,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -3921,36 +3933,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -3961,26 +4055,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4075,10 +4169,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4514,10 +4613,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4532,11 +4639,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/lte/bindings/modulegen__gcc_ILP32.py b/src/lte/bindings/modulegen__gcc_ILP32.py index 11ffb76f9..ed2f8ef25 100644 --- a/src/lte/bindings/modulegen__gcc_ILP32.py +++ b/src/lte/bindings/modulegen__gcc_ILP32.py @@ -5900,10 +5900,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5918,11 +5926,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/lte/bindings/modulegen__gcc_LP64.py b/src/lte/bindings/modulegen__gcc_LP64.py index 11ffb76f9..ed2f8ef25 100644 --- a/src/lte/bindings/modulegen__gcc_LP64.py +++ b/src/lte/bindings/modulegen__gcc_LP64.py @@ -5900,10 +5900,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5918,11 +5926,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/mesh/bindings/modulegen__gcc_ILP32.py b/src/mesh/bindings/modulegen__gcc_ILP32.py index 71c75fba5..afbf60e59 100644 --- a/src/mesh/bindings/modulegen__gcc_ILP32.py +++ b/src/mesh/bindings/modulegen__gcc_ILP32.py @@ -135,7 +135,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## status-code.h (module 'wifi'): ns3::StatusCode [class] module.add_class('StatusCode', import_from_module='ns.wifi') ## tag.h (module 'network'): ns3::Tag [class] @@ -4876,6 +4876,11 @@ def register_Ns3WifiMac_methods(root_module, cls): 'void', [param('ns3::Time', 'pifs')], is_pure_virtual=True, is_virtual=True) + ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetPromisc() [member function] + cls.add_method('SetPromisc', + 'void', + [], + is_pure_virtual=True, is_virtual=True) ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSifs(ns3::Time sifs) [member function] cls.add_method('SetSifs', 'void', @@ -5352,11 +5357,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'double', [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) const [member function] + ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] cls.add_method('CalculateTxDuration', 'ns3::Time', [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], - is_pure_virtual=True, is_const=True, is_virtual=True) + is_static=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function] cls.add_method('ConfigureStandard', 'void', @@ -5577,6 +5582,26 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::WifiMode', [], is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function] + cls.add_method('GetPayloadDurationMicroSeconds', + 'uint32_t', + [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderMode', + 'ns3::WifiMode', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpPreambleDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetStateDuration() [member function] cls.add_method('GetStateDuration', 'ns3::Time', @@ -5627,12 +5652,12 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'bool', [], is_pure_virtual=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] - cls.add_method('NotifyPromiscSniffRx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] + cls.add_method('NotifyMonitorSniffRx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')]) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] - cls.add_method('NotifyPromiscSniffTx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] + cls.add_method('NotifyMonitorSniffTx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr packet) [member function] @@ -7435,10 +7460,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -7453,11 +7486,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): @@ -7792,6 +7820,11 @@ def register_Ns3RegularWifiMac_methods(root_module, cls): 'ns3::Mac48Address', [], is_const=True, is_virtual=True) + ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetPromisc() [member function] + cls.add_method('SetPromisc', + 'void', + [], + is_virtual=True) ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Enqueue(ns3::Ptr packet, ns3::Mac48Address to, ns3::Mac48Address from) [member function] cls.add_method('Enqueue', 'void', diff --git a/src/mesh/bindings/modulegen__gcc_LP64.py b/src/mesh/bindings/modulegen__gcc_LP64.py index e78e576be..12418be92 100644 --- a/src/mesh/bindings/modulegen__gcc_LP64.py +++ b/src/mesh/bindings/modulegen__gcc_LP64.py @@ -135,7 +135,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## status-code.h (module 'wifi'): ns3::StatusCode [class] module.add_class('StatusCode', import_from_module='ns.wifi') ## tag.h (module 'network'): ns3::Tag [class] @@ -4876,6 +4876,11 @@ def register_Ns3WifiMac_methods(root_module, cls): 'void', [param('ns3::Time', 'pifs')], is_pure_virtual=True, is_virtual=True) + ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetPromisc() [member function] + cls.add_method('SetPromisc', + 'void', + [], + is_pure_virtual=True, is_virtual=True) ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::SetSifs(ns3::Time sifs) [member function] cls.add_method('SetSifs', 'void', @@ -5352,11 +5357,11 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'double', [param('ns3::WifiMode', 'txMode'), param('double', 'ber')], is_pure_virtual=True, is_const=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) const [member function] + ## wifi-phy.h (module 'wifi'): static ns3::Time ns3::WifiPhy::CalculateTxDuration(uint32_t size, ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] cls.add_method('CalculateTxDuration', 'ns3::Time', [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], - is_pure_virtual=True, is_const=True, is_virtual=True) + is_static=True) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::ConfigureStandard(ns3::WifiPhyStandard standard) [member function] cls.add_method('ConfigureStandard', 'void', @@ -5577,6 +5582,26 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'ns3::WifiMode', [], is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPayloadDurationMicroSeconds(uint32_t size, ns3::WifiMode payloadMode) [member function] + cls.add_method('GetPayloadDurationMicroSeconds', + 'uint32_t', + [param('uint32_t', 'size'), param('ns3::WifiMode', 'payloadMode')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpHeaderDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static ns3::WifiMode ns3::WifiPhy::GetPlcpHeaderMode(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpHeaderMode', + 'ns3::WifiMode', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) + ## wifi-phy.h (module 'wifi'): static uint32_t ns3::WifiPhy::GetPlcpPreambleDurationMicroSeconds(ns3::WifiMode payloadMode, ns3::WifiPreamble preamble) [member function] + cls.add_method('GetPlcpPreambleDurationMicroSeconds', + 'uint32_t', + [param('ns3::WifiMode', 'payloadMode'), param('ns3::WifiPreamble', 'preamble')], + is_static=True) ## wifi-phy.h (module 'wifi'): ns3::Time ns3::WifiPhy::GetStateDuration() [member function] cls.add_method('GetStateDuration', 'ns3::Time', @@ -5627,12 +5652,12 @@ def register_Ns3WifiPhy_methods(root_module, cls): 'bool', [], is_pure_virtual=True, is_virtual=True) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] - cls.add_method('NotifyPromiscSniffRx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffRx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble, double signalDbm, double noiseDbm) [member function] + cls.add_method('NotifyMonitorSniffRx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble'), param('double', 'signalDbm'), param('double', 'noiseDbm')]) - ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyPromiscSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] - cls.add_method('NotifyPromiscSniffTx', + ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyMonitorSniffTx(ns3::Ptr packet, uint16_t channelFreqMhz, uint16_t channelNumber, uint32_t rate, bool isShortPreamble) [member function] + cls.add_method('NotifyMonitorSniffTx', 'void', [param('ns3::Ptr< ns3::Packet const >', 'packet'), param('uint16_t', 'channelFreqMhz'), param('uint16_t', 'channelNumber'), param('uint32_t', 'rate'), param('bool', 'isShortPreamble')]) ## wifi-phy.h (module 'wifi'): void ns3::WifiPhy::NotifyRxBegin(ns3::Ptr packet) [member function] @@ -7435,10 +7460,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -7453,11 +7486,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): @@ -7792,6 +7820,11 @@ def register_Ns3RegularWifiMac_methods(root_module, cls): 'ns3::Mac48Address', [], is_const=True, is_virtual=True) + ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::SetPromisc() [member function] + cls.add_method('SetPromisc', + 'void', + [], + is_virtual=True) ## regular-wifi-mac.h (module 'wifi'): void ns3::RegularWifiMac::Enqueue(ns3::Ptr packet, ns3::Mac48Address to, ns3::Mac48Address from) [member function] cls.add_method('Enqueue', 'void', diff --git a/src/mobility/bindings/modulegen__gcc_ILP32.py b/src/mobility/bindings/modulegen__gcc_ILP32.py index e160c1aaa..87673ee34 100644 --- a/src/mobility/bindings/modulegen__gcc_ILP32.py +++ b/src/mobility/bindings/modulegen__gcc_ILP32.py @@ -3136,10 +3136,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -3154,11 +3162,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/mobility/bindings/modulegen__gcc_LP64.py b/src/mobility/bindings/modulegen__gcc_LP64.py index e160c1aaa..87673ee34 100644 --- a/src/mobility/bindings/modulegen__gcc_LP64.py +++ b/src/mobility/bindings/modulegen__gcc_LP64.py @@ -3136,10 +3136,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -3154,11 +3162,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/mpi/bindings/modulegen__gcc_ILP32.py b/src/mpi/bindings/modulegen__gcc_ILP32.py index 9850c9a57..ce4766873 100644 --- a/src/mpi/bindings/modulegen__gcc_ILP32.py +++ b/src/mpi/bindings/modulegen__gcc_ILP32.py @@ -726,6 +726,11 @@ def register_Ns3MpiInterface_methods(root_module, cls): 'void', [], is_static=True) + ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::Disable() [member function] + cls.add_method('Disable', + 'void', + [], + is_static=True) ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::Enable(int * pargc, char * * * pargv) [member function] cls.add_method('Enable', 'void', diff --git a/src/mpi/bindings/modulegen__gcc_LP64.py b/src/mpi/bindings/modulegen__gcc_LP64.py index 9850c9a57..ce4766873 100644 --- a/src/mpi/bindings/modulegen__gcc_LP64.py +++ b/src/mpi/bindings/modulegen__gcc_LP64.py @@ -726,6 +726,11 @@ def register_Ns3MpiInterface_methods(root_module, cls): 'void', [], is_static=True) + ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::Disable() [member function] + cls.add_method('Disable', + 'void', + [], + is_static=True) ## mpi-interface.h (module 'mpi'): static void ns3::MpiInterface::Enable(int * pargc, char * * * pargv) [member function] cls.add_method('Enable', 'void', diff --git a/src/netanim/bindings/callbacks_list.py b/src/netanim/bindings/callbacks_list.py index 6cda13fc6..ecf7537d5 100644 --- a/src/netanim/bindings/callbacks_list.py +++ b/src/netanim/bindings/callbacks_list.py @@ -1,2 +1,3 @@ callback_classes = [ + ['void', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff --git a/src/netanim/bindings/modulegen__gcc_ILP32.py b/src/netanim/bindings/modulegen__gcc_ILP32.py index 9af2478b6..dc3123799 100644 --- a/src/netanim/bindings/modulegen__gcc_ILP32.py +++ b/src/netanim/bindings/modulegen__gcc_ILP32.py @@ -26,12 +26,32 @@ def register_types(module): module.add_class('Address', import_from_module='ns.network') ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration] module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network') + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo [class] + module.add_class('AnimPacketInfo') + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo [class] + module.add_class('AnimRxInfo') ## animation-interface.h (module 'netanim'): ns3::AnimationInterface [class] module.add_class('AnimationInterface') ## attribute-list.h (module 'core'): ns3::AttributeList [class] module.add_class('AttributeList', import_from_module='ns.core') + ## buffer.h (module 'network'): ns3::Buffer [class] + module.add_class('Buffer', import_from_module='ns.network') + ## buffer.h (module 'network'): ns3::Buffer::Iterator [class] + module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::Buffer']) + ## packet.h (module 'network'): ns3::ByteTagIterator [class] + module.add_class('ByteTagIterator', import_from_module='ns.network') + ## packet.h (module 'network'): ns3::ByteTagIterator::Item [class] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagIterator']) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList [class] + module.add_class('ByteTagList', import_from_module='ns.network') + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator [class] + module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList']) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item [struct] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator']) ## callback.h (module 'core'): ns3::CallbackBase [class] module.add_class('CallbackBase', import_from_module='ns.core') + ## event-id.h (module 'core'): ns3::EventId [class] + module.add_class('EventId', import_from_module='ns.core') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] module.add_class('Ipv4Address', import_from_module='ns.network') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] @@ -46,14 +66,40 @@ def register_types(module): module.add_class('Ipv6Prefix', import_from_module='ns.network') ## log.h (module 'core'): ns3::LogComponent [class] module.add_class('LogComponent', import_from_module='ns.core') + ## mac48-address.h (module 'network'): ns3::Mac48Address [class] + module.add_class('Mac48Address', import_from_module='ns.network') + ## mac48-address.h (module 'network'): ns3::Mac48Address [class] + root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address']) ## node-list.h (module 'network'): ns3::NodeList [class] module.add_class('NodeList', import_from_module='ns.network') ## object-base.h (module 'core'): ns3::ObjectBase [class] module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core') ## object.h (module 'core'): ns3::ObjectDeleter [struct] module.add_class('ObjectDeleter', import_from_module='ns.core') + ## object-factory.h (module 'core'): ns3::ObjectFactory [class] + module.add_class('ObjectFactory', import_from_module='ns.core') + ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class] + module.add_class('PacketMetadata', import_from_module='ns.network') + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata']) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [enumeration] + module.add_enum('', ['PAYLOAD', 'HEADER', 'TRAILER'], outer_class=root_module['ns3::PacketMetadata::Item'], import_from_module='ns.network') + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator [class] + module.add_class('ItemIterator', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata']) + ## packet.h (module 'network'): ns3::PacketTagIterator [class] + module.add_class('PacketTagIterator', import_from_module='ns.network') + ## packet.h (module 'network'): ns3::PacketTagIterator::Item [class] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagIterator']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList [class] + module.add_class('PacketTagList', import_from_module='ns.network') + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] + module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simulator.h (module 'core'): ns3::Simulator [class] + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') + ## tag.h (module 'network'): ns3::Tag [class] + module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] module.add_class('TagBuffer', import_from_module='ns.network') ## type-id.h (module 'core'): ns3::TypeId [class] @@ -64,10 +110,20 @@ def register_types(module): module.add_class('AttributeInfo', import_from_module='ns.core', outer_class=root_module['ns3::TypeId']) ## attribute-list.h (module 'core'): ns3::UnsafeAttributeList [class] module.add_class('UnsafeAttributeList', import_from_module='ns.core') + ## vector.h (module 'core'): ns3::Vector2D [class] + module.add_class('Vector2D', import_from_module='ns.core') + ## vector.h (module 'core'): ns3::Vector3D [class] + module.add_class('Vector3D', import_from_module='ns.core') ## empty.h (module 'core'): ns3::empty [class] module.add_class('empty', import_from_module='ns.core') ## int64x64-double.h (module 'core'): ns3::int64x64_t [class] module.add_class('int64x64_t', import_from_module='ns.core') + ## animation-interface.h (module 'netanim'): ns3::AnimByteTag [class] + module.add_class('AnimByteTag', parent=root_module['ns3::Tag']) + ## chunk.h (module 'network'): ns3::Chunk [class] + module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) + ## header.h (module 'network'): ns3::Header [class] + module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -80,12 +136,20 @@ def register_types(module): module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## nstime.h (module 'core'): ns3::Time [class] module.add_class('Time', import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time [class] root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t']) + ## trailer.h (module 'network'): ns3::Trailer [class] + module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## attribute.h (module 'core'): ns3::AttributeAccessor [class] module.add_class('AttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) ## attribute.h (module 'core'): ns3::AttributeChecker [class] @@ -100,6 +164,8 @@ def register_types(module): module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class] module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## event-impl.h (module 'core'): ns3::EventImpl [class] + module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class] module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class] @@ -116,10 +182,26 @@ def register_types(module): module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class] module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] + module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] + module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class] + module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice [class] module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration] module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network') + ## nix-vector.h (module 'network'): ns3::NixVector [class] + module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) + ## node.h (module 'network'): ns3::Node [class] + module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class] + module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class] + module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## packet.h (module 'network'): ns3::Packet [class] + module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## nstime.h (module 'core'): ns3::TimeChecker [class] module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -128,16 +210,43 @@ def register_types(module): module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## type-id.h (module 'core'): ns3::TypeIdValue [class] module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## vector.h (module 'core'): ns3::Vector2DChecker [class] + module.add_class('Vector2DChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## vector.h (module 'core'): ns3::Vector2DValue [class] + module.add_class('Vector2DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## vector.h (module 'core'): ns3::Vector3DChecker [class] + module.add_class('Vector3DChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## vector.h (module 'core'): ns3::Vector3DValue [class] + module.add_class('Vector3DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## address.h (module 'network'): ns3::AddressChecker [class] module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::map< unsigned int, ns3::AnimRxInfo >', ('unsigned int', 'ns3::AnimRxInfo'), container_type='map') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogTimePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogTimePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogTimePrinter&') + typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue') + typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') + typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') + module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') + typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') + typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') + typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') + module.add_typedef(root_module['ns3::Vector3D'], 'Vector') + typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') + typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') + typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') + module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + + ## Register a nested module for the namespace Config + + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) + ## Register a nested module for the namespace FatalImpl @@ -145,37 +254,75 @@ def register_types(module): register_types_ns3_FatalImpl(nested_module) +def register_types_ns3_Config(module): + root_module = module.get_root() + + ## config.h (module 'core'): ns3::Config::MatchContainer [class] + module.add_class('MatchContainer', import_from_module='ns.core') + module.add_container('std::vector< ns3::Ptr< ns3::Object > >', 'ns3::Ptr< ns3::Object >', container_type='vector') + module.add_container('std::vector< std::string >', 'std::string', container_type='vector') + def register_types_ns3_FatalImpl(module): root_module = module.get_root() def register_methods(root_module): register_Ns3Address_methods(root_module, root_module['ns3::Address']) + register_Ns3AnimPacketInfo_methods(root_module, root_module['ns3::AnimPacketInfo']) + register_Ns3AnimRxInfo_methods(root_module, root_module['ns3::AnimRxInfo']) register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface']) register_Ns3AttributeList_methods(root_module, root_module['ns3::AttributeList']) + register_Ns3Buffer_methods(root_module, root_module['ns3::Buffer']) + register_Ns3BufferIterator_methods(root_module, root_module['ns3::Buffer::Iterator']) + register_Ns3ByteTagIterator_methods(root_module, root_module['ns3::ByteTagIterator']) + register_Ns3ByteTagIteratorItem_methods(root_module, root_module['ns3::ByteTagIterator::Item']) + register_Ns3ByteTagList_methods(root_module, root_module['ns3::ByteTagList']) + register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator']) + register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item']) register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) + register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent']) + register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3NodeList_methods(root_module, root_module['ns3::NodeList']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) + register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) + register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata']) + register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item']) + register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator']) + register_Ns3PacketTagIterator_methods(root_module, root_module['ns3::PacketTagIterator']) + register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item']) + register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) + register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) + register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) + register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) register_Ns3TypeIdAttributeInfo_methods(root_module, root_module['ns3::TypeId::AttributeInfo']) register_Ns3UnsafeAttributeList_methods(root_module, root_module['ns3::UnsafeAttributeList']) + register_Ns3Vector2D_methods(root_module, root_module['ns3::Vector2D']) + register_Ns3Vector3D_methods(root_module, root_module['ns3::Vector3D']) register_Ns3Empty_methods(root_module, root_module['ns3::empty']) register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t']) + register_Ns3AnimByteTag_methods(root_module, root_module['ns3::AnimByteTag']) + register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk']) + register_Ns3Header_methods(root_module, root_module['ns3::Header']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3Time_methods(root_module, root_module['ns3::Time']) + register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer']) register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor']) register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker']) register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue']) @@ -183,6 +330,7 @@ def register_methods(root_module): register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase']) register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue']) register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) + register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue']) register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker']) @@ -191,13 +339,26 @@ def register_methods(root_module): register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) + register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) + register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) + register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) + register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) + register_Ns3Node_methods(root_module, root_module['ns3::Node']) + register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) + register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) + register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) + register_Ns3Vector2DChecker_methods(root_module, root_module['ns3::Vector2DChecker']) + register_Ns3Vector2DValue_methods(root_module, root_module['ns3::Vector2DValue']) + register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker']) + register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue']) register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker']) register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue']) + register_Ns3ConfigMatchContainer_methods(root_module, root_module['ns3::Config::MatchContainer']) return def register_Ns3Address_methods(root_module, cls): @@ -270,11 +431,77 @@ def register_Ns3Address_methods(root_module, cls): is_const=True) return +def register_Ns3AnimPacketInfo_methods(root_module, cls): + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::AnimPacketInfo(ns3::AnimPacketInfo const & arg0) [copy constructor] + cls.add_constructor([param('ns3::AnimPacketInfo const &', 'arg0')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::AnimPacketInfo() [constructor] + cls.add_constructor([]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::AnimPacketInfo(ns3::Ptr tx_nd, ns3::Time const & fbTx, ns3::Time const & lbTx, ns3::Vector txLoc) [constructor] + cls.add_constructor([param('ns3::Ptr< ns3::NetDevice const >', 'tx_nd'), param('ns3::Time const &', 'fbTx'), param('ns3::Time const &', 'lbTx'), param('ns3::Vector', 'txLoc')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo ns3::AnimPacketInfo::GetRxInfo(ns3::Ptr nd) [member function] + cls.add_method('GetRxInfo', + 'ns3::AnimRxInfo', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd')]) + ## animation-interface-helper.h (module 'netanim'): void ns3::AnimPacketInfo::ProcessRxBegin(ns3::Ptr nd, ns3::Time const & fbRx) [member function] + cls.add_method('ProcessRxBegin', + 'void', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd'), param('ns3::Time const &', 'fbRx')]) + ## animation-interface-helper.h (module 'netanim'): void ns3::AnimPacketInfo::ProcessRxDrop(ns3::Ptr nd) [member function] + cls.add_method('ProcessRxDrop', + 'void', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd')]) + ## animation-interface-helper.h (module 'netanim'): bool ns3::AnimPacketInfo::ProcessRxEnd(ns3::Ptr nd, ns3::Time const & fbRx, ns3::Vector rxLoc) [member function] + cls.add_method('ProcessRxEnd', + 'bool', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd'), param('ns3::Time const &', 'fbRx'), param('ns3::Vector', 'rxLoc')]) + ## animation-interface-helper.h (module 'netanim'): void ns3::AnimPacketInfo::RemoveRxInfo(ns3::Ptr nd) [member function] + cls.add_method('RemoveRxInfo', + 'void', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::firstlastbitDelta [variable] + cls.add_instance_attribute('firstlastbitDelta', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_fbTx [variable] + cls.add_instance_attribute('m_fbTx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_lbTx [variable] + cls.add_instance_attribute('m_lbTx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_rx [variable] + cls.add_instance_attribute('m_rx', 'std::map< unsigned int, ns3::AnimRxInfo >', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_txLoc [variable] + cls.add_instance_attribute('m_txLoc', 'ns3::Vector', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_txnd [variable] + cls.add_instance_attribute('m_txnd', 'ns3::Ptr< ns3::NetDevice const >', is_const=False) + return + +def register_Ns3AnimRxInfo_methods(root_module, cls): + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::AnimRxInfo(ns3::AnimRxInfo const & arg0) [copy constructor] + cls.add_constructor([param('ns3::AnimRxInfo const &', 'arg0')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::AnimRxInfo() [constructor] + cls.add_constructor([]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::AnimRxInfo(ns3::Time const & fbRx, ns3::Ptr nd, double rxRange) [constructor] + cls.add_constructor([param('ns3::Time const &', 'fbRx'), param('ns3::Ptr< ns3::NetDevice const >', 'nd'), param('double', 'rxRange')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::m_fbRx [variable] + cls.add_instance_attribute('m_fbRx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::m_lbRx [variable] + cls.add_instance_attribute('m_lbRx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::m_rxnd [variable] + cls.add_instance_attribute('m_rxnd', 'ns3::Ptr< ns3::NetDevice const >', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::rxRange [variable] + cls.add_instance_attribute('rxRange', 'double', is_const=False) + return + def register_Ns3AnimationInterface_methods(root_module, cls): ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface(ns3::AnimationInterface const & arg0) [copy constructor] cls.add_constructor([param('ns3::AnimationInterface const &', 'arg0')]) ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface() [constructor] cls.add_constructor([]) + ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface(std::string const filename, bool usingXML=true) [constructor] + cls.add_constructor([param('std::string const', 'filename'), param('bool', 'usingXML', default_value='true')]) + ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface(uint16_t port, bool usingXML=true) [constructor] + cls.add_constructor([param('uint16_t', 'port'), param('bool', 'usingXML', default_value='true')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetMobilityPollInterval(ns3::Time t) [member function] + cls.add_method('SetMobilityPollInterval', + 'void', + [param('ns3::Time', 't')]) ## animation-interface.h (module 'netanim'): bool ns3::AnimationInterface::SetOutputFile(std::string const & fn) [member function] cls.add_method('SetOutputFile', 'bool', @@ -283,6 +510,10 @@ def register_Ns3AnimationInterface_methods(root_module, cls): cls.add_method('SetServerPort', 'bool', [param('uint16_t', 'port')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetXMLOutput() [member function] + cls.add_method('SetXMLOutput', + 'void', + []) ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::StartAnimation() [member function] cls.add_method('StartAnimation', 'void', @@ -330,6 +561,355 @@ def register_Ns3AttributeList_methods(root_module, cls): [param('ns3::TypeId', 'tid'), param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) return +def register_Ns3Buffer_methods(root_module, cls): + ## buffer.h (module 'network'): ns3::Buffer::Buffer() [constructor] + cls.add_constructor([]) + ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize) [constructor] + cls.add_constructor([param('uint32_t', 'dataSize')]) + ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize, bool initialize) [constructor] + cls.add_constructor([param('uint32_t', 'dataSize'), param('bool', 'initialize')]) + ## buffer.h (module 'network'): ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor] + cls.add_constructor([param('ns3::Buffer const &', 'o')]) + ## buffer.h (module 'network'): bool ns3::Buffer::AddAtEnd(uint32_t end) [member function] + cls.add_method('AddAtEnd', + 'bool', + [param('uint32_t', 'end')]) + ## buffer.h (module 'network'): void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('ns3::Buffer const &', 'o')]) + ## buffer.h (module 'network'): bool ns3::Buffer::AddAtStart(uint32_t start) [member function] + cls.add_method('AddAtStart', + 'bool', + [param('uint32_t', 'start')]) + ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function] + cls.add_method('Begin', + 'ns3::Buffer::Iterator', + [], + is_const=True) + ## buffer.h (module 'network'): void ns3::Buffer::CopyData(std::ostream * os, uint32_t size) const [member function] + cls.add_method('CopyData', + 'void', + [param('std::ostream *', 'os'), param('uint32_t', 'size')], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::CopyData(uint8_t * buffer, uint32_t size) const [member function] + cls.add_method('CopyData', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], + is_const=True) + ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function] + cls.add_method('CreateFragment', + 'ns3::Buffer', + [param('uint32_t', 'start'), param('uint32_t', 'length')], + is_const=True) + ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function] + cls.add_method('CreateFullCopy', + 'ns3::Buffer', + [], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::End() const [member function] + cls.add_method('End', + 'ns3::Buffer::Iterator', + [], + is_const=True) + ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentEndOffset() const [member function] + cls.add_method('GetCurrentEndOffset', + 'int32_t', + [], + is_const=True) + ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentStartOffset() const [member function] + cls.add_method('GetCurrentStartOffset', + 'int32_t', + [], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSize() const [member function] + cls.add_method('GetSize', + 'uint32_t', + [], + is_const=True) + ## buffer.h (module 'network'): uint8_t const * ns3::Buffer::PeekData() const [member function] + cls.add_method('PeekData', + 'uint8_t const *', + [], + is_const=True) + ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function] + cls.add_method('RemoveAtEnd', + 'void', + [param('uint32_t', 'end')]) + ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtStart(uint32_t start) [member function] + cls.add_method('RemoveAtStart', + 'void', + [param('uint32_t', 'start')]) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + return + +def register_Ns3BufferIterator_methods(root_module, cls): + ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator(ns3::Buffer::Iterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Buffer::Iterator const &', 'arg0')]) + ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator() [constructor] + cls.add_constructor([]) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function] + cls.add_method('CalculateIpChecksum', + 'uint16_t', + [param('uint16_t', 'size')]) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function] + cls.add_method('CalculateIpChecksum', + 'uint16_t', + [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')]) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function] + cls.add_method('GetDistanceFrom', + 'uint32_t', + [param('ns3::Buffer::Iterator const &', 'o')], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function] + cls.add_method('GetSize', + 'uint32_t', + [], + is_const=True) + ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsEnd() const [member function] + cls.add_method('IsEnd', + 'bool', + [], + is_const=True) + ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsStart() const [member function] + cls.add_method('IsStart', + 'bool', + [], + is_const=True) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next() [member function] + cls.add_method('Next', + 'void', + []) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next(uint32_t delta) [member function] + cls.add_method('Next', + 'void', + [param('uint32_t', 'delta')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev() [member function] + cls.add_method('Prev', + 'void', + []) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function] + cls.add_method('Prev', + 'void', + [param('uint32_t', 'delta')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function] + cls.add_method('Read', + 'void', + [param('uint8_t *', 'buffer'), param('uint32_t', 'size')]) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function] + cls.add_method('ReadLsbtohU16', + 'uint16_t', + []) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function] + cls.add_method('ReadLsbtohU32', + 'uint32_t', + []) + ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function] + cls.add_method('ReadLsbtohU64', + 'uint64_t', + []) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function] + cls.add_method('ReadNtohU16', + 'uint16_t', + []) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function] + cls.add_method('ReadNtohU32', + 'uint32_t', + []) + ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function] + cls.add_method('ReadNtohU64', + 'uint64_t', + []) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadU16() [member function] + cls.add_method('ReadU16', + 'uint16_t', + []) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadU32() [member function] + cls.add_method('ReadU32', + 'uint32_t', + []) + ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadU64() [member function] + cls.add_method('ReadU64', + 'uint64_t', + []) + ## buffer.h (module 'network'): uint8_t ns3::Buffer::Iterator::ReadU8() [member function] + cls.add_method('ReadU8', + 'uint8_t', + []) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function] + cls.add_method('Write', + 'void', + [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function] + cls.add_method('WriteHtolsbU16', + 'void', + [param('uint16_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function] + cls.add_method('WriteHtolsbU32', + 'void', + [param('uint32_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function] + cls.add_method('WriteHtolsbU64', + 'void', + [param('uint64_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function] + cls.add_method('WriteHtonU16', + 'void', + [param('uint16_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function] + cls.add_method('WriteHtonU32', + 'void', + [param('uint32_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function] + cls.add_method('WriteHtonU64', + 'void', + [param('uint64_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function] + cls.add_method('WriteU16', + 'void', + [param('uint16_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function] + cls.add_method('WriteU32', + 'void', + [param('uint32_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function] + cls.add_method('WriteU64', + 'void', + [param('uint64_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function] + cls.add_method('WriteU8', + 'void', + [param('uint8_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function] + cls.add_method('WriteU8', + 'void', + [param('uint8_t', 'data'), param('uint32_t', 'len')]) + return + +def register_Ns3ByteTagIterator_methods(root_module, cls): + ## packet.h (module 'network'): ns3::ByteTagIterator::ByteTagIterator(ns3::ByteTagIterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagIterator const &', 'arg0')]) + ## packet.h (module 'network'): bool ns3::ByteTagIterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## packet.h (module 'network'): ns3::ByteTagIterator::Item ns3::ByteTagIterator::Next() [member function] + cls.add_method('Next', + 'ns3::ByteTagIterator::Item', + []) + return + +def register_Ns3ByteTagIteratorItem_methods(root_module, cls): + ## packet.h (module 'network'): ns3::ByteTagIterator::Item::Item(ns3::ByteTagIterator::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagIterator::Item const &', 'arg0')]) + ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetEnd() const [member function] + cls.add_method('GetEnd', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetStart() const [member function] + cls.add_method('GetStart', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): void ns3::ByteTagIterator::Item::GetTag(ns3::Tag & tag) const [member function] + cls.add_method('GetTag', + 'void', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): ns3::TypeId ns3::ByteTagIterator::Item::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + return + +def register_Ns3ByteTagList_methods(root_module, cls): + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList() [constructor] + cls.add_constructor([]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList(ns3::ByteTagList const & o) [copy constructor] + cls.add_constructor([param('ns3::ByteTagList const &', 'o')]) + ## byte-tag-list.h (module 'network'): ns3::TagBuffer ns3::ByteTagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function] + cls.add_method('Add', + 'ns3::TagBuffer', + [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')]) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::Add(ns3::ByteTagList const & o) [member function] + cls.add_method('Add', + 'void', + [param('ns3::ByteTagList const &', 'o')]) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')]) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function] + cls.add_method('AddAtStart', + 'void', + [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator ns3::ByteTagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function] + cls.add_method('Begin', + 'ns3::ByteTagList::Iterator', + [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], + is_const=True) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::RemoveAll() [member function] + cls.add_method('RemoveAll', + 'void', + []) + return + +def register_Ns3ByteTagListIterator_methods(root_module, cls): + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Iterator(ns3::ByteTagList::Iterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagList::Iterator const &', 'arg0')]) + ## byte-tag-list.h (module 'network'): uint32_t ns3::ByteTagList::Iterator::GetOffsetStart() const [member function] + cls.add_method('GetOffsetStart', + 'uint32_t', + [], + is_const=True) + ## byte-tag-list.h (module 'network'): bool ns3::ByteTagList::Iterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item ns3::ByteTagList::Iterator::Next() [member function] + cls.add_method('Next', + 'ns3::ByteTagList::Iterator::Item', + []) + return + +def register_Ns3ByteTagListIteratorItem_methods(root_module, cls): + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::ByteTagList::Iterator::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagList::Iterator::Item const &', 'arg0')]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor] + cls.add_constructor([param('ns3::TagBuffer', 'buf')]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::buf [variable] + cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::end [variable] + cls.add_instance_attribute('end', 'int32_t', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::size [variable] + cls.add_instance_attribute('size', 'uint32_t', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::start [variable] + cls.add_instance_attribute('start', 'int32_t', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::tid [variable] + cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False) + return + def register_Ns3CallbackBase_methods(root_module, cls): ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::CallbackBase const & arg0) [copy constructor] cls.add_constructor([param('ns3::CallbackBase const &', 'arg0')]) @@ -350,6 +930,51 @@ def register_Ns3CallbackBase_methods(root_module, cls): is_static=True, visibility='protected') return +def register_Ns3EventId_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('==') + ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EventId const &', 'arg0')]) + ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor] + cls.add_constructor([]) + ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor] + cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')]) + ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function] + cls.add_method('Cancel', + 'void', + []) + ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_const=True) + ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function] + cls.add_method('GetTs', + 'uint64_t', + [], + is_const=True) + ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function] + cls.add_method('GetUid', + 'uint32_t', + [], + is_const=True) + ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function] + cls.add_method('IsExpired', + 'bool', + [], + is_const=True) + ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function] + cls.add_method('IsRunning', + 'bool', + [], + is_const=True) + ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function] + cls.add_method('PeekEventImpl', + 'ns3::EventImpl *', + [], + is_const=True) + return + def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -767,6 +1392,78 @@ def register_Ns3LogComponent_methods(root_module, cls): is_const=True) return +def register_Ns3Mac48Address_methods(root_module, cls): + cls.add_binary_comparison_operator('<') + cls.add_binary_comparison_operator('!=') + cls.add_output_stream_operator() + cls.add_binary_comparison_operator('==') + ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')]) + ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address() [constructor] + cls.add_constructor([]) + ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(char const * str) [constructor] + cls.add_constructor([param('char const *', 'str')]) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::Allocate() [member function] + cls.add_method('Allocate', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::ConvertFrom(ns3::Address const & address) [member function] + cls.add_method('ConvertFrom', + 'ns3::Mac48Address', + [param('ns3::Address const &', 'address')], + is_static=True) + ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyFrom(uint8_t const * buffer) [member function] + cls.add_method('CopyFrom', + 'void', + [param('uint8_t const *', 'buffer')]) + ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyTo(uint8_t * buffer) const [member function] + cls.add_method('CopyTo', + 'void', + [param('uint8_t *', 'buffer')], + is_const=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetBroadcast() [member function] + cls.add_method('GetBroadcast', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv4Address address) [member function] + cls.add_method('GetMulticast', + 'ns3::Mac48Address', + [param('ns3::Ipv4Address', 'address')], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv6Address address) [member function] + cls.add_method('GetMulticast', + 'ns3::Mac48Address', + [param('ns3::Ipv6Address', 'address')], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast6Prefix() [member function] + cls.add_method('GetMulticast6Prefix', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticastPrefix() [member function] + cls.add_method('GetMulticastPrefix', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsBroadcast() const [member function] + cls.add_method('IsBroadcast', + 'bool', + [], + is_const=True) + ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsGroup() const [member function] + cls.add_method('IsGroup', + 'bool', + [], + is_const=True) + ## mac48-address.h (module 'network'): static bool ns3::Mac48Address::IsMatchingType(ns3::Address const & address) [member function] + cls.add_method('IsMatchingType', + 'bool', + [param('ns3::Address const &', 'address')], + is_static=True) + return + def register_Ns3NodeList_methods(root_module, cls): ## node-list.h (module 'network'): ns3::NodeList::NodeList() [constructor] cls.add_constructor([]) @@ -872,6 +1569,231 @@ def register_Ns3ObjectDeleter_methods(root_module, cls): is_static=True) return +def register_Ns3ObjectFactory_methods(root_module, cls): + cls.add_output_stream_operator() + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactory::Create() const [member function] + cls.add_method('Create', + 'ns3::Ptr< ns3::Object >', + [], + is_const=True) + ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(ns3::AttributeList const & list) [member function] + cls.add_method('Set', + 'void', + [param('ns3::AttributeList const &', 'list')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('ns3::TypeId', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('char const *', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('std::string', 'tid')]) + return + +def register_Ns3PacketMetadata_methods(root_module, cls): + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor] + cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(ns3::PacketMetadata const & o) [copy constructor] + cls.add_constructor([param('ns3::PacketMetadata const &', 'o')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddAtEnd(ns3::PacketMetadata const & o) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('ns3::PacketMetadata const &', 'o')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddHeader(ns3::Header const & header, uint32_t size) [member function] + cls.add_method('AddHeader', + 'void', + [param('ns3::Header const &', 'header'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddPaddingAtEnd(uint32_t end) [member function] + cls.add_method('AddPaddingAtEnd', + 'void', + [param('uint32_t', 'end')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddTrailer(ns3::Trailer const & trailer, uint32_t size) [member function] + cls.add_method('AddTrailer', + 'void', + [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::PacketMetadata::BeginItem(ns3::Buffer buffer) const [member function] + cls.add_method('BeginItem', + 'ns3::PacketMetadata::ItemIterator', + [param('ns3::Buffer', 'buffer')], + is_const=True) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata ns3::PacketMetadata::CreateFragment(uint32_t start, uint32_t end) const [member function] + cls.add_method('CreateFragment', + 'ns3::PacketMetadata', + [param('uint32_t', 'start'), param('uint32_t', 'end')], + is_const=True) + ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::Enable() [member function] + cls.add_method('Enable', + 'void', + [], + is_static=True) + ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::EnableChecking() [member function] + cls.add_method('EnableChecking', + 'void', + [], + is_static=True) + ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## packet-metadata.h (module 'network'): uint64_t ns3::PacketMetadata::GetUid() const [member function] + cls.add_method('GetUid', + 'uint64_t', + [], + is_const=True) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtEnd(uint32_t end) [member function] + cls.add_method('RemoveAtEnd', + 'void', + [param('uint32_t', 'end')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtStart(uint32_t start) [member function] + cls.add_method('RemoveAtStart', + 'void', + [param('uint32_t', 'start')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveHeader(ns3::Header const & header, uint32_t size) [member function] + cls.add_method('RemoveHeader', + 'void', + [param('ns3::Header const &', 'header'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveTrailer(ns3::Trailer const & trailer, uint32_t size) [member function] + cls.add_method('RemoveTrailer', + 'void', + [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + return + +def register_Ns3PacketMetadataItem_methods(root_module, cls): + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item() [constructor] + cls.add_constructor([]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item(ns3::PacketMetadata::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketMetadata::Item const &', 'arg0')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::current [variable] + cls.add_instance_attribute('current', 'ns3::Buffer::Iterator', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentSize [variable] + cls.add_instance_attribute('currentSize', 'uint32_t', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromEnd [variable] + cls.add_instance_attribute('currentTrimedFromEnd', 'uint32_t', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromStart [variable] + cls.add_instance_attribute('currentTrimedFromStart', 'uint32_t', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::isFragment [variable] + cls.add_instance_attribute('isFragment', 'bool', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::tid [variable] + cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False) + return + +def register_Ns3PacketMetadataItemIterator_methods(root_module, cls): + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata::ItemIterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketMetadata::ItemIterator const &', 'arg0')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata const * metadata, ns3::Buffer buffer) [constructor] + cls.add_constructor([param('ns3::PacketMetadata const *', 'metadata'), param('ns3::Buffer', 'buffer')]) + ## packet-metadata.h (module 'network'): bool ns3::PacketMetadata::ItemIterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item ns3::PacketMetadata::ItemIterator::Next() [member function] + cls.add_method('Next', + 'ns3::PacketMetadata::Item', + []) + return + +def register_Ns3PacketTagIterator_methods(root_module, cls): + ## packet.h (module 'network'): ns3::PacketTagIterator::PacketTagIterator(ns3::PacketTagIterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketTagIterator const &', 'arg0')]) + ## packet.h (module 'network'): bool ns3::PacketTagIterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## packet.h (module 'network'): ns3::PacketTagIterator::Item ns3::PacketTagIterator::Next() [member function] + cls.add_method('Next', + 'ns3::PacketTagIterator::Item', + []) + return + +def register_Ns3PacketTagIteratorItem_methods(root_module, cls): + ## packet.h (module 'network'): ns3::PacketTagIterator::Item::Item(ns3::PacketTagIterator::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketTagIterator::Item const &', 'arg0')]) + ## packet.h (module 'network'): void ns3::PacketTagIterator::Item::GetTag(ns3::Tag & tag) const [member function] + cls.add_method('GetTag', + 'void', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): ns3::TypeId ns3::PacketTagIterator::Item::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + return + +def register_Ns3PacketTagList_methods(root_module, cls): + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList() [constructor] + cls.add_constructor([]) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList(ns3::PacketTagList const & o) [copy constructor] + cls.add_constructor([param('ns3::PacketTagList const &', 'o')]) + ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::Add(ns3::Tag const & tag) const [member function] + cls.add_method('Add', + 'void', + [param('ns3::Tag const &', 'tag')], + is_const=True) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData const * ns3::PacketTagList::Head() const [member function] + cls.add_method('Head', + 'ns3::PacketTagList::TagData const *', + [], + is_const=True) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Peek(ns3::Tag & tag) const [member function] + cls.add_method('Peek', + 'bool', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Remove(ns3::Tag & tag) [member function] + cls.add_method('Remove', + 'bool', + [param('ns3::Tag &', 'tag')]) + ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::RemoveAll() [member function] + cls.add_method('RemoveAll', + 'void', + []) + return + +def register_Ns3PacketTagListTagData_methods(root_module, cls): + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData() [constructor] + cls.add_constructor([]) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData(ns3::PacketTagList::TagData const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketTagList::TagData const &', 'arg0')]) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::count [variable] + cls.add_instance_attribute('count', 'uint32_t', is_const=False) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::data [variable] + cls.add_instance_attribute('data', 'uint8_t [ 20 ]', is_const=False) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::next [variable] + cls.add_instance_attribute('next', 'ns3::PacketTagList::TagData *', is_const=False) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::tid [variable] + cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False) + return + def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -884,6 +1806,128 @@ def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods is_static=True) return +def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) + ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static ns3::Ptr ns3::Simulator::GetImplementation() [member function] + cls.add_method('GetImplementation', + 'ns3::Ptr< ns3::SimulatorImpl >', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] + cls.add_method('RunOneEvent', + 'void', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + cls.add_method('SetImplementation', + 'void', + [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::ObjectFactory', 'schedulerFactory')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time const &', 'time')], + is_static=True) + return + +def register_Ns3Tag_methods(root_module, cls): + ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] + cls.add_constructor([]) + ## tag.h (module 'network'): ns3::Tag::Tag(ns3::Tag const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Tag const &', 'arg0')]) + ## tag.h (module 'network'): void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function] + cls.add_method('Deserialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_pure_virtual=True, is_virtual=True) + ## tag.h (module 'network'): uint32_t ns3::Tag::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## tag.h (module 'network'): static ns3::TypeId ns3::Tag::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## tag.h (module 'network'): void ns3::Tag::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## tag.h (module 'network'): void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3TagBuffer_methods(root_module, cls): ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(ns3::TagBuffer const & arg0) [copy constructor] cls.add_constructor([param('ns3::TagBuffer const &', 'arg0')]) @@ -1154,6 +2198,36 @@ def register_Ns3UnsafeAttributeList_methods(root_module, cls): [param('std::string', 'name'), param('ns3::AttributeValue const &', 'param')]) return +def register_Ns3Vector2D_methods(root_module, cls): + cls.add_output_stream_operator() + ## vector.h (module 'core'): ns3::Vector2D::Vector2D(ns3::Vector2D const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector2D const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector2D::Vector2D(double _x, double _y) [constructor] + cls.add_constructor([param('double', '_x'), param('double', '_y')]) + ## vector.h (module 'core'): ns3::Vector2D::Vector2D() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector2D::x [variable] + cls.add_instance_attribute('x', 'double', is_const=False) + ## vector.h (module 'core'): ns3::Vector2D::y [variable] + cls.add_instance_attribute('y', 'double', is_const=False) + return + +def register_Ns3Vector3D_methods(root_module, cls): + cls.add_output_stream_operator() + ## vector.h (module 'core'): ns3::Vector3D::Vector3D(ns3::Vector3D const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector3D const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector3D::Vector3D(double _x, double _y, double _z) [constructor] + cls.add_constructor([param('double', '_x'), param('double', '_y'), param('double', '_z')]) + ## vector.h (module 'core'): ns3::Vector3D::Vector3D() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector3D::x [variable] + cls.add_instance_attribute('x', 'double', is_const=False) + ## vector.h (module 'core'): ns3::Vector3D::y [variable] + cls.add_instance_attribute('y', 'double', is_const=False) + ## vector.h (module 'core'): ns3::Vector3D::z [variable] + cls.add_instance_attribute('z', 'double', is_const=False) + return + def register_Ns3Empty_methods(root_module, cls): ## empty.h (module 'core'): ns3::empty::empty() [constructor] cls.add_constructor([]) @@ -1268,6 +2342,107 @@ def register_Ns3Int64x64_t_methods(root_module, cls): [param('ns3::int64x64_t const &', 'o')]) return +def register_Ns3AnimByteTag_methods(root_module, cls): + ## animation-interface.h (module 'netanim'): ns3::AnimByteTag::AnimByteTag() [constructor] + cls.add_constructor([]) + ## animation-interface.h (module 'netanim'): ns3::AnimByteTag::AnimByteTag(ns3::AnimByteTag const & arg0) [copy constructor] + cls.add_constructor([param('ns3::AnimByteTag const &', 'arg0')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Deserialize(ns3::TagBuffer i) [member function] + cls.add_method('Deserialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_virtual=True) + ## animation-interface.h (module 'netanim'): uint64_t ns3::AnimByteTag::Get() const [member function] + cls.add_method('Get', + 'uint64_t', + [], + is_const=True) + ## animation-interface.h (module 'netanim'): ns3::TypeId ns3::AnimByteTag::GetInstanceTypeId() const [member function] + cls.add_method('GetInstanceTypeId', + 'ns3::TypeId', + [], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): uint32_t ns3::AnimByteTag::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): static ns3::TypeId ns3::AnimByteTag::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Serialize(ns3::TagBuffer i) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Set(uint64_t AnimUid) [member function] + cls.add_method('Set', + 'void', + [param('uint64_t', 'AnimUid')]) + return + +def register_Ns3Chunk_methods(root_module, cls): + ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor] + cls.add_constructor([]) + ## chunk.h (module 'network'): ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Chunk const &', 'arg0')]) + ## chunk.h (module 'network'): uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_virtual=True) + ## chunk.h (module 'network'): static ns3::TypeId ns3::Chunk::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## chunk.h (module 'network'): void ns3::Chunk::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + +def register_Ns3Header_methods(root_module, cls): + cls.add_output_stream_operator() + ## header.h (module 'network'): ns3::Header::Header() [constructor] + cls.add_constructor([]) + ## header.h (module 'network'): ns3::Header::Header(ns3::Header const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Header const &', 'arg0')]) + ## header.h (module 'network'): uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_virtual=True) + ## header.h (module 'network'): uint32_t ns3::Header::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## header.h (module 'network'): static ns3::TypeId ns3::Header::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## header.h (module 'network'): void ns3::Header::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## header.h (module 'network'): void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3Object_methods(root_module, cls): ## object.h (module 'core'): ns3::Object::Object() [constructor] cls.add_constructor([]) @@ -1382,6 +2557,42 @@ def register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__ is_static=True) return +def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + +def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter< ns3::NixVector > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + +def register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter< ns3::Packet > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + def register_Ns3Time_methods(root_module, cls): cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) @@ -1538,6 +2749,39 @@ def register_Ns3Time_methods(root_module, cls): is_const=True) return +def register_Ns3Trailer_methods(root_module, cls): + cls.add_output_stream_operator() + ## trailer.h (module 'network'): ns3::Trailer::Trailer() [constructor] + cls.add_constructor([]) + ## trailer.h (module 'network'): ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Trailer const &', 'arg0')]) + ## trailer.h (module 'network'): uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'end')], + is_pure_virtual=True, is_virtual=True) + ## trailer.h (module 'network'): uint32_t ns3::Trailer::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## trailer.h (module 'network'): static ns3::TypeId ns3::Trailer::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## trailer.h (module 'network'): void ns3::Trailer::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## trailer.h (module 'network'): void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3AttributeAccessor_methods(root_module, cls): ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor(ns3::AttributeAccessor const & arg0) [copy constructor] cls.add_constructor([param('ns3::AttributeAccessor const &', 'arg0')]) @@ -1693,6 +2937,30 @@ def register_Ns3EmptyAttributeValue_methods(root_module, cls): is_const=True, visibility='private', is_virtual=True) return +def register_Ns3EventImpl_methods(root_module, cls): + ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EventImpl const &', 'arg0')]) + ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor] + cls.add_constructor([]) + ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function] + cls.add_method('Cancel', + 'void', + []) + ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function] + cls.add_method('Invoke', + 'void', + []) + ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function] + cls.add_method('IsCancelled', + 'bool', + []) + ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function] + cls.add_method('Notify', + 'void', + [], + is_pure_virtual=True, visibility='protected', is_virtual=True) + return + def register_Ns3Ipv4AddressChecker_methods(root_module, cls): ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor] cls.add_constructor([]) @@ -1853,6 +3121,97 @@ def register_Ns3Ipv6PrefixValue_methods(root_module, cls): [param('ns3::Ipv6Prefix const &', 'value')]) return +def register_Ns3Mac48AddressChecker_methods(root_module, cls): + ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] + cls.add_constructor([]) + ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker(ns3::Mac48AddressChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Mac48AddressChecker const &', 'arg0')]) + return + +def register_Ns3Mac48AddressValue_methods(root_module, cls): + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue() [constructor] + cls.add_constructor([]) + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48AddressValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Mac48AddressValue const &', 'arg0')]) + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48Address const & value) [constructor] + cls.add_constructor([param('ns3::Mac48Address const &', 'value')]) + ## mac48-address.h (module 'network'): ns3::Ptr ns3::Mac48AddressValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## mac48-address.h (module 'network'): bool ns3::Mac48AddressValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## mac48-address.h (module 'network'): ns3::Mac48Address ns3::Mac48AddressValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Mac48Address', + [], + is_const=True) + ## mac48-address.h (module 'network'): std::string ns3::Mac48AddressValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## mac48-address.h (module 'network'): void ns3::Mac48AddressValue::Set(ns3::Mac48Address const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Mac48Address const &', 'value')]) + return + +def register_Ns3MobilityModel_methods(root_module, cls): + ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel(ns3::MobilityModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::MobilityModel const &', 'arg0')]) + ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel() [constructor] + cls.add_constructor([]) + ## mobility-model.h (module 'mobility'): double ns3::MobilityModel::GetDistanceFrom(ns3::Ptr position) const [member function] + cls.add_method('GetDistanceFrom', + 'double', + [param('ns3::Ptr< ns3::MobilityModel const >', 'position')], + is_const=True) + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetPosition() const [member function] + cls.add_method('GetPosition', + 'ns3::Vector', + [], + is_const=True) + ## mobility-model.h (module 'mobility'): static ns3::TypeId ns3::MobilityModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetVelocity() const [member function] + cls.add_method('GetVelocity', + 'ns3::Vector', + [], + is_const=True) + ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::SetPosition(ns3::Vector const & position) [member function] + cls.add_method('SetPosition', + 'void', + [param('ns3::Vector const &', 'position')]) + ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::NotifyCourseChange() const [member function] + cls.add_method('NotifyCourseChange', + 'void', + [], + is_const=True, visibility='protected') + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetPosition() const [member function] + cls.add_method('DoGetPosition', + 'ns3::Vector', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetVelocity() const [member function] + cls.add_method('DoGetVelocity', + 'ns3::Vector', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::DoSetPosition(ns3::Vector const & position) [member function] + cls.add_method('DoSetPosition', + 'void', + [param('ns3::Vector const &', 'position')], + is_pure_virtual=True, visibility='private', is_virtual=True) + return + def register_Ns3NetDevice_methods(root_module, cls): ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor] cls.add_constructor([]) @@ -1985,6 +3344,354 @@ def register_Ns3NetDevice_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3NixVector_methods(root_module, cls): + cls.add_output_stream_operator() + ## nix-vector.h (module 'network'): ns3::NixVector::NixVector() [constructor] + cls.add_constructor([]) + ## nix-vector.h (module 'network'): ns3::NixVector::NixVector(ns3::NixVector const & o) [copy constructor] + cls.add_constructor([param('ns3::NixVector const &', 'o')]) + ## nix-vector.h (module 'network'): void ns3::NixVector::AddNeighborIndex(uint32_t newBits, uint32_t numberOfBits) [member function] + cls.add_method('AddNeighborIndex', + 'void', + [param('uint32_t', 'newBits'), param('uint32_t', 'numberOfBits')]) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::BitCount(uint32_t numberOfNeighbors) const [member function] + cls.add_method('BitCount', + 'uint32_t', + [param('uint32_t', 'numberOfNeighbors')], + is_const=True) + ## nix-vector.h (module 'network'): ns3::Ptr ns3::NixVector::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::NixVector >', + [], + is_const=True) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')]) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::ExtractNeighborIndex(uint32_t numberOfBits) [member function] + cls.add_method('ExtractNeighborIndex', + 'uint32_t', + [param('uint32_t', 'numberOfBits')]) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetRemainingBits() [member function] + cls.add_method('GetRemainingBits', + 'uint32_t', + []) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Serialize(uint32_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint32_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + return + +def register_Ns3Node_methods(root_module, cls): + ## node.h (module 'network'): ns3::Node::Node(ns3::Node const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Node const &', 'arg0')]) + ## node.h (module 'network'): ns3::Node::Node() [constructor] + cls.add_constructor([]) + ## node.h (module 'network'): ns3::Node::Node(uint32_t systemId) [constructor] + cls.add_constructor([param('uint32_t', 'systemId')]) + ## node.h (module 'network'): uint32_t ns3::Node::AddApplication(ns3::Ptr application) [member function] + cls.add_method('AddApplication', + 'uint32_t', + [param('ns3::Ptr< ns3::Application >', 'application')]) + ## node.h (module 'network'): uint32_t ns3::Node::AddDevice(ns3::Ptr device) [member function] + cls.add_method('AddDevice', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')]) + ## node.h (module 'network'): static bool ns3::Node::ChecksumEnabled() [member function] + cls.add_method('ChecksumEnabled', + 'bool', + [], + is_static=True) + ## node.h (module 'network'): ns3::Ptr ns3::Node::GetApplication(uint32_t index) const [member function] + cls.add_method('GetApplication', + 'ns3::Ptr< ns3::Application >', + [param('uint32_t', 'index')], + is_const=True) + ## node.h (module 'network'): ns3::Ptr ns3::Node::GetDevice(uint32_t index) const [member function] + cls.add_method('GetDevice', + 'ns3::Ptr< ns3::NetDevice >', + [param('uint32_t', 'index')], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetId() const [member function] + cls.add_method('GetId', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetNApplications() const [member function] + cls.add_method('GetNApplications', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetNDevices() const [member function] + cls.add_method('GetNDevices', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetSystemId() const [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): static ns3::TypeId ns3::Node::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) + ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] + cls.add_method('RegisterProtocolHandler', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) + ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] + cls.add_method('UnregisterProtocolHandler', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler')]) + ## node.h (module 'network'): void ns3::Node::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + ## node.h (module 'network'): void ns3::Node::DoStart() [member function] + cls.add_method('DoStart', + 'void', + [], + visibility='protected', is_virtual=True) + return + +def register_Ns3ObjectFactoryChecker_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')]) + return + +def register_Ns3ObjectFactoryValue_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'value')]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactoryValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function] + cls.add_method('Get', + 'ns3::ObjectFactory', + [], + is_const=True) + ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::ObjectFactory const &', 'value')]) + return + +def register_Ns3Packet_methods(root_module, cls): + cls.add_output_stream_operator() + ## packet.h (module 'network'): ns3::Packet::Packet() [constructor] + cls.add_constructor([]) + ## packet.h (module 'network'): ns3::Packet::Packet(ns3::Packet const & o) [copy constructor] + cls.add_constructor([param('ns3::Packet const &', 'o')]) + ## packet.h (module 'network'): ns3::Packet::Packet(uint32_t size) [constructor] + cls.add_constructor([param('uint32_t', 'size')]) + ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size, bool magic) [constructor] + cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')]) + ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor] + cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr packet) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## packet.h (module 'network'): void ns3::Packet::AddByteTag(ns3::Tag const & tag) const [member function] + cls.add_method('AddByteTag', + 'void', + [param('ns3::Tag const &', 'tag')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::AddHeader(ns3::Header const & header) [member function] + cls.add_method('AddHeader', + 'void', + [param('ns3::Header const &', 'header')]) + ## packet.h (module 'network'): void ns3::Packet::AddPacketTag(ns3::Tag const & tag) const [member function] + cls.add_method('AddPacketTag', + 'void', + [param('ns3::Tag const &', 'tag')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function] + cls.add_method('AddPaddingAtEnd', + 'void', + [param('uint32_t', 'size')]) + ## packet.h (module 'network'): void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function] + cls.add_method('AddTrailer', + 'void', + [param('ns3::Trailer const &', 'trailer')]) + ## packet.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function] + cls.add_method('BeginItem', + 'ns3::PacketMetadata::ItemIterator', + [], + is_const=True) + ## packet.h (module 'network'): ns3::Ptr ns3::Packet::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::Packet >', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::CopyData(uint8_t * buffer, uint32_t size) const [member function] + cls.add_method('CopyData', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::CopyData(std::ostream * os, uint32_t size) const [member function] + cls.add_method('CopyData', + 'void', + [param('std::ostream *', 'os'), param('uint32_t', 'size')], + is_const=True) + ## packet.h (module 'network'): ns3::Ptr ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function] + cls.add_method('CreateFragment', + 'ns3::Ptr< ns3::Packet >', + [param('uint32_t', 'start'), param('uint32_t', 'length')], + is_const=True) + ## packet.h (module 'network'): static void ns3::Packet::EnableChecking() [member function] + cls.add_method('EnableChecking', + 'void', + [], + is_static=True) + ## packet.h (module 'network'): static void ns3::Packet::EnablePrinting() [member function] + cls.add_method('EnablePrinting', + 'void', + [], + is_static=True) + ## packet.h (module 'network'): bool ns3::Packet::FindFirstMatchingByteTag(ns3::Tag & tag) const [member function] + cls.add_method('FindFirstMatchingByteTag', + 'bool', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): ns3::ByteTagIterator ns3::Packet::GetByteTagIterator() const [member function] + cls.add_method('GetByteTagIterator', + 'ns3::ByteTagIterator', + [], + is_const=True) + ## packet.h (module 'network'): ns3::Ptr ns3::Packet::GetNixVector() const [member function] + cls.add_method('GetNixVector', + 'ns3::Ptr< ns3::NixVector >', + [], + is_const=True) + ## packet.h (module 'network'): ns3::PacketTagIterator ns3::Packet::GetPacketTagIterator() const [member function] + cls.add_method('GetPacketTagIterator', + 'ns3::PacketTagIterator', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::GetSize() const [member function] + cls.add_method('GetSize', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): uint64_t ns3::Packet::GetUid() const [member function] + cls.add_method('GetUid', + 'uint64_t', + [], + is_const=True) + ## packet.h (module 'network'): uint8_t const * ns3::Packet::PeekData() const [member function] + cls.add_method('PeekData', + 'uint8_t const *', + [], + deprecated=True, is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::PeekHeader(ns3::Header & header) const [member function] + cls.add_method('PeekHeader', + 'uint32_t', + [param('ns3::Header &', 'header')], + is_const=True) + ## packet.h (module 'network'): bool ns3::Packet::PeekPacketTag(ns3::Tag & tag) const [member function] + cls.add_method('PeekPacketTag', + 'bool', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function] + cls.add_method('PeekTrailer', + 'uint32_t', + [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): void ns3::Packet::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::PrintByteTags(std::ostream & os) const [member function] + cls.add_method('PrintByteTags', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::PrintPacketTags(std::ostream & os) const [member function] + cls.add_method('PrintPacketTags', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::RemoveAllByteTags() [member function] + cls.add_method('RemoveAllByteTags', + 'void', + []) + ## packet.h (module 'network'): void ns3::Packet::RemoveAllPacketTags() [member function] + cls.add_method('RemoveAllPacketTags', + 'void', + []) + ## packet.h (module 'network'): void ns3::Packet::RemoveAtEnd(uint32_t size) [member function] + cls.add_method('RemoveAtEnd', + 'void', + [param('uint32_t', 'size')]) + ## packet.h (module 'network'): void ns3::Packet::RemoveAtStart(uint32_t size) [member function] + cls.add_method('RemoveAtStart', + 'void', + [param('uint32_t', 'size')]) + ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function] + cls.add_method('RemoveHeader', + 'uint32_t', + [param('ns3::Header &', 'header')]) + ## packet.h (module 'network'): bool ns3::Packet::RemovePacketTag(ns3::Tag & tag) [member function] + cls.add_method('RemovePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) + ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function] + cls.add_method('RemoveTrailer', + 'uint32_t', + [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::SetNixVector(ns3::Ptr arg0) [member function] + cls.add_method('SetNixVector', + 'void', + [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) + return + def register_Ns3TimeChecker_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] cls.add_constructor([]) @@ -2065,6 +3772,86 @@ def register_Ns3TypeIdValue_methods(root_module, cls): [param('ns3::TypeId const &', 'value')]) return +def register_Ns3Vector2DChecker_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector2DChecker::Vector2DChecker() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector2DChecker::Vector2DChecker(ns3::Vector2DChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector2DChecker const &', 'arg0')]) + return + +def register_Ns3Vector2DValue_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector2DValue::Vector2DValue() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector2DValue::Vector2DValue(ns3::Vector2DValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector2DValue const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector2DValue::Vector2DValue(ns3::Vector2D const & value) [constructor] + cls.add_constructor([param('ns3::Vector2D const &', 'value')]) + ## vector.h (module 'core'): ns3::Ptr ns3::Vector2DValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): bool ns3::Vector2DValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## vector.h (module 'core'): ns3::Vector2D ns3::Vector2DValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Vector2D', + [], + is_const=True) + ## vector.h (module 'core'): std::string ns3::Vector2DValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): void ns3::Vector2DValue::Set(ns3::Vector2D const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Vector2D const &', 'value')]) + return + +def register_Ns3Vector3DChecker_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector3DChecker::Vector3DChecker() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector3DChecker::Vector3DChecker(ns3::Vector3DChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector3DChecker const &', 'arg0')]) + return + +def register_Ns3Vector3DValue_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector3DValue::Vector3DValue() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector3DValue::Vector3DValue(ns3::Vector3DValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector3DValue const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector3DValue::Vector3DValue(ns3::Vector3D const & value) [constructor] + cls.add_constructor([param('ns3::Vector3D const &', 'value')]) + ## vector.h (module 'core'): ns3::Ptr ns3::Vector3DValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): bool ns3::Vector3DValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## vector.h (module 'core'): ns3::Vector3D ns3::Vector3DValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Vector3D', + [], + is_const=True) + ## vector.h (module 'core'): std::string ns3::Vector3DValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): void ns3::Vector3DValue::Set(ns3::Vector3D const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Vector3D const &', 'value')]) + return + def register_Ns3AddressChecker_methods(root_module, cls): ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor] cls.add_constructor([]) @@ -2105,11 +3892,74 @@ def register_Ns3AddressValue_methods(root_module, cls): [param('ns3::Address const &', 'value')]) return +def register_Ns3ConfigMatchContainer_methods(root_module, cls): + ## config.h (module 'core'): ns3::Config::MatchContainer::MatchContainer(ns3::Config::MatchContainer const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Config::MatchContainer const &', 'arg0')]) + ## config.h (module 'core'): ns3::Config::MatchContainer::MatchContainer() [constructor] + cls.add_constructor([]) + ## config.h (module 'core'): ns3::Config::MatchContainer::MatchContainer(std::vector, std::allocator > > const & objects, std::vector > const & contexts, std::string path) [constructor] + cls.add_constructor([param('std::vector< ns3::Ptr< ns3::Object > > const &', 'objects'), param('std::vector< std::string > const &', 'contexts'), param('std::string', 'path')]) + ## config.h (module 'core'): __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::Config::MatchContainer::Begin() const [member function] + cls.add_method('Begin', + '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Object > const, std::vector< ns3::Ptr< ns3::Object > > >', + [], + is_const=True) + ## config.h (module 'core'): void ns3::Config::MatchContainer::Connect(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('Connect', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): void ns3::Config::MatchContainer::ConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('ConnectWithoutContext', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): void ns3::Config::MatchContainer::Disconnect(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('Disconnect', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): void ns3::Config::MatchContainer::DisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('DisconnectWithoutContext', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::Config::MatchContainer::End() const [member function] + cls.add_method('End', + '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Object > const, std::vector< ns3::Ptr< ns3::Object > > >', + [], + is_const=True) + ## config.h (module 'core'): ns3::Ptr ns3::Config::MatchContainer::Get(uint32_t i) const [member function] + cls.add_method('Get', + 'ns3::Ptr< ns3::Object >', + [param('uint32_t', 'i')], + is_const=True) + ## config.h (module 'core'): std::string ns3::Config::MatchContainer::GetMatchedPath(uint32_t i) const [member function] + cls.add_method('GetMatchedPath', + 'std::string', + [param('uint32_t', 'i')], + is_const=True) + ## config.h (module 'core'): uint32_t ns3::Config::MatchContainer::GetN() const [member function] + cls.add_method('GetN', + 'uint32_t', + [], + is_const=True) + ## config.h (module 'core'): std::string ns3::Config::MatchContainer::GetPath() const [member function] + cls.add_method('GetPath', + 'std::string', + [], + is_const=True) + ## config.h (module 'core'): void ns3::Config::MatchContainer::Set(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + return + def register_functions(root_module): module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) return +def register_functions_ns3_Config(module, root_module): + return + def register_functions_ns3_FatalImpl(module, root_module): return diff --git a/src/netanim/bindings/modulegen__gcc_LP64.py b/src/netanim/bindings/modulegen__gcc_LP64.py index 9af2478b6..dc3123799 100644 --- a/src/netanim/bindings/modulegen__gcc_LP64.py +++ b/src/netanim/bindings/modulegen__gcc_LP64.py @@ -26,12 +26,32 @@ def register_types(module): module.add_class('Address', import_from_module='ns.network') ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration] module.add_enum('MaxSize_e', ['MAX_SIZE'], outer_class=root_module['ns3::Address'], import_from_module='ns.network') + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo [class] + module.add_class('AnimPacketInfo') + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo [class] + module.add_class('AnimRxInfo') ## animation-interface.h (module 'netanim'): ns3::AnimationInterface [class] module.add_class('AnimationInterface') ## attribute-list.h (module 'core'): ns3::AttributeList [class] module.add_class('AttributeList', import_from_module='ns.core') + ## buffer.h (module 'network'): ns3::Buffer [class] + module.add_class('Buffer', import_from_module='ns.network') + ## buffer.h (module 'network'): ns3::Buffer::Iterator [class] + module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::Buffer']) + ## packet.h (module 'network'): ns3::ByteTagIterator [class] + module.add_class('ByteTagIterator', import_from_module='ns.network') + ## packet.h (module 'network'): ns3::ByteTagIterator::Item [class] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagIterator']) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList [class] + module.add_class('ByteTagList', import_from_module='ns.network') + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator [class] + module.add_class('Iterator', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList']) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item [struct] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::ByteTagList::Iterator']) ## callback.h (module 'core'): ns3::CallbackBase [class] module.add_class('CallbackBase', import_from_module='ns.core') + ## event-id.h (module 'core'): ns3::EventId [class] + module.add_class('EventId', import_from_module='ns.core') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] module.add_class('Ipv4Address', import_from_module='ns.network') ## ipv4-address.h (module 'network'): ns3::Ipv4Address [class] @@ -46,14 +66,40 @@ def register_types(module): module.add_class('Ipv6Prefix', import_from_module='ns.network') ## log.h (module 'core'): ns3::LogComponent [class] module.add_class('LogComponent', import_from_module='ns.core') + ## mac48-address.h (module 'network'): ns3::Mac48Address [class] + module.add_class('Mac48Address', import_from_module='ns.network') + ## mac48-address.h (module 'network'): ns3::Mac48Address [class] + root_module['ns3::Mac48Address'].implicitly_converts_to(root_module['ns3::Address']) ## node-list.h (module 'network'): ns3::NodeList [class] module.add_class('NodeList', import_from_module='ns.network') ## object-base.h (module 'core'): ns3::ObjectBase [class] module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core') ## object.h (module 'core'): ns3::ObjectDeleter [struct] module.add_class('ObjectDeleter', import_from_module='ns.core') + ## object-factory.h (module 'core'): ns3::ObjectFactory [class] + module.add_class('ObjectFactory', import_from_module='ns.core') + ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class] + module.add_class('PacketMetadata', import_from_module='ns.network') + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata']) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [enumeration] + module.add_enum('', ['PAYLOAD', 'HEADER', 'TRAILER'], outer_class=root_module['ns3::PacketMetadata::Item'], import_from_module='ns.network') + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator [class] + module.add_class('ItemIterator', import_from_module='ns.network', outer_class=root_module['ns3::PacketMetadata']) + ## packet.h (module 'network'): ns3::PacketTagIterator [class] + module.add_class('PacketTagIterator', import_from_module='ns.network') + ## packet.h (module 'network'): ns3::PacketTagIterator::Item [class] + module.add_class('Item', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagIterator']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList [class] + module.add_class('PacketTagList', import_from_module='ns.network') + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] + module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simulator.h (module 'core'): ns3::Simulator [class] + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') + ## tag.h (module 'network'): ns3::Tag [class] + module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] module.add_class('TagBuffer', import_from_module='ns.network') ## type-id.h (module 'core'): ns3::TypeId [class] @@ -64,10 +110,20 @@ def register_types(module): module.add_class('AttributeInfo', import_from_module='ns.core', outer_class=root_module['ns3::TypeId']) ## attribute-list.h (module 'core'): ns3::UnsafeAttributeList [class] module.add_class('UnsafeAttributeList', import_from_module='ns.core') + ## vector.h (module 'core'): ns3::Vector2D [class] + module.add_class('Vector2D', import_from_module='ns.core') + ## vector.h (module 'core'): ns3::Vector3D [class] + module.add_class('Vector3D', import_from_module='ns.core') ## empty.h (module 'core'): ns3::empty [class] module.add_class('empty', import_from_module='ns.core') ## int64x64-double.h (module 'core'): ns3::int64x64_t [class] module.add_class('int64x64_t', import_from_module='ns.core') + ## animation-interface.h (module 'netanim'): ns3::AnimByteTag [class] + module.add_class('AnimByteTag', parent=root_module['ns3::Tag']) + ## chunk.h (module 'network'): ns3::Chunk [class] + module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) + ## header.h (module 'network'): ns3::Header [class] + module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] @@ -80,12 +136,20 @@ def register_types(module): module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeValue', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::CallbackImplBase', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::EventImpl', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::NixVector', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] + module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Packet', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## nstime.h (module 'core'): ns3::Time [class] module.add_class('Time', import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] module.add_enum('Unit', ['S', 'MS', 'US', 'NS', 'PS', 'FS', 'LAST'], outer_class=root_module['ns3::Time'], import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time [class] root_module['ns3::Time'].implicitly_converts_to(root_module['ns3::int64x64_t']) + ## trailer.h (module 'network'): ns3::Trailer [class] + module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk']) ## attribute.h (module 'core'): ns3::AttributeAccessor [class] module.add_class('AttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) ## attribute.h (module 'core'): ns3::AttributeChecker [class] @@ -100,6 +164,8 @@ def register_types(module): module.add_class('CallbackValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class] module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## event-impl.h (module 'core'): ns3::EventImpl [class] + module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class] module.add_class('Ipv4AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressValue [class] @@ -116,10 +182,26 @@ def register_types(module): module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class] module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] + module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] + module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class] + module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice [class] module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration] module.add_enum('PacketType', ['PACKET_HOST', 'NS3_PACKET_HOST', 'PACKET_BROADCAST', 'NS3_PACKET_BROADCAST', 'PACKET_MULTICAST', 'NS3_PACKET_MULTICAST', 'PACKET_OTHERHOST', 'NS3_PACKET_OTHERHOST'], outer_class=root_module['ns3::NetDevice'], import_from_module='ns.network') + ## nix-vector.h (module 'network'): ns3::NixVector [class] + module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) + ## node.h (module 'network'): ns3::Node [class] + module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class] + module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class] + module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## packet.h (module 'network'): ns3::Packet [class] + module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) ## nstime.h (module 'core'): ns3::TimeChecker [class] module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -128,16 +210,43 @@ def register_types(module): module.add_class('TypeIdChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## type-id.h (module 'core'): ns3::TypeIdValue [class] module.add_class('TypeIdValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## vector.h (module 'core'): ns3::Vector2DChecker [class] + module.add_class('Vector2DChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## vector.h (module 'core'): ns3::Vector2DValue [class] + module.add_class('Vector2DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## vector.h (module 'core'): ns3::Vector3DChecker [class] + module.add_class('Vector3DChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## vector.h (module 'core'): ns3::Vector3DValue [class] + module.add_class('Vector3DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## address.h (module 'network'): ns3::AddressChecker [class] module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::map< unsigned int, ns3::AnimRxInfo >', ('unsigned int', 'ns3::AnimRxInfo'), container_type='map') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogTimePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogTimePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogTimePrinter&') + typehandlers.add_type_alias('ns3::Vector3DValue', 'ns3::VectorValue') + typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') + typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') + module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') + typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') + typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') + typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') + module.add_typedef(root_module['ns3::Vector3D'], 'Vector') + typehandlers.add_type_alias('ns3::Vector3DChecker', 'ns3::VectorChecker') + typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') + typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') + module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + + ## Register a nested module for the namespace Config + + nested_module = module.add_cpp_namespace('Config') + register_types_ns3_Config(nested_module) + ## Register a nested module for the namespace FatalImpl @@ -145,37 +254,75 @@ def register_types(module): register_types_ns3_FatalImpl(nested_module) +def register_types_ns3_Config(module): + root_module = module.get_root() + + ## config.h (module 'core'): ns3::Config::MatchContainer [class] + module.add_class('MatchContainer', import_from_module='ns.core') + module.add_container('std::vector< ns3::Ptr< ns3::Object > >', 'ns3::Ptr< ns3::Object >', container_type='vector') + module.add_container('std::vector< std::string >', 'std::string', container_type='vector') + def register_types_ns3_FatalImpl(module): root_module = module.get_root() def register_methods(root_module): register_Ns3Address_methods(root_module, root_module['ns3::Address']) + register_Ns3AnimPacketInfo_methods(root_module, root_module['ns3::AnimPacketInfo']) + register_Ns3AnimRxInfo_methods(root_module, root_module['ns3::AnimRxInfo']) register_Ns3AnimationInterface_methods(root_module, root_module['ns3::AnimationInterface']) register_Ns3AttributeList_methods(root_module, root_module['ns3::AttributeList']) + register_Ns3Buffer_methods(root_module, root_module['ns3::Buffer']) + register_Ns3BufferIterator_methods(root_module, root_module['ns3::Buffer::Iterator']) + register_Ns3ByteTagIterator_methods(root_module, root_module['ns3::ByteTagIterator']) + register_Ns3ByteTagIteratorItem_methods(root_module, root_module['ns3::ByteTagIterator::Item']) + register_Ns3ByteTagList_methods(root_module, root_module['ns3::ByteTagList']) + register_Ns3ByteTagListIterator_methods(root_module, root_module['ns3::ByteTagList::Iterator']) + register_Ns3ByteTagListIteratorItem_methods(root_module, root_module['ns3::ByteTagList::Iterator::Item']) register_Ns3CallbackBase_methods(root_module, root_module['ns3::CallbackBase']) + register_Ns3EventId_methods(root_module, root_module['ns3::EventId']) register_Ns3Ipv4Address_methods(root_module, root_module['ns3::Ipv4Address']) register_Ns3Ipv4Mask_methods(root_module, root_module['ns3::Ipv4Mask']) register_Ns3Ipv6Address_methods(root_module, root_module['ns3::Ipv6Address']) register_Ns3Ipv6Prefix_methods(root_module, root_module['ns3::Ipv6Prefix']) register_Ns3LogComponent_methods(root_module, root_module['ns3::LogComponent']) + register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3NodeList_methods(root_module, root_module['ns3::NodeList']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) + register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) + register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata']) + register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item']) + register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator']) + register_Ns3PacketTagIterator_methods(root_module, root_module['ns3::PacketTagIterator']) + register_Ns3PacketTagIteratorItem_methods(root_module, root_module['ns3::PacketTagIterator::Item']) + register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) + register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) + register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) + register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) register_Ns3TypeIdAttributeInfo_methods(root_module, root_module['ns3::TypeId::AttributeInfo']) register_Ns3UnsafeAttributeList_methods(root_module, root_module['ns3::UnsafeAttributeList']) + register_Ns3Vector2D_methods(root_module, root_module['ns3::Vector2D']) + register_Ns3Vector3D_methods(root_module, root_module['ns3::Vector3D']) register_Ns3Empty_methods(root_module, root_module['ns3::empty']) register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t']) + register_Ns3AnimByteTag_methods(root_module, root_module['ns3::AnimByteTag']) + register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk']) + register_Ns3Header_methods(root_module, root_module['ns3::Header']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__lt__ns3CallbackImplBase__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::CallbackImplBase, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) + register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter >']) register_Ns3Time_methods(root_module, root_module['ns3::Time']) + register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer']) register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor']) register_Ns3AttributeChecker_methods(root_module, root_module['ns3::AttributeChecker']) register_Ns3AttributeValue_methods(root_module, root_module['ns3::AttributeValue']) @@ -183,6 +330,7 @@ def register_methods(root_module): register_Ns3CallbackImplBase_methods(root_module, root_module['ns3::CallbackImplBase']) register_Ns3CallbackValue_methods(root_module, root_module['ns3::CallbackValue']) register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) + register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue']) register_Ns3Ipv4MaskChecker_methods(root_module, root_module['ns3::Ipv4MaskChecker']) @@ -191,13 +339,26 @@ def register_methods(root_module): register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) + register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) + register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) + register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) + register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) + register_Ns3Node_methods(root_module, root_module['ns3::Node']) + register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) + register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) + register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) register_Ns3TypeIdValue_methods(root_module, root_module['ns3::TypeIdValue']) + register_Ns3Vector2DChecker_methods(root_module, root_module['ns3::Vector2DChecker']) + register_Ns3Vector2DValue_methods(root_module, root_module['ns3::Vector2DValue']) + register_Ns3Vector3DChecker_methods(root_module, root_module['ns3::Vector3DChecker']) + register_Ns3Vector3DValue_methods(root_module, root_module['ns3::Vector3DValue']) register_Ns3AddressChecker_methods(root_module, root_module['ns3::AddressChecker']) register_Ns3AddressValue_methods(root_module, root_module['ns3::AddressValue']) + register_Ns3ConfigMatchContainer_methods(root_module, root_module['ns3::Config::MatchContainer']) return def register_Ns3Address_methods(root_module, cls): @@ -270,11 +431,77 @@ def register_Ns3Address_methods(root_module, cls): is_const=True) return +def register_Ns3AnimPacketInfo_methods(root_module, cls): + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::AnimPacketInfo(ns3::AnimPacketInfo const & arg0) [copy constructor] + cls.add_constructor([param('ns3::AnimPacketInfo const &', 'arg0')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::AnimPacketInfo() [constructor] + cls.add_constructor([]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::AnimPacketInfo(ns3::Ptr tx_nd, ns3::Time const & fbTx, ns3::Time const & lbTx, ns3::Vector txLoc) [constructor] + cls.add_constructor([param('ns3::Ptr< ns3::NetDevice const >', 'tx_nd'), param('ns3::Time const &', 'fbTx'), param('ns3::Time const &', 'lbTx'), param('ns3::Vector', 'txLoc')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo ns3::AnimPacketInfo::GetRxInfo(ns3::Ptr nd) [member function] + cls.add_method('GetRxInfo', + 'ns3::AnimRxInfo', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd')]) + ## animation-interface-helper.h (module 'netanim'): void ns3::AnimPacketInfo::ProcessRxBegin(ns3::Ptr nd, ns3::Time const & fbRx) [member function] + cls.add_method('ProcessRxBegin', + 'void', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd'), param('ns3::Time const &', 'fbRx')]) + ## animation-interface-helper.h (module 'netanim'): void ns3::AnimPacketInfo::ProcessRxDrop(ns3::Ptr nd) [member function] + cls.add_method('ProcessRxDrop', + 'void', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd')]) + ## animation-interface-helper.h (module 'netanim'): bool ns3::AnimPacketInfo::ProcessRxEnd(ns3::Ptr nd, ns3::Time const & fbRx, ns3::Vector rxLoc) [member function] + cls.add_method('ProcessRxEnd', + 'bool', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd'), param('ns3::Time const &', 'fbRx'), param('ns3::Vector', 'rxLoc')]) + ## animation-interface-helper.h (module 'netanim'): void ns3::AnimPacketInfo::RemoveRxInfo(ns3::Ptr nd) [member function] + cls.add_method('RemoveRxInfo', + 'void', + [param('ns3::Ptr< ns3::NetDevice const >', 'nd')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::firstlastbitDelta [variable] + cls.add_instance_attribute('firstlastbitDelta', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_fbTx [variable] + cls.add_instance_attribute('m_fbTx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_lbTx [variable] + cls.add_instance_attribute('m_lbTx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_rx [variable] + cls.add_instance_attribute('m_rx', 'std::map< unsigned int, ns3::AnimRxInfo >', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_txLoc [variable] + cls.add_instance_attribute('m_txLoc', 'ns3::Vector', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimPacketInfo::m_txnd [variable] + cls.add_instance_attribute('m_txnd', 'ns3::Ptr< ns3::NetDevice const >', is_const=False) + return + +def register_Ns3AnimRxInfo_methods(root_module, cls): + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::AnimRxInfo(ns3::AnimRxInfo const & arg0) [copy constructor] + cls.add_constructor([param('ns3::AnimRxInfo const &', 'arg0')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::AnimRxInfo() [constructor] + cls.add_constructor([]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::AnimRxInfo(ns3::Time const & fbRx, ns3::Ptr nd, double rxRange) [constructor] + cls.add_constructor([param('ns3::Time const &', 'fbRx'), param('ns3::Ptr< ns3::NetDevice const >', 'nd'), param('double', 'rxRange')]) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::m_fbRx [variable] + cls.add_instance_attribute('m_fbRx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::m_lbRx [variable] + cls.add_instance_attribute('m_lbRx', 'double', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::m_rxnd [variable] + cls.add_instance_attribute('m_rxnd', 'ns3::Ptr< ns3::NetDevice const >', is_const=False) + ## animation-interface-helper.h (module 'netanim'): ns3::AnimRxInfo::rxRange [variable] + cls.add_instance_attribute('rxRange', 'double', is_const=False) + return + def register_Ns3AnimationInterface_methods(root_module, cls): ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface(ns3::AnimationInterface const & arg0) [copy constructor] cls.add_constructor([param('ns3::AnimationInterface const &', 'arg0')]) ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface() [constructor] cls.add_constructor([]) + ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface(std::string const filename, bool usingXML=true) [constructor] + cls.add_constructor([param('std::string const', 'filename'), param('bool', 'usingXML', default_value='true')]) + ## animation-interface.h (module 'netanim'): ns3::AnimationInterface::AnimationInterface(uint16_t port, bool usingXML=true) [constructor] + cls.add_constructor([param('uint16_t', 'port'), param('bool', 'usingXML', default_value='true')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetMobilityPollInterval(ns3::Time t) [member function] + cls.add_method('SetMobilityPollInterval', + 'void', + [param('ns3::Time', 't')]) ## animation-interface.h (module 'netanim'): bool ns3::AnimationInterface::SetOutputFile(std::string const & fn) [member function] cls.add_method('SetOutputFile', 'bool', @@ -283,6 +510,10 @@ def register_Ns3AnimationInterface_methods(root_module, cls): cls.add_method('SetServerPort', 'bool', [param('uint16_t', 'port')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::SetXMLOutput() [member function] + cls.add_method('SetXMLOutput', + 'void', + []) ## animation-interface.h (module 'netanim'): void ns3::AnimationInterface::StartAnimation() [member function] cls.add_method('StartAnimation', 'void', @@ -330,6 +561,355 @@ def register_Ns3AttributeList_methods(root_module, cls): [param('ns3::TypeId', 'tid'), param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) return +def register_Ns3Buffer_methods(root_module, cls): + ## buffer.h (module 'network'): ns3::Buffer::Buffer() [constructor] + cls.add_constructor([]) + ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize) [constructor] + cls.add_constructor([param('uint32_t', 'dataSize')]) + ## buffer.h (module 'network'): ns3::Buffer::Buffer(uint32_t dataSize, bool initialize) [constructor] + cls.add_constructor([param('uint32_t', 'dataSize'), param('bool', 'initialize')]) + ## buffer.h (module 'network'): ns3::Buffer::Buffer(ns3::Buffer const & o) [copy constructor] + cls.add_constructor([param('ns3::Buffer const &', 'o')]) + ## buffer.h (module 'network'): bool ns3::Buffer::AddAtEnd(uint32_t end) [member function] + cls.add_method('AddAtEnd', + 'bool', + [param('uint32_t', 'end')]) + ## buffer.h (module 'network'): void ns3::Buffer::AddAtEnd(ns3::Buffer const & o) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('ns3::Buffer const &', 'o')]) + ## buffer.h (module 'network'): bool ns3::Buffer::AddAtStart(uint32_t start) [member function] + cls.add_method('AddAtStart', + 'bool', + [param('uint32_t', 'start')]) + ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::Begin() const [member function] + cls.add_method('Begin', + 'ns3::Buffer::Iterator', + [], + is_const=True) + ## buffer.h (module 'network'): void ns3::Buffer::CopyData(std::ostream * os, uint32_t size) const [member function] + cls.add_method('CopyData', + 'void', + [param('std::ostream *', 'os'), param('uint32_t', 'size')], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::CopyData(uint8_t * buffer, uint32_t size) const [member function] + cls.add_method('CopyData', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], + is_const=True) + ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFragment(uint32_t start, uint32_t length) const [member function] + cls.add_method('CreateFragment', + 'ns3::Buffer', + [param('uint32_t', 'start'), param('uint32_t', 'length')], + is_const=True) + ## buffer.h (module 'network'): ns3::Buffer ns3::Buffer::CreateFullCopy() const [member function] + cls.add_method('CreateFullCopy', + 'ns3::Buffer', + [], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Deserialize(uint8_t const * buffer, uint32_t size) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## buffer.h (module 'network'): ns3::Buffer::Iterator ns3::Buffer::End() const [member function] + cls.add_method('End', + 'ns3::Buffer::Iterator', + [], + is_const=True) + ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentEndOffset() const [member function] + cls.add_method('GetCurrentEndOffset', + 'int32_t', + [], + is_const=True) + ## buffer.h (module 'network'): int32_t ns3::Buffer::GetCurrentStartOffset() const [member function] + cls.add_method('GetCurrentStartOffset', + 'int32_t', + [], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::GetSize() const [member function] + cls.add_method('GetSize', + 'uint32_t', + [], + is_const=True) + ## buffer.h (module 'network'): uint8_t const * ns3::Buffer::PeekData() const [member function] + cls.add_method('PeekData', + 'uint8_t const *', + [], + is_const=True) + ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtEnd(uint32_t end) [member function] + cls.add_method('RemoveAtEnd', + 'void', + [param('uint32_t', 'end')]) + ## buffer.h (module 'network'): void ns3::Buffer::RemoveAtStart(uint32_t start) [member function] + cls.add_method('RemoveAtStart', + 'void', + [param('uint32_t', 'start')]) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + return + +def register_Ns3BufferIterator_methods(root_module, cls): + ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator(ns3::Buffer::Iterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Buffer::Iterator const &', 'arg0')]) + ## buffer.h (module 'network'): ns3::Buffer::Iterator::Iterator() [constructor] + cls.add_constructor([]) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size) [member function] + cls.add_method('CalculateIpChecksum', + 'uint16_t', + [param('uint16_t', 'size')]) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::CalculateIpChecksum(uint16_t size, uint32_t initialChecksum) [member function] + cls.add_method('CalculateIpChecksum', + 'uint16_t', + [param('uint16_t', 'size'), param('uint32_t', 'initialChecksum')]) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetDistanceFrom(ns3::Buffer::Iterator const & o) const [member function] + cls.add_method('GetDistanceFrom', + 'uint32_t', + [param('ns3::Buffer::Iterator const &', 'o')], + is_const=True) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function] + cls.add_method('GetSize', + 'uint32_t', + [], + is_const=True) + ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsEnd() const [member function] + cls.add_method('IsEnd', + 'bool', + [], + is_const=True) + ## buffer.h (module 'network'): bool ns3::Buffer::Iterator::IsStart() const [member function] + cls.add_method('IsStart', + 'bool', + [], + is_const=True) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next() [member function] + cls.add_method('Next', + 'void', + []) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Next(uint32_t delta) [member function] + cls.add_method('Next', + 'void', + [param('uint32_t', 'delta')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev() [member function] + cls.add_method('Prev', + 'void', + []) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Prev(uint32_t delta) [member function] + cls.add_method('Prev', + 'void', + [param('uint32_t', 'delta')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Read(uint8_t * buffer, uint32_t size) [member function] + cls.add_method('Read', + 'void', + [param('uint8_t *', 'buffer'), param('uint32_t', 'size')]) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadLsbtohU16() [member function] + cls.add_method('ReadLsbtohU16', + 'uint16_t', + []) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadLsbtohU32() [member function] + cls.add_method('ReadLsbtohU32', + 'uint32_t', + []) + ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadLsbtohU64() [member function] + cls.add_method('ReadLsbtohU64', + 'uint64_t', + []) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadNtohU16() [member function] + cls.add_method('ReadNtohU16', + 'uint16_t', + []) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadNtohU32() [member function] + cls.add_method('ReadNtohU32', + 'uint32_t', + []) + ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadNtohU64() [member function] + cls.add_method('ReadNtohU64', + 'uint64_t', + []) + ## buffer.h (module 'network'): uint16_t ns3::Buffer::Iterator::ReadU16() [member function] + cls.add_method('ReadU16', + 'uint16_t', + []) + ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::ReadU32() [member function] + cls.add_method('ReadU32', + 'uint32_t', + []) + ## buffer.h (module 'network'): uint64_t ns3::Buffer::Iterator::ReadU64() [member function] + cls.add_method('ReadU64', + 'uint64_t', + []) + ## buffer.h (module 'network'): uint8_t ns3::Buffer::Iterator::ReadU8() [member function] + cls.add_method('ReadU8', + 'uint8_t', + []) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(uint8_t const * buffer, uint32_t size) [member function] + cls.add_method('Write', + 'void', + [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::Write(ns3::Buffer::Iterator start, ns3::Buffer::Iterator end) [member function] + cls.add_method('Write', + 'void', + [param('ns3::Buffer::Iterator', 'start'), param('ns3::Buffer::Iterator', 'end')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU16(uint16_t data) [member function] + cls.add_method('WriteHtolsbU16', + 'void', + [param('uint16_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU32(uint32_t data) [member function] + cls.add_method('WriteHtolsbU32', + 'void', + [param('uint32_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtolsbU64(uint64_t data) [member function] + cls.add_method('WriteHtolsbU64', + 'void', + [param('uint64_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU16(uint16_t data) [member function] + cls.add_method('WriteHtonU16', + 'void', + [param('uint16_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU32(uint32_t data) [member function] + cls.add_method('WriteHtonU32', + 'void', + [param('uint32_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteHtonU64(uint64_t data) [member function] + cls.add_method('WriteHtonU64', + 'void', + [param('uint64_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU16(uint16_t data) [member function] + cls.add_method('WriteU16', + 'void', + [param('uint16_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU32(uint32_t data) [member function] + cls.add_method('WriteU32', + 'void', + [param('uint32_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU64(uint64_t data) [member function] + cls.add_method('WriteU64', + 'void', + [param('uint64_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data) [member function] + cls.add_method('WriteU8', + 'void', + [param('uint8_t', 'data')]) + ## buffer.h (module 'network'): void ns3::Buffer::Iterator::WriteU8(uint8_t data, uint32_t len) [member function] + cls.add_method('WriteU8', + 'void', + [param('uint8_t', 'data'), param('uint32_t', 'len')]) + return + +def register_Ns3ByteTagIterator_methods(root_module, cls): + ## packet.h (module 'network'): ns3::ByteTagIterator::ByteTagIterator(ns3::ByteTagIterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagIterator const &', 'arg0')]) + ## packet.h (module 'network'): bool ns3::ByteTagIterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## packet.h (module 'network'): ns3::ByteTagIterator::Item ns3::ByteTagIterator::Next() [member function] + cls.add_method('Next', + 'ns3::ByteTagIterator::Item', + []) + return + +def register_Ns3ByteTagIteratorItem_methods(root_module, cls): + ## packet.h (module 'network'): ns3::ByteTagIterator::Item::Item(ns3::ByteTagIterator::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagIterator::Item const &', 'arg0')]) + ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetEnd() const [member function] + cls.add_method('GetEnd', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::ByteTagIterator::Item::GetStart() const [member function] + cls.add_method('GetStart', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): void ns3::ByteTagIterator::Item::GetTag(ns3::Tag & tag) const [member function] + cls.add_method('GetTag', + 'void', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): ns3::TypeId ns3::ByteTagIterator::Item::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + return + +def register_Ns3ByteTagList_methods(root_module, cls): + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList() [constructor] + cls.add_constructor([]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::ByteTagList(ns3::ByteTagList const & o) [copy constructor] + cls.add_constructor([param('ns3::ByteTagList const &', 'o')]) + ## byte-tag-list.h (module 'network'): ns3::TagBuffer ns3::ByteTagList::Add(ns3::TypeId tid, uint32_t bufferSize, int32_t start, int32_t end) [member function] + cls.add_method('Add', + 'ns3::TagBuffer', + [param('ns3::TypeId', 'tid'), param('uint32_t', 'bufferSize'), param('int32_t', 'start'), param('int32_t', 'end')]) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::Add(ns3::ByteTagList const & o) [member function] + cls.add_method('Add', + 'void', + [param('ns3::ByteTagList const &', 'o')]) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtEnd(int32_t adjustment, int32_t appendOffset) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('int32_t', 'adjustment'), param('int32_t', 'appendOffset')]) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::AddAtStart(int32_t adjustment, int32_t prependOffset) [member function] + cls.add_method('AddAtStart', + 'void', + [param('int32_t', 'adjustment'), param('int32_t', 'prependOffset')]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator ns3::ByteTagList::Begin(int32_t offsetStart, int32_t offsetEnd) const [member function] + cls.add_method('Begin', + 'ns3::ByteTagList::Iterator', + [param('int32_t', 'offsetStart'), param('int32_t', 'offsetEnd')], + is_const=True) + ## byte-tag-list.h (module 'network'): void ns3::ByteTagList::RemoveAll() [member function] + cls.add_method('RemoveAll', + 'void', + []) + return + +def register_Ns3ByteTagListIterator_methods(root_module, cls): + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Iterator(ns3::ByteTagList::Iterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagList::Iterator const &', 'arg0')]) + ## byte-tag-list.h (module 'network'): uint32_t ns3::ByteTagList::Iterator::GetOffsetStart() const [member function] + cls.add_method('GetOffsetStart', + 'uint32_t', + [], + is_const=True) + ## byte-tag-list.h (module 'network'): bool ns3::ByteTagList::Iterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item ns3::ByteTagList::Iterator::Next() [member function] + cls.add_method('Next', + 'ns3::ByteTagList::Iterator::Item', + []) + return + +def register_Ns3ByteTagListIteratorItem_methods(root_module, cls): + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::ByteTagList::Iterator::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ByteTagList::Iterator::Item const &', 'arg0')]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::Item(ns3::TagBuffer buf) [constructor] + cls.add_constructor([param('ns3::TagBuffer', 'buf')]) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::buf [variable] + cls.add_instance_attribute('buf', 'ns3::TagBuffer', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::end [variable] + cls.add_instance_attribute('end', 'int32_t', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::size [variable] + cls.add_instance_attribute('size', 'uint32_t', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::start [variable] + cls.add_instance_attribute('start', 'int32_t', is_const=False) + ## byte-tag-list.h (module 'network'): ns3::ByteTagList::Iterator::Item::tid [variable] + cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False) + return + def register_Ns3CallbackBase_methods(root_module, cls): ## callback.h (module 'core'): ns3::CallbackBase::CallbackBase(ns3::CallbackBase const & arg0) [copy constructor] cls.add_constructor([param('ns3::CallbackBase const &', 'arg0')]) @@ -350,6 +930,51 @@ def register_Ns3CallbackBase_methods(root_module, cls): is_static=True, visibility='protected') return +def register_Ns3EventId_methods(root_module, cls): + cls.add_binary_comparison_operator('!=') + cls.add_binary_comparison_operator('==') + ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::EventId const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EventId const &', 'arg0')]) + ## event-id.h (module 'core'): ns3::EventId::EventId() [constructor] + cls.add_constructor([]) + ## event-id.h (module 'core'): ns3::EventId::EventId(ns3::Ptr const & impl, uint64_t ts, uint32_t context, uint32_t uid) [constructor] + cls.add_constructor([param('ns3::Ptr< ns3::EventImpl > const &', 'impl'), param('uint64_t', 'ts'), param('uint32_t', 'context'), param('uint32_t', 'uid')]) + ## event-id.h (module 'core'): void ns3::EventId::Cancel() [member function] + cls.add_method('Cancel', + 'void', + []) + ## event-id.h (module 'core'): uint32_t ns3::EventId::GetContext() const [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_const=True) + ## event-id.h (module 'core'): uint64_t ns3::EventId::GetTs() const [member function] + cls.add_method('GetTs', + 'uint64_t', + [], + is_const=True) + ## event-id.h (module 'core'): uint32_t ns3::EventId::GetUid() const [member function] + cls.add_method('GetUid', + 'uint32_t', + [], + is_const=True) + ## event-id.h (module 'core'): bool ns3::EventId::IsExpired() const [member function] + cls.add_method('IsExpired', + 'bool', + [], + is_const=True) + ## event-id.h (module 'core'): bool ns3::EventId::IsRunning() const [member function] + cls.add_method('IsRunning', + 'bool', + [], + is_const=True) + ## event-id.h (module 'core'): ns3::EventImpl * ns3::EventId::PeekEventImpl() const [member function] + cls.add_method('PeekEventImpl', + 'ns3::EventImpl *', + [], + is_const=True) + return + def register_Ns3Ipv4Address_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -767,6 +1392,78 @@ def register_Ns3LogComponent_methods(root_module, cls): is_const=True) return +def register_Ns3Mac48Address_methods(root_module, cls): + cls.add_binary_comparison_operator('<') + cls.add_binary_comparison_operator('!=') + cls.add_output_stream_operator() + cls.add_binary_comparison_operator('==') + ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(ns3::Mac48Address const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Mac48Address const &', 'arg0')]) + ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address() [constructor] + cls.add_constructor([]) + ## mac48-address.h (module 'network'): ns3::Mac48Address::Mac48Address(char const * str) [constructor] + cls.add_constructor([param('char const *', 'str')]) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::Allocate() [member function] + cls.add_method('Allocate', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::ConvertFrom(ns3::Address const & address) [member function] + cls.add_method('ConvertFrom', + 'ns3::Mac48Address', + [param('ns3::Address const &', 'address')], + is_static=True) + ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyFrom(uint8_t const * buffer) [member function] + cls.add_method('CopyFrom', + 'void', + [param('uint8_t const *', 'buffer')]) + ## mac48-address.h (module 'network'): void ns3::Mac48Address::CopyTo(uint8_t * buffer) const [member function] + cls.add_method('CopyTo', + 'void', + [param('uint8_t *', 'buffer')], + is_const=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetBroadcast() [member function] + cls.add_method('GetBroadcast', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv4Address address) [member function] + cls.add_method('GetMulticast', + 'ns3::Mac48Address', + [param('ns3::Ipv4Address', 'address')], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast(ns3::Ipv6Address address) [member function] + cls.add_method('GetMulticast', + 'ns3::Mac48Address', + [param('ns3::Ipv6Address', 'address')], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticast6Prefix() [member function] + cls.add_method('GetMulticast6Prefix', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): static ns3::Mac48Address ns3::Mac48Address::GetMulticastPrefix() [member function] + cls.add_method('GetMulticastPrefix', + 'ns3::Mac48Address', + [], + is_static=True) + ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsBroadcast() const [member function] + cls.add_method('IsBroadcast', + 'bool', + [], + is_const=True) + ## mac48-address.h (module 'network'): bool ns3::Mac48Address::IsGroup() const [member function] + cls.add_method('IsGroup', + 'bool', + [], + is_const=True) + ## mac48-address.h (module 'network'): static bool ns3::Mac48Address::IsMatchingType(ns3::Address const & address) [member function] + cls.add_method('IsMatchingType', + 'bool', + [param('ns3::Address const &', 'address')], + is_static=True) + return + def register_Ns3NodeList_methods(root_module, cls): ## node-list.h (module 'network'): ns3::NodeList::NodeList() [constructor] cls.add_constructor([]) @@ -872,6 +1569,231 @@ def register_Ns3ObjectDeleter_methods(root_module, cls): is_static=True) return +def register_Ns3ObjectFactory_methods(root_module, cls): + cls.add_output_stream_operator() + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactory::Create() const [member function] + cls.add_method('Create', + 'ns3::Ptr< ns3::Object >', + [], + is_const=True) + ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(ns3::AttributeList const & list) [member function] + cls.add_method('Set', + 'void', + [param('ns3::AttributeList const &', 'list')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('ns3::TypeId', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('char const *', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('std::string', 'tid')]) + return + +def register_Ns3PacketMetadata_methods(root_module, cls): + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor] + cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(ns3::PacketMetadata const & o) [copy constructor] + cls.add_constructor([param('ns3::PacketMetadata const &', 'o')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddAtEnd(ns3::PacketMetadata const & o) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('ns3::PacketMetadata const &', 'o')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddHeader(ns3::Header const & header, uint32_t size) [member function] + cls.add_method('AddHeader', + 'void', + [param('ns3::Header const &', 'header'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddPaddingAtEnd(uint32_t end) [member function] + cls.add_method('AddPaddingAtEnd', + 'void', + [param('uint32_t', 'end')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::AddTrailer(ns3::Trailer const & trailer, uint32_t size) [member function] + cls.add_method('AddTrailer', + 'void', + [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::PacketMetadata::BeginItem(ns3::Buffer buffer) const [member function] + cls.add_method('BeginItem', + 'ns3::PacketMetadata::ItemIterator', + [param('ns3::Buffer', 'buffer')], + is_const=True) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata ns3::PacketMetadata::CreateFragment(uint32_t start, uint32_t end) const [member function] + cls.add_method('CreateFragment', + 'ns3::PacketMetadata', + [param('uint32_t', 'start'), param('uint32_t', 'end')], + is_const=True) + ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Deserialize(uint8_t const * buffer, uint32_t size) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::Enable() [member function] + cls.add_method('Enable', + 'void', + [], + is_static=True) + ## packet-metadata.h (module 'network'): static void ns3::PacketMetadata::EnableChecking() [member function] + cls.add_method('EnableChecking', + 'void', + [], + is_static=True) + ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## packet-metadata.h (module 'network'): uint64_t ns3::PacketMetadata::GetUid() const [member function] + cls.add_method('GetUid', + 'uint64_t', + [], + is_const=True) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtEnd(uint32_t end) [member function] + cls.add_method('RemoveAtEnd', + 'void', + [param('uint32_t', 'end')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveAtStart(uint32_t start) [member function] + cls.add_method('RemoveAtStart', + 'void', + [param('uint32_t', 'start')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveHeader(ns3::Header const & header, uint32_t size) [member function] + cls.add_method('RemoveHeader', + 'void', + [param('ns3::Header const &', 'header'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): void ns3::PacketMetadata::RemoveTrailer(ns3::Trailer const & trailer, uint32_t size) [member function] + cls.add_method('RemoveTrailer', + 'void', + [param('ns3::Trailer const &', 'trailer'), param('uint32_t', 'size')]) + ## packet-metadata.h (module 'network'): uint32_t ns3::PacketMetadata::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + return + +def register_Ns3PacketMetadataItem_methods(root_module, cls): + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item() [constructor] + cls.add_constructor([]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::Item(ns3::PacketMetadata::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketMetadata::Item const &', 'arg0')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::current [variable] + cls.add_instance_attribute('current', 'ns3::Buffer::Iterator', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentSize [variable] + cls.add_instance_attribute('currentSize', 'uint32_t', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromEnd [variable] + cls.add_instance_attribute('currentTrimedFromEnd', 'uint32_t', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::currentTrimedFromStart [variable] + cls.add_instance_attribute('currentTrimedFromStart', 'uint32_t', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::isFragment [variable] + cls.add_instance_attribute('isFragment', 'bool', is_const=False) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item::tid [variable] + cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False) + return + +def register_Ns3PacketMetadataItemIterator_methods(root_module, cls): + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata::ItemIterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketMetadata::ItemIterator const &', 'arg0')]) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::ItemIterator::ItemIterator(ns3::PacketMetadata const * metadata, ns3::Buffer buffer) [constructor] + cls.add_constructor([param('ns3::PacketMetadata const *', 'metadata'), param('ns3::Buffer', 'buffer')]) + ## packet-metadata.h (module 'network'): bool ns3::PacketMetadata::ItemIterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item ns3::PacketMetadata::ItemIterator::Next() [member function] + cls.add_method('Next', + 'ns3::PacketMetadata::Item', + []) + return + +def register_Ns3PacketTagIterator_methods(root_module, cls): + ## packet.h (module 'network'): ns3::PacketTagIterator::PacketTagIterator(ns3::PacketTagIterator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketTagIterator const &', 'arg0')]) + ## packet.h (module 'network'): bool ns3::PacketTagIterator::HasNext() const [member function] + cls.add_method('HasNext', + 'bool', + [], + is_const=True) + ## packet.h (module 'network'): ns3::PacketTagIterator::Item ns3::PacketTagIterator::Next() [member function] + cls.add_method('Next', + 'ns3::PacketTagIterator::Item', + []) + return + +def register_Ns3PacketTagIteratorItem_methods(root_module, cls): + ## packet.h (module 'network'): ns3::PacketTagIterator::Item::Item(ns3::PacketTagIterator::Item const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketTagIterator::Item const &', 'arg0')]) + ## packet.h (module 'network'): void ns3::PacketTagIterator::Item::GetTag(ns3::Tag & tag) const [member function] + cls.add_method('GetTag', + 'void', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): ns3::TypeId ns3::PacketTagIterator::Item::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + return + +def register_Ns3PacketTagList_methods(root_module, cls): + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList() [constructor] + cls.add_constructor([]) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::PacketTagList(ns3::PacketTagList const & o) [copy constructor] + cls.add_constructor([param('ns3::PacketTagList const &', 'o')]) + ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::Add(ns3::Tag const & tag) const [member function] + cls.add_method('Add', + 'void', + [param('ns3::Tag const &', 'tag')], + is_const=True) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData const * ns3::PacketTagList::Head() const [member function] + cls.add_method('Head', + 'ns3::PacketTagList::TagData const *', + [], + is_const=True) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Peek(ns3::Tag & tag) const [member function] + cls.add_method('Peek', + 'bool', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Remove(ns3::Tag & tag) [member function] + cls.add_method('Remove', + 'bool', + [param('ns3::Tag &', 'tag')]) + ## packet-tag-list.h (module 'network'): void ns3::PacketTagList::RemoveAll() [member function] + cls.add_method('RemoveAll', + 'void', + []) + return + +def register_Ns3PacketTagListTagData_methods(root_module, cls): + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData() [constructor] + cls.add_constructor([]) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData(ns3::PacketTagList::TagData const & arg0) [copy constructor] + cls.add_constructor([param('ns3::PacketTagList::TagData const &', 'arg0')]) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::count [variable] + cls.add_instance_attribute('count', 'uint32_t', is_const=False) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::data [variable] + cls.add_instance_attribute('data', 'uint8_t [ 20 ]', is_const=False) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::next [variable] + cls.add_instance_attribute('next', 'ns3::PacketTagList::TagData *', is_const=False) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::tid [variable] + cls.add_instance_attribute('tid', 'ns3::TypeId', is_const=False) + return + def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -884,6 +1806,128 @@ def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods is_static=True) return +def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) + ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static ns3::Ptr ns3::Simulator::GetImplementation() [member function] + cls.add_method('GetImplementation', + 'ns3::Ptr< ns3::SimulatorImpl >', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] + cls.add_method('RunOneEvent', + 'void', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + cls.add_method('SetImplementation', + 'void', + [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::ObjectFactory', 'schedulerFactory')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time const &', 'time')], + is_static=True) + return + +def register_Ns3Tag_methods(root_module, cls): + ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] + cls.add_constructor([]) + ## tag.h (module 'network'): ns3::Tag::Tag(ns3::Tag const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Tag const &', 'arg0')]) + ## tag.h (module 'network'): void ns3::Tag::Deserialize(ns3::TagBuffer i) [member function] + cls.add_method('Deserialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_pure_virtual=True, is_virtual=True) + ## tag.h (module 'network'): uint32_t ns3::Tag::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## tag.h (module 'network'): static ns3::TypeId ns3::Tag::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## tag.h (module 'network'): void ns3::Tag::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## tag.h (module 'network'): void ns3::Tag::Serialize(ns3::TagBuffer i) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3TagBuffer_methods(root_module, cls): ## tag-buffer.h (module 'network'): ns3::TagBuffer::TagBuffer(ns3::TagBuffer const & arg0) [copy constructor] cls.add_constructor([param('ns3::TagBuffer const &', 'arg0')]) @@ -1154,6 +2198,36 @@ def register_Ns3UnsafeAttributeList_methods(root_module, cls): [param('std::string', 'name'), param('ns3::AttributeValue const &', 'param')]) return +def register_Ns3Vector2D_methods(root_module, cls): + cls.add_output_stream_operator() + ## vector.h (module 'core'): ns3::Vector2D::Vector2D(ns3::Vector2D const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector2D const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector2D::Vector2D(double _x, double _y) [constructor] + cls.add_constructor([param('double', '_x'), param('double', '_y')]) + ## vector.h (module 'core'): ns3::Vector2D::Vector2D() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector2D::x [variable] + cls.add_instance_attribute('x', 'double', is_const=False) + ## vector.h (module 'core'): ns3::Vector2D::y [variable] + cls.add_instance_attribute('y', 'double', is_const=False) + return + +def register_Ns3Vector3D_methods(root_module, cls): + cls.add_output_stream_operator() + ## vector.h (module 'core'): ns3::Vector3D::Vector3D(ns3::Vector3D const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector3D const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector3D::Vector3D(double _x, double _y, double _z) [constructor] + cls.add_constructor([param('double', '_x'), param('double', '_y'), param('double', '_z')]) + ## vector.h (module 'core'): ns3::Vector3D::Vector3D() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector3D::x [variable] + cls.add_instance_attribute('x', 'double', is_const=False) + ## vector.h (module 'core'): ns3::Vector3D::y [variable] + cls.add_instance_attribute('y', 'double', is_const=False) + ## vector.h (module 'core'): ns3::Vector3D::z [variable] + cls.add_instance_attribute('z', 'double', is_const=False) + return + def register_Ns3Empty_methods(root_module, cls): ## empty.h (module 'core'): ns3::empty::empty() [constructor] cls.add_constructor([]) @@ -1268,6 +2342,107 @@ def register_Ns3Int64x64_t_methods(root_module, cls): [param('ns3::int64x64_t const &', 'o')]) return +def register_Ns3AnimByteTag_methods(root_module, cls): + ## animation-interface.h (module 'netanim'): ns3::AnimByteTag::AnimByteTag() [constructor] + cls.add_constructor([]) + ## animation-interface.h (module 'netanim'): ns3::AnimByteTag::AnimByteTag(ns3::AnimByteTag const & arg0) [copy constructor] + cls.add_constructor([param('ns3::AnimByteTag const &', 'arg0')]) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Deserialize(ns3::TagBuffer i) [member function] + cls.add_method('Deserialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_virtual=True) + ## animation-interface.h (module 'netanim'): uint64_t ns3::AnimByteTag::Get() const [member function] + cls.add_method('Get', + 'uint64_t', + [], + is_const=True) + ## animation-interface.h (module 'netanim'): ns3::TypeId ns3::AnimByteTag::GetInstanceTypeId() const [member function] + cls.add_method('GetInstanceTypeId', + 'ns3::TypeId', + [], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): uint32_t ns3::AnimByteTag::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): static ns3::TypeId ns3::AnimByteTag::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Serialize(ns3::TagBuffer i) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::TagBuffer', 'i')], + is_const=True, is_virtual=True) + ## animation-interface.h (module 'netanim'): void ns3::AnimByteTag::Set(uint64_t AnimUid) [member function] + cls.add_method('Set', + 'void', + [param('uint64_t', 'AnimUid')]) + return + +def register_Ns3Chunk_methods(root_module, cls): + ## chunk.h (module 'network'): ns3::Chunk::Chunk() [constructor] + cls.add_constructor([]) + ## chunk.h (module 'network'): ns3::Chunk::Chunk(ns3::Chunk const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Chunk const &', 'arg0')]) + ## chunk.h (module 'network'): uint32_t ns3::Chunk::Deserialize(ns3::Buffer::Iterator start) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_virtual=True) + ## chunk.h (module 'network'): static ns3::TypeId ns3::Chunk::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## chunk.h (module 'network'): void ns3::Chunk::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + +def register_Ns3Header_methods(root_module, cls): + cls.add_output_stream_operator() + ## header.h (module 'network'): ns3::Header::Header() [constructor] + cls.add_constructor([]) + ## header.h (module 'network'): ns3::Header::Header(ns3::Header const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Header const &', 'arg0')]) + ## header.h (module 'network'): uint32_t ns3::Header::Deserialize(ns3::Buffer::Iterator start) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_virtual=True) + ## header.h (module 'network'): uint32_t ns3::Header::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## header.h (module 'network'): static ns3::TypeId ns3::Header::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## header.h (module 'network'): void ns3::Header::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## header.h (module 'network'): void ns3::Header::Serialize(ns3::Buffer::Iterator start) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3Object_methods(root_module, cls): ## object.h (module 'core'): ns3::Object::Object() [constructor] cls.add_constructor([]) @@ -1382,6 +2557,42 @@ def register_Ns3SimpleRefCount__Ns3CallbackImplBase_Ns3Empty_Ns3DefaultDeleter__ is_static=True) return +def register_Ns3SimpleRefCount__Ns3EventImpl_Ns3Empty_Ns3DefaultDeleter__lt__ns3EventImpl__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter< ns3::EventImpl > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + +def register_Ns3SimpleRefCount__Ns3NixVector_Ns3Empty_Ns3DefaultDeleter__lt__ns3NixVector__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter< ns3::NixVector > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + +def register_Ns3SimpleRefCount__Ns3Packet_Ns3Empty_Ns3DefaultDeleter__lt__ns3Packet__gt___methods(root_module, cls): + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] + cls.add_constructor([]) + ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount(ns3::SimpleRefCount > const & o) [copy constructor] + cls.add_constructor([param('ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter< ns3::Packet > > const &', 'o')]) + ## simple-ref-count.h (module 'core'): static void ns3::SimpleRefCount >::Cleanup() [member function] + cls.add_method('Cleanup', + 'void', + [], + is_static=True) + return + def register_Ns3Time_methods(root_module, cls): cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) @@ -1538,6 +2749,39 @@ def register_Ns3Time_methods(root_module, cls): is_const=True) return +def register_Ns3Trailer_methods(root_module, cls): + cls.add_output_stream_operator() + ## trailer.h (module 'network'): ns3::Trailer::Trailer() [constructor] + cls.add_constructor([]) + ## trailer.h (module 'network'): ns3::Trailer::Trailer(ns3::Trailer const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Trailer const &', 'arg0')]) + ## trailer.h (module 'network'): uint32_t ns3::Trailer::Deserialize(ns3::Buffer::Iterator end) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('ns3::Buffer::Iterator', 'end')], + is_pure_virtual=True, is_virtual=True) + ## trailer.h (module 'network'): uint32_t ns3::Trailer::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## trailer.h (module 'network'): static ns3::TypeId ns3::Trailer::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## trailer.h (module 'network'): void ns3::Trailer::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_pure_virtual=True, is_const=True, is_virtual=True) + ## trailer.h (module 'network'): void ns3::Trailer::Serialize(ns3::Buffer::Iterator start) const [member function] + cls.add_method('Serialize', + 'void', + [param('ns3::Buffer::Iterator', 'start')], + is_pure_virtual=True, is_const=True, is_virtual=True) + return + def register_Ns3AttributeAccessor_methods(root_module, cls): ## attribute.h (module 'core'): ns3::AttributeAccessor::AttributeAccessor(ns3::AttributeAccessor const & arg0) [copy constructor] cls.add_constructor([param('ns3::AttributeAccessor const &', 'arg0')]) @@ -1693,6 +2937,30 @@ def register_Ns3EmptyAttributeValue_methods(root_module, cls): is_const=True, visibility='private', is_virtual=True) return +def register_Ns3EventImpl_methods(root_module, cls): + ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EventImpl const &', 'arg0')]) + ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl() [constructor] + cls.add_constructor([]) + ## event-impl.h (module 'core'): void ns3::EventImpl::Cancel() [member function] + cls.add_method('Cancel', + 'void', + []) + ## event-impl.h (module 'core'): void ns3::EventImpl::Invoke() [member function] + cls.add_method('Invoke', + 'void', + []) + ## event-impl.h (module 'core'): bool ns3::EventImpl::IsCancelled() [member function] + cls.add_method('IsCancelled', + 'bool', + []) + ## event-impl.h (module 'core'): void ns3::EventImpl::Notify() [member function] + cls.add_method('Notify', + 'void', + [], + is_pure_virtual=True, visibility='protected', is_virtual=True) + return + def register_Ns3Ipv4AddressChecker_methods(root_module, cls): ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker::Ipv4AddressChecker() [constructor] cls.add_constructor([]) @@ -1853,6 +3121,97 @@ def register_Ns3Ipv6PrefixValue_methods(root_module, cls): [param('ns3::Ipv6Prefix const &', 'value')]) return +def register_Ns3Mac48AddressChecker_methods(root_module, cls): + ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] + cls.add_constructor([]) + ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker(ns3::Mac48AddressChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Mac48AddressChecker const &', 'arg0')]) + return + +def register_Ns3Mac48AddressValue_methods(root_module, cls): + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue() [constructor] + cls.add_constructor([]) + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48AddressValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Mac48AddressValue const &', 'arg0')]) + ## mac48-address.h (module 'network'): ns3::Mac48AddressValue::Mac48AddressValue(ns3::Mac48Address const & value) [constructor] + cls.add_constructor([param('ns3::Mac48Address const &', 'value')]) + ## mac48-address.h (module 'network'): ns3::Ptr ns3::Mac48AddressValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## mac48-address.h (module 'network'): bool ns3::Mac48AddressValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## mac48-address.h (module 'network'): ns3::Mac48Address ns3::Mac48AddressValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Mac48Address', + [], + is_const=True) + ## mac48-address.h (module 'network'): std::string ns3::Mac48AddressValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## mac48-address.h (module 'network'): void ns3::Mac48AddressValue::Set(ns3::Mac48Address const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Mac48Address const &', 'value')]) + return + +def register_Ns3MobilityModel_methods(root_module, cls): + ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel(ns3::MobilityModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::MobilityModel const &', 'arg0')]) + ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel() [constructor] + cls.add_constructor([]) + ## mobility-model.h (module 'mobility'): double ns3::MobilityModel::GetDistanceFrom(ns3::Ptr position) const [member function] + cls.add_method('GetDistanceFrom', + 'double', + [param('ns3::Ptr< ns3::MobilityModel const >', 'position')], + is_const=True) + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetPosition() const [member function] + cls.add_method('GetPosition', + 'ns3::Vector', + [], + is_const=True) + ## mobility-model.h (module 'mobility'): static ns3::TypeId ns3::MobilityModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::GetVelocity() const [member function] + cls.add_method('GetVelocity', + 'ns3::Vector', + [], + is_const=True) + ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::SetPosition(ns3::Vector const & position) [member function] + cls.add_method('SetPosition', + 'void', + [param('ns3::Vector const &', 'position')]) + ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::NotifyCourseChange() const [member function] + cls.add_method('NotifyCourseChange', + 'void', + [], + is_const=True, visibility='protected') + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetPosition() const [member function] + cls.add_method('DoGetPosition', + 'ns3::Vector', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## mobility-model.h (module 'mobility'): ns3::Vector ns3::MobilityModel::DoGetVelocity() const [member function] + cls.add_method('DoGetVelocity', + 'ns3::Vector', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + ## mobility-model.h (module 'mobility'): void ns3::MobilityModel::DoSetPosition(ns3::Vector const & position) [member function] + cls.add_method('DoSetPosition', + 'void', + [param('ns3::Vector const &', 'position')], + is_pure_virtual=True, visibility='private', is_virtual=True) + return + def register_Ns3NetDevice_methods(root_module, cls): ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor] cls.add_constructor([]) @@ -1985,6 +3344,354 @@ def register_Ns3NetDevice_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3NixVector_methods(root_module, cls): + cls.add_output_stream_operator() + ## nix-vector.h (module 'network'): ns3::NixVector::NixVector() [constructor] + cls.add_constructor([]) + ## nix-vector.h (module 'network'): ns3::NixVector::NixVector(ns3::NixVector const & o) [copy constructor] + cls.add_constructor([param('ns3::NixVector const &', 'o')]) + ## nix-vector.h (module 'network'): void ns3::NixVector::AddNeighborIndex(uint32_t newBits, uint32_t numberOfBits) [member function] + cls.add_method('AddNeighborIndex', + 'void', + [param('uint32_t', 'newBits'), param('uint32_t', 'numberOfBits')]) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::BitCount(uint32_t numberOfNeighbors) const [member function] + cls.add_method('BitCount', + 'uint32_t', + [param('uint32_t', 'numberOfNeighbors')], + is_const=True) + ## nix-vector.h (module 'network'): ns3::Ptr ns3::NixVector::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::NixVector >', + [], + is_const=True) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Deserialize(uint32_t const * buffer, uint32_t size) [member function] + cls.add_method('Deserialize', + 'uint32_t', + [param('uint32_t const *', 'buffer'), param('uint32_t', 'size')]) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::ExtractNeighborIndex(uint32_t numberOfBits) [member function] + cls.add_method('ExtractNeighborIndex', + 'uint32_t', + [param('uint32_t', 'numberOfBits')]) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetRemainingBits() [member function] + cls.add_method('GetRemainingBits', + 'uint32_t', + []) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## nix-vector.h (module 'network'): uint32_t ns3::NixVector::Serialize(uint32_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint32_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + return + +def register_Ns3Node_methods(root_module, cls): + ## node.h (module 'network'): ns3::Node::Node(ns3::Node const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Node const &', 'arg0')]) + ## node.h (module 'network'): ns3::Node::Node() [constructor] + cls.add_constructor([]) + ## node.h (module 'network'): ns3::Node::Node(uint32_t systemId) [constructor] + cls.add_constructor([param('uint32_t', 'systemId')]) + ## node.h (module 'network'): uint32_t ns3::Node::AddApplication(ns3::Ptr application) [member function] + cls.add_method('AddApplication', + 'uint32_t', + [param('ns3::Ptr< ns3::Application >', 'application')]) + ## node.h (module 'network'): uint32_t ns3::Node::AddDevice(ns3::Ptr device) [member function] + cls.add_method('AddDevice', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')]) + ## node.h (module 'network'): static bool ns3::Node::ChecksumEnabled() [member function] + cls.add_method('ChecksumEnabled', + 'bool', + [], + is_static=True) + ## node.h (module 'network'): ns3::Ptr ns3::Node::GetApplication(uint32_t index) const [member function] + cls.add_method('GetApplication', + 'ns3::Ptr< ns3::Application >', + [param('uint32_t', 'index')], + is_const=True) + ## node.h (module 'network'): ns3::Ptr ns3::Node::GetDevice(uint32_t index) const [member function] + cls.add_method('GetDevice', + 'ns3::Ptr< ns3::NetDevice >', + [param('uint32_t', 'index')], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetId() const [member function] + cls.add_method('GetId', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetNApplications() const [member function] + cls.add_method('GetNApplications', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetNDevices() const [member function] + cls.add_method('GetNDevices', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): uint32_t ns3::Node::GetSystemId() const [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_const=True) + ## node.h (module 'network'): static ns3::TypeId ns3::Node::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) + ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] + cls.add_method('RegisterProtocolHandler', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) + ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] + cls.add_method('UnregisterProtocolHandler', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler')]) + ## node.h (module 'network'): void ns3::Node::DoDispose() [member function] + cls.add_method('DoDispose', + 'void', + [], + visibility='protected', is_virtual=True) + ## node.h (module 'network'): void ns3::Node::DoStart() [member function] + cls.add_method('DoStart', + 'void', + [], + visibility='protected', is_virtual=True) + return + +def register_Ns3ObjectFactoryChecker_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')]) + return + +def register_Ns3ObjectFactoryValue_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'value')]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactoryValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function] + cls.add_method('Get', + 'ns3::ObjectFactory', + [], + is_const=True) + ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::ObjectFactory const &', 'value')]) + return + +def register_Ns3Packet_methods(root_module, cls): + cls.add_output_stream_operator() + ## packet.h (module 'network'): ns3::Packet::Packet() [constructor] + cls.add_constructor([]) + ## packet.h (module 'network'): ns3::Packet::Packet(ns3::Packet const & o) [copy constructor] + cls.add_constructor([param('ns3::Packet const &', 'o')]) + ## packet.h (module 'network'): ns3::Packet::Packet(uint32_t size) [constructor] + cls.add_constructor([param('uint32_t', 'size')]) + ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size, bool magic) [constructor] + cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size'), param('bool', 'magic')]) + ## packet.h (module 'network'): ns3::Packet::Packet(uint8_t const * buffer, uint32_t size) [constructor] + cls.add_constructor([param('uint8_t const *', 'buffer'), param('uint32_t', 'size')]) + ## packet.h (module 'network'): void ns3::Packet::AddAtEnd(ns3::Ptr packet) [member function] + cls.add_method('AddAtEnd', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## packet.h (module 'network'): void ns3::Packet::AddByteTag(ns3::Tag const & tag) const [member function] + cls.add_method('AddByteTag', + 'void', + [param('ns3::Tag const &', 'tag')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::AddHeader(ns3::Header const & header) [member function] + cls.add_method('AddHeader', + 'void', + [param('ns3::Header const &', 'header')]) + ## packet.h (module 'network'): void ns3::Packet::AddPacketTag(ns3::Tag const & tag) const [member function] + cls.add_method('AddPacketTag', + 'void', + [param('ns3::Tag const &', 'tag')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::AddPaddingAtEnd(uint32_t size) [member function] + cls.add_method('AddPaddingAtEnd', + 'void', + [param('uint32_t', 'size')]) + ## packet.h (module 'network'): void ns3::Packet::AddTrailer(ns3::Trailer const & trailer) [member function] + cls.add_method('AddTrailer', + 'void', + [param('ns3::Trailer const &', 'trailer')]) + ## packet.h (module 'network'): ns3::PacketMetadata::ItemIterator ns3::Packet::BeginItem() const [member function] + cls.add_method('BeginItem', + 'ns3::PacketMetadata::ItemIterator', + [], + is_const=True) + ## packet.h (module 'network'): ns3::Ptr ns3::Packet::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::Packet >', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::CopyData(uint8_t * buffer, uint32_t size) const [member function] + cls.add_method('CopyData', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'size')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::CopyData(std::ostream * os, uint32_t size) const [member function] + cls.add_method('CopyData', + 'void', + [param('std::ostream *', 'os'), param('uint32_t', 'size')], + is_const=True) + ## packet.h (module 'network'): ns3::Ptr ns3::Packet::CreateFragment(uint32_t start, uint32_t length) const [member function] + cls.add_method('CreateFragment', + 'ns3::Ptr< ns3::Packet >', + [param('uint32_t', 'start'), param('uint32_t', 'length')], + is_const=True) + ## packet.h (module 'network'): static void ns3::Packet::EnableChecking() [member function] + cls.add_method('EnableChecking', + 'void', + [], + is_static=True) + ## packet.h (module 'network'): static void ns3::Packet::EnablePrinting() [member function] + cls.add_method('EnablePrinting', + 'void', + [], + is_static=True) + ## packet.h (module 'network'): bool ns3::Packet::FindFirstMatchingByteTag(ns3::Tag & tag) const [member function] + cls.add_method('FindFirstMatchingByteTag', + 'bool', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): ns3::ByteTagIterator ns3::Packet::GetByteTagIterator() const [member function] + cls.add_method('GetByteTagIterator', + 'ns3::ByteTagIterator', + [], + is_const=True) + ## packet.h (module 'network'): ns3::Ptr ns3::Packet::GetNixVector() const [member function] + cls.add_method('GetNixVector', + 'ns3::Ptr< ns3::NixVector >', + [], + is_const=True) + ## packet.h (module 'network'): ns3::PacketTagIterator ns3::Packet::GetPacketTagIterator() const [member function] + cls.add_method('GetPacketTagIterator', + 'ns3::PacketTagIterator', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::GetSerializedSize() const [member function] + cls.add_method('GetSerializedSize', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::GetSize() const [member function] + cls.add_method('GetSize', + 'uint32_t', + [], + is_const=True) + ## packet.h (module 'network'): uint64_t ns3::Packet::GetUid() const [member function] + cls.add_method('GetUid', + 'uint64_t', + [], + is_const=True) + ## packet.h (module 'network'): uint8_t const * ns3::Packet::PeekData() const [member function] + cls.add_method('PeekData', + 'uint8_t const *', + [], + deprecated=True, is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::PeekHeader(ns3::Header & header) const [member function] + cls.add_method('PeekHeader', + 'uint32_t', + [param('ns3::Header &', 'header')], + is_const=True) + ## packet.h (module 'network'): bool ns3::Packet::PeekPacketTag(ns3::Tag & tag) const [member function] + cls.add_method('PeekPacketTag', + 'bool', + [param('ns3::Tag &', 'tag')], + is_const=True) + ## packet.h (module 'network'): uint32_t ns3::Packet::PeekTrailer(ns3::Trailer & trailer) [member function] + cls.add_method('PeekTrailer', + 'uint32_t', + [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): void ns3::Packet::Print(std::ostream & os) const [member function] + cls.add_method('Print', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::PrintByteTags(std::ostream & os) const [member function] + cls.add_method('PrintByteTags', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::PrintPacketTags(std::ostream & os) const [member function] + cls.add_method('PrintPacketTags', + 'void', + [param('std::ostream &', 'os')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::RemoveAllByteTags() [member function] + cls.add_method('RemoveAllByteTags', + 'void', + []) + ## packet.h (module 'network'): void ns3::Packet::RemoveAllPacketTags() [member function] + cls.add_method('RemoveAllPacketTags', + 'void', + []) + ## packet.h (module 'network'): void ns3::Packet::RemoveAtEnd(uint32_t size) [member function] + cls.add_method('RemoveAtEnd', + 'void', + [param('uint32_t', 'size')]) + ## packet.h (module 'network'): void ns3::Packet::RemoveAtStart(uint32_t size) [member function] + cls.add_method('RemoveAtStart', + 'void', + [param('uint32_t', 'size')]) + ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveHeader(ns3::Header & header) [member function] + cls.add_method('RemoveHeader', + 'uint32_t', + [param('ns3::Header &', 'header')]) + ## packet.h (module 'network'): bool ns3::Packet::RemovePacketTag(ns3::Tag & tag) [member function] + cls.add_method('RemovePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) + ## packet.h (module 'network'): uint32_t ns3::Packet::RemoveTrailer(ns3::Trailer & trailer) [member function] + cls.add_method('RemoveTrailer', + 'uint32_t', + [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] + cls.add_method('Serialize', + 'uint32_t', + [param('uint8_t *', 'buffer'), param('uint32_t', 'maxSize')], + is_const=True) + ## packet.h (module 'network'): void ns3::Packet::SetNixVector(ns3::Ptr arg0) [member function] + cls.add_method('SetNixVector', + 'void', + [param('ns3::Ptr< ns3::NixVector >', 'arg0')]) + return + def register_Ns3TimeChecker_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] cls.add_constructor([]) @@ -2065,6 +3772,86 @@ def register_Ns3TypeIdValue_methods(root_module, cls): [param('ns3::TypeId const &', 'value')]) return +def register_Ns3Vector2DChecker_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector2DChecker::Vector2DChecker() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector2DChecker::Vector2DChecker(ns3::Vector2DChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector2DChecker const &', 'arg0')]) + return + +def register_Ns3Vector2DValue_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector2DValue::Vector2DValue() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector2DValue::Vector2DValue(ns3::Vector2DValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector2DValue const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector2DValue::Vector2DValue(ns3::Vector2D const & value) [constructor] + cls.add_constructor([param('ns3::Vector2D const &', 'value')]) + ## vector.h (module 'core'): ns3::Ptr ns3::Vector2DValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): bool ns3::Vector2DValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## vector.h (module 'core'): ns3::Vector2D ns3::Vector2DValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Vector2D', + [], + is_const=True) + ## vector.h (module 'core'): std::string ns3::Vector2DValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): void ns3::Vector2DValue::Set(ns3::Vector2D const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Vector2D const &', 'value')]) + return + +def register_Ns3Vector3DChecker_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector3DChecker::Vector3DChecker() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector3DChecker::Vector3DChecker(ns3::Vector3DChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector3DChecker const &', 'arg0')]) + return + +def register_Ns3Vector3DValue_methods(root_module, cls): + ## vector.h (module 'core'): ns3::Vector3DValue::Vector3DValue() [constructor] + cls.add_constructor([]) + ## vector.h (module 'core'): ns3::Vector3DValue::Vector3DValue(ns3::Vector3DValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Vector3DValue const &', 'arg0')]) + ## vector.h (module 'core'): ns3::Vector3DValue::Vector3DValue(ns3::Vector3D const & value) [constructor] + cls.add_constructor([param('ns3::Vector3D const &', 'value')]) + ## vector.h (module 'core'): ns3::Ptr ns3::Vector3DValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): bool ns3::Vector3DValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## vector.h (module 'core'): ns3::Vector3D ns3::Vector3DValue::Get() const [member function] + cls.add_method('Get', + 'ns3::Vector3D', + [], + is_const=True) + ## vector.h (module 'core'): std::string ns3::Vector3DValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## vector.h (module 'core'): void ns3::Vector3DValue::Set(ns3::Vector3D const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::Vector3D const &', 'value')]) + return + def register_Ns3AddressChecker_methods(root_module, cls): ## address.h (module 'network'): ns3::AddressChecker::AddressChecker() [constructor] cls.add_constructor([]) @@ -2105,11 +3892,74 @@ def register_Ns3AddressValue_methods(root_module, cls): [param('ns3::Address const &', 'value')]) return +def register_Ns3ConfigMatchContainer_methods(root_module, cls): + ## config.h (module 'core'): ns3::Config::MatchContainer::MatchContainer(ns3::Config::MatchContainer const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Config::MatchContainer const &', 'arg0')]) + ## config.h (module 'core'): ns3::Config::MatchContainer::MatchContainer() [constructor] + cls.add_constructor([]) + ## config.h (module 'core'): ns3::Config::MatchContainer::MatchContainer(std::vector, std::allocator > > const & objects, std::vector > const & contexts, std::string path) [constructor] + cls.add_constructor([param('std::vector< ns3::Ptr< ns3::Object > > const &', 'objects'), param('std::vector< std::string > const &', 'contexts'), param('std::string', 'path')]) + ## config.h (module 'core'): __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::Config::MatchContainer::Begin() const [member function] + cls.add_method('Begin', + '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Object > const, std::vector< ns3::Ptr< ns3::Object > > >', + [], + is_const=True) + ## config.h (module 'core'): void ns3::Config::MatchContainer::Connect(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('Connect', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): void ns3::Config::MatchContainer::ConnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('ConnectWithoutContext', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): void ns3::Config::MatchContainer::Disconnect(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('Disconnect', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): void ns3::Config::MatchContainer::DisconnectWithoutContext(std::string name, ns3::CallbackBase const & cb) [member function] + cls.add_method('DisconnectWithoutContext', + 'void', + [param('std::string', 'name'), param('ns3::CallbackBase const &', 'cb')]) + ## config.h (module 'core'): __gnu_cxx::__normal_iterator*,std::vector, std::allocator > > > ns3::Config::MatchContainer::End() const [member function] + cls.add_method('End', + '__gnu_cxx::__normal_iterator< ns3::Ptr< ns3::Object > const, std::vector< ns3::Ptr< ns3::Object > > >', + [], + is_const=True) + ## config.h (module 'core'): ns3::Ptr ns3::Config::MatchContainer::Get(uint32_t i) const [member function] + cls.add_method('Get', + 'ns3::Ptr< ns3::Object >', + [param('uint32_t', 'i')], + is_const=True) + ## config.h (module 'core'): std::string ns3::Config::MatchContainer::GetMatchedPath(uint32_t i) const [member function] + cls.add_method('GetMatchedPath', + 'std::string', + [param('uint32_t', 'i')], + is_const=True) + ## config.h (module 'core'): uint32_t ns3::Config::MatchContainer::GetN() const [member function] + cls.add_method('GetN', + 'uint32_t', + [], + is_const=True) + ## config.h (module 'core'): std::string ns3::Config::MatchContainer::GetPath() const [member function] + cls.add_method('GetPath', + 'std::string', + [], + is_const=True) + ## config.h (module 'core'): void ns3::Config::MatchContainer::Set(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + return + def register_functions(root_module): module = root_module + register_functions_ns3_Config(module.get_submodule('Config'), root_module) register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module) return +def register_functions_ns3_Config(module, root_module): + return + def register_functions_ns3_FatalImpl(module, root_module): return diff --git a/src/network/bindings/modulegen__gcc_ILP32.py b/src/network/bindings/modulegen__gcc_ILP32.py index 6756222ae..f83926c4b 100644 --- a/src/network/bindings/modulegen__gcc_ILP32.py +++ b/src/network/bindings/modulegen__gcc_ILP32.py @@ -147,7 +147,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -384,6 +384,9 @@ def register_types(module): module.add_class('PbbAddressTlv', parent=root_module['ns3::PbbTlv']) module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -396,15 +399,12 @@ def register_types(module): typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') ## Register a nested module for the namespace FatalImpl @@ -5817,10 +5817,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5835,11 +5843,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/network/bindings/modulegen__gcc_LP64.py b/src/network/bindings/modulegen__gcc_LP64.py index 6756222ae..f83926c4b 100644 --- a/src/network/bindings/modulegen__gcc_LP64.py +++ b/src/network/bindings/modulegen__gcc_LP64.py @@ -147,7 +147,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -384,6 +384,9 @@ def register_types(module): module.add_class('PbbAddressTlv', parent=root_module['ns3::PbbTlv']) module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type='list') module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -396,15 +399,12 @@ def register_types(module): typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') ## Register a nested module for the namespace FatalImpl @@ -5817,10 +5817,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5835,11 +5843,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py b/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py index 5f50b26ed..d418b8eb9 100644 --- a/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py +++ b/src/nix-vector-routing/bindings/modulegen__gcc_ILP32.py @@ -242,6 +242,7 @@ def register_types(module): module.add_class('BridgeNetDevice', import_from_module='ns.bridge', parent=root_module['ns3::NetDevice']) ## ipv4-nix-vector-routing.h (module 'nix-vector-routing'): ns3::Ipv4NixVectorRouting [class] module.add_class('Ipv4NixVectorRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') typehandlers.add_type_alias('std::map< ns3::Ipv4Address, ns3::Ptr< ns3::NixVector >, std::less< ns3::Ipv4Address >, std::allocator< std::pair< ns3::Ipv4Address const, ns3::Ptr< ns3::NixVector > > > >', 'ns3::NixMap_t') typehandlers.add_type_alias('std::map< ns3::Ipv4Address, ns3::Ptr< ns3::NixVector >, std::less< ns3::Ipv4Address >, std::allocator< std::pair< ns3::Ipv4Address const, ns3::Ptr< ns3::NixVector > > > >*', 'ns3::NixMap_t*') typehandlers.add_type_alias('std::map< ns3::Ipv4Address, ns3::Ptr< ns3::NixVector >, std::less< ns3::Ipv4Address >, std::allocator< std::pair< ns3::Ipv4Address const, ns3::Ptr< ns3::NixVector > > > >&', 'ns3::NixMap_t&') @@ -2413,10 +2414,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3667,10 +3668,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4146,10 +4152,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4164,11 +4178,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py b/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py index 5f50b26ed..d418b8eb9 100644 --- a/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py +++ b/src/nix-vector-routing/bindings/modulegen__gcc_LP64.py @@ -242,6 +242,7 @@ def register_types(module): module.add_class('BridgeNetDevice', import_from_module='ns.bridge', parent=root_module['ns3::NetDevice']) ## ipv4-nix-vector-routing.h (module 'nix-vector-routing'): ns3::Ipv4NixVectorRouting [class] module.add_class('Ipv4NixVectorRouting', parent=root_module['ns3::Ipv4RoutingProtocol']) + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') typehandlers.add_type_alias('std::map< ns3::Ipv4Address, ns3::Ptr< ns3::NixVector >, std::less< ns3::Ipv4Address >, std::allocator< std::pair< ns3::Ipv4Address const, ns3::Ptr< ns3::NixVector > > > >', 'ns3::NixMap_t') typehandlers.add_type_alias('std::map< ns3::Ipv4Address, ns3::Ptr< ns3::NixVector >, std::less< ns3::Ipv4Address >, std::allocator< std::pair< ns3::Ipv4Address const, ns3::Ptr< ns3::NixVector > > > >*', 'ns3::NixMap_t*') typehandlers.add_type_alias('std::map< ns3::Ipv4Address, ns3::Ptr< ns3::NixVector >, std::less< ns3::Ipv4Address >, std::allocator< std::pair< ns3::Ipv4Address const, ns3::Ptr< ns3::NixVector > > > >&', 'ns3::NixMap_t&') @@ -2413,10 +2414,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3667,10 +3668,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4146,10 +4152,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4164,11 +4178,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/olsr/bindings/modulegen__gcc_ILP32.py b/src/olsr/bindings/modulegen__gcc_ILP32.py index 407051d95..2f2817ca0 100644 --- a/src/olsr/bindings/modulegen__gcc_ILP32.py +++ b/src/olsr/bindings/modulegen__gcc_ILP32.py @@ -123,7 +123,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs [class] module.add_class('SystemWallClockMs', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] @@ -284,6 +284,7 @@ def register_types(module): module.add_container('std::vector< ns3::olsr::AssociationTuple >', 'ns3::olsr::AssociationTuple', container_type='vector') module.add_container('std::vector< ns3::olsr::Association >', 'ns3::olsr::Association', container_type='vector') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector') ## Register a nested module for the namespace FatalImpl @@ -2979,10 +2980,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -4225,10 +4226,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4789,10 +4795,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4807,11 +4821,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/olsr/bindings/modulegen__gcc_LP64.py b/src/olsr/bindings/modulegen__gcc_LP64.py index 407051d95..2f2817ca0 100644 --- a/src/olsr/bindings/modulegen__gcc_LP64.py +++ b/src/olsr/bindings/modulegen__gcc_LP64.py @@ -123,7 +123,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs [class] module.add_class('SystemWallClockMs', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] @@ -284,6 +284,7 @@ def register_types(module): module.add_container('std::vector< ns3::olsr::AssociationTuple >', 'ns3::olsr::AssociationTuple', container_type='vector') module.add_container('std::vector< ns3::olsr::Association >', 'ns3::olsr::Association', container_type='vector') module.add_container('std::vector< ns3::Ipv4Address >', 'ns3::Ipv4Address', container_type='vector') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') module.add_container('std::vector< unsigned int >', 'unsigned int', container_type='vector') ## Register a nested module for the namespace FatalImpl @@ -2979,10 +2980,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -4225,10 +4226,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4789,10 +4795,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4807,11 +4821,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py b/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py index 7a3062556..8a875c128 100644 --- a/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py +++ b/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py @@ -129,7 +129,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -229,7 +229,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -286,6 +286,7 @@ def register_types(module): module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -3354,10 +3355,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -4685,29 +4686,18 @@ def register_Ns3Ipv4AddressValue_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -4716,102 +4706,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -4822,36 +4741,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -4862,26 +4863,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4976,10 +4977,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -5746,10 +5752,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5764,11 +5778,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py b/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py index 7a3062556..8a875c128 100644 --- a/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py +++ b/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py @@ -129,7 +129,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -229,7 +229,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -286,6 +286,7 @@ def register_types(module): module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -3354,10 +3355,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -4685,29 +4686,18 @@ def register_Ns3Ipv4AddressValue_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -4716,102 +4706,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -4822,36 +4741,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -4862,26 +4863,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -4976,10 +4977,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -5746,10 +5752,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -5764,11 +5778,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/point-to-point/bindings/modulegen__gcc_ILP32.py b/src/point-to-point/bindings/modulegen__gcc_ILP32.py index f46a38c82..fe3327f38 100644 --- a/src/point-to-point/bindings/modulegen__gcc_ILP32.py +++ b/src/point-to-point/bindings/modulegen__gcc_ILP32.py @@ -105,7 +105,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -3789,10 +3789,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -3807,11 +3815,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/point-to-point/bindings/modulegen__gcc_LP64.py b/src/point-to-point/bindings/modulegen__gcc_LP64.py index f46a38c82..fe3327f38 100644 --- a/src/point-to-point/bindings/modulegen__gcc_LP64.py +++ b/src/point-to-point/bindings/modulegen__gcc_LP64.py @@ -105,7 +105,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -3789,10 +3789,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -3807,11 +3815,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/spectrum/bindings/callbacks_list.py b/src/spectrum/bindings/callbacks_list.py index d19dcf015..382599b22 100644 --- a/src/spectrum/bindings/callbacks_list.py +++ b/src/spectrum/bindings/callbacks_list.py @@ -1,7 +1,7 @@ callback_classes = [ + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::Address const&', 'ns3::NetDevice::PacketType', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'ns3::Ptr', 'ns3::Ptr', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], diff --git a/src/spectrum/bindings/modulegen__gcc_ILP32.py b/src/spectrum/bindings/modulegen__gcc_ILP32.py index 4108303d5..69320507c 100644 --- a/src/spectrum/bindings/modulegen__gcc_ILP32.py +++ b/src/spectrum/bindings/modulegen__gcc_ILP32.py @@ -118,6 +118,8 @@ def register_types(module): module.add_class('SpectrumType') ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory [class] module.add_class('SpectrumTypeFactory') + ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs [class] + module.add_class('SystemWallClockMs', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -186,10 +188,16 @@ def register_types(module): module.add_class('ParetoVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel [class] module.add_class('PropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::Object']) + ## propagation-loss-model.h (module 'propagation'): ns3::PropagationLossModel [class] + module.add_class('PropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::Object']) ## queue.h (module 'network'): ns3::Queue [class] module.add_class('Queue', import_from_module='ns.network', parent=root_module['ns3::Object']) ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel [class] module.add_class('RandomPropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationDelayModel']) + ## propagation-loss-model.h (module 'propagation'): ns3::RandomPropagationLossModel [class] + module.add_class('RandomPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) + ## propagation-loss-model.h (module 'propagation'): ns3::RangePropagationLossModel [class] + module.add_class('RangePropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -226,6 +234,8 @@ def register_types(module): module.add_class('SpectrumPropagationLossModel', parent=root_module['ns3::Object']) ## spectrum-value.h (module 'spectrum'): ns3::SpectrumValue [class] module.add_class('SpectrumValue', parent=root_module['ns3::SimpleRefCount< ns3::SpectrumValue, ns3::empty, ns3::DefaultDeleter >']) + ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel [class] + module.add_class('ThreeLogDistancePropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## nstime.h (module 'core'): ns3::Time [class] module.add_class('Time', import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] @@ -236,6 +246,8 @@ def register_types(module): module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >']) ## trailer.h (module 'network'): ns3::Trailer [class] module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk']) + ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel [class] + module.add_class('TwoRayGroundPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## waveform-generator.h (module 'spectrum'): ns3::WaveformGenerator [class] module.add_class('WaveformGenerator', parent=root_module['ns3::SpectrumPhy']) ## aloha-noack-mac-header.h (module 'spectrum'): ns3::AlohaNoackMacHeader [class] @@ -264,6 +276,10 @@ def register_types(module): module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## event-impl.h (module 'core'): ns3::EventImpl [class] module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) + ## propagation-loss-model.h (module 'propagation'): ns3::FixedRssLossModel [class] + module.add_class('FixedRssLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) + ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel [class] + module.add_class('FriisPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## friis-spectrum-propagation-loss.h (module 'spectrum'): ns3::FriisSpectrumPropagationLossModel [class] module.add_class('FriisSpectrumPropagationLossModel', parent=root_module['ns3::SpectrumPropagationLossModel']) ## half-duplex-ideal-phy.h (module 'spectrum'): ns3::HalfDuplexIdealPhy [class] @@ -286,12 +302,18 @@ def register_types(module): module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class] module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## propagation-loss-model.h (module 'propagation'): ns3::LogDistancePropagationLossModel [class] + module.add_class('LogDistancePropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## propagation-loss-model.h (module 'propagation'): ns3::MatrixPropagationLossModel [class] + module.add_class('MatrixPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class] module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object']) + ## propagation-loss-model.h (module 'propagation'): ns3::NakagamiPropagationLossModel [class] + module.add_class('NakagamiPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## net-device.h (module 'network'): ns3::NetDevice [class] module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration] @@ -351,6 +373,9 @@ def register_types(module): module.add_container('std::vector< double >', 'double', container_type='vector') module.add_container('ns3::Bands', 'ns3::BandInfo', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -387,18 +412,15 @@ def register_types(module): typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') @@ -467,6 +489,7 @@ def register_methods(root_module): register_Ns3SpectrumPhyHelper_methods(root_module, root_module['ns3::SpectrumPhyHelper']) register_Ns3SpectrumType_methods(root_module, root_module['ns3::SpectrumType']) register_Ns3SpectrumTypeFactory_methods(root_module, root_module['ns3::SpectrumTypeFactory']) + register_Ns3SystemWallClockMs_methods(root_module, root_module['ns3::SystemWallClockMs']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TriangularVariable_methods(root_module, root_module['ns3::TriangularVariable']) @@ -500,8 +523,11 @@ def register_methods(root_module): register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) register_Ns3ParetoVariable_methods(root_module, root_module['ns3::ParetoVariable']) register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel']) + register_Ns3PropagationLossModel_methods(root_module, root_module['ns3::PropagationLossModel']) register_Ns3Queue_methods(root_module, root_module['ns3::Queue']) register_Ns3RandomPropagationDelayModel_methods(root_module, root_module['ns3::RandomPropagationDelayModel']) + register_Ns3RandomPropagationLossModel_methods(root_module, root_module['ns3::RandomPropagationLossModel']) + register_Ns3RangePropagationLossModel_methods(root_module, root_module['ns3::RangePropagationLossModel']) register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) @@ -520,9 +546,11 @@ def register_methods(root_module): register_Ns3SpectrumPhy_methods(root_module, root_module['ns3::SpectrumPhy']) register_Ns3SpectrumPropagationLossModel_methods(root_module, root_module['ns3::SpectrumPropagationLossModel']) register_Ns3SpectrumValue_methods(root_module, root_module['ns3::SpectrumValue']) + register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, root_module['ns3::ThreeLogDistancePropagationLossModel']) register_Ns3Time_methods(root_module, root_module['ns3::Time']) register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor']) register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer']) + register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, root_module['ns3::TwoRayGroundPropagationLossModel']) register_Ns3WaveformGenerator_methods(root_module, root_module['ns3::WaveformGenerator']) register_Ns3AlohaNoackMacHeader_methods(root_module, root_module['ns3::AlohaNoackMacHeader']) register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor']) @@ -537,6 +565,8 @@ def register_methods(root_module): register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue']) register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) + register_Ns3FixedRssLossModel_methods(root_module, root_module['ns3::FixedRssLossModel']) + register_Ns3FriisPropagationLossModel_methods(root_module, root_module['ns3::FriisPropagationLossModel']) register_Ns3FriisSpectrumPropagationLossModel_methods(root_module, root_module['ns3::FriisSpectrumPropagationLossModel']) register_Ns3HalfDuplexIdealPhy_methods(root_module, root_module['ns3::HalfDuplexIdealPhy']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) @@ -547,9 +577,12 @@ def register_methods(root_module): register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) + register_Ns3LogDistancePropagationLossModel_methods(root_module, root_module['ns3::LogDistancePropagationLossModel']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) + register_Ns3MatrixPropagationLossModel_methods(root_module, root_module['ns3::MatrixPropagationLossModel']) register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel']) + register_Ns3NakagamiPropagationLossModel_methods(root_module, root_module['ns3::NakagamiPropagationLossModel']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) @@ -2231,10 +2264,22 @@ def register_Ns3SpectrumChannelHelper_methods(root_module, cls): cls.add_constructor([]) ## spectrum-helper.h (module 'spectrum'): ns3::SpectrumChannelHelper::SpectrumChannelHelper(ns3::SpectrumChannelHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::SpectrumChannelHelper const &', 'arg0')]) + ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddPropagationLoss(std::string name, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), 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(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function] + cls.add_method('AddPropagationLoss', + 'void', + [param('std::string', 'name'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), 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()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')]) + ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddPropagationLoss(ns3::Ptr m) [member function] + cls.add_method('AddPropagationLoss', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'm')]) ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddSpectrumPropagationLoss(std::string name, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), 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(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function] cls.add_method('AddSpectrumPropagationLoss', 'void', [param('std::string', 'name'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), 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()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')]) + ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddSpectrumPropagationLoss(ns3::Ptr m) [member function] + cls.add_method('AddSpectrumPropagationLoss', + 'void', + [param('ns3::Ptr< ns3::SpectrumPropagationLossModel >', 'm')]) ## spectrum-helper.h (module 'spectrum'): ns3::Ptr ns3::SpectrumChannelHelper::Create() const [member function] cls.add_method('Create', 'ns3::Ptr< ns3::SpectrumChannel >', @@ -2318,6 +2363,36 @@ def register_Ns3SpectrumTypeFactory_methods(root_module, cls): is_static=True) return +def register_Ns3SystemWallClockMs_methods(root_module, cls): + ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs::SystemWallClockMs(ns3::SystemWallClockMs const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')]) + ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs::SystemWallClockMs() [constructor] + cls.add_constructor([]) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::End() [member function] + cls.add_method('End', + 'int64_t', + []) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::GetElapsedReal() const [member function] + cls.add_method('GetElapsedReal', + 'int64_t', + [], + is_const=True) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::GetElapsedSystem() const [member function] + cls.add_method('GetElapsedSystem', + 'int64_t', + [], + is_const=True) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::GetElapsedUser() const [member function] + cls.add_method('GetElapsedUser', + 'int64_t', + [], + is_const=True) + ## system-wall-clock-ms.h (module 'core'): void ns3::SystemWallClockMs::Start() [member function] + cls.add_method('Start', + 'void', + []) + return + def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -3183,6 +3258,30 @@ def register_Ns3PropagationDelayModel_methods(root_module, cls): is_static=True) return +def register_Ns3PropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::PropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::PropagationLossModel::PropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::PropagationLossModel::SetNext(ns3::Ptr next) [member function] + cls.add_method('SetNext', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'next')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::PropagationLossModel::CalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('CalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::PropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3Queue_methods(root_module, cls): ## queue.h (module 'network'): ns3::Queue::Queue(ns3::Queue const & arg0) [copy constructor] cls.add_constructor([param('ns3::Queue const &', 'arg0')]) @@ -3288,6 +3387,36 @@ def register_Ns3RandomPropagationDelayModel_methods(root_module, cls): is_static=True) return +def register_Ns3RandomPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::RandomPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::RandomPropagationLossModel::RandomPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::RandomPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + +def register_Ns3RangePropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::RangePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::RangePropagationLossModel::RangePropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::RangePropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -3666,6 +3795,21 @@ def register_Ns3SpectrumValue_methods(root_module, cls): []) return +def register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::ThreeLogDistancePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel::ThreeLogDistancePropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::ThreeLogDistancePropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3Time_methods(root_module, cls): cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) @@ -3882,6 +4026,56 @@ def register_Ns3Trailer_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::TwoRayGroundPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'frequency'), param('double', 'speed')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] + cls.add_method('SetSystemLoss', + 'void', + [param('double', 'systemLoss')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetMinDistance(double minDistance) [member function] + cls.add_method('SetMinDistance', + 'void', + [param('double', 'minDistance')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetMinDistance() const [member function] + cls.add_method('GetMinDistance', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] + cls.add_method('GetLambda', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetSystemLoss() const [member function] + cls.add_method('GetSystemLoss', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetHeightAboveZ(double heightAboveZ) [member function] + cls.add_method('SetHeightAboveZ', + 'void', + [param('double', 'heightAboveZ')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3WaveformGenerator_methods(root_module, cls): ## waveform-generator.h (module 'spectrum'): ns3::WaveformGenerator::WaveformGenerator(ns3::WaveformGenerator const & arg0) [copy constructor] cls.add_constructor([param('ns3::WaveformGenerator const &', 'arg0')]) @@ -4302,6 +4496,71 @@ def register_Ns3EventImpl_methods(root_module, cls): is_pure_virtual=True, visibility='protected', is_virtual=True) return +def register_Ns3FixedRssLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::FixedRssLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::FixedRssLossModel::FixedRssLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FixedRssLossModel::SetRss(double rss) [member function] + cls.add_method('SetRss', + 'void', + [param('double', 'rss')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::FixedRssLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + +def register_Ns3FriisPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::FriisPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'frequency'), param('double', 'speed')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] + cls.add_method('SetSystemLoss', + 'void', + [param('double', 'systemLoss')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetMinDistance(double minDistance) [member function] + cls.add_method('SetMinDistance', + 'void', + [param('double', 'minDistance')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetMinDistance() const [member function] + cls.add_method('GetMinDistance', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] + cls.add_method('GetLambda', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetSystemLoss() const [member function] + cls.add_method('GetSystemLoss', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3FriisSpectrumPropagationLossModel_methods(root_module, cls): ## friis-spectrum-propagation-loss.h (module 'spectrum'): ns3::FriisSpectrumPropagationLossModel::FriisSpectrumPropagationLossModel(ns3::FriisSpectrumPropagationLossModel const & arg0) [copy constructor] cls.add_constructor([param('ns3::FriisSpectrumPropagationLossModel const &', 'arg0')]) @@ -4577,6 +4836,34 @@ def register_Ns3Ipv6PrefixValue_methods(root_module, cls): [param('ns3::Ipv6Prefix const &', 'value')]) return +def register_Ns3LogDistancePropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::LogDistancePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::LogDistancePropagationLossModel::LogDistancePropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::LogDistancePropagationLossModel::SetPathLossExponent(double n) [member function] + cls.add_method('SetPathLossExponent', + 'void', + [param('double', 'n')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::LogDistancePropagationLossModel::GetPathLossExponent() const [member function] + cls.add_method('GetPathLossExponent', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): void ns3::LogDistancePropagationLossModel::SetReference(double referenceDistance, double referenceLoss) [member function] + cls.add_method('SetReference', + 'void', + [param('double', 'referenceDistance'), param('double', 'referenceLoss')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::LogDistancePropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3Mac48AddressChecker_methods(root_module, cls): ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] cls.add_constructor([]) @@ -4617,6 +4904,29 @@ def register_Ns3Mac48AddressValue_methods(root_module, cls): [param('ns3::Mac48Address const &', 'value')]) return +def register_Ns3MatrixPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::MatrixPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::MatrixPropagationLossModel::MatrixPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::MatrixPropagationLossModel::SetLoss(ns3::Ptr a, ns3::Ptr b, double loss, bool symmetric=true) [member function] + cls.add_method('SetLoss', + 'void', + [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b'), param('double', 'loss'), param('bool', 'symmetric', default_value='true')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::MatrixPropagationLossModel::SetDefaultLoss(double arg0) [member function] + cls.add_method('SetDefaultLoss', + 'void', + [param('double', 'arg0')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::MatrixPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3MobilityModel_methods(root_module, cls): ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel(ns3::MobilityModel const & arg0) [copy constructor] cls.add_constructor([param('ns3::MobilityModel const &', 'arg0')]) @@ -4668,6 +4978,21 @@ def register_Ns3MobilityModel_methods(root_module, cls): is_pure_virtual=True, visibility='private', is_virtual=True) return +def register_Ns3NakagamiPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::NakagamiPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::NakagamiPropagationLossModel::NakagamiPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::NakagamiPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3NetDevice_methods(root_module, cls): ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor] cls.add_constructor([]) @@ -4899,10 +5224,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4917,11 +5250,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3NonCommunicatingNetDevice_methods(root_module, cls): @@ -5438,6 +5766,11 @@ def register_Ns3SpectrumChannel_methods(root_module, cls): cls.add_constructor([]) ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel::SpectrumChannel(ns3::SpectrumChannel const & arg0) [copy constructor] cls.add_constructor([param('ns3::SpectrumChannel const &', 'arg0')]) + ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_pure_virtual=True, is_virtual=True) ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', @@ -5845,6 +6178,11 @@ def register_Ns3MultiModelSpectrumChannel_methods(root_module, cls): cls.add_constructor([param('ns3::MultiModelSpectrumChannel const &', 'arg0')]) ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::MultiModelSpectrumChannel::MultiModelSpectrumChannel() [constructor] cls.add_constructor([]) + ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_virtual=True) ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', @@ -5902,6 +6240,11 @@ def register_Ns3SingleModelSpectrumChannel_methods(root_module, cls): cls.add_constructor([param('ns3::SingleModelSpectrumChannel const &', 'arg0')]) ## single-model-spectrum-channel.h (module 'spectrum'): ns3::SingleModelSpectrumChannel::SingleModelSpectrumChannel() [constructor] cls.add_constructor([]) + ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_virtual=True) ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', diff --git a/src/spectrum/bindings/modulegen__gcc_LP64.py b/src/spectrum/bindings/modulegen__gcc_LP64.py index 4108303d5..69320507c 100644 --- a/src/spectrum/bindings/modulegen__gcc_LP64.py +++ b/src/spectrum/bindings/modulegen__gcc_LP64.py @@ -118,6 +118,8 @@ def register_types(module): module.add_class('SpectrumType') ## spectrum-type.h (module 'spectrum'): ns3::SpectrumTypeFactory [class] module.add_class('SpectrumTypeFactory') + ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs [class] + module.add_class('SystemWallClockMs', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -186,10 +188,16 @@ def register_types(module): module.add_class('ParetoVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## propagation-delay-model.h (module 'propagation'): ns3::PropagationDelayModel [class] module.add_class('PropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::Object']) + ## propagation-loss-model.h (module 'propagation'): ns3::PropagationLossModel [class] + module.add_class('PropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::Object']) ## queue.h (module 'network'): ns3::Queue [class] module.add_class('Queue', import_from_module='ns.network', parent=root_module['ns3::Object']) ## propagation-delay-model.h (module 'propagation'): ns3::RandomPropagationDelayModel [class] module.add_class('RandomPropagationDelayModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationDelayModel']) + ## propagation-loss-model.h (module 'propagation'): ns3::RandomPropagationLossModel [class] + module.add_class('RandomPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) + ## propagation-loss-model.h (module 'propagation'): ns3::RangePropagationLossModel [class] + module.add_class('RangePropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -226,6 +234,8 @@ def register_types(module): module.add_class('SpectrumPropagationLossModel', parent=root_module['ns3::Object']) ## spectrum-value.h (module 'spectrum'): ns3::SpectrumValue [class] module.add_class('SpectrumValue', parent=root_module['ns3::SimpleRefCount< ns3::SpectrumValue, ns3::empty, ns3::DefaultDeleter >']) + ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel [class] + module.add_class('ThreeLogDistancePropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## nstime.h (module 'core'): ns3::Time [class] module.add_class('Time', import_from_module='ns.core') ## nstime.h (module 'core'): ns3::Time::Unit [enumeration] @@ -236,6 +246,8 @@ def register_types(module): module.add_class('TraceSourceAccessor', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::TraceSourceAccessor, ns3::empty, ns3::DefaultDeleter >']) ## trailer.h (module 'network'): ns3::Trailer [class] module.add_class('Trailer', import_from_module='ns.network', parent=root_module['ns3::Chunk']) + ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel [class] + module.add_class('TwoRayGroundPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## waveform-generator.h (module 'spectrum'): ns3::WaveformGenerator [class] module.add_class('WaveformGenerator', parent=root_module['ns3::SpectrumPhy']) ## aloha-noack-mac-header.h (module 'spectrum'): ns3::AlohaNoackMacHeader [class] @@ -264,6 +276,10 @@ def register_types(module): module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## event-impl.h (module 'core'): ns3::EventImpl [class] module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) + ## propagation-loss-model.h (module 'propagation'): ns3::FixedRssLossModel [class] + module.add_class('FixedRssLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) + ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel [class] + module.add_class('FriisPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## friis-spectrum-propagation-loss.h (module 'spectrum'): ns3::FriisSpectrumPropagationLossModel [class] module.add_class('FriisSpectrumPropagationLossModel', parent=root_module['ns3::SpectrumPropagationLossModel']) ## half-duplex-ideal-phy.h (module 'spectrum'): ns3::HalfDuplexIdealPhy [class] @@ -286,12 +302,18 @@ def register_types(module): module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class] module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## propagation-loss-model.h (module 'propagation'): ns3::LogDistancePropagationLossModel [class] + module.add_class('LogDistancePropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] module.add_class('Mac48AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## propagation-loss-model.h (module 'propagation'): ns3::MatrixPropagationLossModel [class] + module.add_class('MatrixPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## mobility-model.h (module 'mobility'): ns3::MobilityModel [class] module.add_class('MobilityModel', import_from_module='ns.mobility', parent=root_module['ns3::Object']) + ## propagation-loss-model.h (module 'propagation'): ns3::NakagamiPropagationLossModel [class] + module.add_class('NakagamiPropagationLossModel', import_from_module='ns.propagation', parent=root_module['ns3::PropagationLossModel']) ## net-device.h (module 'network'): ns3::NetDevice [class] module.add_class('NetDevice', import_from_module='ns.network', parent=root_module['ns3::Object']) ## net-device.h (module 'network'): ns3::NetDevice::PacketType [enumeration] @@ -351,6 +373,9 @@ def register_types(module): module.add_container('std::vector< double >', 'double', container_type='vector') module.add_container('ns3::Bands', 'ns3::BandInfo', container_type='vector') module.add_container('std::vector< ns3::Ptr< ns3::SpectrumPhy > >', 'ns3::Ptr< ns3::SpectrumPhy >', container_type='vector') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') + typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndOkCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndOkCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndOkCallback&') @@ -387,18 +412,15 @@ def register_types(module): typehandlers.add_type_alias('ns3::Vector3DChecker*', 'ns3::VectorChecker*') typehandlers.add_type_alias('ns3::Vector3DChecker&', 'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') - typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxEndErrorCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxEndErrorCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxEndErrorCallback&') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >', 'ns3::Values') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >*', 'ns3::Values*') typehandlers.add_type_alias('std::vector< double, std::allocator< double > >&', 'ns3::Values&') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') - typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxStartCallback') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxStartCallback*') + typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxStartCallback&') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >', 'ns3::SpectrumConverterMap_t') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >*', 'ns3::SpectrumConverterMap_t*') typehandlers.add_type_alias('std::map< unsigned int, ns3::SpectrumConverter, std::less< unsigned int >, std::allocator< std::pair< unsigned int const, ns3::SpectrumConverter > > >&', 'ns3::SpectrumConverterMap_t&') @@ -467,6 +489,7 @@ def register_methods(root_module): register_Ns3SpectrumPhyHelper_methods(root_module, root_module['ns3::SpectrumPhyHelper']) register_Ns3SpectrumType_methods(root_module, root_module['ns3::SpectrumType']) register_Ns3SpectrumTypeFactory_methods(root_module, root_module['ns3::SpectrumTypeFactory']) + register_Ns3SystemWallClockMs_methods(root_module, root_module['ns3::SystemWallClockMs']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TriangularVariable_methods(root_module, root_module['ns3::TriangularVariable']) @@ -500,8 +523,11 @@ def register_methods(root_module): register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) register_Ns3ParetoVariable_methods(root_module, root_module['ns3::ParetoVariable']) register_Ns3PropagationDelayModel_methods(root_module, root_module['ns3::PropagationDelayModel']) + register_Ns3PropagationLossModel_methods(root_module, root_module['ns3::PropagationLossModel']) register_Ns3Queue_methods(root_module, root_module['ns3::Queue']) register_Ns3RandomPropagationDelayModel_methods(root_module, root_module['ns3::RandomPropagationDelayModel']) + register_Ns3RandomPropagationLossModel_methods(root_module, root_module['ns3::RandomPropagationLossModel']) + register_Ns3RangePropagationLossModel_methods(root_module, root_module['ns3::RangePropagationLossModel']) register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) @@ -520,9 +546,11 @@ def register_methods(root_module): register_Ns3SpectrumPhy_methods(root_module, root_module['ns3::SpectrumPhy']) register_Ns3SpectrumPropagationLossModel_methods(root_module, root_module['ns3::SpectrumPropagationLossModel']) register_Ns3SpectrumValue_methods(root_module, root_module['ns3::SpectrumValue']) + register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, root_module['ns3::ThreeLogDistancePropagationLossModel']) register_Ns3Time_methods(root_module, root_module['ns3::Time']) register_Ns3TraceSourceAccessor_methods(root_module, root_module['ns3::TraceSourceAccessor']) register_Ns3Trailer_methods(root_module, root_module['ns3::Trailer']) + register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, root_module['ns3::TwoRayGroundPropagationLossModel']) register_Ns3WaveformGenerator_methods(root_module, root_module['ns3::WaveformGenerator']) register_Ns3AlohaNoackMacHeader_methods(root_module, root_module['ns3::AlohaNoackMacHeader']) register_Ns3AttributeAccessor_methods(root_module, root_module['ns3::AttributeAccessor']) @@ -537,6 +565,8 @@ def register_methods(root_module): register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue']) register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) + register_Ns3FixedRssLossModel_methods(root_module, root_module['ns3::FixedRssLossModel']) + register_Ns3FriisPropagationLossModel_methods(root_module, root_module['ns3::FriisPropagationLossModel']) register_Ns3FriisSpectrumPropagationLossModel_methods(root_module, root_module['ns3::FriisSpectrumPropagationLossModel']) register_Ns3HalfDuplexIdealPhy_methods(root_module, root_module['ns3::HalfDuplexIdealPhy']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) @@ -547,9 +577,12 @@ def register_methods(root_module): register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) + register_Ns3LogDistancePropagationLossModel_methods(root_module, root_module['ns3::LogDistancePropagationLossModel']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) + register_Ns3MatrixPropagationLossModel_methods(root_module, root_module['ns3::MatrixPropagationLossModel']) register_Ns3MobilityModel_methods(root_module, root_module['ns3::MobilityModel']) + register_Ns3NakagamiPropagationLossModel_methods(root_module, root_module['ns3::NakagamiPropagationLossModel']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) @@ -2231,10 +2264,22 @@ def register_Ns3SpectrumChannelHelper_methods(root_module, cls): cls.add_constructor([]) ## spectrum-helper.h (module 'spectrum'): ns3::SpectrumChannelHelper::SpectrumChannelHelper(ns3::SpectrumChannelHelper const & arg0) [copy constructor] cls.add_constructor([param('ns3::SpectrumChannelHelper const &', 'arg0')]) + ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddPropagationLoss(std::string name, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), 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(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function] + cls.add_method('AddPropagationLoss', + 'void', + [param('std::string', 'name'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), 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()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')]) + ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddPropagationLoss(ns3::Ptr m) [member function] + cls.add_method('AddPropagationLoss', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'm')]) ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddSpectrumPropagationLoss(std::string name, std::string n0="", ns3::AttributeValue const & v0=ns3::EmptyAttributeValue(), 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(), std::string n5="", ns3::AttributeValue const & v5=ns3::EmptyAttributeValue(), std::string n6="", ns3::AttributeValue const & v6=ns3::EmptyAttributeValue(), std::string n7="", ns3::AttributeValue const & v7=ns3::EmptyAttributeValue()) [member function] cls.add_method('AddSpectrumPropagationLoss', 'void', [param('std::string', 'name'), param('std::string', 'n0', default_value='""'), param('ns3::AttributeValue const &', 'v0', default_value='ns3::EmptyAttributeValue()'), 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()'), param('std::string', 'n5', default_value='""'), param('ns3::AttributeValue const &', 'v5', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n6', default_value='""'), param('ns3::AttributeValue const &', 'v6', default_value='ns3::EmptyAttributeValue()'), param('std::string', 'n7', default_value='""'), param('ns3::AttributeValue const &', 'v7', default_value='ns3::EmptyAttributeValue()')]) + ## spectrum-helper.h (module 'spectrum'): void ns3::SpectrumChannelHelper::AddSpectrumPropagationLoss(ns3::Ptr m) [member function] + cls.add_method('AddSpectrumPropagationLoss', + 'void', + [param('ns3::Ptr< ns3::SpectrumPropagationLossModel >', 'm')]) ## spectrum-helper.h (module 'spectrum'): ns3::Ptr ns3::SpectrumChannelHelper::Create() const [member function] cls.add_method('Create', 'ns3::Ptr< ns3::SpectrumChannel >', @@ -2318,6 +2363,36 @@ def register_Ns3SpectrumTypeFactory_methods(root_module, cls): is_static=True) return +def register_Ns3SystemWallClockMs_methods(root_module, cls): + ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs::SystemWallClockMs(ns3::SystemWallClockMs const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SystemWallClockMs const &', 'arg0')]) + ## system-wall-clock-ms.h (module 'core'): ns3::SystemWallClockMs::SystemWallClockMs() [constructor] + cls.add_constructor([]) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::End() [member function] + cls.add_method('End', + 'int64_t', + []) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::GetElapsedReal() const [member function] + cls.add_method('GetElapsedReal', + 'int64_t', + [], + is_const=True) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::GetElapsedSystem() const [member function] + cls.add_method('GetElapsedSystem', + 'int64_t', + [], + is_const=True) + ## system-wall-clock-ms.h (module 'core'): int64_t ns3::SystemWallClockMs::GetElapsedUser() const [member function] + cls.add_method('GetElapsedUser', + 'int64_t', + [], + is_const=True) + ## system-wall-clock-ms.h (module 'core'): void ns3::SystemWallClockMs::Start() [member function] + cls.add_method('Start', + 'void', + []) + return + def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -3183,6 +3258,30 @@ def register_Ns3PropagationDelayModel_methods(root_module, cls): is_static=True) return +def register_Ns3PropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::PropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::PropagationLossModel::PropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::PropagationLossModel::SetNext(ns3::Ptr next) [member function] + cls.add_method('SetNext', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'next')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::PropagationLossModel::CalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('CalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::PropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3Queue_methods(root_module, cls): ## queue.h (module 'network'): ns3::Queue::Queue(ns3::Queue const & arg0) [copy constructor] cls.add_constructor([param('ns3::Queue const &', 'arg0')]) @@ -3288,6 +3387,36 @@ def register_Ns3RandomPropagationDelayModel_methods(root_module, cls): is_static=True) return +def register_Ns3RandomPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::RandomPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::RandomPropagationLossModel::RandomPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::RandomPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + +def register_Ns3RangePropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::RangePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::RangePropagationLossModel::RangePropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::RangePropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -3666,6 +3795,21 @@ def register_Ns3SpectrumValue_methods(root_module, cls): []) return +def register_Ns3ThreeLogDistancePropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::ThreeLogDistancePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::ThreeLogDistancePropagationLossModel::ThreeLogDistancePropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::ThreeLogDistancePropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3Time_methods(root_module, cls): cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) cls.add_binary_numeric_operator('-', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right')) @@ -3882,6 +4026,56 @@ def register_Ns3Trailer_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3TwoRayGroundPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::TwoRayGroundPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::TwoRayGroundPropagationLossModel::TwoRayGroundPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double frequency, double speed) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'frequency'), param('double', 'speed')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetLambda(double lambda) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetSystemLoss(double systemLoss) [member function] + cls.add_method('SetSystemLoss', + 'void', + [param('double', 'systemLoss')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetMinDistance(double minDistance) [member function] + cls.add_method('SetMinDistance', + 'void', + [param('double', 'minDistance')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetMinDistance() const [member function] + cls.add_method('GetMinDistance', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetLambda() const [member function] + cls.add_method('GetLambda', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::GetSystemLoss() const [member function] + cls.add_method('GetSystemLoss', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): void ns3::TwoRayGroundPropagationLossModel::SetHeightAboveZ(double heightAboveZ) [member function] + cls.add_method('SetHeightAboveZ', + 'void', + [param('double', 'heightAboveZ')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::TwoRayGroundPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3WaveformGenerator_methods(root_module, cls): ## waveform-generator.h (module 'spectrum'): ns3::WaveformGenerator::WaveformGenerator(ns3::WaveformGenerator const & arg0) [copy constructor] cls.add_constructor([param('ns3::WaveformGenerator const &', 'arg0')]) @@ -4302,6 +4496,71 @@ def register_Ns3EventImpl_methods(root_module, cls): is_pure_virtual=True, visibility='protected', is_virtual=True) return +def register_Ns3FixedRssLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::FixedRssLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::FixedRssLossModel::FixedRssLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FixedRssLossModel::SetRss(double rss) [member function] + cls.add_method('SetRss', + 'void', + [param('double', 'rss')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::FixedRssLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + +def register_Ns3FriisPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::FriisPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::FriisPropagationLossModel::FriisPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double frequency, double speed) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'frequency'), param('double', 'speed')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetLambda(double lambda) [member function] + cls.add_method('SetLambda', + 'void', + [param('double', 'lambda')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetSystemLoss(double systemLoss) [member function] + cls.add_method('SetSystemLoss', + 'void', + [param('double', 'systemLoss')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::FriisPropagationLossModel::SetMinDistance(double minDistance) [member function] + cls.add_method('SetMinDistance', + 'void', + [param('double', 'minDistance')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetMinDistance() const [member function] + cls.add_method('GetMinDistance', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetLambda() const [member function] + cls.add_method('GetLambda', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::GetSystemLoss() const [member function] + cls.add_method('GetSystemLoss', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): double ns3::FriisPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3FriisSpectrumPropagationLossModel_methods(root_module, cls): ## friis-spectrum-propagation-loss.h (module 'spectrum'): ns3::FriisSpectrumPropagationLossModel::FriisSpectrumPropagationLossModel(ns3::FriisSpectrumPropagationLossModel const & arg0) [copy constructor] cls.add_constructor([param('ns3::FriisSpectrumPropagationLossModel const &', 'arg0')]) @@ -4577,6 +4836,34 @@ def register_Ns3Ipv6PrefixValue_methods(root_module, cls): [param('ns3::Ipv6Prefix const &', 'value')]) return +def register_Ns3LogDistancePropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::LogDistancePropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::LogDistancePropagationLossModel::LogDistancePropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::LogDistancePropagationLossModel::SetPathLossExponent(double n) [member function] + cls.add_method('SetPathLossExponent', + 'void', + [param('double', 'n')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::LogDistancePropagationLossModel::GetPathLossExponent() const [member function] + cls.add_method('GetPathLossExponent', + 'double', + [], + is_const=True) + ## propagation-loss-model.h (module 'propagation'): void ns3::LogDistancePropagationLossModel::SetReference(double referenceDistance, double referenceLoss) [member function] + cls.add_method('SetReference', + 'void', + [param('double', 'referenceDistance'), param('double', 'referenceLoss')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::LogDistancePropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3Mac48AddressChecker_methods(root_module, cls): ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] cls.add_constructor([]) @@ -4617,6 +4904,29 @@ def register_Ns3Mac48AddressValue_methods(root_module, cls): [param('ns3::Mac48Address const &', 'value')]) return +def register_Ns3MatrixPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::MatrixPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::MatrixPropagationLossModel::MatrixPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): void ns3::MatrixPropagationLossModel::SetLoss(ns3::Ptr a, ns3::Ptr b, double loss, bool symmetric=true) [member function] + cls.add_method('SetLoss', + 'void', + [param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b'), param('double', 'loss'), param('bool', 'symmetric', default_value='true')]) + ## propagation-loss-model.h (module 'propagation'): void ns3::MatrixPropagationLossModel::SetDefaultLoss(double arg0) [member function] + cls.add_method('SetDefaultLoss', + 'void', + [param('double', 'arg0')]) + ## propagation-loss-model.h (module 'propagation'): double ns3::MatrixPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3MobilityModel_methods(root_module, cls): ## mobility-model.h (module 'mobility'): ns3::MobilityModel::MobilityModel(ns3::MobilityModel const & arg0) [copy constructor] cls.add_constructor([param('ns3::MobilityModel const &', 'arg0')]) @@ -4668,6 +4978,21 @@ def register_Ns3MobilityModel_methods(root_module, cls): is_pure_virtual=True, visibility='private', is_virtual=True) return +def register_Ns3NakagamiPropagationLossModel_methods(root_module, cls): + ## propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::NakagamiPropagationLossModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## propagation-loss-model.h (module 'propagation'): ns3::NakagamiPropagationLossModel::NakagamiPropagationLossModel() [constructor] + cls.add_constructor([]) + ## propagation-loss-model.h (module 'propagation'): double ns3::NakagamiPropagationLossModel::DoCalcRxPower(double txPowerDbm, ns3::Ptr a, ns3::Ptr b) const [member function] + cls.add_method('DoCalcRxPower', + 'double', + [param('double', 'txPowerDbm'), param('ns3::Ptr< ns3::MobilityModel >', 'a'), param('ns3::Ptr< ns3::MobilityModel >', 'b')], + is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3NetDevice_methods(root_module, cls): ## net-device.h (module 'network'): ns3::NetDevice::NetDevice() [constructor] cls.add_constructor([]) @@ -4899,10 +5224,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4917,11 +5250,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3NonCommunicatingNetDevice_methods(root_module, cls): @@ -5438,6 +5766,11 @@ def register_Ns3SpectrumChannel_methods(root_module, cls): cls.add_constructor([]) ## spectrum-channel.h (module 'spectrum'): ns3::SpectrumChannel::SpectrumChannel(ns3::SpectrumChannel const & arg0) [copy constructor] cls.add_constructor([param('ns3::SpectrumChannel const &', 'arg0')]) + ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_pure_virtual=True, is_virtual=True) ## spectrum-channel.h (module 'spectrum'): void ns3::SpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', @@ -5845,6 +6178,11 @@ def register_Ns3MultiModelSpectrumChannel_methods(root_module, cls): cls.add_constructor([param('ns3::MultiModelSpectrumChannel const &', 'arg0')]) ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::MultiModelSpectrumChannel::MultiModelSpectrumChannel() [constructor] cls.add_constructor([]) + ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_virtual=True) ## multi-model-spectrum-channel.h (module 'spectrum'): void ns3::MultiModelSpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', @@ -5902,6 +6240,11 @@ def register_Ns3SingleModelSpectrumChannel_methods(root_module, cls): cls.add_constructor([param('ns3::SingleModelSpectrumChannel const &', 'arg0')]) ## single-model-spectrum-channel.h (module 'spectrum'): ns3::SingleModelSpectrumChannel::SingleModelSpectrumChannel() [constructor] cls.add_constructor([]) + ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddPropagationLossModel(ns3::Ptr loss) [member function] + cls.add_method('AddPropagationLossModel', + 'void', + [param('ns3::Ptr< ns3::PropagationLossModel >', 'loss')], + is_virtual=True) ## single-model-spectrum-channel.h (module 'spectrum'): void ns3::SingleModelSpectrumChannel::AddRx(ns3::Ptr phy) [member function] cls.add_method('AddRx', 'void', diff --git a/src/stats/bindings/modulegen__gcc_ILP32.py b/src/stats/bindings/modulegen__gcc_ILP32.py index 1ca3c087a..ff657a868 100644 --- a/src/stats/bindings/modulegen__gcc_ILP32.py +++ b/src/stats/bindings/modulegen__gcc_ILP32.py @@ -87,7 +87,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## data-calculator.h (module 'stats'): ns3::StatisticalSummary [class] module.add_class('StatisticalSummary', allow_subclassing=True) ## tag.h (module 'network'): ns3::Tag [class] diff --git a/src/stats/bindings/modulegen__gcc_LP64.py b/src/stats/bindings/modulegen__gcc_LP64.py index 1ca3c087a..ff657a868 100644 --- a/src/stats/bindings/modulegen__gcc_LP64.py +++ b/src/stats/bindings/modulegen__gcc_LP64.py @@ -87,7 +87,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## data-calculator.h (module 'stats'): ns3::StatisticalSummary [class] module.add_class('StatisticalSummary', allow_subclassing=True) ## tag.h (module 'network'): ns3::Tag [class] diff --git a/src/tap-bridge/bindings/modulegen__gcc_ILP32.py b/src/tap-bridge/bindings/modulegen__gcc_ILP32.py index a8d822d83..ffa8d0878 100644 --- a/src/tap-bridge/bindings/modulegen__gcc_ILP32.py +++ b/src/tap-bridge/bindings/modulegen__gcc_ILP32.py @@ -3604,10 +3604,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -3622,11 +3630,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/tap-bridge/bindings/modulegen__gcc_LP64.py b/src/tap-bridge/bindings/modulegen__gcc_LP64.py index 916d2cae5..84bdf0496 100644 --- a/src/tap-bridge/bindings/modulegen__gcc_LP64.py +++ b/src/tap-bridge/bindings/modulegen__gcc_LP64.py @@ -3604,10 +3604,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -3622,11 +3630,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/tools/bindings/modulegen__gcc_ILP32.py b/src/tools/bindings/modulegen__gcc_ILP32.py index ba26fde79..f6a360bae 100644 --- a/src/tools/bindings/modulegen__gcc_ILP32.py +++ b/src/tools/bindings/modulegen__gcc_ILP32.py @@ -75,7 +75,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] diff --git a/src/tools/bindings/modulegen__gcc_LP64.py b/src/tools/bindings/modulegen__gcc_LP64.py index ba26fde79..f6a360bae 100644 --- a/src/tools/bindings/modulegen__gcc_LP64.py +++ b/src/tools/bindings/modulegen__gcc_LP64.py @@ -75,7 +75,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] diff --git a/src/topology-read/bindings/modulegen__gcc_ILP32.py b/src/topology-read/bindings/modulegen__gcc_ILP32.py index 4d18f529b..da45e5d2b 100644 --- a/src/topology-read/bindings/modulegen__gcc_ILP32.py +++ b/src/topology-read/bindings/modulegen__gcc_ILP32.py @@ -2152,10 +2152,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -2170,11 +2178,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3OrbisTopologyReader_methods(root_module, cls): diff --git a/src/topology-read/bindings/modulegen__gcc_LP64.py b/src/topology-read/bindings/modulegen__gcc_LP64.py index 4d18f529b..da45e5d2b 100644 --- a/src/topology-read/bindings/modulegen__gcc_LP64.py +++ b/src/topology-read/bindings/modulegen__gcc_LP64.py @@ -2152,10 +2152,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -2170,11 +2178,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3OrbisTopologyReader_methods(root_module, cls): diff --git a/src/uan/bindings/modulegen__gcc_ILP32.py b/src/uan/bindings/modulegen__gcc_ILP32.py index f76869a45..f69edbe1b 100644 --- a/src/uan/bindings/modulegen__gcc_ILP32.py +++ b/src/uan/bindings/modulegen__gcc_ILP32.py @@ -93,7 +93,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -6252,10 +6252,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -6270,11 +6278,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/uan/bindings/modulegen__gcc_LP64.py b/src/uan/bindings/modulegen__gcc_LP64.py index f76869a45..f69edbe1b 100644 --- a/src/uan/bindings/modulegen__gcc_LP64.py +++ b/src/uan/bindings/modulegen__gcc_LP64.py @@ -93,7 +93,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -6252,10 +6252,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -6270,11 +6278,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/visualizer/bindings/modulegen__gcc_ILP32.py b/src/visualizer/bindings/modulegen__gcc_ILP32.py index de02af88b..cd11fc14a 100644 --- a/src/visualizer/bindings/modulegen__gcc_ILP32.py +++ b/src/visualizer/bindings/modulegen__gcc_ILP32.py @@ -68,6 +68,8 @@ def register_types(module): module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core') ## object.h (module 'core'): ns3::ObjectDeleter [struct] module.add_class('ObjectDeleter', import_from_module='ns.core') + ## object-factory.h (module 'core'): ns3::ObjectFactory [class] + module.add_class('ObjectFactory', import_from_module='ns.core') ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class] module.add_class('PacketMetadata', import_from_module='ns.network') ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct] @@ -108,6 +110,8 @@ def register_types(module): module.add_class('TxPacketSample', parent=root_module['ns3::PyViz::PacketSample'], outer_class=root_module['ns3::PyViz']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simulator.h (module 'core'): ns3::Simulator [class] + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -201,7 +205,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -236,6 +240,10 @@ def register_types(module): module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) ## node.h (module 'network'): ns3::Node [class] module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class] + module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class] + module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper [class] module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] @@ -262,6 +270,7 @@ def register_types(module): module.add_container('std::vector< std::string >', 'std::string', container_type='vector') module.add_container('std::set< unsigned int >', 'unsigned int', container_type='set') module.add_container('std::vector< ns3::PyViz::NodeStatistics >', 'ns3::PyViz::NodeStatistics', container_type='vector') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -293,6 +302,7 @@ def register_methods(root_module): register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) + register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata']) register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item']) register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator']) @@ -311,6 +321,7 @@ def register_methods(root_module): register_Ns3PyVizTransmissionSample_methods(root_module, root_module['ns3::PyViz::TransmissionSample']) register_Ns3PyVizTxPacketSample_methods(root_module, root_module['ns3::PyViz::TxPacketSample']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) + register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) @@ -367,6 +378,8 @@ def register_methods(root_module): register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) + register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) + register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) @@ -1487,6 +1500,44 @@ def register_Ns3ObjectDeleter_methods(root_module, cls): is_static=True) return +def register_Ns3ObjectFactory_methods(root_module, cls): + cls.add_output_stream_operator() + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactory::Create() const [member function] + cls.add_method('Create', + 'ns3::Ptr< ns3::Object >', + [], + is_const=True) + ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(ns3::AttributeList const & list) [member function] + cls.add_method('Set', + 'void', + [param('ns3::AttributeList const &', 'list')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('ns3::TypeId', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('char const *', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('std::string', 'tid')]) + return + def register_Ns3PacketMetadata_methods(root_module, cls): ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor] cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')]) @@ -1865,6 +1916,96 @@ def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods is_static=True) return +def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) + ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static ns3::Ptr ns3::Simulator::GetImplementation() [member function] + cls.add_method('GetImplementation', + 'ns3::Ptr< ns3::SimulatorImpl >', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] + cls.add_method('RunOneEvent', + 'void', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + cls.add_method('SetImplementation', + 'void', + [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::ObjectFactory', 'schedulerFactory')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time const &', 'time')], + is_static=True) + return + def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -2438,10 +2579,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3620,29 +3761,18 @@ def register_Ns3Ipv4AddressValue_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -3651,102 +3781,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -3757,36 +3816,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -3797,26 +3938,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -3911,10 +4052,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4390,10 +4536,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4408,11 +4562,46 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', + return + +def register_Ns3ObjectFactoryChecker_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')]) + return + +def register_Ns3ObjectFactoryValue_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'value')]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactoryValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function] + cls.add_method('Get', + 'ns3::ObjectFactory', + [], + is_const=True) + ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function] + cls.add_method('Set', 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) + [param('ns3::ObjectFactory const &', 'value')]) return def register_Ns3OutputStreamWrapper_methods(root_module, cls): diff --git a/src/visualizer/bindings/modulegen__gcc_LP64.py b/src/visualizer/bindings/modulegen__gcc_LP64.py index de02af88b..cd11fc14a 100644 --- a/src/visualizer/bindings/modulegen__gcc_LP64.py +++ b/src/visualizer/bindings/modulegen__gcc_LP64.py @@ -68,6 +68,8 @@ def register_types(module): module.add_class('ObjectBase', allow_subclassing=True, import_from_module='ns.core') ## object.h (module 'core'): ns3::ObjectDeleter [struct] module.add_class('ObjectDeleter', import_from_module='ns.core') + ## object-factory.h (module 'core'): ns3::ObjectFactory [class] + module.add_class('ObjectFactory', import_from_module='ns.core') ## packet-metadata.h (module 'network'): ns3::PacketMetadata [class] module.add_class('PacketMetadata', import_from_module='ns.network') ## packet-metadata.h (module 'network'): ns3::PacketMetadata::Item [struct] @@ -108,6 +110,8 @@ def register_types(module): module.add_class('TxPacketSample', parent=root_module['ns3::PyViz::PacketSample'], outer_class=root_module['ns3::PyViz']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) + ## simulator.h (module 'core'): ns3::Simulator [class] + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -201,7 +205,7 @@ def register_types(module): ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol [class] module.add_class('Ipv4L3Protocol', import_from_module='ns.internet', parent=root_module['ns3::Ipv4']) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::DropReason [enumeration] - module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') + module.add_enum('DropReason', ['DROP_TTL_EXPIRED', 'DROP_NO_ROUTE', 'DROP_BAD_CHECKSUM', 'DROP_INTERFACE_DOWN', 'DROP_ROUTE_ERROR', 'DROP_FRAGMENT_TIMEOUT'], outer_class=root_module['ns3::Ipv4L3Protocol'], import_from_module='ns.internet') ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol [class] module.add_class('Ipv4L4Protocol', import_from_module='ns.internet', parent=root_module['ns3::Object']) ## ipv4-l4-protocol.h (module 'internet'): ns3::Ipv4L4Protocol::RxStatus [enumeration] @@ -236,6 +240,10 @@ def register_types(module): module.add_class('NixVector', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::NixVector, ns3::empty, ns3::DefaultDeleter >']) ## node.h (module 'network'): ns3::Node [class] module.add_class('Node', import_from_module='ns.network', parent=root_module['ns3::Object']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker [class] + module.add_class('ObjectFactoryChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue [class] + module.add_class('ObjectFactoryValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## output-stream-wrapper.h (module 'network'): ns3::OutputStreamWrapper [class] module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter >']) ## packet.h (module 'network'): ns3::Packet [class] @@ -262,6 +270,7 @@ def register_types(module): module.add_container('std::vector< std::string >', 'std::string', container_type='vector') module.add_container('std::set< unsigned int >', 'unsigned int', container_type='set') module.add_container('std::vector< ns3::PyViz::NodeStatistics >', 'ns3::PyViz::NodeStatistics', container_type='vector') + module.add_container('std::map< unsigned int, unsigned int >', ('unsigned int', 'unsigned int'), container_type='map') ## Register a nested module for the namespace FatalImpl @@ -293,6 +302,7 @@ def register_methods(root_module): register_Ns3Mac48Address_methods(root_module, root_module['ns3::Mac48Address']) register_Ns3ObjectBase_methods(root_module, root_module['ns3::ObjectBase']) register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) + register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3PacketMetadata_methods(root_module, root_module['ns3::PacketMetadata']) register_Ns3PacketMetadataItem_methods(root_module, root_module['ns3::PacketMetadata::Item']) register_Ns3PacketMetadataItemIterator_methods(root_module, root_module['ns3::PacketMetadata::ItemIterator']) @@ -311,6 +321,7 @@ def register_methods(root_module): register_Ns3PyVizTransmissionSample_methods(root_module, root_module['ns3::PyViz::TransmissionSample']) register_Ns3PyVizTxPacketSample_methods(root_module, root_module['ns3::PyViz::TxPacketSample']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) + register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) @@ -367,6 +378,8 @@ def register_methods(root_module): register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) register_Ns3NixVector_methods(root_module, root_module['ns3::NixVector']) register_Ns3Node_methods(root_module, root_module['ns3::Node']) + register_Ns3ObjectFactoryChecker_methods(root_module, root_module['ns3::ObjectFactoryChecker']) + register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue']) register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper']) register_Ns3Packet_methods(root_module, root_module['ns3::Packet']) register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) @@ -1487,6 +1500,44 @@ def register_Ns3ObjectDeleter_methods(root_module, cls): is_static=True) return +def register_Ns3ObjectFactory_methods(root_module, cls): + cls.add_output_stream_operator() + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory(ns3::ObjectFactory const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactory::ObjectFactory() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactory::Create() const [member function] + cls.add_method('Create', + 'ns3::Ptr< ns3::Object >', + [], + is_const=True) + ## object-factory.h (module 'core'): ns3::TypeId ns3::ObjectFactory::GetTypeId() const [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_const=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(std::string name, ns3::AttributeValue const & value) [member function] + cls.add_method('Set', + 'void', + [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::Set(ns3::AttributeList const & list) [member function] + cls.add_method('Set', + 'void', + [param('ns3::AttributeList const &', 'list')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(ns3::TypeId tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('ns3::TypeId', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(char const * tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('char const *', 'tid')]) + ## object-factory.h (module 'core'): void ns3::ObjectFactory::SetTypeId(std::string tid) [member function] + cls.add_method('SetTypeId', + 'void', + [param('std::string', 'tid')]) + return + def register_Ns3PacketMetadata_methods(root_module, cls): ## packet-metadata.h (module 'network'): ns3::PacketMetadata::PacketMetadata(uint64_t uid, uint32_t size) [constructor] cls.add_constructor([param('uint64_t', 'uid'), param('uint32_t', 'size')]) @@ -1865,6 +1916,96 @@ def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods is_static=True) return +def register_Ns3Simulator_methods(root_module, cls): + ## simulator.h (module 'core'): ns3::Simulator::Simulator(ns3::Simulator const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Simulator const &', 'arg0')]) + ## simulator.h (module 'core'): static void ns3::Simulator::Cancel(ns3::EventId const & id) [member function] + cls.add_method('Cancel', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Destroy() [member function] + cls.add_method('Destroy', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetContext() [member function] + cls.add_method('GetContext', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetDelayLeft(ns3::EventId const & id) [member function] + cls.add_method('GetDelayLeft', + 'ns3::Time', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static ns3::Ptr ns3::Simulator::GetImplementation() [member function] + cls.add_method('GetImplementation', + 'ns3::Ptr< ns3::SimulatorImpl >', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::GetMaximumSimulationTime() [member function] + cls.add_method('GetMaximumSimulationTime', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static uint32_t ns3::Simulator::GetSystemId() [member function] + cls.add_method('GetSystemId', + 'uint32_t', + [], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsExpired(ns3::EventId const & id) [member function] + cls.add_method('IsExpired', + 'bool', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static bool ns3::Simulator::IsFinished() [member function] + cls.add_method('IsFinished', + 'bool', + [], + is_static=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] + cls.add_method('Next', + 'ns3::Time', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] + cls.add_method('Now', + 'ns3::Time', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Remove(ns3::EventId const & id) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::EventId const &', 'id')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] + cls.add_method('RunOneEvent', + 'void', + [], + is_static=True, deprecated=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] + cls.add_method('SetImplementation', + 'void', + [param('ns3::Ptr< ns3::SimulatorImpl >', 'impl')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::SetScheduler(ns3::ObjectFactory schedulerFactory) [member function] + cls.add_method('SetScheduler', + 'void', + [param('ns3::ObjectFactory', 'schedulerFactory')], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop() [member function] + cls.add_method('Stop', + 'void', + [], + is_static=True) + ## simulator.h (module 'core'): static void ns3::Simulator::Stop(ns3::Time const & time) [member function] + cls.add_method('Stop', + 'void', + [param('ns3::Time const &', 'time')], + is_static=True) + return + def register_Ns3Tag_methods(root_module, cls): ## tag.h (module 'network'): ns3::Tag::Tag() [constructor] cls.add_constructor([]) @@ -2438,10 +2579,10 @@ def register_Ns3Ipv4Header_methods(root_module, cls): cls.add_method('SetDontFragment', 'void', []) - ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offset) [member function] + ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetFragmentOffset(uint16_t offsetBytes) [member function] cls.add_method('SetFragmentOffset', 'void', - [param('uint16_t', 'offset')]) + [param('uint16_t', 'offsetBytes')]) ## ipv4-header.h (module 'internet'): void ns3::Ipv4Header::SetIdentification(uint16_t identification) [member function] cls.add_method('SetIdentification', 'void', @@ -3620,29 +3761,18 @@ def register_Ns3Ipv4AddressValue_methods(root_module, cls): return def register_Ns3Ipv4L3Protocol_methods(root_module, cls): - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] - cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::Ipv4L3Protocol() [constructor] cls.add_constructor([]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] - cls.add_method('SetNode', - 'void', - [param('ns3::Ptr< ns3::Node >', 'node')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] - cls.add_method('SetRoutingProtocol', - 'void', - [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] + cls.add_method('AddAddress', + 'bool', + [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] + cls.add_method('AddInterface', + 'uint32_t', + [param('ns3::Ptr< ns3::NetDevice >', 'device')], is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] - cls.add_method('GetRoutingProtocol', - 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::CreateRawSocket() [member function] cls.add_method('CreateRawSocket', 'ns3::Ptr< ns3::Socket >', @@ -3651,102 +3781,31 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): cls.add_method('DeleteRawSocket', 'void', [param('ns3::Ptr< ns3::Socket >', 'socket')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] - cls.add_method('Insert', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] - cls.add_method('GetProtocol', - 'ns3::Ptr< ns3::Ipv4L4Protocol >', - [param('int', 'protocolNumber')], - is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] - cls.add_method('Remove', - 'void', - [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] - cls.add_method('SetDefaultTtl', - 'void', - [param('uint8_t', 'ttl')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] - cls.add_method('Receive', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] - cls.add_method('Send', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] - cls.add_method('SendWithHeader', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::AddInterface(ns3::Ptr device) [member function] - cls.add_method('AddInterface', - 'uint32_t', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] + cls.add_method('GetAddress', + 'ns3::Ipv4InterfaceAddress', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetInterface(uint32_t i) const [member function] cls.add_method('GetInterface', 'ns3::Ptr< ns3::Ipv4Interface >', [param('uint32_t', 'i')], is_const=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] - cls.add_method('GetNInterfaces', - 'uint32_t', - [], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForAddress(ns3::Ipv4Address addr) const [member function] cls.add_method('GetInterfaceForAddress', 'int32_t', [param('ns3::Ipv4Address', 'addr')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] - cls.add_method('GetInterfaceForPrefix', - 'int32_t', - [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], - is_const=True, is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForDevice(ns3::Ptr device) const [member function] cls.add_method('GetInterfaceForDevice', 'int32_t', [param('ns3::Ptr< ns3::NetDevice const >', 'device')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] - cls.add_method('IsDestinationAddress', - 'bool', - [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + ## ipv4-l3-protocol.h (module 'internet'): int32_t ns3::Ipv4L3Protocol::GetInterfaceForPrefix(ns3::Ipv4Address addr, ns3::Ipv4Mask mask) const [member function] + cls.add_method('GetInterfaceForPrefix', + 'int32_t', + [param('ns3::Ipv4Address', 'addr'), param('ns3::Ipv4Mask', 'mask')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::AddAddress(uint32_t i, ns3::Ipv4InterfaceAddress address) [member function] - cls.add_method('AddAddress', - 'bool', - [param('uint32_t', 'i'), param('ns3::Ipv4InterfaceAddress', 'address')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4InterfaceAddress ns3::Ipv4L3Protocol::GetAddress(uint32_t interfaceIndex, uint32_t addressIndex) const [member function] - cls.add_method('GetAddress', - 'ns3::Ipv4InterfaceAddress', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] - cls.add_method('GetNAddresses', - 'uint32_t', - [param('uint32_t', 'interface')], - is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] - cls.add_method('RemoveAddress', - 'bool', - [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] - cls.add_method('SelectSourceAddress', - 'ns3::Ipv4Address', - [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] - cls.add_method('SetMetric', - 'void', - [param('uint32_t', 'i'), param('uint16_t', 'metric')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): uint16_t ns3::Ipv4L3Protocol::GetMetric(uint32_t i) const [member function] cls.add_method('GetMetric', 'uint16_t', @@ -3757,36 +3816,118 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'uint16_t', [param('uint32_t', 'i')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] - cls.add_method('IsUp', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNAddresses(uint32_t interface) const [member function] + cls.add_method('GetNAddresses', + 'uint32_t', + [param('uint32_t', 'interface')], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] - cls.add_method('SetUp', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] - cls.add_method('SetDown', - 'void', - [param('uint32_t', 'i')], - is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] - cls.add_method('IsForwarding', - 'bool', - [param('uint32_t', 'i')], + ## ipv4-l3-protocol.h (module 'internet'): uint32_t ns3::Ipv4L3Protocol::GetNInterfaces() const [member function] + cls.add_method('GetNInterfaces', + 'uint32_t', + [], is_const=True, is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] - cls.add_method('SetForwarding', - 'void', - [param('uint32_t', 'i'), param('bool', 'val')], - is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetNetDevice(uint32_t i) [member function] cls.add_method('GetNetDevice', 'ns3::Ptr< ns3::NetDevice >', [param('uint32_t', 'i')], is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetProtocol(int protocolNumber) const [member function] + cls.add_method('GetProtocol', + 'ns3::Ptr< ns3::Ipv4L4Protocol >', + [param('int', 'protocolNumber')], + is_const=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ptr ns3::Ipv4L3Protocol::GetRoutingProtocol() const [member function] + cls.add_method('GetRoutingProtocol', + 'ns3::Ptr< ns3::Ipv4RoutingProtocol >', + [], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): static ns3::TypeId ns3::Ipv4L3Protocol::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Insert(ns3::Ptr protocol) [member function] + cls.add_method('Insert', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsDestinationAddress(ns3::Ipv4Address address, uint32_t iif) const [member function] + cls.add_method('IsDestinationAddress', + 'bool', + [param('ns3::Ipv4Address', 'address'), param('uint32_t', 'iif')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsForwarding(uint32_t i) const [member function] + cls.add_method('IsForwarding', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::IsUp(uint32_t i) const [member function] + cls.add_method('IsUp', + 'bool', + [param('uint32_t', 'i')], + is_const=True, is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Receive(ns3::Ptr device, ns3::Ptr p, uint16_t protocol, ns3::Address const & from, ns3::Address const & to, ns3::NetDevice::PacketType packetType) [member function] + cls.add_method('Receive', + 'void', + [param('ns3::Ptr< ns3::NetDevice >', 'device'), param('ns3::Ptr< ns3::Packet const >', 'p'), param('uint16_t', 'protocol'), param('ns3::Address const &', 'from'), param('ns3::Address const &', 'to'), param('ns3::NetDevice::PacketType', 'packetType')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Remove(ns3::Ptr protocol) [member function] + cls.add_method('Remove', + 'void', + [param('ns3::Ptr< ns3::Ipv4L4Protocol >', 'protocol')]) + ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::RemoveAddress(uint32_t interfaceIndex, uint32_t addressIndex) [member function] + cls.add_method('RemoveAddress', + 'bool', + [param('uint32_t', 'interfaceIndex'), param('uint32_t', 'addressIndex')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4Address ns3::Ipv4L3Protocol::SelectSourceAddress(ns3::Ptr device, ns3::Ipv4Address dst, ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e scope) [member function] + cls.add_method('SelectSourceAddress', + 'ns3::Ipv4Address', + [param('ns3::Ptr< ns3::NetDevice const >', 'device'), param('ns3::Ipv4Address', 'dst'), param('ns3::Ipv4InterfaceAddress::InterfaceAddressScope_e', 'scope')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::Send(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination, uint8_t protocol, ns3::Ptr route) [member function] + cls.add_method('Send', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination'), param('uint8_t', 'protocol'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SendWithHeader(ns3::Ptr packet, ns3::Ipv4Header ipHeader, ns3::Ptr route) [member function] + cls.add_method('SendWithHeader', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Header', 'ipHeader'), param('ns3::Ptr< ns3::Ipv4Route >', 'route')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDefaultTtl(uint8_t ttl) [member function] + cls.add_method('SetDefaultTtl', + 'void', + [param('uint8_t', 'ttl')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetDown(uint32_t i) [member function] + cls.add_method('SetDown', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetForwarding(uint32_t i, bool val) [member function] + cls.add_method('SetForwarding', + 'void', + [param('uint32_t', 'i'), param('bool', 'val')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetMetric(uint32_t i, uint16_t metric) [member function] + cls.add_method('SetMetric', + 'void', + [param('uint32_t', 'i'), param('uint16_t', 'metric')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetNode(ns3::Ptr node) [member function] + cls.add_method('SetNode', + 'void', + [param('ns3::Ptr< ns3::Node >', 'node')]) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetRoutingProtocol(ns3::Ptr routingProtocol) [member function] + cls.add_method('SetRoutingProtocol', + 'void', + [param('ns3::Ptr< ns3::Ipv4RoutingProtocol >', 'routingProtocol')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetUp(uint32_t i) [member function] + cls.add_method('SetUp', + 'void', + [param('uint32_t', 'i')], + is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): ns3::Ipv4L3Protocol::PROT_NUMBER [variable] + cls.add_static_attribute('PROT_NUMBER', 'uint16_t const', is_const=True) ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::DoDispose() [member function] cls.add_method('DoDispose', 'void', @@ -3797,26 +3938,26 @@ def register_Ns3Ipv4L3Protocol_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] - cls.add_method('SetIpForward', - 'void', - [param('bool', 'forward')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetIpForward() const [member function] cls.add_method('GetIpForward', 'bool', [], is_const=True, visibility='private', is_virtual=True) - ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] - cls.add_method('SetWeakEsModel', - 'void', - [param('bool', 'model')], - visibility='private', is_virtual=True) ## ipv4-l3-protocol.h (module 'internet'): bool ns3::Ipv4L3Protocol::GetWeakEsModel() const [member function] cls.add_method('GetWeakEsModel', 'bool', [], is_const=True, visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetIpForward(bool forward) [member function] + cls.add_method('SetIpForward', + 'void', + [param('bool', 'forward')], + visibility='private', is_virtual=True) + ## ipv4-l3-protocol.h (module 'internet'): void ns3::Ipv4L3Protocol::SetWeakEsModel(bool model) [member function] + cls.add_method('SetWeakEsModel', + 'void', + [param('bool', 'model')], + visibility='private', is_virtual=True) return def register_Ns3Ipv4L4Protocol_methods(root_module, cls): @@ -3911,10 +4052,15 @@ def register_Ns3Ipv4MulticastRoute_methods(root_module, cls): 'ns3::Ipv4Address', [], is_const=True) - ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) const [member function] + ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetOutputTtl(uint32_t oif) [member function] cls.add_method('GetOutputTtl', 'uint32_t', [param('uint32_t', 'oif')], + deprecated=True) + ## ipv4-route.h (module 'internet'): std::map, std::allocator > > ns3::Ipv4MulticastRoute::GetOutputTtlMap() const [member function] + cls.add_method('GetOutputTtlMap', + 'std::map< unsigned int, unsigned int >', + [], is_const=True) ## ipv4-route.h (module 'internet'): uint32_t ns3::Ipv4MulticastRoute::GetParent() const [member function] cls.add_method('GetParent', @@ -4390,10 +4536,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -4408,11 +4562,46 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', + return + +def register_Ns3ObjectFactoryChecker_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryChecker::ObjectFactoryChecker(ns3::ObjectFactoryChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryChecker const &', 'arg0')]) + return + +def register_Ns3ObjectFactoryValue_methods(root_module, cls): + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue() [constructor] + cls.add_constructor([]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactoryValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ObjectFactoryValue const &', 'arg0')]) + ## object-factory.h (module 'core'): ns3::ObjectFactoryValue::ObjectFactoryValue(ns3::ObjectFactory const & value) [constructor] + cls.add_constructor([param('ns3::ObjectFactory const &', 'value')]) + ## object-factory.h (module 'core'): ns3::Ptr ns3::ObjectFactoryValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): bool ns3::ObjectFactoryValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## object-factory.h (module 'core'): ns3::ObjectFactory ns3::ObjectFactoryValue::Get() const [member function] + cls.add_method('Get', + 'ns3::ObjectFactory', + [], + is_const=True) + ## object-factory.h (module 'core'): std::string ns3::ObjectFactoryValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## object-factory.h (module 'core'): void ns3::ObjectFactoryValue::Set(ns3::ObjectFactory const & value) [member function] + cls.add_method('Set', 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) + [param('ns3::ObjectFactory const &', 'value')]) return def register_Ns3OutputStreamWrapper_methods(root_module, cls): diff --git a/src/wifi/bindings/modulegen__gcc_ILP32.py b/src/wifi/bindings/modulegen__gcc_ILP32.py index 7a48328f9..8fbfc096f 100644 --- a/src/wifi/bindings/modulegen__gcc_ILP32.py +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py @@ -9299,10 +9299,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -9317,11 +9325,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/wifi/bindings/modulegen__gcc_LP64.py b/src/wifi/bindings/modulegen__gcc_LP64.py index 7a48328f9..8fbfc096f 100644 --- a/src/wifi/bindings/modulegen__gcc_LP64.py +++ b/src/wifi/bindings/modulegen__gcc_LP64.py @@ -9299,10 +9299,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -9317,11 +9325,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/wimax/bindings/modulegen__gcc_ILP32.py b/src/wimax/bindings/modulegen__gcc_ILP32.py index 1c0864520..870ecccb9 100644 --- a/src/wimax/bindings/modulegen__gcc_ILP32.py +++ b/src/wimax/bindings/modulegen__gcc_ILP32.py @@ -165,7 +165,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -9779,10 +9779,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -9797,11 +9805,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): diff --git a/src/wimax/bindings/modulegen__gcc_LP64.py b/src/wimax/bindings/modulegen__gcc_LP64.py index 428852c57..8d45e32d4 100644 --- a/src/wimax/bindings/modulegen__gcc_LP64.py +++ b/src/wimax/bindings/modulegen__gcc_LP64.py @@ -165,7 +165,7 @@ def register_types(module): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] - module.add_class('Simulator', is_singleton=True, import_from_module='ns.core') + module.add_class('Simulator', destructor_visibility='private', import_from_module='ns.core') ## tag.h (module 'network'): ns3::Tag [class] module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] @@ -9779,10 +9779,18 @@ def register_Ns3Node_methods(root_module, cls): 'ns3::TypeId', [], is_static=True) + ## node.h (module 'network'): void ns3::Node::RegisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('RegisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::RegisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler, uint16_t protocolType, ns3::Ptr device, bool promiscuous=false) [member function] cls.add_method('RegisterProtocolHandler', 'void', [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::Ptr< ns3::Packet const >, unsigned short, ns3::Address const &, ns3::Address const &, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty >', 'handler'), param('uint16_t', 'protocolType'), param('ns3::Ptr< ns3::NetDevice >', 'device'), param('bool', 'promiscuous', default_value='false')]) + ## node.h (module 'network'): void ns3::Node::UnregisterDeviceAdditionListener(ns3::Callback,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty,ns3::empty> listener) [member function] + cls.add_method('UnregisterDeviceAdditionListener', + 'void', + [param('ns3::Callback< void, ns3::Ptr< ns3::NetDevice >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'listener')]) ## node.h (module 'network'): void ns3::Node::UnregisterProtocolHandler(ns3::Callback, ns3::Ptr, unsigned short, ns3::Address const&, ns3::Address const&, ns3::NetDevice::PacketType, ns3::empty, ns3::empty, ns3::empty> handler) [member function] cls.add_method('UnregisterProtocolHandler', 'void', @@ -9797,11 +9805,6 @@ def register_Ns3Node_methods(root_module, cls): 'void', [], visibility='protected', is_virtual=True) - ## node.h (module 'network'): void ns3::Node::NotifyDeviceAdded(ns3::Ptr device) [member function] - cls.add_method('NotifyDeviceAdded', - 'void', - [param('ns3::Ptr< ns3::NetDevice >', 'device')], - visibility='private', is_virtual=True) return def register_Ns3ObjectFactoryChecker_methods(root_module, cls): From 1c271f129f879e616f22240ba2a96bd9172cf5d4 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Thu, 21 Jul 2011 11:07:59 +0100 Subject: [PATCH 031/202] Bug 1222 - Incomplete PointToPointNetDevice Python bindings --- .../bindings/modulegen__gcc_ILP32.py | 613 ++++++++++++++++++ .../bindings/modulegen__gcc_LP64.py | 613 ++++++++++++++++++ .../bindings/modulegen_customizations.py | 5 + src/point-to-point/bindings/scan-header.h | 6 + 4 files changed, 1237 insertions(+) create mode 100644 src/point-to-point/bindings/modulegen_customizations.py create mode 100644 src/point-to-point/bindings/scan-header.h diff --git a/src/point-to-point/bindings/modulegen__gcc_ILP32.py b/src/point-to-point/bindings/modulegen__gcc_ILP32.py index fe3327f38..ce18a75fe 100644 --- a/src/point-to-point/bindings/modulegen__gcc_ILP32.py +++ b/src/point-to-point/bindings/modulegen__gcc_ILP32.py @@ -20,6 +20,8 @@ def module_init(): def register_types(module): root_module = module.get_root() + ## error-model.h (module 'network'): ns3::ErrorUnit [enumeration] + module.add_enum('ErrorUnit', ['EU_BIT', 'EU_BYTE', 'EU_PKT'], import_from_module='ns.network') ## address.h (module 'network'): ns3::Address [class] module.add_class('Address', import_from_module='ns.network') ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration] @@ -102,6 +104,12 @@ def register_types(module): module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network') ## point-to-point-helper.h (module 'point-to-point'): ns3::PointToPointHelper [class] module.add_class('PointToPointHelper', parent=[root_module['ns3::PcapHelperForDevice'], root_module['ns3::AsciiTraceHelperForDevice']]) + ## random-variable.h (module 'core'): ns3::RandomVariable [class] + module.add_class('RandomVariable', import_from_module='ns.core') + ## random-variable.h (module 'core'): ns3::SeedManager [class] + module.add_class('SeedManager', import_from_module='ns.core') + ## random-variable.h (module 'core'): ns3::SequentialVariable [class] + module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -110,30 +118,62 @@ def register_types(module): module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] module.add_class('TagBuffer', import_from_module='ns.network') + ## random-variable.h (module 'core'): ns3::TriangularVariable [class] + module.add_class('TriangularVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## type-id.h (module 'core'): ns3::TypeId [class] module.add_class('TypeId', import_from_module='ns.core') ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration] module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core') ## type-id.h (module 'core'): ns3::TypeId::AttributeInfo [struct] module.add_class('AttributeInfo', import_from_module='ns.core', outer_class=root_module['ns3::TypeId']) + ## random-variable.h (module 'core'): ns3::UniformVariable [class] + module.add_class('UniformVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## attribute-list.h (module 'core'): ns3::UnsafeAttributeList [class] module.add_class('UnsafeAttributeList', import_from_module='ns.core') + ## random-variable.h (module 'core'): ns3::WeibullVariable [class] + module.add_class('WeibullVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ZetaVariable [class] + module.add_class('ZetaVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ZipfVariable [class] + module.add_class('ZipfVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## empty.h (module 'core'): ns3::empty [class] module.add_class('empty', import_from_module='ns.core') ## int64x64-double.h (module 'core'): ns3::int64x64_t [class] module.add_class('int64x64_t', import_from_module='ns.core') ## chunk.h (module 'network'): ns3::Chunk [class] module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) + ## random-variable.h (module 'core'): ns3::ConstantVariable [class] + module.add_class('ConstantVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::DeterministicVariable [class] + module.add_class('DeterministicVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::EmpiricalVariable [class] + module.add_class('EmpiricalVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ErlangVariable [class] + module.add_class('ErlangVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ExponentialVariable [class] + module.add_class('ExponentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::GammaVariable [class] + module.add_class('GammaVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## header.h (module 'network'): ns3::Header [class] module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) + ## random-variable.h (module 'core'): ns3::IntEmpiricalVariable [class] + module.add_class('IntEmpiricalVariable', import_from_module='ns.core', parent=root_module['ns3::EmpiricalVariable']) + ## random-variable.h (module 'core'): ns3::LogNormalVariable [class] + module.add_class('LogNormalVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::NormalVariable [class] + module.add_class('NormalVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object']) + ## random-variable.h (module 'core'): ns3::ParetoVariable [class] + module.add_class('ParetoVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper [class] module.add_class('PcapFileWrapper', import_from_module='ns.network', parent=root_module['ns3::Object']) ## ppp-header.h (module 'point-to-point'): ns3::PppHeader [class] module.add_class('PppHeader', parent=root_module['ns3::Header']) + ## queue.h (module 'network'): ns3::Queue [class] + module.add_class('Queue', import_from_module='ns.network', parent=root_module['ns3::Object']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -178,6 +218,8 @@ def register_types(module): module.add_class('DataRateValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class] module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## error-model.h (module 'network'): ns3::ErrorModel [class] + module.add_class('ErrorModel', import_from_module='ns.network', parent=root_module['ns3::Object']) ## event-impl.h (module 'core'): ns3::EventImpl [class] module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class] @@ -196,6 +238,8 @@ def register_types(module): module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class] module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## error-model.h (module 'network'): ns3::ListErrorModel [class] + module.add_class('ListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] @@ -222,6 +266,14 @@ def register_types(module): module.add_class('PointToPointNetDevice', parent=root_module['ns3::NetDevice']) ## point-to-point-remote-channel.h (module 'point-to-point'): ns3::PointToPointRemoteChannel [class] module.add_class('PointToPointRemoteChannel', parent=root_module['ns3::PointToPointChannel']) + ## random-variable.h (module 'core'): ns3::RandomVariableChecker [class] + module.add_class('RandomVariableChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## random-variable.h (module 'core'): ns3::RandomVariableValue [class] + module.add_class('RandomVariableValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## error-model.h (module 'network'): ns3::RateErrorModel [class] + module.add_class('RateErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) + ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class] + module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) ## nstime.h (module 'core'): ns3::TimeChecker [class] module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -234,6 +286,7 @@ def register_types(module): module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') ## Register a nested module for the namespace FatalImpl @@ -281,21 +334,40 @@ def register_methods(root_module): register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper']) + register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) + register_Ns3TriangularVariable_methods(root_module, root_module['ns3::TriangularVariable']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) register_Ns3TypeIdAttributeInfo_methods(root_module, root_module['ns3::TypeId::AttributeInfo']) + register_Ns3UniformVariable_methods(root_module, root_module['ns3::UniformVariable']) register_Ns3UnsafeAttributeList_methods(root_module, root_module['ns3::UnsafeAttributeList']) + register_Ns3WeibullVariable_methods(root_module, root_module['ns3::WeibullVariable']) + register_Ns3ZetaVariable_methods(root_module, root_module['ns3::ZetaVariable']) + register_Ns3ZipfVariable_methods(root_module, root_module['ns3::ZipfVariable']) register_Ns3Empty_methods(root_module, root_module['ns3::empty']) register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t']) register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk']) + register_Ns3ConstantVariable_methods(root_module, root_module['ns3::ConstantVariable']) + register_Ns3DeterministicVariable_methods(root_module, root_module['ns3::DeterministicVariable']) + register_Ns3EmpiricalVariable_methods(root_module, root_module['ns3::EmpiricalVariable']) + register_Ns3ErlangVariable_methods(root_module, root_module['ns3::ErlangVariable']) + register_Ns3ExponentialVariable_methods(root_module, root_module['ns3::ExponentialVariable']) + register_Ns3GammaVariable_methods(root_module, root_module['ns3::GammaVariable']) register_Ns3Header_methods(root_module, root_module['ns3::Header']) + register_Ns3IntEmpiricalVariable_methods(root_module, root_module['ns3::IntEmpiricalVariable']) + register_Ns3LogNormalVariable_methods(root_module, root_module['ns3::LogNormalVariable']) + register_Ns3NormalVariable_methods(root_module, root_module['ns3::NormalVariable']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) + register_Ns3ParetoVariable_methods(root_module, root_module['ns3::ParetoVariable']) register_Ns3PcapFileWrapper_methods(root_module, root_module['ns3::PcapFileWrapper']) register_Ns3PppHeader_methods(root_module, root_module['ns3::PppHeader']) + register_Ns3Queue_methods(root_module, root_module['ns3::Queue']) register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) @@ -316,6 +388,7 @@ def register_methods(root_module): register_Ns3DataRateChecker_methods(root_module, root_module['ns3::DataRateChecker']) register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue']) register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) + register_Ns3ErrorModel_methods(root_module, root_module['ns3::ErrorModel']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue']) @@ -325,6 +398,7 @@ def register_methods(root_module): register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) + register_Ns3ListErrorModel_methods(root_module, root_module['ns3::ListErrorModel']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) @@ -337,6 +411,10 @@ def register_methods(root_module): register_Ns3PointToPointChannel_methods(root_module, root_module['ns3::PointToPointChannel']) register_Ns3PointToPointNetDevice_methods(root_module, root_module['ns3::PointToPointNetDevice']) register_Ns3PointToPointRemoteChannel_methods(root_module, root_module['ns3::PointToPointRemoteChannel']) + register_Ns3RandomVariableChecker_methods(root_module, root_module['ns3::RandomVariableChecker']) + register_Ns3RandomVariableValue_methods(root_module, root_module['ns3::RandomVariableValue']) + register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) + register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -2067,6 +2145,65 @@ def register_Ns3PointToPointHelper_methods(root_module, cls): visibility='private', is_virtual=True) return +def register_Ns3RandomVariable_methods(root_module, cls): + cls.add_output_stream_operator() + ## random-variable.h (module 'core'): ns3::RandomVariable::RandomVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::RandomVariable::RandomVariable(ns3::RandomVariable const & o) [copy constructor] + cls.add_constructor([param('ns3::RandomVariable const &', 'o')]) + ## random-variable.h (module 'core'): uint32_t ns3::RandomVariable::GetInteger() const [member function] + cls.add_method('GetInteger', + 'uint32_t', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::RandomVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + return + +def register_Ns3SeedManager_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) + ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] + cls.add_method('CheckSeed', + 'bool', + [param('uint32_t', 'seed')], + is_static=True) + ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint32_t', + [], + is_static=True) + ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint32_t', 'run')], + is_static=True) + ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + +def register_Ns3SequentialVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(ns3::SequentialVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SequentialVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(double f, double l, double i=1, uint32_t c=1) [constructor] + cls.add_constructor([param('double', 'f'), param('double', 'l'), param('double', 'i', default_value='1'), param('uint32_t', 'c', default_value='1')]) + ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(double f, double l, ns3::RandomVariable const & i, uint32_t c=1) [constructor] + cls.add_constructor([param('double', 'f'), param('double', 'l'), param('ns3::RandomVariable const &', 'i'), param('uint32_t', 'c', default_value='1')]) + return + def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -2264,6 +2401,15 @@ def register_Ns3TagBuffer_methods(root_module, cls): [param('uint8_t', 'v')]) return +def register_Ns3TriangularVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::TriangularVariable::TriangularVariable(ns3::TriangularVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::TriangularVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::TriangularVariable::TriangularVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::TriangularVariable::TriangularVariable(double s, double l, double mean) [constructor] + cls.add_constructor([param('double', 's'), param('double', 'l'), param('double', 'mean')]) + return + def register_Ns3TypeId_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -2455,6 +2601,28 @@ def register_Ns3TypeIdAttributeInfo_methods(root_module, cls): cls.add_instance_attribute('initialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False) return +def register_Ns3UniformVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::UniformVariable::UniformVariable(ns3::UniformVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::UniformVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::UniformVariable::UniformVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::UniformVariable::UniformVariable(double s, double l) [constructor] + cls.add_constructor([param('double', 's'), param('double', 'l')]) + ## random-variable.h (module 'core'): uint32_t ns3::UniformVariable::GetInteger(uint32_t s, uint32_t l) [member function] + cls.add_method('GetInteger', + 'uint32_t', + [param('uint32_t', 's'), param('uint32_t', 'l')]) + ## random-variable.h (module 'core'): double ns3::UniformVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::UniformVariable::GetValue(double s, double l) [member function] + cls.add_method('GetValue', + 'double', + [param('double', 's'), param('double', 'l')]) + return + def register_Ns3UnsafeAttributeList_methods(root_module, cls): ## attribute-list.h (module 'core'): ns3::UnsafeAttributeList::UnsafeAttributeList() [constructor] cls.add_constructor([]) @@ -2471,6 +2639,37 @@ def register_Ns3UnsafeAttributeList_methods(root_module, cls): [param('std::string', 'name'), param('ns3::AttributeValue const &', 'param')]) return +def register_Ns3WeibullVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(ns3::WeibullVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::WeibullVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(double m) [constructor] + cls.add_constructor([param('double', 'm')]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(double m, double s) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's')]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(double m, double s, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')]) + return + +def register_Ns3ZetaVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ZetaVariable::ZetaVariable(ns3::ZetaVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ZetaVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ZetaVariable::ZetaVariable(double alpha) [constructor] + cls.add_constructor([param('double', 'alpha')]) + ## random-variable.h (module 'core'): ns3::ZetaVariable::ZetaVariable() [constructor] + cls.add_constructor([]) + return + +def register_Ns3ZipfVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ZipfVariable::ZipfVariable(ns3::ZipfVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ZipfVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ZipfVariable::ZipfVariable(long int N, double alpha) [constructor] + cls.add_constructor([param('long int', 'N'), param('double', 'alpha')]) + ## random-variable.h (module 'core'): ns3::ZipfVariable::ZipfVariable() [constructor] + cls.add_constructor([]) + return + def register_Ns3Empty_methods(root_module, cls): ## empty.h (module 'core'): ns3::empty::empty() [constructor] cls.add_constructor([]) @@ -2607,6 +2806,86 @@ def register_Ns3Chunk_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3ConstantVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ConstantVariable::ConstantVariable(ns3::ConstantVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ConstantVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ConstantVariable::ConstantVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ConstantVariable::ConstantVariable(double c) [constructor] + cls.add_constructor([param('double', 'c')]) + ## random-variable.h (module 'core'): void ns3::ConstantVariable::SetConstant(double c) [member function] + cls.add_method('SetConstant', + 'void', + [param('double', 'c')]) + return + +def register_Ns3DeterministicVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::DeterministicVariable::DeterministicVariable(ns3::DeterministicVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::DeterministicVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::DeterministicVariable::DeterministicVariable(double * d, uint32_t c) [constructor] + cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')]) + return + +def register_Ns3EmpiricalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::EmpiricalVariable::EmpiricalVariable(ns3::EmpiricalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EmpiricalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::EmpiricalVariable::EmpiricalVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): void ns3::EmpiricalVariable::CDF(double v, double c) [member function] + cls.add_method('CDF', + 'void', + [param('double', 'v'), param('double', 'c')]) + return + +def register_Ns3ErlangVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ErlangVariable::ErlangVariable(ns3::ErlangVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ErlangVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ErlangVariable::ErlangVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ErlangVariable::ErlangVariable(unsigned int k, double lambda) [constructor] + cls.add_constructor([param('unsigned int', 'k'), param('double', 'lambda')]) + ## random-variable.h (module 'core'): double ns3::ErlangVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::ErlangVariable::GetValue(unsigned int k, double lambda) const [member function] + cls.add_method('GetValue', + 'double', + [param('unsigned int', 'k'), param('double', 'lambda')], + is_const=True) + return + +def register_Ns3ExponentialVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable(ns3::ExponentialVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ExponentialVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable(double m) [constructor] + cls.add_constructor([param('double', 'm')]) + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable(double m, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 'b')]) + return + +def register_Ns3GammaVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::GammaVariable::GammaVariable(ns3::GammaVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::GammaVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::GammaVariable::GammaVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::GammaVariable::GammaVariable(double alpha, double beta) [constructor] + cls.add_constructor([param('double', 'alpha'), param('double', 'beta')]) + ## random-variable.h (module 'core'): double ns3::GammaVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::GammaVariable::GetValue(double alpha, double beta) const [member function] + cls.add_method('GetValue', + 'double', + [param('double', 'alpha'), param('double', 'beta')], + is_const=True) + return + def register_Ns3Header_methods(root_module, cls): cls.add_output_stream_operator() ## header.h (module 'network'): ns3::Header::Header() [constructor] @@ -2640,6 +2919,31 @@ def register_Ns3Header_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3IntEmpiricalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::IntEmpiricalVariable::IntEmpiricalVariable(ns3::IntEmpiricalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::IntEmpiricalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::IntEmpiricalVariable::IntEmpiricalVariable() [constructor] + cls.add_constructor([]) + return + +def register_Ns3LogNormalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::LogNormalVariable::LogNormalVariable(ns3::LogNormalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::LogNormalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::LogNormalVariable::LogNormalVariable(double mu, double sigma) [constructor] + cls.add_constructor([param('double', 'mu'), param('double', 'sigma')]) + return + +def register_Ns3NormalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable(ns3::NormalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::NormalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable(double m, double v) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 'v')]) + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable(double m, double v, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 'v'), param('double', 'b')]) + return + def register_Ns3Object_methods(root_module, cls): ## object.h (module 'core'): ns3::Object::Object() [constructor] cls.add_constructor([]) @@ -2706,6 +3010,23 @@ def register_Ns3ObjectAggregateIterator_methods(root_module, cls): []) return +def register_Ns3ParetoVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(ns3::ParetoVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ParetoVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(double m) [constructor] + cls.add_constructor([param('double', 'm')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(double m, double s) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(double m, double s, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(std::pair params) [constructor] + cls.add_constructor([param('std::pair< double, double >', 'params')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(std::pair params, double b) [constructor] + cls.add_constructor([param('std::pair< double, double >', 'params'), param('double', 'b')]) + return + def register_Ns3PcapFileWrapper_methods(root_module, cls): ## pcap-file-wrapper.h (module 'network'): static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function] cls.add_method('GetTypeId', @@ -2827,6 +3148,94 @@ def register_Ns3PppHeader_methods(root_module, cls): [param('uint16_t', 'protocol')]) return +def register_Ns3Queue_methods(root_module, cls): + ## queue.h (module 'network'): ns3::Queue::Queue(ns3::Queue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Queue const &', 'arg0')]) + ## queue.h (module 'network'): ns3::Queue::Queue() [constructor] + cls.add_constructor([]) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Dequeue() [member function] + cls.add_method('Dequeue', + 'ns3::Ptr< ns3::Packet >', + []) + ## queue.h (module 'network'): void ns3::Queue::DequeueAll() [member function] + cls.add_method('DequeueAll', + 'void', + []) + ## queue.h (module 'network'): bool ns3::Queue::Enqueue(ns3::Ptr p) [member function] + cls.add_method('Enqueue', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')]) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetNBytes() const [member function] + cls.add_method('GetNBytes', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetNPackets() const [member function] + cls.add_method('GetNPackets', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalDroppedBytes() const [member function] + cls.add_method('GetTotalDroppedBytes', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalDroppedPackets() const [member function] + cls.add_method('GetTotalDroppedPackets', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalReceivedBytes() const [member function] + cls.add_method('GetTotalReceivedBytes', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalReceivedPackets() const [member function] + cls.add_method('GetTotalReceivedPackets', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): static ns3::TypeId ns3::Queue::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## queue.h (module 'network'): bool ns3::Queue::IsEmpty() const [member function] + cls.add_method('IsEmpty', + 'bool', + [], + is_const=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Peek() const [member function] + cls.add_method('Peek', + 'ns3::Ptr< ns3::Packet const >', + [], + is_const=True) + ## queue.h (module 'network'): void ns3::Queue::ResetStatistics() [member function] + cls.add_method('ResetStatistics', + 'void', + []) + ## queue.h (module 'network'): void ns3::Queue::Drop(ns3::Ptr packet) [member function] + cls.add_method('Drop', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet')], + visibility='protected') + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoDequeue() [member function] + cls.add_method('DoDequeue', + 'ns3::Ptr< ns3::Packet >', + [], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## queue.h (module 'network'): bool ns3::Queue::DoEnqueue(ns3::Ptr p) [member function] + cls.add_method('DoEnqueue', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoPeek() const [member function] + cls.add_method('DoPeek', + 'ns3::Ptr< ns3::Packet const >', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -3334,6 +3743,49 @@ def register_Ns3EmptyAttributeValue_methods(root_module, cls): is_const=True, visibility='private', is_virtual=True) return +def register_Ns3ErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::ErrorModel::ErrorModel(ns3::ErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::ErrorModel::ErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): void ns3::ErrorModel::Disable() [member function] + cls.add_method('Disable', + 'void', + []) + ## error-model.h (module 'network'): void ns3::ErrorModel::Enable() [member function] + cls.add_method('Enable', + 'void', + []) + ## error-model.h (module 'network'): static ns3::TypeId ns3::ErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): bool ns3::ErrorModel::IsCorrupt(ns3::Ptr pkt) [member function] + cls.add_method('IsCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'pkt')]) + ## error-model.h (module 'network'): bool ns3::ErrorModel::IsEnabled() const [member function] + cls.add_method('IsEnabled', + 'bool', + [], + is_const=True) + ## error-model.h (module 'network'): void ns3::ErrorModel::Reset() [member function] + cls.add_method('Reset', + 'void', + []) + ## error-model.h (module 'network'): bool ns3::ErrorModel::DoCorrupt(ns3::Ptr arg0) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'arg0')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::ErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + is_pure_virtual=True, visibility='private', is_virtual=True) + return + def register_Ns3EventImpl_methods(root_module, cls): ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor] cls.add_constructor([param('ns3::EventImpl const &', 'arg0')]) @@ -3518,6 +3970,37 @@ def register_Ns3Ipv6PrefixValue_methods(root_module, cls): [param('ns3::Ipv6Prefix const &', 'value')]) return +def register_Ns3ListErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::ListErrorModel::ListErrorModel(ns3::ListErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ListErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::ListErrorModel::ListErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): std::list > ns3::ListErrorModel::GetList() const [member function] + cls.add_method('GetList', + 'std::list< unsigned int >', + [], + is_const=True) + ## error-model.h (module 'network'): static ns3::TypeId ns3::ListErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): void ns3::ListErrorModel::SetList(std::list > const & packetlist) [member function] + cls.add_method('SetList', + 'void', + [param('std::list< unsigned int > const &', 'packetlist')]) + ## error-model.h (module 'network'): bool ns3::ListErrorModel::DoCorrupt(ns3::Ptr p) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::ListErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + visibility='private', is_virtual=True) + return + def register_Ns3Mac48AddressChecker_methods(root_module, cls): ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] cls.add_constructor([]) @@ -4293,6 +4776,136 @@ def register_Ns3PointToPointRemoteChannel_methods(root_module, cls): is_virtual=True) return +def register_Ns3RandomVariableChecker_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::RandomVariableChecker::RandomVariableChecker() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::RandomVariableChecker::RandomVariableChecker(ns3::RandomVariableChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RandomVariableChecker const &', 'arg0')]) + return + +def register_Ns3RandomVariableValue_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::RandomVariableValue::RandomVariableValue() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::RandomVariableValue::RandomVariableValue(ns3::RandomVariableValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RandomVariableValue const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::RandomVariableValue::RandomVariableValue(ns3::RandomVariable const & value) [constructor] + cls.add_constructor([param('ns3::RandomVariable const &', 'value')]) + ## random-variable.h (module 'core'): ns3::Ptr ns3::RandomVariableValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## random-variable.h (module 'core'): bool ns3::RandomVariableValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## random-variable.h (module 'core'): ns3::RandomVariable ns3::RandomVariableValue::Get() const [member function] + cls.add_method('Get', + 'ns3::RandomVariable', + [], + is_const=True) + ## random-variable.h (module 'core'): std::string ns3::RandomVariableValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## random-variable.h (module 'core'): void ns3::RandomVariableValue::Set(ns3::RandomVariable const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::RandomVariable const &', 'value')]) + return + +def register_Ns3RateErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::RateErrorModel::RateErrorModel(ns3::RateErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RateErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::RateErrorModel::RateErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): double ns3::RateErrorModel::GetRate() const [member function] + cls.add_method('GetRate', + 'double', + [], + is_const=True) + ## error-model.h (module 'network'): static ns3::TypeId ns3::RateErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): ns3::ErrorUnit ns3::RateErrorModel::GetUnit() const [member function] + cls.add_method('GetUnit', + 'ns3::ErrorUnit', + [], + is_const=True) + ## error-model.h (module 'network'): void ns3::RateErrorModel::SetRandomVariable(ns3::RandomVariable const & ranvar) [member function] + cls.add_method('SetRandomVariable', + 'void', + [param('ns3::RandomVariable const &', 'ranvar')]) + ## error-model.h (module 'network'): void ns3::RateErrorModel::SetRate(double rate) [member function] + cls.add_method('SetRate', + 'void', + [param('double', 'rate')]) + ## error-model.h (module 'network'): void ns3::RateErrorModel::SetUnit(ns3::ErrorUnit error_unit) [member function] + cls.add_method('SetUnit', + 'void', + [param('ns3::ErrorUnit', 'error_unit')]) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorrupt(ns3::Ptr p) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorruptBit(ns3::Ptr p) [member function] + cls.add_method('DoCorruptBit', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorruptByte(ns3::Ptr p) [member function] + cls.add_method('DoCorruptByte', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorruptPkt(ns3::Ptr p) [member function] + cls.add_method('DoCorruptPkt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::RateErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + visibility='private', is_virtual=True) + return + +def register_Ns3ReceiveListErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::ReceiveListErrorModel::ReceiveListErrorModel(ns3::ReceiveListErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ReceiveListErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::ReceiveListErrorModel::ReceiveListErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): std::list > ns3::ReceiveListErrorModel::GetList() const [member function] + cls.add_method('GetList', + 'std::list< unsigned int >', + [], + is_const=True) + ## error-model.h (module 'network'): static ns3::TypeId ns3::ReceiveListErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): void ns3::ReceiveListErrorModel::SetList(std::list > const & packetlist) [member function] + cls.add_method('SetList', + 'void', + [param('std::list< unsigned int > const &', 'packetlist')]) + ## error-model.h (module 'network'): bool ns3::ReceiveListErrorModel::DoCorrupt(ns3::Ptr p) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::ReceiveListErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + visibility='private', is_virtual=True) + return + def register_Ns3TimeChecker_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] cls.add_constructor([]) diff --git a/src/point-to-point/bindings/modulegen__gcc_LP64.py b/src/point-to-point/bindings/modulegen__gcc_LP64.py index fe3327f38..ce18a75fe 100644 --- a/src/point-to-point/bindings/modulegen__gcc_LP64.py +++ b/src/point-to-point/bindings/modulegen__gcc_LP64.py @@ -20,6 +20,8 @@ def module_init(): def register_types(module): root_module = module.get_root() + ## error-model.h (module 'network'): ns3::ErrorUnit [enumeration] + module.add_enum('ErrorUnit', ['EU_BIT', 'EU_BYTE', 'EU_PKT'], import_from_module='ns.network') ## address.h (module 'network'): ns3::Address [class] module.add_class('Address', import_from_module='ns.network') ## address.h (module 'network'): ns3::Address::MaxSize_e [enumeration] @@ -102,6 +104,12 @@ def register_types(module): module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network') ## point-to-point-helper.h (module 'point-to-point'): ns3::PointToPointHelper [class] module.add_class('PointToPointHelper', parent=[root_module['ns3::PcapHelperForDevice'], root_module['ns3::AsciiTraceHelperForDevice']]) + ## random-variable.h (module 'core'): ns3::RandomVariable [class] + module.add_class('RandomVariable', import_from_module='ns.core') + ## random-variable.h (module 'core'): ns3::SeedManager [class] + module.add_class('SeedManager', import_from_module='ns.core') + ## random-variable.h (module 'core'): ns3::SequentialVariable [class] + module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -110,30 +118,62 @@ def register_types(module): module.add_class('Tag', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) ## tag-buffer.h (module 'network'): ns3::TagBuffer [class] module.add_class('TagBuffer', import_from_module='ns.network') + ## random-variable.h (module 'core'): ns3::TriangularVariable [class] + module.add_class('TriangularVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## type-id.h (module 'core'): ns3::TypeId [class] module.add_class('TypeId', import_from_module='ns.core') ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration] module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core') ## type-id.h (module 'core'): ns3::TypeId::AttributeInfo [struct] module.add_class('AttributeInfo', import_from_module='ns.core', outer_class=root_module['ns3::TypeId']) + ## random-variable.h (module 'core'): ns3::UniformVariable [class] + module.add_class('UniformVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## attribute-list.h (module 'core'): ns3::UnsafeAttributeList [class] module.add_class('UnsafeAttributeList', import_from_module='ns.core') + ## random-variable.h (module 'core'): ns3::WeibullVariable [class] + module.add_class('WeibullVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ZetaVariable [class] + module.add_class('ZetaVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ZipfVariable [class] + module.add_class('ZipfVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## empty.h (module 'core'): ns3::empty [class] module.add_class('empty', import_from_module='ns.core') ## int64x64-double.h (module 'core'): ns3::int64x64_t [class] module.add_class('int64x64_t', import_from_module='ns.core') ## chunk.h (module 'network'): ns3::Chunk [class] module.add_class('Chunk', import_from_module='ns.network', parent=root_module['ns3::ObjectBase']) + ## random-variable.h (module 'core'): ns3::ConstantVariable [class] + module.add_class('ConstantVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::DeterministicVariable [class] + module.add_class('DeterministicVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::EmpiricalVariable [class] + module.add_class('EmpiricalVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ErlangVariable [class] + module.add_class('ErlangVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::ExponentialVariable [class] + module.add_class('ExponentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::GammaVariable [class] + module.add_class('GammaVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## header.h (module 'network'): ns3::Header [class] module.add_class('Header', import_from_module='ns.network', parent=root_module['ns3::Chunk']) + ## random-variable.h (module 'core'): ns3::IntEmpiricalVariable [class] + module.add_class('IntEmpiricalVariable', import_from_module='ns.core', parent=root_module['ns3::EmpiricalVariable']) + ## random-variable.h (module 'core'): ns3::LogNormalVariable [class] + module.add_class('LogNormalVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) + ## random-variable.h (module 'core'): ns3::NormalVariable [class] + module.add_class('NormalVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## object.h (module 'core'): ns3::Object [class] module.add_class('Object', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) ## object.h (module 'core'): ns3::Object::AggregateIterator [class] module.add_class('AggregateIterator', import_from_module='ns.core', outer_class=root_module['ns3::Object']) + ## random-variable.h (module 'core'): ns3::ParetoVariable [class] + module.add_class('ParetoVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## pcap-file-wrapper.h (module 'network'): ns3::PcapFileWrapper [class] module.add_class('PcapFileWrapper', import_from_module='ns.network', parent=root_module['ns3::Object']) ## ppp-header.h (module 'point-to-point'): ns3::PppHeader [class] module.add_class('PppHeader', parent=root_module['ns3::Header']) + ## queue.h (module 'network'): ns3::Queue [class] + module.add_class('Queue', import_from_module='ns.network', parent=root_module['ns3::Object']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::AttributeAccessor', 'ns3::empty', 'ns3::DefaultDeleter'], parent=root_module['ns3::empty'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount > [class] @@ -178,6 +218,8 @@ def register_types(module): module.add_class('DataRateValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class] module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## error-model.h (module 'network'): ns3::ErrorModel [class] + module.add_class('ErrorModel', import_from_module='ns.network', parent=root_module['ns3::Object']) ## event-impl.h (module 'core'): ns3::EventImpl [class] module.add_class('EventImpl', import_from_module='ns.core', parent=root_module['ns3::SimpleRefCount< ns3::EventImpl, ns3::empty, ns3::DefaultDeleter >']) ## ipv4-address.h (module 'network'): ns3::Ipv4AddressChecker [class] @@ -196,6 +238,8 @@ def register_types(module): module.add_class('Ipv6PrefixChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## ipv6-address.h (module 'network'): ns3::Ipv6PrefixValue [class] module.add_class('Ipv6PrefixValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + ## error-model.h (module 'network'): ns3::ListErrorModel [class] + module.add_class('ListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker [class] module.add_class('Mac48AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## mac48-address.h (module 'network'): ns3::Mac48AddressValue [class] @@ -222,6 +266,14 @@ def register_types(module): module.add_class('PointToPointNetDevice', parent=root_module['ns3::NetDevice']) ## point-to-point-remote-channel.h (module 'point-to-point'): ns3::PointToPointRemoteChannel [class] module.add_class('PointToPointRemoteChannel', parent=root_module['ns3::PointToPointChannel']) + ## random-variable.h (module 'core'): ns3::RandomVariableChecker [class] + module.add_class('RandomVariableChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) + ## random-variable.h (module 'core'): ns3::RandomVariableValue [class] + module.add_class('RandomVariableValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) + ## error-model.h (module 'network'): ns3::RateErrorModel [class] + module.add_class('RateErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) + ## error-model.h (module 'network'): ns3::ReceiveListErrorModel [class] + module.add_class('ReceiveListErrorModel', import_from_module='ns.network', parent=root_module['ns3::ErrorModel']) ## nstime.h (module 'core'): ns3::TimeChecker [class] module.add_class('TimeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker']) ## nstime.h (module 'core'): ns3::TimeValue [class] @@ -234,6 +286,7 @@ def register_types(module): module.add_class('AddressChecker', import_from_module='ns.network', parent=root_module['ns3::AttributeChecker']) ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) + module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') ## Register a nested module for the namespace FatalImpl @@ -281,21 +334,40 @@ def register_methods(root_module): register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper']) + register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) register_Ns3Tag_methods(root_module, root_module['ns3::Tag']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) + register_Ns3TriangularVariable_methods(root_module, root_module['ns3::TriangularVariable']) register_Ns3TypeId_methods(root_module, root_module['ns3::TypeId']) register_Ns3TypeIdAttributeInfo_methods(root_module, root_module['ns3::TypeId::AttributeInfo']) + register_Ns3UniformVariable_methods(root_module, root_module['ns3::UniformVariable']) register_Ns3UnsafeAttributeList_methods(root_module, root_module['ns3::UnsafeAttributeList']) + register_Ns3WeibullVariable_methods(root_module, root_module['ns3::WeibullVariable']) + register_Ns3ZetaVariable_methods(root_module, root_module['ns3::ZetaVariable']) + register_Ns3ZipfVariable_methods(root_module, root_module['ns3::ZipfVariable']) register_Ns3Empty_methods(root_module, root_module['ns3::empty']) register_Ns3Int64x64_t_methods(root_module, root_module['ns3::int64x64_t']) register_Ns3Chunk_methods(root_module, root_module['ns3::Chunk']) + register_Ns3ConstantVariable_methods(root_module, root_module['ns3::ConstantVariable']) + register_Ns3DeterministicVariable_methods(root_module, root_module['ns3::DeterministicVariable']) + register_Ns3EmpiricalVariable_methods(root_module, root_module['ns3::EmpiricalVariable']) + register_Ns3ErlangVariable_methods(root_module, root_module['ns3::ErlangVariable']) + register_Ns3ExponentialVariable_methods(root_module, root_module['ns3::ExponentialVariable']) + register_Ns3GammaVariable_methods(root_module, root_module['ns3::GammaVariable']) register_Ns3Header_methods(root_module, root_module['ns3::Header']) + register_Ns3IntEmpiricalVariable_methods(root_module, root_module['ns3::IntEmpiricalVariable']) + register_Ns3LogNormalVariable_methods(root_module, root_module['ns3::LogNormalVariable']) + register_Ns3NormalVariable_methods(root_module, root_module['ns3::NormalVariable']) register_Ns3Object_methods(root_module, root_module['ns3::Object']) register_Ns3ObjectAggregateIterator_methods(root_module, root_module['ns3::Object::AggregateIterator']) + register_Ns3ParetoVariable_methods(root_module, root_module['ns3::ParetoVariable']) register_Ns3PcapFileWrapper_methods(root_module, root_module['ns3::PcapFileWrapper']) register_Ns3PppHeader_methods(root_module, root_module['ns3::PppHeader']) + register_Ns3Queue_methods(root_module, root_module['ns3::Queue']) register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeAccessor, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeChecker_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeChecker__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeChecker, ns3::empty, ns3::DefaultDeleter >']) register_Ns3SimpleRefCount__Ns3AttributeValue_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeValue__gt___methods(root_module, root_module['ns3::SimpleRefCount< ns3::AttributeValue, ns3::empty, ns3::DefaultDeleter >']) @@ -316,6 +388,7 @@ def register_methods(root_module): register_Ns3DataRateChecker_methods(root_module, root_module['ns3::DataRateChecker']) register_Ns3DataRateValue_methods(root_module, root_module['ns3::DataRateValue']) register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue']) + register_Ns3ErrorModel_methods(root_module, root_module['ns3::ErrorModel']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3Ipv4AddressChecker_methods(root_module, root_module['ns3::Ipv4AddressChecker']) register_Ns3Ipv4AddressValue_methods(root_module, root_module['ns3::Ipv4AddressValue']) @@ -325,6 +398,7 @@ def register_methods(root_module): register_Ns3Ipv6AddressValue_methods(root_module, root_module['ns3::Ipv6AddressValue']) register_Ns3Ipv6PrefixChecker_methods(root_module, root_module['ns3::Ipv6PrefixChecker']) register_Ns3Ipv6PrefixValue_methods(root_module, root_module['ns3::Ipv6PrefixValue']) + register_Ns3ListErrorModel_methods(root_module, root_module['ns3::ListErrorModel']) register_Ns3Mac48AddressChecker_methods(root_module, root_module['ns3::Mac48AddressChecker']) register_Ns3Mac48AddressValue_methods(root_module, root_module['ns3::Mac48AddressValue']) register_Ns3NetDevice_methods(root_module, root_module['ns3::NetDevice']) @@ -337,6 +411,10 @@ def register_methods(root_module): register_Ns3PointToPointChannel_methods(root_module, root_module['ns3::PointToPointChannel']) register_Ns3PointToPointNetDevice_methods(root_module, root_module['ns3::PointToPointNetDevice']) register_Ns3PointToPointRemoteChannel_methods(root_module, root_module['ns3::PointToPointRemoteChannel']) + register_Ns3RandomVariableChecker_methods(root_module, root_module['ns3::RandomVariableChecker']) + register_Ns3RandomVariableValue_methods(root_module, root_module['ns3::RandomVariableValue']) + register_Ns3RateErrorModel_methods(root_module, root_module['ns3::RateErrorModel']) + register_Ns3ReceiveListErrorModel_methods(root_module, root_module['ns3::ReceiveListErrorModel']) register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker']) register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue']) register_Ns3TypeIdChecker_methods(root_module, root_module['ns3::TypeIdChecker']) @@ -2067,6 +2145,65 @@ def register_Ns3PointToPointHelper_methods(root_module, cls): visibility='private', is_virtual=True) return +def register_Ns3RandomVariable_methods(root_module, cls): + cls.add_output_stream_operator() + ## random-variable.h (module 'core'): ns3::RandomVariable::RandomVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::RandomVariable::RandomVariable(ns3::RandomVariable const & o) [copy constructor] + cls.add_constructor([param('ns3::RandomVariable const &', 'o')]) + ## random-variable.h (module 'core'): uint32_t ns3::RandomVariable::GetInteger() const [member function] + cls.add_method('GetInteger', + 'uint32_t', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::RandomVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + return + +def register_Ns3SeedManager_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) + ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] + cls.add_method('CheckSeed', + 'bool', + [param('uint32_t', 'seed')], + is_static=True) + ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint32_t', + [], + is_static=True) + ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint32_t', 'run')], + is_static=True) + ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + +def register_Ns3SequentialVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(ns3::SequentialVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::SequentialVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(double f, double l, double i=1, uint32_t c=1) [constructor] + cls.add_constructor([param('double', 'f'), param('double', 'l'), param('double', 'i', default_value='1'), param('uint32_t', 'c', default_value='1')]) + ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(double f, double l, ns3::RandomVariable const & i, uint32_t c=1) [constructor] + cls.add_constructor([param('double', 'f'), param('double', 'l'), param('ns3::RandomVariable const &', 'i'), param('uint32_t', 'c', default_value='1')]) + return + def register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -2264,6 +2401,15 @@ def register_Ns3TagBuffer_methods(root_module, cls): [param('uint8_t', 'v')]) return +def register_Ns3TriangularVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::TriangularVariable::TriangularVariable(ns3::TriangularVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::TriangularVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::TriangularVariable::TriangularVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::TriangularVariable::TriangularVariable(double s, double l, double mean) [constructor] + cls.add_constructor([param('double', 's'), param('double', 'l'), param('double', 'mean')]) + return + def register_Ns3TypeId_methods(root_module, cls): cls.add_binary_comparison_operator('<') cls.add_binary_comparison_operator('!=') @@ -2455,6 +2601,28 @@ def register_Ns3TypeIdAttributeInfo_methods(root_module, cls): cls.add_instance_attribute('initialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False) return +def register_Ns3UniformVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::UniformVariable::UniformVariable(ns3::UniformVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::UniformVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::UniformVariable::UniformVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::UniformVariable::UniformVariable(double s, double l) [constructor] + cls.add_constructor([param('double', 's'), param('double', 'l')]) + ## random-variable.h (module 'core'): uint32_t ns3::UniformVariable::GetInteger(uint32_t s, uint32_t l) [member function] + cls.add_method('GetInteger', + 'uint32_t', + [param('uint32_t', 's'), param('uint32_t', 'l')]) + ## random-variable.h (module 'core'): double ns3::UniformVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::UniformVariable::GetValue(double s, double l) [member function] + cls.add_method('GetValue', + 'double', + [param('double', 's'), param('double', 'l')]) + return + def register_Ns3UnsafeAttributeList_methods(root_module, cls): ## attribute-list.h (module 'core'): ns3::UnsafeAttributeList::UnsafeAttributeList() [constructor] cls.add_constructor([]) @@ -2471,6 +2639,37 @@ def register_Ns3UnsafeAttributeList_methods(root_module, cls): [param('std::string', 'name'), param('ns3::AttributeValue const &', 'param')]) return +def register_Ns3WeibullVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(ns3::WeibullVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::WeibullVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(double m) [constructor] + cls.add_constructor([param('double', 'm')]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(double m, double s) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's')]) + ## random-variable.h (module 'core'): ns3::WeibullVariable::WeibullVariable(double m, double s, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')]) + return + +def register_Ns3ZetaVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ZetaVariable::ZetaVariable(ns3::ZetaVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ZetaVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ZetaVariable::ZetaVariable(double alpha) [constructor] + cls.add_constructor([param('double', 'alpha')]) + ## random-variable.h (module 'core'): ns3::ZetaVariable::ZetaVariable() [constructor] + cls.add_constructor([]) + return + +def register_Ns3ZipfVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ZipfVariable::ZipfVariable(ns3::ZipfVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ZipfVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ZipfVariable::ZipfVariable(long int N, double alpha) [constructor] + cls.add_constructor([param('long int', 'N'), param('double', 'alpha')]) + ## random-variable.h (module 'core'): ns3::ZipfVariable::ZipfVariable() [constructor] + cls.add_constructor([]) + return + def register_Ns3Empty_methods(root_module, cls): ## empty.h (module 'core'): ns3::empty::empty() [constructor] cls.add_constructor([]) @@ -2607,6 +2806,86 @@ def register_Ns3Chunk_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3ConstantVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ConstantVariable::ConstantVariable(ns3::ConstantVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ConstantVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ConstantVariable::ConstantVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ConstantVariable::ConstantVariable(double c) [constructor] + cls.add_constructor([param('double', 'c')]) + ## random-variable.h (module 'core'): void ns3::ConstantVariable::SetConstant(double c) [member function] + cls.add_method('SetConstant', + 'void', + [param('double', 'c')]) + return + +def register_Ns3DeterministicVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::DeterministicVariable::DeterministicVariable(ns3::DeterministicVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::DeterministicVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::DeterministicVariable::DeterministicVariable(double * d, uint32_t c) [constructor] + cls.add_constructor([param('double *', 'd'), param('uint32_t', 'c')]) + return + +def register_Ns3EmpiricalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::EmpiricalVariable::EmpiricalVariable(ns3::EmpiricalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::EmpiricalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::EmpiricalVariable::EmpiricalVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): void ns3::EmpiricalVariable::CDF(double v, double c) [member function] + cls.add_method('CDF', + 'void', + [param('double', 'v'), param('double', 'c')]) + return + +def register_Ns3ErlangVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ErlangVariable::ErlangVariable(ns3::ErlangVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ErlangVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ErlangVariable::ErlangVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ErlangVariable::ErlangVariable(unsigned int k, double lambda) [constructor] + cls.add_constructor([param('unsigned int', 'k'), param('double', 'lambda')]) + ## random-variable.h (module 'core'): double ns3::ErlangVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::ErlangVariable::GetValue(unsigned int k, double lambda) const [member function] + cls.add_method('GetValue', + 'double', + [param('unsigned int', 'k'), param('double', 'lambda')], + is_const=True) + return + +def register_Ns3ExponentialVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable(ns3::ExponentialVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ExponentialVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable(double m) [constructor] + cls.add_constructor([param('double', 'm')]) + ## random-variable.h (module 'core'): ns3::ExponentialVariable::ExponentialVariable(double m, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 'b')]) + return + +def register_Ns3GammaVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::GammaVariable::GammaVariable(ns3::GammaVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::GammaVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::GammaVariable::GammaVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::GammaVariable::GammaVariable(double alpha, double beta) [constructor] + cls.add_constructor([param('double', 'alpha'), param('double', 'beta')]) + ## random-variable.h (module 'core'): double ns3::GammaVariable::GetValue() const [member function] + cls.add_method('GetValue', + 'double', + [], + is_const=True) + ## random-variable.h (module 'core'): double ns3::GammaVariable::GetValue(double alpha, double beta) const [member function] + cls.add_method('GetValue', + 'double', + [param('double', 'alpha'), param('double', 'beta')], + is_const=True) + return + def register_Ns3Header_methods(root_module, cls): cls.add_output_stream_operator() ## header.h (module 'network'): ns3::Header::Header() [constructor] @@ -2640,6 +2919,31 @@ def register_Ns3Header_methods(root_module, cls): is_pure_virtual=True, is_const=True, is_virtual=True) return +def register_Ns3IntEmpiricalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::IntEmpiricalVariable::IntEmpiricalVariable(ns3::IntEmpiricalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::IntEmpiricalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::IntEmpiricalVariable::IntEmpiricalVariable() [constructor] + cls.add_constructor([]) + return + +def register_Ns3LogNormalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::LogNormalVariable::LogNormalVariable(ns3::LogNormalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::LogNormalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::LogNormalVariable::LogNormalVariable(double mu, double sigma) [constructor] + cls.add_constructor([param('double', 'mu'), param('double', 'sigma')]) + return + +def register_Ns3NormalVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable(ns3::NormalVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::NormalVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable(double m, double v) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 'v')]) + ## random-variable.h (module 'core'): ns3::NormalVariable::NormalVariable(double m, double v, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 'v'), param('double', 'b')]) + return + def register_Ns3Object_methods(root_module, cls): ## object.h (module 'core'): ns3::Object::Object() [constructor] cls.add_constructor([]) @@ -2706,6 +3010,23 @@ def register_Ns3ObjectAggregateIterator_methods(root_module, cls): []) return +def register_Ns3ParetoVariable_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(ns3::ParetoVariable const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ParetoVariable const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(double m) [constructor] + cls.add_constructor([param('double', 'm')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(double m, double s) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(double m, double s, double b) [constructor] + cls.add_constructor([param('double', 'm'), param('double', 's'), param('double', 'b')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(std::pair params) [constructor] + cls.add_constructor([param('std::pair< double, double >', 'params')]) + ## random-variable.h (module 'core'): ns3::ParetoVariable::ParetoVariable(std::pair params, double b) [constructor] + cls.add_constructor([param('std::pair< double, double >', 'params'), param('double', 'b')]) + return + def register_Ns3PcapFileWrapper_methods(root_module, cls): ## pcap-file-wrapper.h (module 'network'): static ns3::TypeId ns3::PcapFileWrapper::GetTypeId() [member function] cls.add_method('GetTypeId', @@ -2827,6 +3148,94 @@ def register_Ns3PppHeader_methods(root_module, cls): [param('uint16_t', 'protocol')]) return +def register_Ns3Queue_methods(root_module, cls): + ## queue.h (module 'network'): ns3::Queue::Queue(ns3::Queue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::Queue const &', 'arg0')]) + ## queue.h (module 'network'): ns3::Queue::Queue() [constructor] + cls.add_constructor([]) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Dequeue() [member function] + cls.add_method('Dequeue', + 'ns3::Ptr< ns3::Packet >', + []) + ## queue.h (module 'network'): void ns3::Queue::DequeueAll() [member function] + cls.add_method('DequeueAll', + 'void', + []) + ## queue.h (module 'network'): bool ns3::Queue::Enqueue(ns3::Ptr p) [member function] + cls.add_method('Enqueue', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')]) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetNBytes() const [member function] + cls.add_method('GetNBytes', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetNPackets() const [member function] + cls.add_method('GetNPackets', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalDroppedBytes() const [member function] + cls.add_method('GetTotalDroppedBytes', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalDroppedPackets() const [member function] + cls.add_method('GetTotalDroppedPackets', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalReceivedBytes() const [member function] + cls.add_method('GetTotalReceivedBytes', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): uint32_t ns3::Queue::GetTotalReceivedPackets() const [member function] + cls.add_method('GetTotalReceivedPackets', + 'uint32_t', + [], + is_const=True) + ## queue.h (module 'network'): static ns3::TypeId ns3::Queue::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## queue.h (module 'network'): bool ns3::Queue::IsEmpty() const [member function] + cls.add_method('IsEmpty', + 'bool', + [], + is_const=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::Peek() const [member function] + cls.add_method('Peek', + 'ns3::Ptr< ns3::Packet const >', + [], + is_const=True) + ## queue.h (module 'network'): void ns3::Queue::ResetStatistics() [member function] + cls.add_method('ResetStatistics', + 'void', + []) + ## queue.h (module 'network'): void ns3::Queue::Drop(ns3::Ptr packet) [member function] + cls.add_method('Drop', + 'void', + [param('ns3::Ptr< ns3::Packet >', 'packet')], + visibility='protected') + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoDequeue() [member function] + cls.add_method('DoDequeue', + 'ns3::Ptr< ns3::Packet >', + [], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## queue.h (module 'network'): bool ns3::Queue::DoEnqueue(ns3::Ptr p) [member function] + cls.add_method('DoEnqueue', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## queue.h (module 'network'): ns3::Ptr ns3::Queue::DoPeek() const [member function] + cls.add_method('DoPeek', + 'ns3::Ptr< ns3::Packet const >', + [], + is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True) + return + def register_Ns3SimpleRefCount__Ns3AttributeAccessor_Ns3Empty_Ns3DefaultDeleter__lt__ns3AttributeAccessor__gt___methods(root_module, cls): ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount >::SimpleRefCount() [constructor] cls.add_constructor([]) @@ -3334,6 +3743,49 @@ def register_Ns3EmptyAttributeValue_methods(root_module, cls): is_const=True, visibility='private', is_virtual=True) return +def register_Ns3ErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::ErrorModel::ErrorModel(ns3::ErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::ErrorModel::ErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): void ns3::ErrorModel::Disable() [member function] + cls.add_method('Disable', + 'void', + []) + ## error-model.h (module 'network'): void ns3::ErrorModel::Enable() [member function] + cls.add_method('Enable', + 'void', + []) + ## error-model.h (module 'network'): static ns3::TypeId ns3::ErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): bool ns3::ErrorModel::IsCorrupt(ns3::Ptr pkt) [member function] + cls.add_method('IsCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'pkt')]) + ## error-model.h (module 'network'): bool ns3::ErrorModel::IsEnabled() const [member function] + cls.add_method('IsEnabled', + 'bool', + [], + is_const=True) + ## error-model.h (module 'network'): void ns3::ErrorModel::Reset() [member function] + cls.add_method('Reset', + 'void', + []) + ## error-model.h (module 'network'): bool ns3::ErrorModel::DoCorrupt(ns3::Ptr arg0) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'arg0')], + is_pure_virtual=True, visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::ErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + is_pure_virtual=True, visibility='private', is_virtual=True) + return + def register_Ns3EventImpl_methods(root_module, cls): ## event-impl.h (module 'core'): ns3::EventImpl::EventImpl(ns3::EventImpl const & arg0) [copy constructor] cls.add_constructor([param('ns3::EventImpl const &', 'arg0')]) @@ -3518,6 +3970,37 @@ def register_Ns3Ipv6PrefixValue_methods(root_module, cls): [param('ns3::Ipv6Prefix const &', 'value')]) return +def register_Ns3ListErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::ListErrorModel::ListErrorModel(ns3::ListErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ListErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::ListErrorModel::ListErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): std::list > ns3::ListErrorModel::GetList() const [member function] + cls.add_method('GetList', + 'std::list< unsigned int >', + [], + is_const=True) + ## error-model.h (module 'network'): static ns3::TypeId ns3::ListErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): void ns3::ListErrorModel::SetList(std::list > const & packetlist) [member function] + cls.add_method('SetList', + 'void', + [param('std::list< unsigned int > const &', 'packetlist')]) + ## error-model.h (module 'network'): bool ns3::ListErrorModel::DoCorrupt(ns3::Ptr p) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::ListErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + visibility='private', is_virtual=True) + return + def register_Ns3Mac48AddressChecker_methods(root_module, cls): ## mac48-address.h (module 'network'): ns3::Mac48AddressChecker::Mac48AddressChecker() [constructor] cls.add_constructor([]) @@ -4293,6 +4776,136 @@ def register_Ns3PointToPointRemoteChannel_methods(root_module, cls): is_virtual=True) return +def register_Ns3RandomVariableChecker_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::RandomVariableChecker::RandomVariableChecker() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::RandomVariableChecker::RandomVariableChecker(ns3::RandomVariableChecker const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RandomVariableChecker const &', 'arg0')]) + return + +def register_Ns3RandomVariableValue_methods(root_module, cls): + ## random-variable.h (module 'core'): ns3::RandomVariableValue::RandomVariableValue() [constructor] + cls.add_constructor([]) + ## random-variable.h (module 'core'): ns3::RandomVariableValue::RandomVariableValue(ns3::RandomVariableValue const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RandomVariableValue const &', 'arg0')]) + ## random-variable.h (module 'core'): ns3::RandomVariableValue::RandomVariableValue(ns3::RandomVariable const & value) [constructor] + cls.add_constructor([param('ns3::RandomVariable const &', 'value')]) + ## random-variable.h (module 'core'): ns3::Ptr ns3::RandomVariableValue::Copy() const [member function] + cls.add_method('Copy', + 'ns3::Ptr< ns3::AttributeValue >', + [], + is_const=True, is_virtual=True) + ## random-variable.h (module 'core'): bool ns3::RandomVariableValue::DeserializeFromString(std::string value, ns3::Ptr checker) [member function] + cls.add_method('DeserializeFromString', + 'bool', + [param('std::string', 'value'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_virtual=True) + ## random-variable.h (module 'core'): ns3::RandomVariable ns3::RandomVariableValue::Get() const [member function] + cls.add_method('Get', + 'ns3::RandomVariable', + [], + is_const=True) + ## random-variable.h (module 'core'): std::string ns3::RandomVariableValue::SerializeToString(ns3::Ptr checker) const [member function] + cls.add_method('SerializeToString', + 'std::string', + [param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')], + is_const=True, is_virtual=True) + ## random-variable.h (module 'core'): void ns3::RandomVariableValue::Set(ns3::RandomVariable const & value) [member function] + cls.add_method('Set', + 'void', + [param('ns3::RandomVariable const &', 'value')]) + return + +def register_Ns3RateErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::RateErrorModel::RateErrorModel(ns3::RateErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RateErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::RateErrorModel::RateErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): double ns3::RateErrorModel::GetRate() const [member function] + cls.add_method('GetRate', + 'double', + [], + is_const=True) + ## error-model.h (module 'network'): static ns3::TypeId ns3::RateErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): ns3::ErrorUnit ns3::RateErrorModel::GetUnit() const [member function] + cls.add_method('GetUnit', + 'ns3::ErrorUnit', + [], + is_const=True) + ## error-model.h (module 'network'): void ns3::RateErrorModel::SetRandomVariable(ns3::RandomVariable const & ranvar) [member function] + cls.add_method('SetRandomVariable', + 'void', + [param('ns3::RandomVariable const &', 'ranvar')]) + ## error-model.h (module 'network'): void ns3::RateErrorModel::SetRate(double rate) [member function] + cls.add_method('SetRate', + 'void', + [param('double', 'rate')]) + ## error-model.h (module 'network'): void ns3::RateErrorModel::SetUnit(ns3::ErrorUnit error_unit) [member function] + cls.add_method('SetUnit', + 'void', + [param('ns3::ErrorUnit', 'error_unit')]) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorrupt(ns3::Ptr p) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorruptBit(ns3::Ptr p) [member function] + cls.add_method('DoCorruptBit', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorruptByte(ns3::Ptr p) [member function] + cls.add_method('DoCorruptByte', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): bool ns3::RateErrorModel::DoCorruptPkt(ns3::Ptr p) [member function] + cls.add_method('DoCorruptPkt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::RateErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + visibility='private', is_virtual=True) + return + +def register_Ns3ReceiveListErrorModel_methods(root_module, cls): + ## error-model.h (module 'network'): ns3::ReceiveListErrorModel::ReceiveListErrorModel(ns3::ReceiveListErrorModel const & arg0) [copy constructor] + cls.add_constructor([param('ns3::ReceiveListErrorModel const &', 'arg0')]) + ## error-model.h (module 'network'): ns3::ReceiveListErrorModel::ReceiveListErrorModel() [constructor] + cls.add_constructor([]) + ## error-model.h (module 'network'): std::list > ns3::ReceiveListErrorModel::GetList() const [member function] + cls.add_method('GetList', + 'std::list< unsigned int >', + [], + is_const=True) + ## error-model.h (module 'network'): static ns3::TypeId ns3::ReceiveListErrorModel::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## error-model.h (module 'network'): void ns3::ReceiveListErrorModel::SetList(std::list > const & packetlist) [member function] + cls.add_method('SetList', + 'void', + [param('std::list< unsigned int > const &', 'packetlist')]) + ## error-model.h (module 'network'): bool ns3::ReceiveListErrorModel::DoCorrupt(ns3::Ptr p) [member function] + cls.add_method('DoCorrupt', + 'bool', + [param('ns3::Ptr< ns3::Packet >', 'p')], + visibility='private', is_virtual=True) + ## error-model.h (module 'network'): void ns3::ReceiveListErrorModel::DoReset() [member function] + cls.add_method('DoReset', + 'void', + [], + visibility='private', is_virtual=True) + return + def register_Ns3TimeChecker_methods(root_module, cls): ## nstime.h (module 'core'): ns3::TimeChecker::TimeChecker() [constructor] cls.add_constructor([]) diff --git a/src/point-to-point/bindings/modulegen_customizations.py b/src/point-to-point/bindings/modulegen_customizations.py new file mode 100644 index 000000000..838288fee --- /dev/null +++ b/src/point-to-point/bindings/modulegen_customizations.py @@ -0,0 +1,5 @@ + +def post_register_types(root_module): + root_module.add_include('"ns3/queue.h"') + root_module.add_include('"ns3/error-model.h"') + diff --git a/src/point-to-point/bindings/scan-header.h b/src/point-to-point/bindings/scan-header.h new file mode 100644 index 000000000..134fac6f8 --- /dev/null +++ b/src/point-to-point/bindings/scan-header.h @@ -0,0 +1,6 @@ +// -*- c++ -*- + +#include "ns3/point-to-point-module.h" + +#include "ns3/queue.h" +#include "ns3/error-model.h" From 9378ce8e08791b061798023bc501de144ead4b19 Mon Sep 17 00:00:00 2001 From: Lalith Suresh Date: Mon, 25 Jul 2011 22:02:50 +0530 Subject: [PATCH 032/202] Fixes bug caused due to incorrect HNA routing table updating that leads to stale entries --- src/olsr/model/olsr-routing-protocol.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index f0d1eba84..b63b6f7c2 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -1112,6 +1112,13 @@ RoutingProtocol::RoutingTableComputation () // and if the announced network is not announced by the node itself, // then a new routing entry is created. const AssociationSet &associationSet = m_state.GetAssociationSet (); + + // Clear HNA routing table + for (uint32_t i = 0; i < m_hnaRoutingTable->GetNRoutes (); i++) + { + m_hnaRoutingTable->RemoveRoute (0); + } + for (AssociationSet::const_iterator it = associationSet.begin (); it != associationSet.end (); it++) { From 6937841b8547f56e224f259f743665b10d2c6932 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 27 Jul 2011 10:51:39 +0100 Subject: [PATCH 033/202] Remove accidental scratch code insertion/commit --- scratch/scratch-simulator.cc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scratch/scratch-simulator.cc b/scratch/scratch-simulator.cc index 8cc67567e..f11de3ccd 100644 --- a/scratch/scratch-simulator.cc +++ b/scratch/scratch-simulator.cc @@ -23,10 +23,5 @@ using namespace ns3; int main (int argc, char *argv[]) { - Time t1 = Seconds (2); - - int64x64_t t2 = 10*t1; - - NS_LOG_UNCOND ("Scratch Simulator"); } From 8a38290eb856693480acda5a4edaf1dbf1ceaa74 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Fri, 29 Jul 2011 03:38:59 -0400 Subject: [PATCH 034/202] add support for --update-data to test.py, move test runner code to library for modular build, add support for hierarchical tests beyond the previous two-level hierarchy. --- src/aodv/test/aodv-regression.cc | 20 +- src/aodv/test/bug-772.cc | 23 +- src/core/model/system-path.cc | 270 ++++ src/core/model/system-path.h | 72 + src/core/model/test.cc | 1285 +++++++++-------- src/core/model/test.h | 1000 +++++-------- src/core/wscript | 5 +- .../test/dot11s/hwmp-proactive-regression.cc | 18 +- .../test/dot11s/hwmp-reactive-regression.cc | 19 +- .../test/dot11s/hwmp-simplest-regression.cc | 18 +- .../dot11s/hwmp-target-flags-regression.cc | 18 +- src/mesh/test/dot11s/pmp-regression.cc | 18 +- src/mesh/test/dot11s/regression.cc | 1 + src/mesh/test/flame/flame-regression.cc | 18 +- src/mesh/test/flame/flame-test-suite.cc | 2 +- src/mesh/test/flame/regression.cc | 1 + .../test/ns2-mobility-helper-test-suite.cc | 6 +- src/network/test/packetbb-test-suite.cc | 30 +- src/network/test/pcap-file-test-suite.cc | 15 +- src/network/utils/pcap-test.h | 34 + src/network/wscript | 1 + src/olsr/test/bug780-test.cc | 26 +- src/olsr/test/hello-regression-test.cc | 19 +- src/olsr/test/regression-test-suite.cc | 1 + src/olsr/test/tc-regression-test.cc | 19 +- src/spectrum/test/spectrum-ideal-phy-test.cc | 18 +- src/spectrum/test/spectrum-test.h | 6 +- src/spectrum/test/spectrum-value-test.cc | 4 +- src/test/ns3tcp/ns3tcp-interop-test-suite.cc | 2 +- src/test/ns3tcp/ns3tcp-loss-test-suite.cc | 7 +- src/test/ns3tcp/ns3tcp-state-test-suite.cc | 2 +- src/wscript | 73 +- test.py | 168 ++- utils/test-runner.cc | 451 +----- 34 files changed, 1620 insertions(+), 2050 deletions(-) create mode 100644 src/core/model/system-path.cc create mode 100644 src/core/model/system-path.h create mode 100644 src/network/utils/pcap-test.h diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc index 285225898..df095273d 100644 --- a/src/aodv/test/aodv-regression.cc +++ b/src/aodv/test/aodv-regression.cc @@ -41,11 +41,9 @@ #include "ns3/v4ping-helper.h" #include "ns3/nqos-wifi-mac-helper.h" #include "ns3/config.h" +#include "ns3/pcap-test.h" #include -/// Set to true to rewrite reference traces, leave false to run regression tests -const bool WRITE_VECTORS = false; - namespace ns3 { namespace aodv { //----------------------------------------------------------------------------- @@ -56,6 +54,7 @@ class AodvRegressionTestSuite : public TestSuite public: AodvRegressionTestSuite () : TestSuite ("routing-aodv-regression", SYSTEM) { + SetDataDir (NS_TEST_SOURCEDIR); // General RREQ-RREP-RRER test case AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test")); // Bug 606 test case, should crash if bug is not fixed @@ -107,7 +106,7 @@ ChainRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -161,8 +160,7 @@ ChainRegressionTest::CreateDevices () p.Stop (m_time); // 4. write PCAP - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : GetTempDir ()) + m_prefix; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (m_prefix)); } void @@ -170,15 +168,7 @@ ChainRegressionTest::CheckResults () { for (uint32_t i = 0; i < m_size; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << m_prefix << "-" << i << "-0.pcap"; - os2 << GetTempDir () << m_prefix << "-" << i << "-0.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (m_prefix << "-" << i << "-0.pcap"); } } diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc index a6a12d11a..022640f36 100644 --- a/src/aodv/test/bug-772.cc +++ b/src/aodv/test/bug-772.cc @@ -43,11 +43,9 @@ #include "ns3/inet-socket-address.h" #include "ns3/data-rate.h" #include "ns3/packet-sink-helper.h" +#include "ns3/pcap-test.h" #include -/// Set to true to rewrite reference traces, leave false to run regression tests -const bool WRITE_VECTORS = false; - namespace ns3 { namespace aodv { @@ -55,7 +53,7 @@ namespace aodv { // UdpChainTest //----------------------------------------------------------------------------- Bug772ChainTest::Bug772ChainTest (const char * const prefix, const char * const proto, Time t, uint32_t size) : - TestCase ("Bug 772 UDP/TCP chain regression test"), + TestCase ("Bug 772 UDP and TCP chain regression test"), m_nodes (0), m_prefix (prefix), m_proto (proto), @@ -82,7 +80,7 @@ Bug772ChainTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -143,9 +141,8 @@ Bug772ChainTest::CreateDevices () app.Start (Seconds (0.0)); // 4. write PCAP on the first and last nodes only - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : GetTempDir ()) + m_prefix; - wifiPhy.EnablePcap (prefix, devices.Get (0)); - wifiPhy.EnablePcap (prefix, devices.Get (m_size-1)); + wifiPhy.EnablePcap (CreateTempDirFilename (m_prefix), devices.Get (0)); + wifiPhy.EnablePcap (CreateTempDirFilename (m_prefix), devices.Get (m_size-1)); } void @@ -153,15 +150,7 @@ Bug772ChainTest::CheckResults () { for (uint32_t i = 0; i < m_size; i += (m_size - 1) /*first and last nodes only*/) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << m_prefix << "-" << i << "-0.pcap"; - os2 << GetTempDir () << m_prefix << "-" << i << "-0.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ(m_prefix << "-" << i << "-0.pcap"); } } diff --git a/src/core/model/system-path.cc b/src/core/model/system-path.cc new file mode 100644 index 000000000..e2209cc39 --- /dev/null +++ b/src/core/model/system-path.cc @@ -0,0 +1,270 @@ +#include "system-path.h" +#include "fatal-error.h" +#include "assert.h" +#include "ns3/core-config.h" +#include +#include +#include +#if defined (HAVE_DIRENT_H) and defined (HAVE_SYS_TYPES_H) +#define HAVE_OPENDIR +#include +#include +#endif +#if defined (HAVE_SYS_STAT_H) and defined (HAVE_SYS_TYPES_H) +#define HAVE_MKDIR_H +#include +#include +#endif +#include +#ifdef __APPLE__ +#include +#endif /* __APPLE__ */ + + +#if defined (__win32__) +#define SYSTEM_PATH_SEP "\\" +#else +#define SYSTEM_PATH_SEP "/" +#endif + +namespace ns3 { + +namespace SystemPath { + +std::string Dirname (std::string path) +{ + std::list elements = Split (path); + std::list::const_iterator last = elements.end(); + last--; + return Join (elements.begin (), last); +} + +std::string FindSelfDirectory (void) +{ + /** + * This function returns the path to the running $PREFIX. + * Mac OS X: _NSGetExecutablePath() (man 3 dyld) + * Linux: readlink /proc/self/exe + * Solaris: getexecname() + * FreeBSD: sysctl CTL_KERN KERN_PROC KERN_PROC_PATHNAME -1 + * BSD with procfs: readlink /proc/curproc/file + * Windows: GetModuleFileName() with hModule = NULL + */ + std::string filename; +#if defined(__linux__) + { + ssize_t size = 1024; + char *buffer = (char*)malloc (size); + memset (buffer, 0, size); + int status; + while (true) + { + status = readlink("/proc/self/exe", buffer, size); + if (status != 1 || (status == -1 && errno != ENAMETOOLONG)) + { + break; + } + size *= 2; + free (buffer); + buffer = (char*)malloc (size); + memset (buffer, 0, size); + } + if (status == -1) + { + NS_FATAL_ERROR ("Oops, could not find self directory."); + } + filename = buffer; + free (buffer); + } +#elif defined (__win32__) + { + // XXX: untested. it should work if code is compiled with + // LPTSTR = char * + DWORD size = 1024; + LPTSTR lpFilename = (LPTSTR) malloc (sizeof(TCHAR) * size); + DWORD status = GetModuleFilename (0, lpFilename, size); + while (status == size) + { + size = size * 2; + free (lpFilename); + lpFilename = (LPTSTR) malloc (sizeof(TCHAR) * size); + status = GetModuleFilename (0, lpFilename, size); + } + NS_ASSERT (status != 0); + filename = lpFilename; + free (lpFilename); + } +#elif defined (__APPLE__) + { + uint32_t bufsize = 1024; + char *buffer = (char *) malloc (bufsize); + NS_ASSERT (buffer != 0); + int status = _NSGetExecutablePath (buffer, &bufsize); + if (status == -1) + { + free (buffer); + buffer = (char *) malloc (bufsize); + status = _NSGetExecutablePath (buffer, &bufsize); + } + NS_ASSERT (status == 0); + filename = buffer; + free (buffer); + } +#endif + return Dirname (filename); +} + +std::string Append (std::string left, std::string right) +{ + // removing trailing separators from 'left' + while (true) + { + std::string::size_type lastSep = left.rfind (SYSTEM_PATH_SEP); + if (lastSep != left.size () - 1) + { + break; + } + left = left.substr (0, left.size () - 1); + } + std::string retval = left + SYSTEM_PATH_SEP + right; + return retval; +} + +std::list Split (std::string path) +{ + std::list retval; + std::string::size_type current = 0, next = 0; + next = path.find (SYSTEM_PATH_SEP, current); + while (next != std::string::npos) + { + std::string item = path.substr (current, next - current); + retval.push_back (item); + current = next + 1; + next = path.find (SYSTEM_PATH_SEP, current); + } + std::string item = path.substr (current, next - current); + retval.push_back (item); + return retval; +} + +std::string Join (std::list::const_iterator begin, + std::list::const_iterator end) +{ + std::string retval = ""; + for (std::list::const_iterator i = begin; i != end; i++) + { + if (i == begin) + { + retval = *i; + } + else + { + retval = retval + SYSTEM_PATH_SEP + *i; + } + } + return retval; +} + +std::list ReadFiles (std::string path) +{ + std::list files; +#if defined HAVE_OPENDIR + DIR *dp = opendir (path.c_str ()); + if (dp == NULL) + { + NS_FATAL_ERROR ("Could not open directory=" << path); + } + struct dirent *de = readdir (dp); + while (de != 0) + { + files.push_back (de->d_name); + de = readdir (dp); + } + closedir (dp); +#elif defined (HAVE_FIND_FIRST_FILE) + // XXX: untested + HANDLE hFind; + WIN32_FIND_DATA fileData; + + hFind = FindFirstFile (path.c_str (), &FindFileData); + if (hFind == INVALID_HANDLE_VALUE) + { + NS_FATAL_ERROR ("Could not open directory=" << path); + } + do + { + files.push_back (fileData.cFileName); + } while (FindNextFile (hFind, &fileData)); + FindClose(hFind); +#else +#error "No support for reading a directory on this platform" +#endif + return files; +} + +std::string +MakeTemporaryDirectoryName (void) +{ + char *path = NULL; + + path = getenv ("TMP"); + if (path == NULL) + { + path = getenv ("TEMP"); + if (path == NULL) + { + path = const_cast ("/tmp"); + } + } + + // + // Just in case the user wants to go back and find the output, we give + // a hint as to which dir we created by including a time hint. + // + time_t now = time (NULL); + struct tm *tm_now = localtime (&now); + // + // But we also randomize the name in case there are multiple users doing + // this at the same time + // + srand (time (0)); + long int n = rand (); + + // + // The final path to the directory is going to look something like + // + // /tmp/ns3-14.30.29.32767 + // + // The first segment comes from one of the temporary directory env + // variables or /tmp if not found. The directory name starts with an + // identifier telling folks who is making all of the temp directories + // and then the local time (in this case 14.30.29 -- which is 2:30 and + // 29 seconds PM). + // + std::ostringstream oss; + oss << path << SYSTEM_PATH_SEP << "ns-3." << tm_now->tm_hour << "." + << tm_now->tm_min << "." << tm_now->tm_sec << "." << n; + + return oss.str (); +} + +void +MakeDirectories (std::string path) +{ + std::list elements = Split (path); + for (std::list::const_iterator i = elements.begin (); i != elements.end (); ++i) + { + std::string tmp = Join (elements.begin (), i); +#if defined(HAVE_MKDIR_H) + mkdir (tmp.c_str (), S_IRWXU); +#endif + } +#if defined(HAVE_MKDIR_H) + mkdir (path.c_str (), S_IRWXU); +#endif + +} + +} // namespace SystemPath + +} // namespace ns3 diff --git a/src/core/model/system-path.h b/src/core/model/system-path.h new file mode 100644 index 000000000..79ef2c398 --- /dev/null +++ b/src/core/model/system-path.h @@ -0,0 +1,72 @@ +#ifndef SYSTEM_PATH +#define SYSTEM_PATH + +#include +#include + +namespace ns3 { + +/** + * \brief Encapsulate OS-specific functions to manipulate file and directory paths. + * + * The functions provided here are used mostly to implement the ns-3 test framework. + */ +namespace SystemPath { + + /** + * \return the directory in which the currently-executing binary is located + */ + std::string FindSelfDirectory (void); + + /** + * \param left a path element + * \param right a path element + * \return a concatenation of the two input paths + */ + std::string Append (std::string left, std::string right); + + /** + * \param path a path + * \return a list of path elements that can be joined together again with + * the Join function. + * \sa ns3::SystemPath::Join + */ + std::list Split (std::string path); + + /** + * \param begin iterator to first element to join + * \param end iterator to last element to join + * \return a path that is a concatenation of all the input elements. + */ + std::string Join (std::list::const_iterator begin, + std::list::const_iterator end); + + /** + * \param path a path which identifies a directory + * \return a list of the filenames which are located in the input directory + */ + std::list ReadFiles (std::string path); + + /** + * \return a path which identifies a temporary directory. + * + * The returned path identifies a directory which does not exist yet + * Call ns3::SystemPath::MakeDirectories to create it. Yes, there is a + * well-known security race in this API but we don't care in ns-3. + */ + std::string MakeTemporaryDirectoryName (void); + + /** + * \param path a path to a directory + * + * Create all the directories leading to path. + */ + void MakeDirectories (std::string path); + +} // namespace SystemPath + + +} // namespace ns3 + + +#endif /* SYSTEM_PATH */ diff --git a/src/core/model/test.cc b/src/core/model/test.cc index d863812bb..98b8d39f3 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -19,43 +19,15 @@ #include "test.h" #include "assert.h" #include "abort.h" +#include "system-path.h" #include +#include +#include +#include -// Set to true to enable a segmentation fault upon a test case macro test -// failing (for debugging purposes) -bool gBreakOnFailure = false; namespace ns3 { -// -// XML files have restrictions on certain characters that may be present in -// data. We need to replace these characters with their alternate -// representation on the way into the XML file. -// -std::string -ReplaceXmlSpecialCharacters (std::string xml) -{ - std::string specials = "<>&\"'"; - std::string replacements[] = { "<", ">", "&", "'", """}; - std::string result; - std::size_t index, length = xml.length (); - - for (size_t i = 0; i < length; ++i) - { - char character = xml[i]; - - if ((index = specials.find (character)) == std::string::npos) - { - result.push_back (character); - } - else - { - result += replacements[index]; - } - } - return result; -} - bool TestDoubleIsEqual (const double x1, const double x2, const double epsilon) { @@ -83,640 +55,283 @@ TestDoubleIsEqual (const double x1, const double x2, const double epsilon) return true; } +struct TestCaseFailure +{ + TestCaseFailure (std::string _cond, std::string _actual, + std::string _limit, std::string _message, + std::string _file, int32_t _line); + std::string cond; + std::string actual; + std::string limit; + std::string message; + std::string file; + int32_t line; +}; +struct TestCase::Result +{ + Result (); + SystemWallClockMs clock; + std::vector failure; + bool childrenFailed; +}; + +class TestRunnerImpl +{ +public: + void AddTestSuite (TestSuite *testSuite); + void StartTestCase (std::string name); + void EndTestCase (void); + void ReportTestFailure (std::string cond, std::string actual, + std::string limit, std::string message, + std::string file, int32_t line); + bool MustAssertOnFailure (void) const; + bool MustContinueOnFailure (void) const; + bool MustUpdateData (void) const; + std::string GetTopLevelSourceDir (void) const; + std::string GetTempDir (void) const; + + int Run (int argc, char *argv[]); + + static TestRunnerImpl *Instance (void); + +private: + TestRunnerImpl (); + ~TestRunnerImpl (); + + bool IsTopLevelSourceDir (std::string path) const; + std::string ReplaceXmlSpecialCharacters (std::string xml) const; + void PrintReport (TestCase *test, std::ostream *os, bool xml, int level); + void PrintTestNameList (std::list::const_iterator begin, + std::list::const_iterator end) const; + void PrintTestTypeList (void) const; + void PrintHelp (const char *programName) const; + std::list FilterTests (std::string testName, enum TestSuite::Type testType) const; + + + typedef std::vector TestSuiteVector; + + TestSuiteVector m_suites; + std::string m_tempDir; + bool m_verbose; + bool m_assertOnFailure; + bool m_continueOnFailure; + bool m_updateData; +}; + + + +TestCaseFailure::TestCaseFailure (std::string _cond, std::string _actual, + std::string _limit, std::string _message, + std::string _file, int32_t _line) + : cond (_cond), actual (_actual), limit (_limit), + message (_message), file (_file), line (_line) +{} +TestCase::Result::Result () + : childrenFailed (false) +{} + + TestCase::TestCase (std::string name) - : m_name (name), - m_verbose (false), - m_continueOnFailure (false), - m_detailsReported (false), - m_basedir ("invalid"), - m_tempdir ("invalid"), - m_ofs (0), - m_error (false) + : m_parent (0), + m_dataDir (""), + m_runner (0), + m_result (0), + m_name (name) { } TestCase::~TestCase () { + NS_ASSERT (m_runner == 0); + m_parent = 0; + delete m_result; + for (std::vector::const_iterator i = m_children.begin (); i != m_children.end (); ++i) + { + delete *i; + } + m_children.clear (); } void -TestCase::ReportStart (void) +TestCase::AddTestCase (TestCase *testCase) { - DoReportStart (); + m_children.push_back (testCase); + testCase->m_parent = this; + + std::string::size_type slash, antislash; + slash = testCase->m_name.find ("/"); + antislash = testCase->m_name.find ("\\"); + if (slash != std::string::npos || antislash != std::string::npos) + { + std::string fullname = testCase->m_name; + TestCase *current = testCase->m_parent; + while (current != 0) + { + fullname = current->m_name + "/" + fullname; + current = current->m_parent; + } + if (slash != std::string::npos) + { + NS_FATAL_ERROR ("Invalid test name: cannot contain slashes: \"" << fullname << "\""); + } + if (antislash != std::string::npos) + { + NS_FATAL_ERROR ("Invalid test name: cannot contain antislashes: \"" << fullname << "\""); + } + } } -void -TestCase::ReportCaseSuccess (void) +bool +TestCase::IsFailed (void) const { - UpdateErrorStatus (false); - DoReportCaseSuccess (); + return m_result->childrenFailed || !m_result->failure.empty (); } -void -TestCase::ReportCaseFailure (void) +void +TestCase::Run (TestRunnerImpl *runner) { - UpdateErrorStatus (true); - DoReportCaseFailure (); -} - -void -TestCase::ReportTestFailure ( - std::string cond, - std::string actual, - std::string limit, - std::string message, - std::string file, - int32_t line) -{ - UpdateErrorStatus (true); - DoReportTestFailure (cond, actual, limit, message, file, line); - m_detailsReported = true; -} - -void -TestCase::ReportEnd (void) -{ - DoReportStart (); -} - -void -TestCase::Run (void) -{ - // - // We set up a flag to make sure the user plays by the rules and actually - // does something to report the details of an error. - // - m_detailsReported = false; - - DoReportStart (); + m_result = new Result (); + m_runner = runner; DoSetup (); - + m_result->clock.Start (); + for (std::vector::const_iterator i = m_children.begin (); i != m_children.end (); ++i) + { + TestCase *test = *i; + test->Run (runner); + if (IsFailed ()) + { + goto out; + } + } DoRun (); - + out: + m_result->clock.End (); DoTeardown (); - - if (GetErrorStatus () == false) - { - DoReportCaseSuccess (); - } - else - { - // - // It is a programming error to return an error from a test case without - // calling ReportTestFailure. Typically this is done automagically when - // using the ASSERT or EXPECT macros. If you don't use these, you must - // ReportTestFailure on any errors yourself, which will set - // m_detailsReported and make us happy. - // - NS_ASSERT_MSG (m_detailsReported, "The details of a failing test was not reported"); - - DoReportCaseFailure (); - } - - DoReportEnd (); - - return; + m_runner = 0; } - -void -TestCase::SetVerbose (bool verbose) -{ - m_verbose = verbose; -} - -void -TestCase::SetContinueOnFailure (bool continueOnFailure) -{ - m_continueOnFailure = continueOnFailure; -} - -void -TestCase::SetName (std::string name) -{ - m_name = name; -} - std::string -TestCase::GetName (void) +TestCase::GetName (void) const { return m_name; } - -void -TestCase::SetBaseDir (std::string basedir) +void +TestCase::ReportTestFailure (std::string cond, std::string actual, + std::string limit, std::string message, + std::string file, int32_t line) { - // - // C and C++ allow one to use forward slashes even on systems where the - // separator is actually a backslash. - // - if (basedir[basedir.length () - 1] != '/') + m_result->failure.push_back (TestCaseFailure (cond, actual, limit, + message, file, line)); + // set childrenFailed flag on parents. + struct TestCase *current = m_parent; + while (current != 0) { - m_basedir = basedir + "/"; + current->m_result->childrenFailed = true; + current = current->m_parent; + } + +} +bool +TestCase::MustAssertOnFailure (void) const +{ + return m_runner->MustAssertOnFailure (); +} +bool +TestCase::MustContinueOnFailure (void) const +{ + return m_runner->MustContinueOnFailure (); +} + +std::string +TestCase::CreateDataDirFilename (std::string filename) +{ + const TestCase *current = this; + while (current->m_dataDir == "" && current != 0) + { + current = current->m_parent; + } + if (current == 0) + { + NS_FATAL_ERROR ("No one called SetDataDir prior to calling this function"); + } + + std::string a = SystemPath::Append (m_runner->GetTopLevelSourceDir (), current->m_dataDir); + std::string b = SystemPath::Append (a, filename); + return b; +} +std::string +TestCase::CreateTempDirFilename (std::string filename) +{ + if (m_runner->MustUpdateData ()) + { + return CreateDataDirFilename (filename); } else { - m_basedir = basedir; + std::list names; + const TestCase *current = this; + while (current != 0) + { + names.push_front (current->m_name); + current = current->m_parent; + } + std::string tempDir = SystemPath::Append (m_runner->GetTempDir (), SystemPath::Join (names.begin (), names.end ())); + SystemPath::MakeDirectories (tempDir); + return SystemPath::Append (tempDir, filename); } } - -std::string -TestCase::GetBaseDir (void) +bool +TestCase::GetErrorStatus (void) const { - return m_basedir; + return IsStatusFailure (); +} +bool +TestCase::IsStatusFailure (void) const +{ + return !IsStatusSuccess (); +} +bool +TestCase::IsStatusSuccess (void) const +{ + return m_result->failure.empty (); } void -TestCase::SetTempDir (std::string tempdir) +TestCase::SetDataDir (std::string directory) { - // - // C and C++ allow one to use forward slashes even on systems where the - // separator is actually a backslash. - // - if (tempdir[tempdir.length () - 1] != '/') - { - m_tempdir = tempdir + "/"; - } - else - { - m_tempdir = tempdir; - } -} - -std::string -TestCase::GetTempDir (void) -{ - return m_tempdir; -} - -std::string -TestCase::GetSourceDir (std::string file) -{ - // - // The parameter is actually going to be __FILE__ which may have - // backslashes in it on win32 systems. For example, - // - // ..\src\common\pcap-file-test-suite.cc (win32) - // - // or - // - // ../src/common/pcap-file-test-suite.cc (grown-up systems) - // -#ifdef WIN32 - std::string::size_type relPathBegin = file.find_first_of ("\\"); - std::string::size_type relPathEnd = file.find_last_of ("\\"); -#else - std::string::size_type relPathBegin = file.find_first_of ("/"); - std::string::size_type relPathEnd = file.find_last_of ("/"); -#endif - - NS_ABORT_MSG_IF (relPathBegin == std::string::npos, "TestCase::GetSourceDir(): Internal Error"); - NS_ABORT_MSG_IF (relPathEnd == std::string::npos, "TestCase::GetSourceDir(): Internal Error"); - - return GetBaseDir () + file.substr (relPathBegin, relPathEnd + 1 - relPathBegin); -} - -void -TestCase::SetStream (std::ofstream *ofs) -{ - m_ofs = ofs; -} - -std::ofstream * -TestCase::GetStream (void) -{ - return m_ofs; -} - -void -TestCase::UpdateErrorStatus (bool error) -{ - m_error |= error; -} - -void -TestCase::SetErrorStatus (bool error) -{ - m_error = error; -} - -bool -TestCase::GetErrorStatus (void) -{ - return m_error; -} - -bool -TestCase::ContinueOnFailure (void) -{ - return m_continueOnFailure; -} - -void -TestCase::DoReportStart (void) -{ - m_msClock.Start (); - - if (m_ofs == 0) - { - return; - } - *m_ofs << " " << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (GetName ()) << "" << std::endl; -} - -void -TestCase::DoReportCaseSuccess (void) -{ - if (m_ofs == 0) - { - return; - } - *m_ofs << " PASS" << std::endl; -} - -void -TestCase::DoReportCaseFailure (void) -{ - if (m_ofs == 0) - { - return; - } - *m_ofs << " FAIL" << std::endl; -} - -void -TestCase::DoReportTestFailure ( - std::string cond, - std::string actual, - std::string limit, - std::string message, - std::string file, - int32_t line) -{ - if (m_ofs == 0) - { - return; - } - - *m_ofs << " " << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (cond) << "" << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (actual) << "" << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (limit) << "" << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (message) << "" << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (file) << "" << std::endl; - *m_ofs << " " << line << "" << std::endl; - *m_ofs << " " << std::endl; -} - -void -TestCase::DoReportEnd (void) -{ - m_msClock.End (); - - if (m_ofs == 0) - { - return; - } - - (*m_ofs).precision (3); - *m_ofs << std::fixed; - - const double MS_PER_SEC = 1000.; - - *m_ofs << " " << "real " << m_msClock.GetElapsedReal () / MS_PER_SEC - << " user " << m_msClock.GetElapsedUser () / MS_PER_SEC - << " system " << m_msClock.GetElapsedSystem () / MS_PER_SEC - << "" << std::endl; - - *m_ofs << " " << std::endl; + m_dataDir = directory; } void TestCase::DoSetup (void) -{ -} - +{} void TestCase::DoTeardown (void) -{ -} +{} -TestSuite::TestSuite (std::string name, TestType type) - : m_name (name), - m_verbose (false), - m_basedir ("invalid"), - m_tempdir ("invalid"), - m_ofs (0), - m_error (false), + +TestSuite::TestSuite (std::string name, TestSuite::Type type) + : TestCase (name), m_type (type) { - TestRunner::AddTestSuite (this); + TestRunnerImpl::Instance ()->AddTestSuite (this); } -TestSuite::~TestSuite () -{ - for (TestCaseVector_t::iterator i = m_tests.begin (); i != m_tests.end (); ++i) - { - delete *i; - *i = 0; - } - - m_tests.erase (m_tests.begin (), m_tests.end ()); -} - -void -TestSuite::ReportStart (void) -{ - DoReportStart (); -} - -void -TestSuite::ReportSuccess (void) -{ - UpdateErrorStatus (false); - DoReportSuccess (); -} - -void -TestSuite::ReportFailure (void) -{ - UpdateErrorStatus (true); - DoReportFailure (); -} - -void -TestSuite::ReportEnd (void) -{ - DoReportEnd (); -} - -bool -TestSuite::Run (void) -{ - DoReportStart (); - - DoSetup (); - DoRun (); - DoTeardown (); - - if (GetErrorStatus () == false) - { - DoReportSuccess (); - } - else - { - DoReportFailure (); - } - - DoReportEnd (); - - return GetErrorStatus (); -} - -uint32_t -TestSuite::AddTestCase (TestCase *testCase) -{ - uint32_t index = m_tests.size (); - m_tests.push_back (testCase); - return index; -} - -uint32_t -TestSuite::GetNTestCases (void) -{ - return m_tests.size (); -} - -TestCase * -TestSuite::GetTestCase (uint32_t n) -{ - return m_tests[n]; -} - -TestSuite::TestType +TestSuite::Type TestSuite::GetTestType (void) { return m_type; } void -TestSuite::SetVerbose (bool verbose) -{ - m_verbose = verbose; -} - -void -TestSuite::SetContinueOnFailure (bool continueOnFailure) -{ - m_continueOnFailure = continueOnFailure; -} - -void -TestSuite::SetName (std::string name) -{ - m_name = name; -} - -std::string -TestSuite::GetName (void) -{ - return m_name; -} - -void -TestSuite::SetBaseDir (std::string basedir) -{ - // - // C and C++ allow one to use forward slashes even on systems where the - // separator is actually a backslash. - // - if (basedir[basedir.length () - 1] != '/') - { - m_basedir = basedir + "/"; - } - else - { - m_basedir = basedir; - } -} - -std::string -TestSuite::GetBaseDir (void) -{ - return m_basedir; -} - -void -TestSuite::SetTempDir (std::string tempdir) -{ - // - // C and C++ allow one to use forward slashes even on systems where the - // separator is actually a backslash. - // - if (tempdir[tempdir.length () - 1] != '/') - { - m_tempdir = tempdir + "/"; - } - else - { - m_tempdir = tempdir; - } -} - -std::string -TestSuite::GetTempDir (void) -{ - return m_tempdir; -} - -void -TestSuite::SetStream (std::ofstream *ofs) -{ - m_ofs = ofs; -} - -void -TestSuite::UpdateErrorStatus (bool error) -{ - m_error |= error; -} - -void -TestSuite::SetErrorStatus (bool error) -{ - m_error = error; -} - -bool -TestSuite::GetErrorStatus (void) -{ - return m_error; -} - -bool -TestSuite::ContinueOnFailure (void) -{ - return m_continueOnFailure; -} - -void -TestSuite::DoReportStart (void) -{ - m_msClock.Start (); - - if (m_ofs == 0) - { - return; - } - *m_ofs << "" << std::endl; - *m_ofs << " " << ReplaceXmlSpecialCharacters (GetName ()) << "" << std::endl; -} - -void -TestSuite::DoReportFailure (void) -{ - if (m_ofs == 0) - { - return; - } - *m_ofs << " FAIL" << std::endl; -} - -void -TestSuite::DoReportSuccess (void) -{ - if (m_ofs == 0) - { - return; - } - *m_ofs << " PASS" << std::endl; -} - -void -TestSuite::DoReportEnd (void) -{ - m_msClock.End (); - - if (m_ofs == 0) - { - return; - } - - (*m_ofs).precision (3); - *m_ofs << std::fixed; - - const double MS_PER_SEC = 1000.; - - *m_ofs << " " << "real " << m_msClock.GetElapsedReal () / MS_PER_SEC - << " user " << m_msClock.GetElapsedUser () / MS_PER_SEC - << " system " << m_msClock.GetElapsedSystem () / MS_PER_SEC - << "" << std::endl; - - *m_ofs << "" << std::endl; -} - -void -TestSuite::DoSetup (void) -{ -} - -void TestSuite::DoRun (void) -{ - SetErrorStatus (false); - - for (TestCaseVector_t::iterator i = m_tests.begin (); i != m_tests.end (); ++i) - { - // - // Set the current options for the test case - // - (*i)->SetVerbose (m_verbose); - (*i)->SetContinueOnFailure (m_continueOnFailure); - (*i)->SetBaseDir (m_basedir); - (*i)->SetTempDir (m_tempdir); - (*i)->SetStream (m_ofs); - - // - // Run the test case - // - (*i)->Run (); - UpdateErrorStatus ((*i)->GetErrorStatus ()); - - // - // Exit if we have detected an error and we are not allowing multiple failures - // - if (GetErrorStatus () && m_continueOnFailure == false) - { - return; - } - } - -} - -void -TestSuite::DoTeardown (void) -{ -} - -class TestRunnerImpl -{ -public: - uint32_t AddTestSuite (TestSuite *testSuite); - uint32_t GetNTestSuites (void); - TestSuite *GetTestSuite (uint32_t n); - bool RunTestSuite (uint32_t n); - - static TestRunnerImpl *Instance (void); -private: - TestRunnerImpl (); - ~TestRunnerImpl (); - - typedef std::vector TestSuiteVector_t; - TestSuiteVector_t m_suites; -}; +{} TestRunnerImpl::TestRunnerImpl () + : m_tempDir (""), + m_assertOnFailure (false), + m_continueOnFailure (true), + m_updateData (false) { } @@ -724,6 +339,8 @@ TestRunnerImpl::~TestRunnerImpl () { } + + TestRunnerImpl * TestRunnerImpl::Instance (void) { @@ -731,42 +348,456 @@ TestRunnerImpl::Instance (void) return &runner; } -uint32_t +void TestRunnerImpl::AddTestSuite (TestSuite *testSuite) { - uint32_t index = m_suites.size (); m_suites.push_back (testSuite); - return index; } -uint32_t -TestRunnerImpl::GetNTestSuites (void) + +bool +TestRunnerImpl::MustAssertOnFailure (void) const { - return m_suites.size (); + return m_assertOnFailure; +} +bool +TestRunnerImpl::MustContinueOnFailure (void) const +{ + return m_continueOnFailure; } -TestSuite * -TestRunnerImpl::GetTestSuite (uint32_t n) +bool +TestRunnerImpl::MustUpdateData (void) const { - return m_suites[n]; + return m_updateData; +} +std::string +TestRunnerImpl::GetTempDir (void) const +{ + return m_tempDir; +} +bool +TestRunnerImpl::IsTopLevelSourceDir (std::string path) const +{ + bool haveVersion = false; + bool haveLicense = false; + + // + // If there's a file named VERSION and a file named LICENSE in this + // directory, we assume it's our top level source directory. + // + + std::list files = SystemPath::ReadFiles (path); + for (std::list::const_iterator i = files.begin (); i != files.end (); ++i) + { + if (*i == "VERSION") + { + haveVersion = true; + } + else if (*i == "LICENSE") + { + haveLicense = true; + } + } + + return haveVersion && haveLicense; } -uint32_t -TestRunner::AddTestSuite (TestSuite *testSuite) +std::string +TestRunnerImpl::GetTopLevelSourceDir (void) const { - return TestRunnerImpl::Instance ()->AddTestSuite (testSuite); + std::string self = SystemPath::FindSelfDirectory (); + std::list elements = SystemPath::Split (self); + while (!elements.empty ()) + { + std::string path = SystemPath::Join (elements.begin (), elements.end ()); + if (IsTopLevelSourceDir (path)) + { + return path; + } + elements.pop_back (); + } + NS_FATAL_ERROR ("Could not find source directory from self=" << self); } -uint32_t -TestRunner::GetNTestSuites (void) +// +// XML files have restrictions on certain characters that may be present in +// data. We need to replace these characters with their alternate +// representation on the way into the XML file. +// +std::string +TestRunnerImpl::ReplaceXmlSpecialCharacters (std::string xml) const { - return TestRunnerImpl::Instance ()->GetNTestSuites (); + std::string specials = "<>&\"'"; + std::string replacements[] = {"<", ">", "&", "'", """}; + std::string result; + std::size_t index, length = xml.length (); + + for (size_t i = 0; i < length; ++i) + { + char character = xml[i]; + + if ((index = specials.find (character)) == std::string::npos) + { + result.push_back (character); + } + else + { + result += replacements[index]; + } + } + return result; } -TestSuite * -TestRunner::GetTestSuite (uint32_t n) +struct Indent { - return TestRunnerImpl::Instance ()->GetTestSuite (n); + Indent (int level); + int level; +}; +Indent::Indent (int _level) + : level (_level) +{} +std::ostream &operator << (std::ostream &os, const Indent &val) +{ + for (int i = 0; i < val.level; i++) + { + os << " "; + } + return os; +} + +void +TestRunnerImpl::PrintReport (TestCase *test, std::ostream *os, bool xml, int level) +{ + if (test->m_result == 0) + { + // Do not print reports for tests that were not run. + return; + } + const double MS_PER_SEC = 1000.; + double real = test->m_result->clock.GetElapsedReal () / MS_PER_SEC; + double user = test->m_result->clock.GetElapsedUser () / MS_PER_SEC; + double system = test->m_result->clock.GetElapsedSystem () / MS_PER_SEC; + + (*os).precision (3); + *os << std::fixed; + + std::string statusString = test->IsFailed ()?"FAIL":"PASS"; + if (xml) + { + *os << Indent (level) << "" << std::endl; + *os << Indent (level+1) << "" << ReplaceXmlSpecialCharacters (test->m_name) + << "" << std::endl; + *os << Indent (level+1) << "" << statusString << "" << std::endl; + *os << Indent (level+1) << "" << std::endl; + } + else + { + *os << Indent (level) << statusString << " " << test->GetName () + << " " << real << "ms" << std::endl; + if (m_verbose) + { + for (uint32_t i = 0; i < test->m_result->failure.size (); i++) + { + TestCaseFailure failure = test->m_result->failure[i]; + *os << Indent (level) << " got=\"" << failure.cond << "\" expected=\"" + << failure.actual << "\" in=\"" << failure.file << ":" << failure.line + << "\" " << failure.message << std::endl; + } + for (uint32_t i = 0; i < test->m_children.size (); i++) + { + TestCase *child = test->m_children[i]; + PrintReport (child, os, xml, level + 1); + } + } + } +} + +void +TestRunnerImpl::PrintHelp (const char *program_name) const +{ + std::cout << "Usage: " << program_name << " [OPTIONS]" << std::endl + << std::endl + << "Options: " + << " --help : print these options" << std::endl + << " --print-test-name-list : print the list of names of tests available" << std::endl + << " --print-test-type-list : print the list of types of tests available" << std::endl + << " --print-temp-dir : Print name of temporary directory before running the tests" << std::endl + << " --test-type=TYPE : Process only tests of type TYPE" << std::endl + << " --test-name=NAME : Process only test whose name matches NAME" << std::endl + << " --assert-on-failure : when a test fails, crash immediately (useful" << std::endl + << " when running under a debugger" << std::endl + << " --stop-on-failure : when a test fails, stop immediately" << std::endl + << " --verbose : Print details of test execution" << std::endl + << " --xml : format test run output as xml" << std::endl + << " --tempdir=DIR : set temp dir for tests to store output files" << std::endl + << " --datadir=DIR : set data dir for tests to read reference files" << std::endl + << " --out=FILE : send test result to FILE instead of standard " + << "output" << std::endl + << " --append=FILE : append test result to FILE instead of standard " + << "output" << std::endl + ; +} + +void +TestRunnerImpl::PrintTestNameList (std::list::const_iterator begin, + std::list::const_iterator end) const +{ + for (std::list::const_iterator i = begin; i != end; ++i) + { + TestCase *test = *i; + std::cout << test->GetName () << std::endl; + } +} + +void +TestRunnerImpl::PrintTestTypeList (void) const +{ + std::cout << " bvt: Build Verification Tests (to see if build completed successfully)" << std::endl; + std::cout << " core: Run all TestSuite-based tests (exclude examples)" << std::endl; + std::cout << " example: Examples (to see if example programs run successfully)" << std::endl; + std::cout << " performance: Performance Tests (check to see if the system is as fast as expected)" << std::endl; + std::cout << " system: System Tests (spans modules to check integration of modules)" << std::endl; + std::cout << " unit: Unit Tests (within modules to check basic functionality)" << std::endl; +} + + +std::list +TestRunnerImpl::FilterTests (std::string testName, enum TestSuite::Type testType) const +{ + std::list tests; + for (uint32_t i = 0; i < m_suites.size (); ++i) + { + TestSuite *test = m_suites[i]; + if (testType != TestSuite::ALL && test->GetTestType () != testType) + { + // skip test + continue; + } + if (testName != "" && test->GetName () != testName) + { + // skip test + continue; + } + tests.push_back (test); + } + return tests; +} + + +int +TestRunnerImpl::Run (int argc, char *argv[]) +{ + std::string testName = ""; + std::string testTypeString = ""; + std::string out = ""; + bool xml = false; + bool append = false; + bool printTempDir = false; + bool printTestTypeList = false; + bool printTestNameList = false; + char *progname = argv[0]; + + argv++; + + while (*argv != 0) + { + char *arg = *argv; + + if (strcmp(arg, "--assert-on-failure") == 0) + { + m_assertOnFailure = true; + } + else if (strcmp (arg, "--stop-on-failure") == 0) + { + m_continueOnFailure = false; + } + else if (strcmp (arg, "--verbose") == 0) + { + m_verbose = true; + } + else if (strcmp (arg, "--print-temp-dir") == 0) + { + printTempDir = true; + } + else if (strcmp (arg, "--update-data") == 0) + { + m_updateData = true; + } + else if (strcmp (arg, "--help") == 0) + { + PrintHelp (progname); + return 0; + } + else if (strcmp (arg, "--print-test-name-list") == 0) + { + printTestNameList = true; + } + else if (strcmp (arg, "--print-test-type-list") == 0) + { + printTestTypeList = true; + } + else if (strcmp(arg, "--append") == 0) + { + append = true; + } + else if (strcmp(arg, "--xml") == 0) + { + xml = true; + } + else if (strncmp(arg, "--test-type=", strlen("--test-type=")) == 0) + { + testTypeString = arg + strlen("--test-type="); + } + else if (strncmp(arg, "--test-name=", strlen("--test-name=")) == 0) + { + testName = arg + strlen("--test-name="); + } + else if (strncmp(arg, "--tempdir=", strlen("--tempdir=")) == 0) + { + m_tempDir = arg + strlen("--tempdir="); + } + else if (strncmp(arg, "--out=", strlen("--out=")) == 0) + { + out = arg + strlen("--out="); + } + else + { + // un-recognized command-line argument + PrintHelp (progname); + return 0; + } + argv++; + } + enum TestSuite::Type testType; + if (testTypeString == "") + { + testType = TestSuite::ALL; + } + else if (testTypeString == "bvt") + { + testType = TestSuite::BVT; + } + else if (testTypeString == "core") + { + testType = TestSuite::ALL; + } + else if (testTypeString == "example") + { + testType = TestSuite::EXAMPLE; + } + else if (testTypeString == "unit") + { + testType = TestSuite::UNIT; + } + else if (testTypeString == "system") + { + testType = TestSuite::SYSTEM; + } + else + { + std::cout << "Invalid test type specified: " << testTypeString << std::endl; + PrintTestTypeList (); + return 1; + } + + std::list tests = FilterTests (testName, testType); + + if (m_tempDir == "") + { + m_tempDir = SystemPath::MakeTemporaryDirectoryName (); + } + if (printTempDir) + { + std::cout << m_tempDir << std::endl; + } + if (printTestNameList) + { + PrintTestNameList (tests.begin (), tests.end ()); + return 0; + } + if (printTestTypeList) + { + PrintTestTypeList (); + return 0; + } + + + std::ostream *os; + if (out != "") + { + std::ofstream *ofs; + ofs = new std::ofstream(); + std::ios_base::openmode mode = std::ios_base::out; + if (append) + { + mode |= std::ios_base::app; + } + else + { + mode |= std::ios_base::trunc; + } + ofs->open (out.c_str (), mode); + os = ofs; + } + else + { + os = &std::cout; + } + + // let's run our tests now. + bool failed = false; + for (std::list::const_iterator i = tests.begin (); i != tests.end (); ++i) + { + TestCase *test = *i; + test->Run (this); + PrintReport (test, os, xml, 0); + if (test->IsFailed ()) + { + failed = true; + if (!m_continueOnFailure) + { + return 1; + } + } + } + + if (out != "") + { + delete os; + } + + return failed?1:0; +} + +int +TestRunner::Run (int argc, char *argv[]) +{ + return TestRunnerImpl::Instance ()->Run (argc, argv); } } // namespace ns3 diff --git a/src/core/model/test.h b/src/core/model/test.h index e8c5d7d19..c903d5e53 100644 --- a/src/core/model/test.h +++ b/src/core/model/test.h @@ -28,9 +28,8 @@ #include #include -#include "ns3/system-wall-clock-ms.h" - -extern bool gBreakOnFailure; +#include "system-wall-clock-ms.h" +#include "deprecated.h" // // Note on below macros: @@ -42,14 +41,31 @@ extern bool gBreakOnFailure; // defining a robust macro. // -/** - * \brief Convenience macro to extract the source directory of the current - * source file. - * - * \see TestCase::GetSourceDir - */ -#define NS_TEST_SOURCEDIR \ - TestCase::GetSourceDir (__FILE__) +#define ASSERT_ON_FAILURE \ + do { \ + if (MustAssertOnFailure ()) \ + { \ + *(int *)0 = 0; \ + } \ + } while (false) + +#define CONTINUE_ON_FAILURE \ + do { \ + if (!MustContinueOnFailure ()) \ + { \ + return; \ + } \ + } while (false) + +#define CONTINUE_ON_FAILURE_RETURNS_BOOL \ + do { \ + if (!MustContinueOnFailure ()) \ + { \ + return IsStatusFailure (); \ + } \ + } while (false) + + // =========================================================================== // Test for equality (generic version) @@ -58,25 +74,24 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_EQ_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) == (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) == " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_EQ_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) == (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) == " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE; \ + } \ + } while (false) /** * \brief Test that an actual and expected (limit) value are equal and report @@ -110,25 +125,24 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) == (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) == " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return true; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) == (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) == " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE_RETURNS_BOOL; \ + } \ + } while (false) /** * \brief Test that an actual and expected (limit) value are equal and report @@ -168,21 +182,23 @@ extern bool gBreakOnFailure; * Required to avoid use of return statement which allows use in methods * (esp. callbacks) returning void. */ -#define NS_TEST_EXPECT_MSG_EQ_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) == (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) == " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - } \ - } while (false) +#define NS_TEST_EXPECT_MSG_EQ_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) == (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) == " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + } \ + } while (false) /** * \brief Test that an actual and expected (limit) value are equal and report @@ -221,27 +237,28 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_EQ_TOL_INTERNAL(actual, limit, tol, msg, file, line) \ - do { \ - if ((actual) > (limit) + (tol) || (actual) < (limit) - (tol)) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit << " +- " << tol; \ - std::ostringstream condStream; \ - condStream << # actual << " (actual) < " << # limit << " (limit) + " << # tol << " (tol) && " << \ - # actual << " (actual) > " << # limit << " (limit) - " << # tol << " (tol)"; \ - ReportTestFailure (condStream.str (), actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_EQ_TOL_INTERNAL(actual, limit, tol, msg, file, line) \ + do { \ + if ((actual) > (limit) + (tol) || (actual) < (limit) - (tol)) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit << " +- " << tol; \ + std::ostringstream condStream; \ + condStream << #actual << " (actual) < " << #limit \ + << " (limit) + " << #tol << " (tol) && " \ + << #actual << " (actual) > " << #limit \ + << " (limit) - " << #tol << " (tol)"; \ + ReportTestFailure (condStream.str (), actualStream.str (), \ + limitStream.str (), msgStream.str (), \ + file, line); \ + CONTINUE_ON_FAILURE; \ + } \ + } while (false) /** * \brief Test that actual and expected (limit) values are equal to plus or minus @@ -297,27 +314,28 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_EQ_TOL_RETURNS_BOOL_INTERNAL(actual, limit, tol, msg, file, line) \ - do { \ - if ((actual) > (limit) + (tol) || (actual) < (limit) - (tol)) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit << " +- " << tol; \ - std::ostringstream condStream; \ - condStream << # actual << " (actual) < " << # limit << " (limit) + " << # tol << " (tol) && " << \ - # actual << " (actual) > " << # limit << " (limit) - " << # tol << " (tol)"; \ - ReportTestFailure (condStream.str (), actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return true; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_EQ_TOL_RETURNS_BOOL_INTERNAL(actual, limit, tol, msg, file, line) \ + do { \ + if ((actual) > (limit) + (tol) || (actual) < (limit) - (tol)) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit << " +- " << tol; \ + std::ostringstream condStream; \ + condStream << #actual << " (actual) < " << #limit \ + << " (limit) + " << #tol << " (tol) && " \ + << #actual << " (actual) > " << #limit \ + << " (limit) - " << #tol << " (tol)"; \ + ReportTestFailure (condStream.str (), actualStream.str (), \ + limitStream.str (), msgStream.str (), \ + file, line); \ + CONTINUE_ON_FAILURE_RETURNS_BOOL; \ + } \ + } while (false) /** * \brief Test that actual and expected (limit) values are equal to plus or minus @@ -379,23 +397,27 @@ extern bool gBreakOnFailure; * Required to avoid use of return statement which allows use in methods * (esp. callbacks) returning void. */ -#define NS_TEST_EXPECT_MSG_EQ_TOL_INTERNAL(actual, limit, tol, msg, file, line) \ - do { \ - if ((actual) > (limit) + (tol) || (actual) < (limit) - (tol)) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit << " +- " << tol; \ - std::ostringstream condStream; \ - condStream << # actual << " (actual) < " << # limit << " (limit) + " << # tol << " (tol) && " << \ - # actual << " (actual) > " << # limit << " (limit) - " << # tol << " (tol)"; \ - ReportTestFailure (condStream.str (), actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - } \ - } while (false) +#define NS_TEST_EXPECT_MSG_EQ_TOL_INTERNAL(actual, limit, tol, msg, file, line) \ + do { \ + if ((actual) > (limit) + (tol) || (actual) < (limit) - (tol)) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit << " +- " << tol; \ + std::ostringstream condStream; \ + condStream << #actual << " (actual) < " << #limit \ + << " (limit) + " << #tol << " (tol) && " \ + << #actual << " (actual) > " << #limit \ + << " (limit) - " << #tol << " (tol)"; \ + ReportTestFailure (condStream.str (), actualStream.str (), \ + limitStream.str (), msgStream.str (), \ + file, line); \ + } \ + } while (false) /** * \brief Test that actual and expected (limit) values are equal to plus or minus @@ -455,25 +477,24 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_NE_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) != (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) != " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_NE_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) != (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) != " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE; \ + } \ + } while (false) /** * \brief Test that an actual and expected (limit) value are equal and report @@ -506,25 +527,24 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_NE_RETURNS_BOOL_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) != (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) != " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return true; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_NE_RETURNS_BOOL_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) != (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) != " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE_RETURNS_BOOL; \ + } \ + } while (false) /** * \brief Test that an actual and expected (limit) value are equal and report @@ -563,21 +583,23 @@ extern bool gBreakOnFailure; * Required to avoid use of return statement which allows use in methods * (callbacks) returning void. */ -#define NS_TEST_EXPECT_MSG_NE_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) != (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) != " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - } \ - } while (false) +#define NS_TEST_EXPECT_MSG_NE_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) != (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) != " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + } \ + } while (false) /** * \brief Test that an actual and expected (limit) value are equal and report @@ -614,25 +636,24 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_LT_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) < (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) < " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_LT_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) < (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) < " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE; \ + } \ + } while (false) /** * \brief Test that an actual value is less than a limit and report and abort @@ -658,21 +679,23 @@ extern bool gBreakOnFailure; * Required to avoid use of return statement which allows use in methods * (callbacks) returning void. */ -#define NS_TEST_EXPECT_MSG_LT_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) < (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) < " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - } \ - } while (false) +#define NS_TEST_EXPECT_MSG_LT_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) < (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) < " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + } \ + } while (false) /** * \brief Test that an actual value is less than a limit and report if not. @@ -698,25 +721,24 @@ extern bool gBreakOnFailure; /** * \internal */ -#define NS_TEST_ASSERT_MSG_GT_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) > (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReportTestFailure (std::string (# actual) + " (actual) > " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - if (!ContinueOnFailure ()) \ - { \ - return; \ - } \ - } \ - } while (false) +#define NS_TEST_ASSERT_MSG_GT_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) > (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) > " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE; \ + } \ + } while (false) /** * \brief Test that an actual value is greater than a limit and report and abort @@ -742,21 +764,23 @@ extern bool gBreakOnFailure; * Required to avoid use of return statement which allows use in methods * (callbacks) returning void. */ -#define NS_TEST_EXPECT_MSG_GT_INTERNAL(actual, limit, msg, file, line) \ - do { \ - if (!((actual) > (limit))) \ - { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ - std::ostringstream msgStream; \ - msgStream << msg; \ - std::ostringstream actualStream; \ - actualStream << actual; \ - std::ostringstream limitStream; \ - limitStream << limit; \ - ReporTesttFailure (std::string (# actual) + " (actual) > " + std::string (# limit) + " (limit)", \ - actualStream.str (), limitStream.str (), msgStream.str (), file, line); \ - } \ - } while (false) +#define NS_TEST_EXPECT_MSG_GT_INTERNAL(actual, limit, msg, file, line) \ + do { \ + if (!((actual) > (limit))) \ + { \ + ASSERT_ON_FAILURE; \ + std::ostringstream msgStream; \ + msgStream << msg; \ + std::ostringstream actualStream; \ + actualStream << actual; \ + std::ostringstream limitStream; \ + limitStream << limit; \ + ReportTestFailure (std::string (#actual) + " (actual) > " + \ + std::string (#limit) + " (limit)", \ + actualStream.str (), limitStream.str (), \ + msgStream.str (), file, line); \ + } \ + } while (false) /** * \brief Test that an actual value is greater than a limit and report if not. @@ -795,256 +819,122 @@ namespace ns3 { * \param epsilon The second of double precision floating point numberss to compare * \returns Returns true if the doubles are equal to a precision defined by epsilon */ -bool TestDoubleIsEqual (const double a, const double b, const double epsilon = std::numeric_limits::epsilon ()); +bool TestDoubleIsEqual (const double a, const double b, + const double epsilon = std::numeric_limits::epsilon ()); + +class TestRunnerImpl; /** - * \brief A single test case. + * \brief encapsulates test code + * + * To allow a new test to be run within the ns-3 test framework, users + * need to create subclasses of this base class, override the DoRun method, + * and use the NS_TEST_* macros within DoRun. */ class TestCase { public: - TestCase (std::string name); virtual ~TestCase (); - /** - * \brief Run this test case. - */ - void Run (void); - - /** - * \brief Set the verbosity of this test case. - * \param verbose Whether or not to turn on any output the - * test case may provide. - */ - void SetVerbose (bool verbose); - - /** - * \brief Tell the test case whether or not to continue testing if an error is - * detected. - * - * Typically, test cases depend on some number of individual tests. Often, - * these tests build on functionality that has been previously verified. In - * this case, subsequent test failures may simply be alternate manifestations - * of previously detected errors. Some developers may only be interested in - * seeing the first failure. Other developers may want to see all the - * information they can get, and want to see all failures. This is a matter - * of individual preference, so we allow this behavior to be configured. - * - * \param continueOnFailure If true, run tests after a failure has been - * detected, otherwise stop on the first error. - */ - void SetContinueOnFailure (bool continueOnFailure); - - /** - * \brief Set the name of this test case. - */ - void SetName (std::string name); - - /** - * \brief Get the name of this test case. - */ - std::string GetName (void); - - /** - * \brief Set the base directory of the ns-3 distribution. - */ - void SetBaseDir (std::string dir); - - /** - * \brief Get the base directory of the ns-3 distribution. - */ - std::string GetBaseDir (void); - - /** - * \brief Set the temporary file directory (where to write temporary files). - */ - void SetTempDir (std::string dir); - - /** - * \brief Get the temporary file directory . - */ - std::string GetTempDir (void); - -/** - * \brief Get the source directory of the current source file. - * - * One of the basic models of the test environment is that dedicated test- - * and response vectors live in the same directory as the source file. So it - * is a common operation to figure out what directory a given source file lives - * in. - * - * __FILE__ provides almost all of what we need, but in the gnu toolchain it - * comes out as something like "../src/core/pcap-file-test-suite.cc". - * - * We really don't want to have any dependency on the directory out of which a - * test is run, so we ask that any test-runner give us the base directory of the - * distribution, which is set via TestCase::SetBaseDir(). That string will look - * something like "/home/user/repos/ns-3-allinone/ns-3-dev". - * - * This function stitches the two pieces together and removes the file name to - * return something like "/home/user/repos/ns-3-allinone/ns-3-dev/src/core/". - * - * \param file The current source file name relative to the base directory. - * \returns The current source directory. - * - * \warning Always call this function as GetSourceDir (__FILE__) or use the - * convenience macro NS_TEST_SOURCEDIR. - */ - std::string GetSourceDir (std::string file); - - /** - * \brief Set the stream to which status and result messages will be written. - * - * We really don't want to have to pass an ofstream around to every function - * and we especially don't want to have to make our clients plumb an ofstream - * around so we need to save it. Since file streams are not designed to be - * copied or assigned (what does it mean to have duplicate streams to a file) - * we have to stash a pointer to the stream. - * - * \param ofs output file stream - */ - void SetStream (std::ofstream *ofs); - - /** - * \brief Get the stream to which status and result messages will be written. - */ - std::ofstream *GetStream (void); - - /** - * \brief Manually update the error status of this test case. - * - * This does a logical OR of the error argument with the current error status. - * If the argument is false, it does nothing. If the argument is true, it - * sets the error status to "an error has occurred." - * - * \param error The status to use to update the test case error status - */ - void UpdateErrorStatus (bool error); - - /** - * \brief Manually set the error status of this test case. - * - * This sets the current error status to the argument provided. Can be used - * to reset any previous errors if the argument is false. - * - * \param error The status to use to set the test case error status - */ - void SetErrorStatus (bool error); - - /** - * \brief Get the error status of this test case. - */ - bool GetErrorStatus (void); - - /** - * \brief Should test cases continue running in the presence of errors? - * \returns True if the test case should continue, false otherwise. - */ - bool ContinueOnFailure (void); - - /** - * \brief Issue a test report than the test suite has started running. - */ - void ReportStart (void); - - /** - * \brief Issue a test report than the test case has declared success. - */ - void ReportCaseSuccess (void); - - /** - * \brief Issue a test report than the test case has declared failure. - */ - void ReportCaseFailure (void); - - /** - * \brief Issue a test report than the test case has found an error and - * report the details. - */ - void ReportTestFailure (std::string cond, std::string actual, std::string limit, std::string message, - std::string file, int32_t line); - - /** - * \brief Issue a test report than the test case has completed its run. - */ - void ReportEnd (void); - protected: /** - * \internal - * \brief Implementation of reporting method for the start of the test case. + * \param name the name of the new test created */ - virtual void DoReportStart (void); + TestCase (std::string name); /** - * \internal - * \brief Implementation of reporting method for success of the test case. + * \brief Add an individual test case to this test suite. + * + * \param testCase Pointer to the test case object to be added. */ - virtual void DoReportCaseSuccess (void); + void AddTestCase (TestCase *testCase); /** - * \internal - * \brief Implementation of reporting method for failure of the test case. + * \param directory the directory where the test data is located + * + * In general, this method is invoked as SetDataDir (NS_TEST_SOURCEDIR); */ - virtual void DoReportCaseFailure (void); + void SetDataDir (std::string directory); /** - * \internal - * \brief Implementation of reporting method for failure of the test case. + * This method is deprecated. IsStatusFailure replaces it. */ - virtual void DoReportTestFailure (std::string cond, std::string actual, std::string limit, std::string message, - std::string file, int32_t line); + bool GetErrorStatus (void) const NS_DEPRECATED; + /** + * \return true if the tests have failed, false otherwise. + */ + bool IsStatusFailure (void) const; + /** + * \return true if the tests have succeeded, false otherwise. + */ + bool IsStatusSuccess (void) const; + + // The methods below are used only by test macros and should not + // be used by normal users. + void ReportTestFailure (std::string cond, std::string actual, + std::string limit, std::string message, + std::string file, int32_t line); + bool MustAssertOnFailure (void) const; + bool MustContinueOnFailure (void) const; + std::string CreateDataDirFilename (std::string filename); + std::string CreateTempDirFilename (std::string filename); +private: + friend class TestRunnerImpl; /** - * \internal - * \brief Implementation of reporting method for the end of the test case. - */ - virtual void DoReportEnd (void); - - /** - * \internal * \brief Implementation to do any local setup required for this test case. + * + * Subclasses should override this method to perform any costly per-test setup + * before DoRun is invoked. */ virtual void DoSetup (void); /** - * \internal * \brief Implementation to actually run this test case. + * + * Subclasses should override this method to conduct their tests. */ virtual void DoRun (void) = 0; /** - * \internal * \brief Implementation to do any local setup required for this test case. + * + * Subclasses should override this method to perform any costly per-test teardown */ virtual void DoTeardown (void); -private: + // forbid copying objects TestCase (TestCase& tc); TestCase& operator= (TestCase& tc); - SystemWallClockMs m_msClock; + // methods called by TestRunnerImpl + void Run (TestRunnerImpl *runner); + std::string GetName (void) const; + bool IsFailed (void) const; + + + struct Result; + + TestCase *m_parent; + std::vector m_children; + std::string m_dataDir; + TestRunnerImpl *m_runner; + struct Result *m_result; std::string m_name; - bool m_verbose; - bool m_continueOnFailure; - bool m_detailsReported; - std::string m_basedir; - std::string m_tempdir; - std::ofstream *m_ofs; - bool m_error; }; /** * \brief A suite of tests to run. */ -class TestSuite +class TestSuite : public TestCase { public: /** * \enum TestType * \brief Type of test. */ - enum TestType { + enum Type { + ALL = 0, BVT = 1, /**< This test suite implements a Build Verification Test */ UNIT, /**< This test suite implements a Unit Test */ SYSTEM, /**< This test suite implements a System Test */ @@ -1058,226 +948,20 @@ public: * \param name The name of the test suite. * \param type The TestType of the test suite (defaults to UNIT test). */ - TestSuite (std::string name, TestType type = UNIT); - - /** - * \brief Destroy a test suite. - */ - virtual ~TestSuite (); - - /** - * \brief Run this test suite. - * - * \returns Boolean sense of "an error has occurred." - */ - bool Run (void); - - /** - * \brief Add an individual test case to this test suite. - * - * \param testCase Pointer to the test case object to be added. - * \returns Integer assigned as identifer of the provided test case. - */ - uint32_t AddTestCase (TestCase *testCase); - - /** - * \brief Get the number of test cases that have been added to this test suite. - * - * \returns Number of test cases in the suite. - */ - uint32_t GetNTestCases (void); - - /** - * \brief Get the test case at index i. - */ - TestCase *GetTestCase (uint32_t i); + TestSuite (std::string name, Type type = UNIT); /** * \brief get the kind of test this test suite implements * - * \returns the TestType of the suite. + * \returns the Type of the suite. */ - TestType GetTestType (void); - - /** - * \brief Set the verbosity of this test suite. - * \param verbose Whether or not to turn on any output the - * test case may provide. - */ - void SetVerbose (bool verbose); - - /** - * \brief Tell the test suite and its test cases whether or not to continue - * testing if an error is detected. - * - * Typically, test suites depend on some number of test cases, which in turn - * depend on some number of individual tests. Often, these tests build on - * functionality that has been previously verified. In this case, subsequent - * test failures may simply be alternate manifestations of previously detected - * errors. Some developers may only be interested in seeing the first failure. - * Other developers may want to see all the information they can get, and want - * to see all failures. This is a matter of individual preference, so we allow - * this behavior to be configured. - * - * \param continueOnFailure If true, continue running test cases after a - * failure has been detected, otherwise stop on the - * first error. - */ - void SetContinueOnFailure (bool continueOnFailure); - - /** - * \brief Set the name of this test suite. - */ - void SetName (std::string name); - - /** - * \brief Get the name of this test suite. - */ - std::string GetName (void); - - /** - * \brief Set the base directory of the ns-3 distribution. - */ - void SetBaseDir (std::string basedir); - - /** - * \brief Get the base directory of the ns-3 distribution. - */ - std::string GetBaseDir (void); - - /** - * \brief Set the temporary file directory (where to write temporary files). - */ - void SetTempDir (std::string dir); - - /** - * \brief Get the temporary file directory. - */ - std::string GetTempDir (void); - - /** - * \brief Set the stream to which status and result messages will be written. - * - * We really don't want to have to pass an ofstream around to every function - * and we especially don't want to have to make our clients plumb an ofstream - * around so we need to save it. Since file streams are not designed to be - * copied or assigned (what does it mean to have duplicate streams to a file) - * we have to stash a pointer to the stream. - * \param ofs output file stream - */ - void SetStream (std::ofstream *ofs); - - /** - * \brief Manually update the error status of this test suite. - * - * This does a logical OR of the error argument with the current error status. - * If the argument is false, it does nothing. If the argument is true, it - * sets the error status to "an error has occurred." - * - * \param error The status to use to update the test suite error status - */ - void UpdateErrorStatus (bool error); - - /** - * \brief Manually set the error status of this test suite. - * - * This sets the current error status to the argument provided. Can be used - * to reset any previous errors if the argument is false. - * - * \param error The status to use to set the test suite error status - */ - void SetErrorStatus (bool error); - - /** - * \brief Get the error status of this test suite. - */ - bool GetErrorStatus (void); - - /** - * \brief Should test suite continue running cases in the presence of errors? - * \returns True if the test suite should continue, false otherwise. - */ - bool ContinueOnFailure (void); - - /** - * \brief Issue a test report than the test suite has started running. - */ - void ReportStart (void); - - /** - * \brief Issue a test report than the test suite has declared success. - */ - void ReportSuccess (void); - - /** - * \brief Issue a test report than the test suite has found an error. - */ - void ReportFailure (void); - - /** - * \brief Issue a test report than the test suite has completed its run. - */ - void ReportEnd (void); - -protected: - /** - * \internal - * \brief Implementation of reporting method for the start of the test suite. - */ - virtual void DoReportStart (void); - - /** - * \internal - * \brief Implementation of reporting method for success of the test suite. - */ - virtual void DoReportSuccess (void); - - /** - * \internal - * \brief Implementation of reporting method for failure of the test suite. - */ - virtual void DoReportFailure (void); - - /** - * \internal - * \brief Implementation of reporting method for the end of the test suite. - */ - virtual void DoReportEnd (void); - - /** - * \internal - * \brief Implementation to do any local setup required for this test suite. - */ - virtual void DoSetup (void); - - /** - * \internal - * \brief Implementation to actually run this test suite. - */ - virtual void DoRun (void); - - /** - * \internal - * \brief Implementation to do any local setup required for this test suite. - */ - virtual void DoTeardown (void); + TestSuite::Type GetTestType (void); private: - TestSuite (TestSuite& ts); - TestSuite& operator= (TestSuite& ts); + virtual void DoRun (void); - SystemWallClockMs m_msClock; - std::string m_name; - bool m_verbose; - bool m_continueOnFailure; - std::string m_basedir; - std::string m_tempdir; - std::ofstream *m_ofs; - bool m_error; - TestType m_type; - typedef std::vector TestCaseVector_t; - TestCaseVector_t m_tests; + TestSuite::Type m_type; }; /** @@ -1286,9 +970,7 @@ private: class TestRunner { public: - static uint32_t AddTestSuite (TestSuite *testSuite); - static uint32_t GetNTestSuites (void); - static TestSuite *GetTestSuite (uint32_t n); + static int Run (int argc, char *argv[]); }; /** @@ -1313,8 +995,8 @@ private: TestVectors& operator= (const TestVectors& tv); bool operator== (const TestVectors& tv) const; - typedef std::vector TestVector_t; - TestVector_t m_vectors; + typedef std::vector TestVector; + TestVector m_vectors; }; template diff --git a/src/core/wscript b/src/core/wscript index 697e13146..1d461a78e 100644 --- a/src/core/wscript +++ b/src/core/wscript @@ -36,8 +36,10 @@ def configure(conf): conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H') conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H') - conf.check(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H') + conf.check(header_name='sys/types.h', define_name='HAVE_SYS_TYPES_H') + conf.check(header_name='sys/stat.h', define_name='HAVE_SYS_STAT_H') + conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H') if conf.check(header_name='stdlib.h'): conf.define('HAVE_STDLIB_H', 1) @@ -144,6 +146,7 @@ def build(bld): 'model/names.cc', 'model/vector.cc', 'model/fatal-impl.cc', + 'model/system-path.cc', ] core_test = bld.create_ns3_module_test_library('core') diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression.cc b/src/mesh/test/dot11s/hwmp-proactive-regression.cc index af1302f0d..b98ea3d50 100644 --- a/src/mesh/test/dot11s/hwmp-proactive-regression.cc +++ b/src/mesh/test/dot11s/hwmp-proactive-regression.cc @@ -32,13 +32,12 @@ #include "ns3/abort.h" #include "ns3/udp-echo-helper.h" #include "ns3/mobility-model.h" +#include "ns3/pcap-test.h" #include #include "hwmp-proactive-regression.h" using namespace ns3; -/// Set to true to rewrite reference traces, leave false to run regression test -const bool WRITE_VECTORS = false; /// Unique PCAP file name prefix const char * const PREFIX = "hwmp-proactive-regression-test"; @@ -65,7 +64,7 @@ HwmpProactiveRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -122,8 +121,7 @@ HwmpProactiveRegressionTest::CreateDevices () address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); // 4. write PCAP if needed - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : std::string (GetTempDir ())) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -131,15 +129,7 @@ HwmpProactiveRegressionTest::CheckResults () { for (int i = 0; i < 5; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); // TODO support default PcapWriter snap length here - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression.cc b/src/mesh/test/dot11s/hwmp-reactive-regression.cc index 0e8190e4b..1c6ced3ac 100644 --- a/src/mesh/test/dot11s/hwmp-reactive-regression.cc +++ b/src/mesh/test/dot11s/hwmp-reactive-regression.cc @@ -31,12 +31,11 @@ #include "ns3/abort.h" #include "ns3/udp-echo-helper.h" #include "ns3/mobility-model.h" +#include "ns3/pcap-test.h" #include #include "hwmp-reactive-regression.h" -/// Set to true to rewrite reference traces, leave false to run regression test -const bool WRITE_VECTORS = false; /// Unique PCAP file name prefix const char * const PREFIX = "hwmp-reactive-regression-test"; @@ -61,7 +60,7 @@ HwmpReactiveRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } void @@ -119,9 +118,7 @@ HwmpReactiveRegressionTest::CreateDevices () address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); // 4. write PCAP if needed - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : std::string (GetTempDir ())) + PREFIX; - wifiPhy.EnablePcapAll (prefix); - + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -129,15 +126,7 @@ HwmpReactiveRegressionTest::CheckResults () { for (int i = 0; i < 6; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); // TODO support default PcapWriter snap length here - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/mesh/test/dot11s/hwmp-simplest-regression.cc b/src/mesh/test/dot11s/hwmp-simplest-regression.cc index 411ad5a6e..59c6c9fe5 100644 --- a/src/mesh/test/dot11s/hwmp-simplest-regression.cc +++ b/src/mesh/test/dot11s/hwmp-simplest-regression.cc @@ -31,13 +31,12 @@ #include "ns3/abort.h" #include "ns3/udp-echo-helper.h" #include "ns3/mobility-model.h" +#include "ns3/pcap-test.h" #include #include "hwmp-simplest-regression.h" using namespace ns3; -/// Set to true to rewrite reference traces, leave false to run regression test -const bool WRITE_VECTORS = false; /// Unique PCAP file name prefix const char * const PREFIX = "hwmp-simplest-regression-test"; @@ -64,7 +63,7 @@ HwmpSimplestRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -131,8 +130,7 @@ HwmpSimplestRegressionTest::CreateDevices () address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); // 4. write PCAP if needed - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : std::string (GetTempDir ())) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -140,15 +138,7 @@ HwmpSimplestRegressionTest::CheckResults () { for (int i = 0; i < 2; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); // TODO support default PcapWriter snap length here - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc index 2f2cdeb93..b7f32f562 100644 --- a/src/mesh/test/dot11s/hwmp-target-flags-regression.cc +++ b/src/mesh/test/dot11s/hwmp-target-flags-regression.cc @@ -31,13 +31,12 @@ #include "ns3/abort.h" #include "ns3/udp-echo-helper.h" #include "ns3/mobility-model.h" +#include "ns3/pcap-test.h" #include #include "hwmp-target-flags-regression.h" using namespace ns3; -/// Set to true to rewrite reference traces, leave false to run regression test -const bool WRITE_VECTORS = false; /// Unique PCAP file name prefix const char * const PREFIX = "hwmp-target-flags-regression-test"; @@ -64,7 +63,7 @@ HwmpDoRfRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -138,8 +137,7 @@ HwmpDoRfRegressionTest::CreateDevices () address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); // 4. write PCAP if needed - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : std::string (GetTempDir ())) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -147,15 +145,7 @@ HwmpDoRfRegressionTest::CheckResults () { for (int i = 0; i < 4; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); // TODO support default PcapWriter snap length here - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/mesh/test/dot11s/pmp-regression.cc b/src/mesh/test/dot11s/pmp-regression.cc index 4f5557de5..6f99aea6d 100644 --- a/src/mesh/test/dot11s/pmp-regression.cc +++ b/src/mesh/test/dot11s/pmp-regression.cc @@ -28,14 +28,13 @@ #include "ns3/internet-stack-helper.h" #include "ns3/mobility-model.h" #include "ns3/pcap-file.h" +#include "ns3/pcap-test.h" #include #include "pmp-regression.h" using namespace ns3; -/// Set to true to rewrite reference traces, leave false to run regression test -const bool WRITE_VECTORS = false; /// Unique PCAP file name prefix const char * const PREFIX = "pmp-regression-test"; @@ -61,7 +60,7 @@ PeerManagementProtocolRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -97,8 +96,7 @@ PeerManagementProtocolRegressionTest::CreateDevices () mesh.SetNumberOfInterfaces (1); NetDeviceContainer meshDevices = mesh.Install (wifiPhy, *m_nodes); // 3. write PCAP if needed - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : std::string (GetTempDir ())) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -106,15 +104,7 @@ PeerManagementProtocolRegressionTest::CheckResults () { for (int i = 0; i < 2; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); // TODO support default PcapWriter snap length here - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/mesh/test/dot11s/regression.cc b/src/mesh/test/dot11s/regression.cc index 789e84703..cfab88a7c 100644 --- a/src/mesh/test/dot11s/regression.cc +++ b/src/mesh/test/dot11s/regression.cc @@ -31,6 +31,7 @@ class Dot11sRegressionSuite : public TestSuite public: Dot11sRegressionSuite () : TestSuite ("devices-mesh-dot11s-regression", SYSTEM) { + SetDataDir (NS_TEST_SOURCEDIR); AddTestCase (new PeerManagementProtocolRegressionTest); AddTestCase (new HwmpSimplestRegressionTest); AddTestCase (new HwmpReactiveRegressionTest); diff --git a/src/mesh/test/flame/flame-regression.cc b/src/mesh/test/flame/flame-regression.cc index f5b70074b..25174036a 100644 --- a/src/mesh/test/flame/flame-regression.cc +++ b/src/mesh/test/flame/flame-regression.cc @@ -28,6 +28,7 @@ #include "ns3/internet-stack-helper.h" #include "ns3/ipv4-address-helper.h" #include "ns3/abort.h" +#include "ns3/pcap-test.h" #include "ns3/udp-echo-helper.h" #include "ns3/mobility-model.h" #include @@ -36,8 +37,6 @@ using namespace ns3; -/// Set to true to rewrite reference traces, leave false to run regression test -const bool WRITE_VECTORS = false; /// Unique PCAP file name prefix const char * const PREFIX = "flame-regression-test"; @@ -65,7 +64,7 @@ FlameRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); delete m_nodes, m_nodes = 0; } @@ -109,8 +108,7 @@ FlameRegressionTest::CreateDevices () address.SetBase ("10.1.1.0", "255.255.255.0"); m_interfaces = address.Assign (meshDevices); // 4. write PCAP if needed - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : GetTempDir ()) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -134,15 +132,7 @@ FlameRegressionTest::CheckResults () { for (int i = 0; i < 3; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); // TODO support default PcapWriter snap length here - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/mesh/test/flame/flame-test-suite.cc b/src/mesh/test/flame/flame-test-suite.cc index 446449f6d..ea7575b11 100644 --- a/src/mesh/test/flame/flame-test-suite.cc +++ b/src/mesh/test/flame/flame-test-suite.cc @@ -87,7 +87,7 @@ private: static FlameRtableTest g_FlameRtableTest; FlameRtableTest::FlameRtableTest () : - TestCase ("Mesh/Flame/FlameRtable"), + TestCase ("FlameRtable"), error (false), dst ("01:00:00:01:00:01"), hop ("01:00:00:01:00:03"), diff --git a/src/mesh/test/flame/regression.cc b/src/mesh/test/flame/regression.cc index ea5f642b7..72c8ad62f 100644 --- a/src/mesh/test/flame/regression.cc +++ b/src/mesh/test/flame/regression.cc @@ -27,6 +27,7 @@ class FlameRegressionSuite : public TestSuite public: FlameRegressionSuite () : TestSuite ("devices-mesh-flame-regression", SYSTEM) { + SetDataDir (NS_TEST_SOURCEDIR); AddTestCase (new FlameRegressionTest); } } g_flameRegressionSuite; diff --git a/src/mobility/test/ns2-mobility-helper-test-suite.cc b/src/mobility/test/ns2-mobility-helper-test-suite.cc index 1213ad22f..ea647c8ec 100644 --- a/src/mobility/test/ns2-mobility-helper-test-suite.cc +++ b/src/mobility/test/ns2-mobility-helper-test-suite.cc @@ -140,7 +140,7 @@ private: /// Dump NS-2 trace to tmp file bool WriteTrace () { - m_traceFile = GetTempDir () + "Ns2MobilityHelperTest.tcl"; + m_traceFile = CreateTempDirFilename ("Ns2MobilityHelperTest.tcl"); std::ofstream of (m_traceFile.c_str ()); NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (of.is_open (), true, "Need to write tmp. file"); of << m_trace; @@ -176,7 +176,7 @@ private: m_nextRefPoint++; } - return GetErrorStatus (); + return IsStatusFailure (); } /// Listen for course change events void CourseChange (std::string context, Ptr mobility) @@ -243,6 +243,8 @@ class Ns2MobilityHelperTestSuite : public TestSuite public: Ns2MobilityHelperTestSuite () : TestSuite ("mobility-ns2-trace-helper", UNIT) { + SetDataDir (NS_TEST_SOURCEDIR); + // to be used as temporary variable for test cases. // Note that test suite takes care of deleting all test cases. Ns2MobilityHelperTest * t (0); diff --git a/src/network/test/packetbb-test-suite.cc b/src/network/test/packetbb-test-suite.cc index 43d96d0eb..74731856f 100644 --- a/src/network/test/packetbb-test-suite.cc +++ b/src/network/test/packetbb-test-suite.cc @@ -40,8 +40,8 @@ protected: virtual void DoRun (void); private: - bool TestSerialize (void); - bool TestDeserialize (void); + void TestSerialize (void); + void TestDeserialize (void); Ptr m_refPacket; Buffer m_refBuffer; @@ -65,44 +65,38 @@ PbbTestCase::~PbbTestCase (void) void PbbTestCase::DoRun (void) { - NS_TEST_ASSERT_MSG_EQ (TestSerialize (), false, - "serialization failed"); - NS_TEST_ASSERT_MSG_EQ (TestDeserialize (), false, - "deserialization failed"); + TestSerialize (); + TestDeserialize (); } -bool +void PbbTestCase::TestSerialize (void) { Buffer newBuffer; newBuffer.AddAtStart (m_refPacket->GetSerializedSize ()); m_refPacket->Serialize (newBuffer.Begin ()); - NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (newBuffer.GetSize (), m_refBuffer.GetSize (), - "serialization failed, buffers have different sizes"); + NS_TEST_ASSERT_MSG_EQ (newBuffer.GetSize (), m_refBuffer.GetSize (), + "serialization failed, buffers have different sizes"); int memrv = memcmp (newBuffer.PeekData (), m_refBuffer.PeekData (), newBuffer.GetSize ()); - NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (memrv, 0, - "serialization faled, buffers differ"); - - return GetErrorStatus (); + NS_TEST_ASSERT_MSG_EQ (memrv, 0, + "serialization faled, buffers differ"); } -bool +void PbbTestCase::TestDeserialize (void) { Ptr newPacket = Create (); uint32_t numbytes = newPacket->Deserialize (m_refBuffer.Begin ()); - NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (numbytes, m_refBuffer.GetSize (), + NS_TEST_ASSERT_MSG_EQ (numbytes, m_refBuffer.GetSize (), "deserialization failed, did not use all bytes"); - NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (*newPacket, *m_refPacket, + NS_TEST_ASSERT_MSG_EQ (*newPacket, *m_refPacket, "deserialization failed, objects do not match"); - - return GetErrorStatus (); } class PbbTestSuite : public TestSuite diff --git a/src/network/test/pcap-file-test-suite.cc b/src/network/test/pcap-file-test-suite.cc index f78942226..87d471e7b 100644 --- a/src/network/test/pcap-file-test-suite.cc +++ b/src/network/test/pcap-file-test-suite.cc @@ -107,7 +107,7 @@ WriteModeCreateTestCase::DoSetup (void) std::stringstream filename; uint32_t n = rand (); filename << n; - m_testFilename = GetTempDir () + filename.str () + ".pcap"; + m_testFilename = CreateTempDirFilename (filename.str () + ".pcap"); } void @@ -219,7 +219,7 @@ ReadModeCreateTestCase::DoSetup (void) std::stringstream filename; uint32_t n = rand (); filename << n; - m_testFilename = GetTempDir () + filename.str () + ".pcap"; + m_testFilename = CreateTempDirFilename (filename.str () + ".pcap"); } void @@ -325,7 +325,7 @@ AppendModeCreateTestCase::DoSetup (void) std::stringstream filename; uint32_t n = rand (); filename << n; - m_testFilename = GetTempDir () + filename.str () + ".pcap"; + m_testFilename = CreateTempDirFilename (filename.str () + ".pcap"); } void @@ -431,7 +431,7 @@ FileHeaderTestCase::DoSetup (void) std::stringstream filename; uint32_t n = rand (); filename << n; - m_testFilename = GetTempDir () + filename.str () + ".pcap"; + m_testFilename = CreateTempDirFilename (filename.str () + ".pcap"); } void @@ -668,7 +668,7 @@ RecordHeaderTestCase::DoSetup (void) std::stringstream filename; uint32_t n = rand (); filename << n; - m_testFilename = GetTempDir () + filename.str () + ".pcap"; + m_testFilename = CreateTempDirFilename (filename.str () + ".pcap"); } void @@ -1008,7 +1008,7 @@ ReadFileTestCase::DoRun (void) // // - std::string filename = NS_TEST_SOURCEDIR + "known.pcap"; + std::string filename = CreateDataDirFilename ("known.pcap"); f.Open (filename, std::ios::in); NS_TEST_ASSERT_MSG_EQ (f.Fail (), false, "Open (" << filename << ", \"std::ios::in\") returns error"); @@ -1070,7 +1070,7 @@ DiffTestCase::DoRun (void) // // Check that PcapDiff(file, file) is false // - std::string filename = NS_TEST_SOURCEDIR + "known.pcap"; + std::string filename = CreateDataDirFilename ("known.pcap"); uint32_t sec (0), usec (0); bool diff = PcapFile::Diff (filename, filename, sec, usec); NS_TEST_EXPECT_MSG_EQ (diff, false, "PcapDiff(file, file) must always be false"); @@ -1110,6 +1110,7 @@ public: PcapFileTestSuite::PcapFileTestSuite () : TestSuite ("pcap-file", UNIT) { + SetDataDir (NS_TEST_SOURCEDIR); AddTestCase (new WriteModeCreateTestCase); AddTestCase (new ReadModeCreateTestCase); //AddTestCase (new AppendModeCreateTestCase); diff --git a/src/network/utils/pcap-test.h b/src/network/utils/pcap-test.h new file mode 100644 index 000000000..8e77e2f16 --- /dev/null +++ b/src/network/utils/pcap-test.h @@ -0,0 +1,34 @@ +#ifndef PCAP_TEST_H +#define PCAP_TEST_H + +#include +#include +#include +#include "pcap-file.h" +#include "ns3/test.h" + +/** + * \brief Test that a pair of reference/new pcap files are equal + * + * The filename is interpreted as a stream. + * + * \param filename The name of the file to read in the reference/temporary + * directories + */ +#define NS_PCAP_TEST_EXPECT_EQ(filename) \ + do { \ + std::ostringstream oss; \ + oss << filename; \ + std::string expected = CreateDataDirFilename (oss.str()); \ + std::string got = CreateTempDirFilename (oss.str()); \ + uint32_t sec(0), usec(0); \ + /* TODO support default PcapWriter snap length here */ \ + bool diff = PcapFile::Diff (got, expected, sec, usec); \ + NS_TEST_EXPECT_MSG_EQ (diff, false, \ + "PCAP traces " << got << " and " << expected \ + << " differ starting from " << sec << " s " \ + << usec << " us"); \ + } while (false) + + +#endif /* PCAP_TEST_H */ diff --git a/src/network/wscript b/src/network/wscript index fa1ea3fa0..5d06dff81 100644 --- a/src/network/wscript +++ b/src/network/wscript @@ -119,6 +119,7 @@ def build(bld): 'utils/sgi-hashmap.h', 'utils/simple-channel.h', 'utils/simple-net-device.h', + 'utils/pcap-test.h', 'helper/application-container.h', 'helper/net-device-container.h', 'helper/node-container.h', diff --git a/src/olsr/test/bug780-test.cc b/src/olsr/test/bug780-test.cc index 11e016627..e549bbb9e 100644 --- a/src/olsr/test/bug780-test.cc +++ b/src/olsr/test/bug780-test.cc @@ -38,16 +38,10 @@ #include "ns3/internet-stack-helper.h" #include "ns3/v4ping-helper.h" #include "ns3/pcap-file.h" +#include "ns3/pcap-test.h" #include "bug780-test.h" -/// Set to true to rewrite reference traces, leave false to run regression tests -namespace -{ -const bool WRITE_VECTORS = false; -} - - namespace ns3 { namespace olsr @@ -84,10 +78,7 @@ Bug780Test::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) - { - CheckResults (); - } + CheckResults (); } void @@ -172,8 +163,7 @@ Bug780Test::CreateNodes (void) p.Stop (Seconds (SimTime) - Seconds (0.001)); // pcap - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : GetTempDir ()) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -181,15 +171,7 @@ Bug780Test::CheckResults () { for (uint32_t i = 0; i < 2; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-0.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-0.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-0.pcap"); } } diff --git a/src/olsr/test/hello-regression-test.cc b/src/olsr/test/hello-regression-test.cc index 672ab9852..1a1c5824a 100644 --- a/src/olsr/test/hello-regression-test.cc +++ b/src/olsr/test/hello-regression-test.cc @@ -30,9 +30,7 @@ #include "ns3/point-to-point-helper.h" #include "ns3/ipv4-address-helper.h" #include "ns3/abort.h" - -/// Set to true to rewrite reference traces, leave false to run regression tests -const bool WRITE_VECTORS = false; +#include "ns3/pcap-test.h" namespace ns3 { @@ -61,7 +59,7 @@ HelloRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); } void @@ -85,8 +83,7 @@ HelloRegressionTest::CreateNodes () ipv4.SetBase ("10.1.1.0", "255.255.255.0"); ipv4.Assign (nd); // setup PCAP traces - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : GetTempDir ()) + PREFIX; - p2p.EnablePcapAll (prefix); + p2p.EnablePcapAll (CreateTempDirFilename (PREFIX)); } void @@ -94,15 +91,7 @@ HelloRegressionTest::CheckResults () { for (uint32_t i = 0; i < 2; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/olsr/test/regression-test-suite.cc b/src/olsr/test/regression-test-suite.cc index aeedb3e0b..9cb102a6e 100644 --- a/src/olsr/test/regression-test-suite.cc +++ b/src/olsr/test/regression-test-suite.cc @@ -30,6 +30,7 @@ class RegressionTestSuite : public TestSuite public: RegressionTestSuite () : TestSuite ("routing-olsr-regression", SYSTEM) { + SetDataDir (NS_TEST_SOURCEDIR); AddTestCase (new HelloRegressionTest); AddTestCase (new TcRegressionTest); AddTestCase (new Bug780Test); diff --git a/src/olsr/test/tc-regression-test.cc b/src/olsr/test/tc-regression-test.cc index f3f7f6a1d..f790c17aa 100644 --- a/src/olsr/test/tc-regression-test.cc +++ b/src/olsr/test/tc-regression-test.cc @@ -25,6 +25,7 @@ #include "ns3/double.h" #include "ns3/uinteger.h" #include "ns3/string.h" +#include "ns3/pcap-test.h" #include "ns3/pcap-file.h" #include "ns3/olsr-helper.h" #include "ns3/internet-stack-helper.h" @@ -35,9 +36,6 @@ #include "ns3/mobility-helper.h" #include "ns3/nqos-wifi-mac-helper.h" -/// Set to true to rewrite reference traces, leave false to run regression tests -const bool WRITE_VECTORS = false; - namespace ns3 { namespace olsr @@ -66,7 +64,7 @@ TcRegressionTest::DoRun () Simulator::Run (); Simulator::Destroy (); - if (!WRITE_VECTORS) CheckResults (); + CheckResults (); } void @@ -113,8 +111,7 @@ TcRegressionTest::CreateNodes () ipv4.Assign (nd); // setup PCAP traces - std::string prefix = (WRITE_VECTORS ? NS_TEST_SOURCEDIR : GetTempDir ()) + PREFIX; - wifiPhy.EnablePcapAll (prefix); + wifiPhy.EnablePcapAll (CreateTempDirFilename(PREFIX)); } void @@ -122,15 +119,7 @@ TcRegressionTest::CheckResults () { for (uint32_t i = 0; i < 3; ++i) { - std::ostringstream os1, os2; - // File naming conventions are hard-coded here. - os1 << NS_TEST_SOURCEDIR << PREFIX << "-" << i << "-1.pcap"; - os2 << GetTempDir () << PREFIX << "-" << i << "-1.pcap"; - - uint32_t sec (0), usec (0); - bool diff = PcapFile::Diff (os1.str (), os2.str (), sec, usec); - NS_TEST_EXPECT_MSG_EQ (diff, false, "PCAP traces " << os1.str () << " and " << os2.str () - << " differ starting from " << sec << " s " << usec << " us"); + NS_PCAP_TEST_EXPECT_EQ (PREFIX << "-" << i << "-1.pcap"); } } diff --git a/src/spectrum/test/spectrum-ideal-phy-test.cc b/src/spectrum/test/spectrum-ideal-phy-test.cc index df4575b4d..3429dbe50 100644 --- a/src/spectrum/test/spectrum-ideal-phy-test.cc +++ b/src/spectrum/test/spectrum-ideal-phy-test.cc @@ -75,6 +75,7 @@ public: private: virtual void DoRun (void); + static std::string Name (std::string channelType, double snrLinear, uint64_t phyRate); double m_snrLinear; uint64_t m_phyRate; @@ -82,24 +83,27 @@ private: std::string m_channelType; }; - +std::string +SpectrumIdealPhyTestCase::Name (std::string channelType, double snrLinear, uint64_t phyRate) +{ + std::ostringstream oss; + oss << channelType + << " snr = " << snrLinear << " (linear), " + << " phyRate = " << phyRate << " bps"; + return oss.str(); +} SpectrumIdealPhyTestCase::SpectrumIdealPhyTestCase (double snrLinear, uint64_t phyRate, bool rateIsAchievable, std::string channelType) - : TestCase (""), + : TestCase (Name (channelType, snrLinear, phyRate)), m_snrLinear (snrLinear), m_phyRate (phyRate), m_rateIsAchievable (rateIsAchievable), m_channelType (channelType) { - std::ostringstream oss; - oss << channelType - << " snr = " << snrLinear << " (linear), " - << " phyRate = " << phyRate << " bps"; - SetName (oss.str ()); } SpectrumIdealPhyTestCase::~SpectrumIdealPhyTestCase () diff --git a/src/spectrum/test/spectrum-test.h b/src/spectrum/test/spectrum-test.h index a2ee80dd4..e4fd32222 100644 --- a/src/spectrum/test/spectrum-test.h +++ b/src/spectrum/test/spectrum-test.h @@ -56,7 +56,7 @@ || (i->fc > j->fc + (tol)) || (i->fc < j->fc - (tol)) \ || (i->fh > j->fh + (tol)) || (i->fh < j->fh - (tol))) \ { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ + ASSERT_ON_FAILURE; \ std::ostringstream indexStream; \ indexStream << "[" << k << "]"; \ std::ostringstream msgStream; \ @@ -67,6 +67,7 @@ expectedStream << j->fl << " <-- " << j->fc << " --> " << j->fh; \ ReportTestFailure (std::string (# actual) + indexStream.str () + " == " + std::string (# expected) + indexStream.str (), \ actualStream.str (), expectedStream.str (), msgStream.str (), (file), (line)); \ + CONTINUE_ON_FAILURE; \ } \ ++i; \ ++j; \ @@ -117,7 +118,7 @@ { \ if ((*i) > (*j) + (tol) || (*i) < (*j) - (tol)) \ { \ - if (gBreakOnFailure) { *(int *)0 = 0; } \ + ASSERT_ON_FAILURE; \ std::ostringstream indexStream; \ indexStream << "[" << k << "]"; \ std::ostringstream msgStream; \ @@ -128,6 +129,7 @@ expectedStream << expected; \ ReportTestFailure (std::string (# actual) + indexStream.str () + " == " + std::string (# expected) + indexStream.str (), \ actualStream.str (), expectedStream.str (), msgStream.str (), file, line); \ + CONTINUE_ON_FAILURE; \ } \ ++i; \ ++j; \ diff --git a/src/spectrum/test/spectrum-value-test.cc b/src/spectrum/test/spectrum-value-test.cc index 3f825c7ea..4ee9d4b14 100644 --- a/src/spectrum/test/spectrum-value-test.cc +++ b/src/spectrum/test/spectrum-value-test.cc @@ -72,8 +72,8 @@ SpectrumValueTestCase::MoreOrLessEqual (SpectrumValue x, SpectrumValue y) void SpectrumValueTestCase::DoRun (void) { - NS_TEST_ASSERT_MSG_SPECTRUM_MODEL_EQ_TOL (*m_a.GetSpectrumModel (), *m_b.GetSpectrumModel (), TOLERANCE, GetName ()); - NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (m_a, m_b, TOLERANCE, GetName ()); + NS_TEST_ASSERT_MSG_SPECTRUM_MODEL_EQ_TOL (*m_a.GetSpectrumModel (), *m_b.GetSpectrumModel (), TOLERANCE, ""); + NS_TEST_ASSERT_MSG_SPECTRUM_VALUE_EQ_TOL (m_a, m_b, TOLERANCE, ""); } diff --git a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc index a31516e8f..20dd7106e 100644 --- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc @@ -184,7 +184,7 @@ Ns3TcpInteroperabilityTestCase::Ipv4L3Tx (std::string context, Ptr // // Avoid streams of errors -- only report the first. // - if (GetErrorStatus () == false) + if (IsStatusSuccess ()) { NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error"); } diff --git a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc index d4a8ac6c7..e6ca84960 100644 --- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc @@ -121,7 +121,7 @@ Ns3TcpLossTestCase::DoSetup (void) // std::ostringstream oss; oss << "/response-vectors/ns3tcp-loss-" << m_tcpModel << m_testCase << "-response-vectors.pcap"; - m_pcapFilename = NS_TEST_SOURCEDIR + oss.str (); + m_pcapFilename = CreateDataDirFilename(oss.str ()); if (m_writeVectors) { @@ -185,6 +185,8 @@ Ns3TcpLossTestCase::Ipv4L3Tx (std::string context, Ptr packet, Ptr uint32_t tsSec, tsUsec, inclLen, origLen, readLen; m_pcapFile.Read (expected, sizeof(expected), tsSec, tsUsec, inclLen, origLen, readLen); + NS_LOG_DEBUG ("read " << readLen); + uint8_t *actual = new uint8_t[readLen]; p->CopyData (actual, readLen); @@ -195,7 +197,7 @@ Ns3TcpLossTestCase::Ipv4L3Tx (std::string context, Ptr packet, Ptr // // Avoid streams of errors -- only report the first. // - if (GetErrorStatus () == false) + if (IsStatusSuccess ()) { NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error"); } @@ -442,6 +444,7 @@ public: Ns3TcpLossTestSuite::Ns3TcpLossTestSuite () : TestSuite ("ns3-tcp-loss", SYSTEM) { + SetDataDir (NS_TEST_SOURCEDIR); Packet::EnablePrinting (); // Enable packet metadata for all test cases AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0)); AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1)); diff --git a/src/test/ns3tcp/ns3tcp-state-test-suite.cc b/src/test/ns3tcp/ns3tcp-state-test-suite.cc index 5fd3d1bee..b141dfc36 100644 --- a/src/test/ns3tcp/ns3tcp-state-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-state-test-suite.cc @@ -190,7 +190,7 @@ Ns3TcpStateTestCase::Ipv4L3Tx (std::string context, Ptr packet, Pt // // Avoid streams of errors -- only report the first. // - if (GetErrorStatus () == false) + if (IsStatusSuccess ()) { NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error"); } diff --git a/src/wscript b/src/wscript index 44194b1df..99db8a9e8 100644 --- a/src/wscript +++ b/src/wscript @@ -151,7 +151,6 @@ class ns3module_taskgen(TaskGen.task_gen): pcfile = bld.new_task_gen('ns3pcfile') pcfile.module = self - def _create_ns3_module(self, bld, name, dependencies, static): # FIXME: env modifications are overwritten by parent caller @@ -169,22 +168,28 @@ class ns3module_taskgen(TaskGen.task_gen): module.features.extend(features) module.path = self.path module.uselib = self.uselib + module.target = 'ns3-' + name if hasattr(self, 'includes'): module.includes = self.includes + if hasattr(self, 'defines'): + module.defines = self.defines + else: + module.defines = [] + if hasattr(self, 'add_objects'): + module.add_objects = self.add_objects + else: + module.add_objects = [] if hasattr(self, "is_ns3_module"): module.is_ns3_module = self.is_ns3_module if hasattr(self, 'add_objects'): module.add_objects = self.add_objects - module.is_static = static - module.vnum = wutils.VNUM - # Add the proper path to the module's name. - module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(self.path), name) - # Set the libraries this module depends on. - module.module_deps = list(dependencies) + linkflags = [] + cxxflags = [] + ccflags = [] if not static: - module.env.append_value('CXXFLAGS', module.env['shlib_CXXFLAGS']) - module.env.append_value('CCFLAGS', module.env['shlib_CXXFLAGS']) + cxxflags = module.env['shlib_CXXFLAGS'] + ccflags = module.env['shlib_CXXFLAGS'] # Turn on the link flags for shared libraries if we have the # proper compiler and platform. if module.env['CXX_NAME'] in ['gcc', 'icc'] and module.env['WL_SONAME_SUPPORTED']: @@ -192,17 +197,54 @@ class ns3module_taskgen(TaskGen.task_gen): # at its beginning because all of the libraries will end # up in the same directory. module_library_name = os.path.basename(ccroot.get_target_name(module)) - module.env.append_value('LINKFLAGS', '-Wl,--soname=%s' % module_library_name) + linkflags = '-Wl,--soname=%s' % module_library_name elif module.env['CXX_NAME'] in ['gcc', 'icc'] and \ os.uname()[4] == 'x86_64' and \ module.env['ENABLE_PYTHON_BINDINGS']: # enable that flag for static builds only on x86-64 platforms # when gcc is present and only when we want python bindings # (it's more efficient to not use this option if we can avoid it) - module.env.append_value('CXXFLAGS', '-mcmodel=large') - module.env.append_value('CCFLAGS', '-mcmodel=large') - module.env.append_value('CXXDEFINES', "NS3_MODULE_COMPILATION") - module.env.append_value('CCDEFINES', "NS3_MODULE_COMPILATION") + cxxflags = '-mcmodel=large' + ccflags = '-mcmodel=large' + cxxdefines = "NS3_MODULE_COMPILATION" + ccdefines = "NS3_MODULE_COMPILATION" + + if len(module.source) > 0 and hasattr(self, 'ns3_dir_location'): + uselib_cpppath = [] + for lib in module.uselib.split(): + if 'CPPPATH_%s' % lib in module.env: + uselib_cpppath.extend(module.env['CPPPATH_%s' % lib]) + objects = [] + for src in module.source[0:-1]: + full_src = os.path.join(self.ns3_dir_location, src) + path = os.path.dirname(full_src) + target = '%s_object' % src + # XXX: calculate the features correctly here. + obj = bld (source=[full_src], target=target, features='cxx cc', + defines=['NS_TEST_SOURCEDIR="%s"' % path], + cxxflags = module.env['CXXFLAGS'] + cxxflags, + ccflags = module.env['CCFLAGS'] + ccflags, + includes=' '.join(uselib_cpppath)) + objects.append(target) + last = module.source[-1] + full_src = os.path.join(self.ns3_dir_location, last) + path = os.path.dirname(full_src) + module.defines.append('NS_TEST_SOURCEDIR="%s"' % path) + module.source = [last] + module.add_objects.extend(objects) + + + module.is_static = static + module.vnum = wutils.VNUM + # Add the proper path to the module's name. + module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(self.path), name) + # Set the libraries this module depends on. + module.module_deps = list(dependencies) + module.env.append_value('CXXFLAGS', cxxflags) + module.env.append_value('CCFLAGS', ccflags) + module.env.append_value('LINKFLAGS', linkflags) + module.env.append_value('CXXDEFINES', cxxdefines) + module.env.append_value('CCDEFINES', ccdefines) module.install_path = "${LIBDIR}" @@ -221,6 +263,7 @@ def create_ns3_module(bld, name, dependencies=(), test=False): module.module_deps = list(dependencies) module.test = test module.is_ns3_module = True + module.ns3_dir_location = bld.path.relpath_gen(bld.srcnode) return module @@ -439,7 +482,7 @@ class ns3pcfile_task(Task.Task): def _generate_pcfile(self, name, use, uselib_local, env, outfilename): outfile = open(outfilename, 'w') prefix = env.PREFIX - includedir = os.path.join(env.INCLUDEDIR, "ns3") + includedir = env.INCLUDEDIR libdir = env.LIBDIR libs = self._self_libs(self.env, name, '${libdir}') for dep in use: diff --git a/test.py b/test.py index bc8680e97..722a60516 100755 --- a/test.py +++ b/test.py @@ -165,53 +165,49 @@ def parse_examples_to_run_file( # TMP_OUTPUT_DIR = "testpy-output" -def get_node_text(node): - for child in node.childNodes: - if child.nodeType == child.TEXT_NODE: - return child.nodeValue - return "None" +def read_test(test): + result = test.find('Result').text + name = test.find('Name').text + if not test.find('Time') is None: + time_real = test.find('Time').get('real') + else: + time_real = '' + return (result, name, time_real) # # A simple example of writing a text file with a test result summary. It is # expected that this output will be fine for developers looking for problems. # +def node_to_text (test, f): + (result, name, time) = read_test(test) + output = "%s: Test Suite \"%s\" (%s)\n" % (result, name, time_real) + f.write(output) + for details in test.findall('FailureDetails'): + f.write(" Details:\n") + f.write(" Message: %s\n" % details.find('Message').text) + f.write(" Condition: %s\n" % details.find('Condition').text) + f.write(" Actual: %s\n" % details.find('Actual').text) + f.write(" Limit: %s\n" % details.find('Limit').text) + f.write(" File: %s\n" % details.find('File').text) + f.write(" Line: %s\n" % details.find('Line').text) + for child in test.findall('Test'): + node_to_text(child, f) + def translate_to_text(results_file, text_file): f = open(text_file, 'w') - try: - dom = xml.dom.minidom.parse(results_file) - except xml.parsers.expat.error: - print "\nAn error was encountered while parsing the XML file %s." % (results_file) - sys.exit(1) + import xml.etree.ElementTree as ET + et = ET.parse (results_file) + for test in et.findall('Test'): + node_to_text (test, f) - for suite in dom.getElementsByTagName("TestSuite"): - result = get_node_text(suite.getElementsByTagName("SuiteResult")[0]) - name = get_node_text(suite.getElementsByTagName("SuiteName")[0]) - time = get_node_text(suite.getElementsByTagName("SuiteTime")[0]) - output = "%s: Test Suite \"%s\" (%s)\n" % (result, name, time) - f.write(output) - if result != "CRASH": - for case in suite.getElementsByTagName("TestCase"): - result = get_node_text(case.getElementsByTagName("CaseResult")[0]) - name = get_node_text(case.getElementsByTagName("CaseName")[0]) - time = get_node_text(case.getElementsByTagName("CaseTime")[0]) - output = " %s: Test Case \"%s\" (%s)\n" % (result, name, time) - f.write(output) - - if result == "FAIL": - for details in case.getElementsByTagName("FailureDetails"): - f.write(" Details:\n") - f.write(" Message: %s\n" % get_node_text(details.getElementsByTagName("Message")[0])) - f.write(" Condition: %s\n" % get_node_text(details.getElementsByTagName("Condition")[0])) - f.write(" Actual: %s\n" % get_node_text(details.getElementsByTagName("Actual")[0])) - f.write(" Limit: %s\n" % get_node_text(details.getElementsByTagName("Limit")[0])) - f.write(" File: %s\n" % get_node_text(details.getElementsByTagName("File")[0])) - f.write(" Line: %s\n" % get_node_text(details.getElementsByTagName("Line")[0])) - - for example in dom.getElementsByTagName("Example"): - result = get_node_text(example.getElementsByTagName("Result")[0]) - name = get_node_text(example.getElementsByTagName("Name")[0]) - time = get_node_text(example.getElementsByTagName("ElapsedTime")[0]) - output = "%s: Example \"%s\" (%s)\n" % (result, name, time) + for example in et.findall('Example'): + result = example.find('Result').text + name = example.find('Name').text + if not example.find('Time') is None: + time_real = example.find('Time').get('real') + else: + time_real = '' + output = "%s: Example \"%s\" (%s)\n" % (result, name, time_real) f.write(output) f.close() @@ -231,20 +227,18 @@ def translate_to_html(results_file, html_file): # # Read and parse the whole results file. # - dom = xml.dom.minidom.parse(results_file) + import xml.etree.ElementTree as ET + et = ET.parse(results_file) # # Iterate through the test suites # f.write("

Test Suites

\n") - for suite in dom.getElementsByTagName("TestSuite"): - + for suite in et.findall('Test'): # # For each test suite, get its name, result and execution time info # - name = get_node_text(suite.getElementsByTagName("SuiteName")[0]) - result = get_node_text(suite.getElementsByTagName("SuiteResult")[0]) - time = get_node_text(suite.getElementsByTagName("SuiteTime")[0]) + (result, name, time) = read_test (suite) # # Print a level three header with the result, name and time. If the @@ -316,15 +310,13 @@ def translate_to_html(results_file, html_file): # # Now iterate through all of the test cases. # - for case in suite.getElementsByTagName("TestCase"): + for case in suite.findall('Test'): # # Get the name, result and timing information from xml to use in # printing table below. # - name = get_node_text(case.getElementsByTagName("CaseName")[0]) - result = get_node_text(case.getElementsByTagName("CaseResult")[0]) - time = get_node_text(case.getElementsByTagName("CaseTime")[0]) + (result, name, time) = read_test(case) # # If the test case failed, we iterate through possibly multiple @@ -349,7 +341,7 @@ def translate_to_html(results_file, html_file): # first_row = True - for details in case.getElementsByTagName("FailureDetails"): + for details in case.findall('FailureDetails'): # # Start a new row in the table for each possible Failure Detail @@ -367,12 +359,12 @@ def translate_to_html(results_file, html_file): f.write("\n") f.write("") - f.write("Message: %s, " % get_node_text(details.getElementsByTagName("Message")[0])) - f.write("Condition: %s, " % get_node_text(details.getElementsByTagName("Condition")[0])) - f.write("Actual: %s, " % get_node_text(details.getElementsByTagName("Actual")[0])) - f.write("Limit: %s, " % get_node_text(details.getElementsByTagName("Limit")[0])) - f.write("File: %s, " % get_node_text(details.getElementsByTagName("File")[0])) - f.write("Line: %s" % get_node_text(details.getElementsByTagName("Line")[0])) + f.write("Message: %s, " % details.find('Message').text) + f.write("Condition: %s, " % details.find('Condition').text) + f.write("Actual: %s, " % details.find('Actual').text) + f.write("Limit: %s, " % details.find('Limit').text) + f.write("File: %s, " % details.find('File').text) + f.write("Line: %s" % details.find('Line').text) f.write("\n") # @@ -428,7 +420,7 @@ def translate_to_html(results_file, html_file): # # Now iterate through all of the examples # - for example in dom.getElementsByTagName("Example"): + for example in et.findall("Example"): # # Start a new row for each example @@ -438,9 +430,7 @@ def translate_to_html(results_file, html_file): # # Get the result and name of the example in question # - result = get_node_text(example.getElementsByTagName("Result")[0]) - name = get_node_text(example.getElementsByTagName("Name")[0]) - time = get_node_text(example.getElementsByTagName("ElapsedTime")[0]) + (result, name, time) = read_test(example) # # If the example either failed or crashed, print its result status @@ -786,7 +776,7 @@ class Job: # # This is the shell command that will be executed in the job. For example, # - # "utils/test-runner --suite=some-test-suite" + # "utils/test-runner --test-name=some-test-suite" # def set_shell_command(self, shell_command): self.shell_command = shell_command @@ -919,8 +909,12 @@ class worker_thread(threading.Thread): # to the test runner, specifically the base directory and temp # file name # + if options.update_data: + update_data = '--update-data' + else: + update_data = '' (job.returncode, standard_out, standard_err, et) = run_job_synchronously(job.shell_command + - " --basedir=%s --tempdir=%s --out=%s" % (job.basedir, job.tempdir, job.tmp_file_name), + " --xml --tempdir=%s --out=%s %s" % (job.tempdir, job.tmp_file_name, update_data), job.cwd, options.valgrind, False) job.set_elapsed_time(et) @@ -1063,12 +1057,12 @@ def run_tests(): # handle them without doing all of the hard work. # if options.kinds: - path_cmd = os.path.join("utils", "test-runner --kinds") + path_cmd = os.path.join("utils", "test-runner --print-test-type-list") (rc, standard_out, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False) print standard_out if options.list: - path_cmd = os.path.join("utils", "test-runner --list") + path_cmd = os.path.join("utils", "test-runner --print-test-name-list") (rc, standard_out, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False) print standard_out @@ -1113,7 +1107,7 @@ def run_tests(): xml_results_file = os.path.join(testpy_output_dir, "results.xml") f = open(xml_results_file, 'w') f.write('\n') - f.write('\n') + f.write('\n') f.close() # @@ -1141,10 +1135,10 @@ def run_tests(): suites = options.suite + "\n" elif len(options.example) == 0 and len(options.pyexample) == 0: if len(options.constrain): - path_cmd = os.path.join("utils", "test-runner --list --constrain=%s" % options.constrain) + path_cmd = os.path.join("utils", "test-runner --print-test-name-list --test-type=%s" % options.constrain) (rc, suites, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False) else: - path_cmd = os.path.join("utils", "test-runner --list") + path_cmd = os.path.join("utils", "test-runner --print-test-name-list") (rc, suites, standard_err, et) = run_job_synchronously(path_cmd, os.getcwd(), False, False) else: suites = "" @@ -1222,11 +1216,11 @@ def run_tests(): job.set_basedir(os.getcwd()) job.set_tempdir(testpy_output_dir) if (options.multiple): - multiple = " --multiple" - else: multiple = "" + else: + multiple = " --stop-on-failure" - path_cmd = os.path.join("utils", "test-runner --suite=%s%s" % (test, multiple)) + path_cmd = os.path.join("utils", "test-runner --test-name=%s%s" % (test, multiple)) job.set_shell_command(path_cmd) if options.valgrind and test in core_valgrind_skip_tests: @@ -1510,7 +1504,7 @@ def run_tests(): else: f.write(' CRASH\n') - f.write(' %.3f\n' % job.elapsed_time) + f.write(' \n') + f.write('\n') f.close() # @@ -1669,6 +1660,9 @@ def main(argv): metavar="EXAMPLE", help="specify a single example to run (with relative path)") + parser.add_option("-u", "--update-data", action="store_true", dest="update_data", default=False, + help="If examples use reference data files, get them to re-generate them") + parser.add_option("-g", "--grind", action="store_true", dest="valgrind", default=False, help="run the test suites and examples using valgrind") diff --git a/utils/test-runner.cc b/utils/test-runner.cc index 93ad3738e..d44ee42d2 100644 --- a/utils/test-runner.cc +++ b/utils/test-runner.cc @@ -17,455 +17,8 @@ */ #include "ns3/test.h" -#include "ns3/assert.h" -#include "ns3/abort.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -extern bool gBreakOnFailure; - -using namespace ns3; - -// -// Create a temporary directory for use by test programs. This is not a -// foolproof thing, but a reasonably good way to get a throwaway directory -// while running tests in a debugger. -// -std::string -TempDir (void) +int main (int argc, char *argv[]) { - char *path = NULL; - - path = getenv ("TMP"); - if (path == NULL) - { - path = getenv ("TEMP"); - if (path == NULL) - { - path = const_cast ("/tmp"); - } - } - - // - // Just in case the user wants to go back and find the output, we give - // a hint as to which dir we created by including a time hint. - // - time_t now = time (NULL); - struct tm *tm_now = localtime (&now); - - // - // But we also randomize the name in case there are multiple users doing - // this at the same time - // - srand (time (0)); - long int n = rand (); - - // - // The final path to the directory is going to look something like - // - // /tmp/ns3-14.30.29.32767 - // - // The first segment comes from one of the temporary directory env - // variables or /tmp if not found. The directory name starts with an - // identifier telling folks who is making all of the temp directories - // and then the local time (in this case 14.30.29 -- which is 2:30 and - // 29 seconds PM). - // - char dirname[1024]; - snprintf (dirname, sizeof(dirname), "%s/ns-3.%d.%d.%d.%ld", path, tm_now->tm_hour, tm_now->tm_min, tm_now->tm_sec, n); - -#if (defined(_WIN32) || defined(_WIN64)) && !defined(__CYGWIN__) - if(mkdir(dirname) == 0) -#else - if (mkdir (dirname, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == 0) -#endif - { - return dirname; - } - else - { - return ""; - } -} - -// -// Test suites may need to figure out where their source directory is in order -// to find test vectors. To do that they will need to know where the base -// directory of the distribution is (the directory in which "src" is found). -// It is painful for a user debugging test suites to always provide that dir -// so we try and find it in the current directory tree. -// -std::string -BaseDir (void) -{ - // - // Get an absolute path to the current working directory. Following code - // depends on the leading '/' - // - char pathbuf[PATH_MAX]; - if (getcwd (pathbuf, sizeof(pathbuf)) == NULL) - { - NS_ABORT_MSG ("Basedir(): unable to getcwd()"); - } - - // - // Walk up the directory tree looking for a directory that has files that - // indicate it is the base of an ns-3 distribution. We use VERSION and - // LICENSE which have been there from the beginning of time. - // - for (;;) - { - bool haveVersion = false; - bool haveLicense = false; - - // - // Open the directory file for the current directory and loop through - // the directory entries. - // - DIR *dp = opendir (pathbuf); - if (dp != NULL) - { - while (struct dirent *de = readdir (dp)) - { - if (strcmp (de->d_name, "VERSION") == 0) - { - haveVersion = true; - } - - if (strcmp (de->d_name, "LICENSE") == 0) - { - haveLicense = true; - } - } - } - closedir (dp); - - // - // If there's a file named VERSION and a file named LICENSE in this - // directory, we assume it's our base directory. - // - if (haveVersion && haveLicense) - { - return pathbuf; - } - - // - // Strip off the last segment of the current directory. - // - char *last = strrchr (pathbuf, '/'); - NS_ASSERT_MSG (last, "No \"/\" found in absolute path ???"); - *last = '\0'; - - if (strlen(pathbuf) == 0) - { - return ""; - } - } - - // - // Quiet the compiler. - // - return ""; -} - -// -// Run one of the test suites. Returns an integer with the boolean sense of -// "an error has occurred." That is, 0 == false -> no error; 1 == true -> an -// error occurred. -// -int -main (int argc, char *argv[]) -{ - bool doVerbose = false; - bool doList = false; - bool doMultiple = false; - bool doHelp = false; - bool doSuite = false; - bool doKinds = false; - - gBreakOnFailure = false; - - bool haveBasedir = false; - bool haveTempdir = false; - bool haveType = false; - - std::string suiteName; - std::string basedir; - std::string tempdir; - std::string outfileName; - std::string typeName; - - - for (int i = 1; i < argc; ++i) - { - std::string arg(argv[i]); - - if (arg.find ("--assert") != std::string::npos) - { - gBreakOnFailure = true; - } - - if (arg.find ("--basedir=") != std::string::npos) - { - basedir = arg.substr (arg.find_first_of ("=") + 1, 9999); - haveBasedir = true; - } - - if (arg.find ("--constrain=") != std::string::npos) - { - typeName = arg.substr (arg.find_first_of ("=") + 1, 9999); - haveType = true; - } - - if (arg.compare ("--help") == 0) - { - doHelp = true; - } - - if (arg.compare ("--kinds") == 0) - { - doKinds = true; - } - - if (arg.compare ("--list") == 0) - { - doList = true; - } - - if (arg.compare ("--multiple") == 0) - { - doMultiple = true; - } - - if (arg.find ("--out=") != std::string::npos) - { - outfileName = arg.substr (arg.find_first_of ("=") + 1, 9999); - } - - if (arg.find ("--suite=") != std::string::npos) - { - suiteName = arg.substr (arg.find_first_of ("=") + 1, 9999); - doSuite = true; - } - - if (arg.find ("--tempdir=") != std::string::npos) - { - tempdir = arg.substr (arg.find_first_of ("=") + 1, 9999); - haveTempdir = true; - } - - if (arg.compare ("--verbose") == 0) - { - doVerbose = true; - } - } - - // - // A help request trumps everything else. If we have one, just print the help - // and leave. - // - if (doHelp) - { - std::cout << " --assert: Tell tests to segfault (like assert) if an error is detected" << std::endl; - std::cout << " --basedir=dir: Set the base directory (where to find src) to \"dir\"" << std::endl; - std::cout << " --tempdir=dir: Set the temporary directory (where to find data files) to \"dir\"" << std::endl; - std::cout << " --constrain=test-type: Constrain checks to test suites of type \"test-type\"" << std::endl; - std::cout << " --help: Print this message" << std::endl; - std::cout << " --kinds: List all of the available kinds of tests" << std::endl; - std::cout << " --list: List all of the test suites (optionally constrained by test-type)" << std::endl; - std::cout << " --multiple: Allow test suites and cases to produce multiple failures" << std::endl; - std::cout << " --out=file-name: Set the test status output file to \"file-name\"" << std::endl; - std::cout << " --suite=suite-name: Run the test suite named \"suite-name\"" << std::endl; - std::cout << " --verbose: Turn on messages in the run test suites" << std::endl; - - return false; - } - - // - // A kinds request trumps everything remaining. If we are asked, just - // print the list of types and leave. - // - if (doKinds) - { - // - // Coming up with a string to represent a test type is completely up to - // us here. We just define the types as being a string composed of the - // enum defined in test.h converted to lower case. - // - std::cout << " bvt: Build Verification Tests (to see if build completed successfully)" << std::endl; - std::cout << " core: Run all TestSuite-based tests (exclude examples)" << std::endl; - std::cout << " example: Examples (to see if example programs run successfully)" << std::endl; - std::cout << " performance: Performance Tests (check to see if the system is as fast as expected)" << std::endl; - std::cout << " system: System Tests (spans modules to check integration of modules)" << std::endl; - std::cout << " unit: Unit Tests (within modules to check basic functionality)" << std::endl; - - return false; - } - - // - // A list request is the first functional request. It trumps running the - // actual tests. If we get a list request, we don't run anything, we just - // do the requested list which may or may not be qualified by a typename. - // - if (doList) - { - for (uint32_t i = 0; i < TestRunner::GetNTestSuites (); ++i) - { - TestSuite *suite = TestRunner::GetTestSuite (i); - - // - // Filter the tests listed by type if requested. The special typeName - // "core" means any TestSuite. - // - if (haveType && typeName != "core") - { - TestSuite::TestType type = suite->GetTestType (); - if (typeName == "bvt" && type != TestSuite::BVT) - { - continue; - } - - if (typeName == "unit" && type != TestSuite::UNIT) - { - continue; - } - - if (typeName == "system" && type != TestSuite::SYSTEM) - { - continue; - } - - if (typeName == "example" && type != TestSuite::EXAMPLE) - { - continue; - } - - if (typeName == "performance" && type != TestSuite::PERFORMANCE) - { - continue; - } - } - - // - // This creates a list of test suite names that can be used by the - // high level test manager to get a list of all tests. It will then - // typically launch individual tests in parallel, calling back here - // with a specific "suite=" to run. - // - std::cout << suite->GetName () << std::endl; - } - - return false; - } - - // - // We have a lot of options possible to provide flexibility. It can become - // painful, however, to provide all of the options when debugging, and it - // turns out that not all tests require all options. It is really helpful - // to try and put together some reasonable defaults if we're not provided - // them. - // - if (!haveTempdir) - { - // - // No temporary directory was provided. We don't know if the selected - // test or tests will need one, but we can cook something up. The - // tmpnam function has its own set of problems, so we'll just do our - // own thing. - // - tempdir = TempDir (); - if (tempdir.size ()) - { - std::cout << "Temporary directory not provided. Using \"" << tempdir << "\"" << std::endl; - haveTempdir = true; - } - else - { - std::cout << "Temporary directory not provided and unable to create one." << std::endl; - return true; - } - } - - if (haveBasedir == false) - { - // - // No basedir was provided. If we don't have it, we can try and find it - // in the current directory tree. - // - basedir = BaseDir (); - if (basedir.size ()) - { - std::cout << "Base directory not provided. Using \"" << basedir << "\"" << std::endl; - haveBasedir = true; - } - else - { - std::cout << "Base directory not provided and unable to find one." << std::endl; - return true; - } - } - - // - // If given an output file, we just append the output of each test suite - // we're asked to run to the end of that file. We need to append since the - // higher level test runner may be just running a number of tests back to - // back. We leave it up to that code to decide how to deal with possible - // parallel operation -- we just append to a file here. If no output file - // is specified, we don't do any output and just return the sense of error - // given by the test. - // - std::ofstream *pofs = 0; - std::ofstream ofs; - - if (!outfileName.empty ()) - { - ofs.open (outfileName.c_str (), std::fstream::out | std::fstream::app); - pofs = &ofs; - } - - // - // If we have a specified test suite to run, then we only run that suite. - // The default case is to "run everything. We don't expect this to be done - // much since typically higher level code will be running suites in parallel - // but we'll do it if asked. - // - bool result = false; - bool suiteRan = false; - - for (uint32_t i = 0; i < TestRunner::GetNTestSuites (); ++i) - { - TestSuite *testSuite = TestRunner::GetTestSuite (i); - if (doSuite == false || (doSuite == true && suiteName == testSuite->GetName ())) - { - testSuite->SetBaseDir (basedir); - testSuite->SetTempDir (tempdir); - testSuite->SetStream (pofs); - testSuite->SetVerbose (doVerbose); - testSuite->SetContinueOnFailure (doMultiple); - result |= testSuite->Run (); - suiteRan = true; - } - } - - ofs.close(); - - // - // If we couldn't figure out how to run at least one test, then return an error - // - if (suiteRan == false) - { - std::cout << "Unable to find a test to run (constraints too severe or test not found)" << std::endl; - return true; - } - - return result; + return ns3::TestRunner::Run (argc, argv); } From 112b892b189ee10fcd068a0bea3723a83cf24c14 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Fri, 29 Jul 2011 13:24:16 -0700 Subject: [PATCH 035/202] Bug 1225 - NS_TEST_SOURCEDIR is being treated as if were a std::string --- src/test/ns3tcp/ns3tcp-interop-test-suite.cc | 5 ++++- src/test/ns3tcp/ns3tcp-state-test-suite.cc | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc index 20dd7106e..12512e1e4 100644 --- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include + #include "ns3/log.h" #include "ns3/abort.h" #include "ns3/test.h" @@ -110,7 +112,8 @@ Ns3TcpInteroperabilityTestCase::DoSetup (void) // We expect there to be a file called tcp-interop-response-vectors.pcap in // response-vectors/ of this directory // - m_pcapFilename = NS_TEST_SOURCEDIR + "/response-vectors/ns3tcp-interop-response-vectors.pcap"; + m_pcapFilename = static_cast (NS_TEST_SOURCEDIR) + + static_cast ("/response-vectors/ns3tcp-interop-response-vectors.pcap"); if (m_writeVectors) { diff --git a/src/test/ns3tcp/ns3tcp-state-test-suite.cc b/src/test/ns3tcp/ns3tcp-state-test-suite.cc index b141dfc36..938c8509e 100644 --- a/src/test/ns3tcp/ns3tcp-state-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-state-test-suite.cc @@ -17,6 +17,7 @@ */ #include +#include #include "ns3/log.h" #include "ns3/abort.h" @@ -116,7 +117,7 @@ Ns3TcpStateTestCase::DoSetup (void) // std::ostringstream oss; oss << "/response-vectors/ns3tcp-state" << m_testCase << "-response-vectors.pcap"; - m_pcapFilename = NS_TEST_SOURCEDIR + oss.str (); + m_pcapFilename = static_cast (NS_TEST_SOURCEDIR) + oss.str (); if (m_writeVectors) { From 4b93c8f43984f46f5829e8682c74fc6c7610f4a4 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 28 Jul 2011 21:36:19 -0700 Subject: [PATCH 036/202] Remove outdated reference to RandomVariable::GetSingleValue --- src/core/model/random-variable.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/core/model/random-variable.h b/src/core/model/random-variable.h index 1b9bcefe0..70babbf29 100644 --- a/src/core/model/random-variable.h +++ b/src/core/model/random-variable.h @@ -158,9 +158,8 @@ protected: * The low end of the range is always included and the high end * of the range is always excluded. * \code - * UniformVariable x(0,10); - * x.GetValue(); //will always return numbers [0,10) - * UniformVariable::GetSingleValue(100,1000); //returns a value [100,1000) + * UniformVariable x (0,10); + * x.GetValue (); //will always return numbers [0,10) * \endcode */ class UniformVariable : public RandomVariable @@ -296,9 +295,7 @@ public: * * \code * ExponentialVariable x(3.14); - * x.GetValue(); //will always return with mean 3.14 - * ExponentialVariable::GetSingleValue(20.1); //returns with mean 20.1 - * ExponentialVariable::GetSingleValue(108); //returns with mean 108 + * x.GetValue (); //will always return with mean 3.14 * \endcode * */ @@ -348,10 +345,8 @@ public: * with the equation \f$ x_m = mean \frac{k-1}{k}, k > 1\f$. * * \code - * ParetoVariable x(3.14); - * x.GetValue(); //will always return with mean 3.14 - * ParetoVariable::GetSingleValue(20.1); //returns with mean 20.1 - * ParetoVariable::GetSingleValue(108); //returns with mean 108 + * ParetoVariable x (3.14); + * x.GetValue (); //will always return with mean 3.14 * \endcode */ class ParetoVariable : public RandomVariable From a2551b178fb535ce2cbf1b4de44a02b6df8979b4 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Thu, 28 Jul 2011 17:41:49 -0700 Subject: [PATCH 037/202] Function log the TcpNewReno::DupAck() --- src/internet/model/tcp-newreno.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/internet/model/tcp-newreno.cc b/src/internet/model/tcp-newreno.cc index fd7d14b0f..bb68e8333 100644 --- a/src/internet/model/tcp-newreno.cc +++ b/src/internet/model/tcp-newreno.cc @@ -147,6 +147,7 @@ TcpNewReno::NewAck (const SequenceNumber32& seq) void TcpNewReno::DupAck (const TcpHeader& t, uint32_t count) { + NS_LOG_FUNCTION (this << count); if (count == 3 && !m_inFastRec) { // triple duplicate ack triggers fast retransmit (RFC2582 sec.3 bullet #1) m_ssThresh = std::max (2 * m_segmentSize, BytesInFlight () / 2); From 4c41275a1114b9b75e915c81f98328ffc52f379b Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 2 Aug 2011 01:59:36 -0700 Subject: [PATCH 038/202] remove ns3/ prefix which is un-needed now that all files are in same module. --- src/core/model/calendar-scheduler.cc | 4 ++-- src/core/model/command-line.h | 2 +- src/core/model/default-simulator-impl.cc | 8 ++++---- src/core/model/default-simulator-impl.h | 2 +- src/core/model/event-id.h | 2 +- src/core/model/event-impl.h | 2 +- src/core/model/heap-scheduler.cc | 4 ++-- src/core/model/int64x64-128.cc | 4 ++-- src/core/model/int64x64-cairo.cc | 6 +++--- src/core/model/int64x64.cc | 2 +- src/core/model/list-scheduler.cc | 2 +- src/core/model/make-event.h | 2 +- src/core/model/map-scheduler.cc | 4 ++-- src/core/model/names.h | 4 ++-- src/core/model/ns2-calendar-scheduler.cc | 4 ++-- src/core/model/nstime.h | 8 ++++---- src/core/model/realtime-simulator-impl.cc | 16 ++++++++-------- src/core/model/realtime-simulator-impl.h | 8 ++++---- src/core/model/scheduler.cc | 2 +- src/core/model/scheduler.h | 2 +- src/core/model/simulator-impl.h | 6 +++--- src/core/model/simulator.cc | 12 ++++++------ src/core/model/simulator.h | 4 ++-- src/core/model/synchronizer.h | 2 +- src/core/model/time.cc | 12 ++++++------ src/core/model/timer-impl.h | 6 +++--- src/core/model/timer.h | 4 ++-- src/core/model/unix-fd-reader.cc | 10 +++++----- src/core/model/unix-fd-reader.h | 6 +++--- src/core/model/vector.cc | 2 +- src/core/model/vector.h | 4 ++-- src/core/model/wall-clock-synchronizer.cc | 4 ++-- src/core/model/wall-clock-synchronizer.h | 2 +- 33 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/core/model/calendar-scheduler.cc b/src/core/model/calendar-scheduler.cc index 10977f9e6..5c2e4a87c 100644 --- a/src/core/model/calendar-scheduler.cc +++ b/src/core/model/calendar-scheduler.cc @@ -23,8 +23,8 @@ #include #include #include -#include "ns3/assert.h" -#include "ns3/log.h" +#include "assert.h" +#include "log.h" namespace ns3 { diff --git a/src/core/model/command-line.h b/src/core/model/command-line.h index 012c4b272..934b955fa 100644 --- a/src/core/model/command-line.h +++ b/src/core/model/command-line.h @@ -24,7 +24,7 @@ #include #include -#include "ns3/callback.h" +#include "callback.h" namespace ns3 { diff --git a/src/core/model/default-simulator-impl.cc b/src/core/model/default-simulator-impl.cc index b3793da42..144648648 100644 --- a/src/core/model/default-simulator-impl.cc +++ b/src/core/model/default-simulator-impl.cc @@ -23,10 +23,10 @@ #include "scheduler.h" #include "event-impl.h" -#include "ns3/ptr.h" -#include "ns3/pointer.h" -#include "ns3/assert.h" -#include "ns3/log.h" +#include "ptr.h" +#include "pointer.h" +#include "assert.h" +#include "log.h" #include diff --git a/src/core/model/default-simulator-impl.h b/src/core/model/default-simulator-impl.h index 0fd8a11cb..f2f1a892d 100644 --- a/src/core/model/default-simulator-impl.h +++ b/src/core/model/default-simulator-impl.h @@ -25,7 +25,7 @@ #include "scheduler.h" #include "event-impl.h" -#include "ns3/ptr.h" +#include "ptr.h" #include diff --git a/src/core/model/event-id.h b/src/core/model/event-id.h index 97b9f18bb..312de66e7 100644 --- a/src/core/model/event-id.h +++ b/src/core/model/event-id.h @@ -21,7 +21,7 @@ #define EVENT_ID_H #include -#include "ns3/ptr.h" +#include "ptr.h" #include "event-impl.h" namespace ns3 { diff --git a/src/core/model/event-impl.h b/src/core/model/event-impl.h index a8faa0676..9eef400f2 100644 --- a/src/core/model/event-impl.h +++ b/src/core/model/event-impl.h @@ -21,7 +21,7 @@ #define EVENT_IMPL_H #include -#include "ns3/simple-ref-count.h" +#include "simple-ref-count.h" namespace ns3 { diff --git a/src/core/model/heap-scheduler.cc b/src/core/model/heap-scheduler.cc index 71e6e492c..309c58df3 100644 --- a/src/core/model/heap-scheduler.cc +++ b/src/core/model/heap-scheduler.cc @@ -22,8 +22,8 @@ #include "heap-scheduler.h" #include "event-impl.h" -#include "ns3/assert.h" -#include "ns3/log.h" +#include "assert.h" +#include "log.h" NS_LOG_COMPONENT_DEFINE ("HeapScheduler"); diff --git a/src/core/model/int64x64-128.cc b/src/core/model/int64x64-128.cc index ea6b948c9..4f5272913 100644 --- a/src/core/model/int64x64-128.cc +++ b/src/core/model/int64x64-128.cc @@ -1,6 +1,6 @@ #include "int64x64-128.h" -#include "ns3/abort.h" -#include "ns3/assert.h" +#include "abort.h" +#include "assert.h" namespace ns3 { diff --git a/src/core/model/int64x64-cairo.cc b/src/core/model/int64x64-cairo.cc index 4c05da45b..56c34e757 100644 --- a/src/core/model/int64x64-cairo.cc +++ b/src/core/model/int64x64-cairo.cc @@ -18,9 +18,9 @@ * Author: Mathieu Lacage */ #include "int64x64-cairo.h" -#include "ns3/test.h" -#include "ns3/abort.h" -#include "ns3/assert.h" +#include "test.h" +#include "abort.h" +#include "assert.h" #include #include diff --git a/src/core/model/int64x64.cc b/src/core/model/int64x64.cc index 99840e37b..f5d0cb752 100644 --- a/src/core/model/int64x64.cc +++ b/src/core/model/int64x64.cc @@ -2,7 +2,7 @@ #include #include #include -#include "ns3/assert.h" +#include "assert.h" namespace ns3 { diff --git a/src/core/model/list-scheduler.cc b/src/core/model/list-scheduler.cc index 3a7198de1..4da4398dc 100644 --- a/src/core/model/list-scheduler.cc +++ b/src/core/model/list-scheduler.cc @@ -22,7 +22,7 @@ #include "event-impl.h" #include #include -#include "ns3/assert.h" +#include "assert.h" namespace ns3 { diff --git a/src/core/model/make-event.h b/src/core/model/make-event.h index 0ce5199b9..66b50c6cf 100644 --- a/src/core/model/make-event.h +++ b/src/core/model/make-event.h @@ -57,7 +57,7 @@ EventImpl * MakeEvent (void (*f)(U1,U2,U3,U4,U5), T1 a1, T2 a2, T3 a3, T4 a4, T5 ********************************************************************/ #include "event-impl.h" -#include "ns3/type-traits.h" +#include "type-traits.h" namespace ns3 { diff --git a/src/core/model/map-scheduler.cc b/src/core/model/map-scheduler.cc index 3eb4776a6..1216818c0 100644 --- a/src/core/model/map-scheduler.cc +++ b/src/core/model/map-scheduler.cc @@ -21,8 +21,8 @@ #include "map-scheduler.h" #include "event-impl.h" -#include "ns3/assert.h" -#include "ns3/log.h" +#include "assert.h" +#include "log.h" #include NS_LOG_COMPONENT_DEFINE ("MapScheduler"); diff --git a/src/core/model/names.h b/src/core/model/names.h index ba7c153a1..3ac74e151 100644 --- a/src/core/model/names.h +++ b/src/core/model/names.h @@ -19,8 +19,8 @@ #ifndef OBJECT_NAMES_H #define OBJECT_NAMES_H -#include "ns3/ptr.h" -#include "ns3/object.h" +#include "ptr.h" +#include "object.h" namespace ns3 { diff --git a/src/core/model/ns2-calendar-scheduler.cc b/src/core/model/ns2-calendar-scheduler.cc index 92c7519fb..3bc1019fe 100644 --- a/src/core/model/ns2-calendar-scheduler.cc +++ b/src/core/model/ns2-calendar-scheduler.cc @@ -20,8 +20,8 @@ #include "ns2-calendar-scheduler.h" #include "event-impl.h" -#include "ns3/assert.h" -#include "ns3/log.h" +#include "assert.h" +#include "log.h" #include #include #include diff --git a/src/core/model/nstime.h b/src/core/model/nstime.h index 7979226a6..e71e8c3bb 100644 --- a/src/core/model/nstime.h +++ b/src/core/model/nstime.h @@ -20,10 +20,10 @@ #ifndef TIME_H #define TIME_H -#include "ns3/assert.h" -#include "ns3/attribute.h" -#include "ns3/attribute-helper.h" -#include "ns3/int64x64.h" +#include "assert.h" +#include "attribute.h" +#include "attribute-helper.h" +#include "int64x64.h" #include #include #include diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index 6acb7ddee..c4cd7fd4c 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -23,14 +23,14 @@ #include "event-impl.h" #include "synchronizer.h" -#include "ns3/ptr.h" -#include "ns3/pointer.h" -#include "ns3/assert.h" -#include "ns3/fatal-error.h" -#include "ns3/log.h" -#include "ns3/system-mutex.h" -#include "ns3/boolean.h" -#include "ns3/enum.h" +#include "ptr.h" +#include "pointer.h" +#include "assert.h" +#include "fatal-error.h" +#include "log.h" +#include "system-mutex.h" +#include "boolean.h" +#include "enum.h" #include diff --git a/src/core/model/realtime-simulator-impl.h b/src/core/model/realtime-simulator-impl.h index dd1ee2b2e..c5a0955d7 100644 --- a/src/core/model/realtime-simulator-impl.h +++ b/src/core/model/realtime-simulator-impl.h @@ -25,10 +25,10 @@ #include "synchronizer.h" #include "event-impl.h" -#include "ns3/ptr.h" -#include "ns3/assert.h" -#include "ns3/log.h" -#include "ns3/system-mutex.h" +#include "ptr.h" +#include "assert.h" +#include "log.h" +#include "system-mutex.h" #include diff --git a/src/core/model/scheduler.cc b/src/core/model/scheduler.cc index b416fee0f..79d038022 100644 --- a/src/core/model/scheduler.cc +++ b/src/core/model/scheduler.cc @@ -19,7 +19,7 @@ */ #include "scheduler.h" -#include "ns3/assert.h" +#include "assert.h" namespace ns3 { diff --git a/src/core/model/scheduler.h b/src/core/model/scheduler.h index a78c070e1..9e5df6ca6 100644 --- a/src/core/model/scheduler.h +++ b/src/core/model/scheduler.h @@ -22,7 +22,7 @@ #define SCHEDULER_H #include -#include "ns3/object.h" +#include "object.h" namespace ns3 { diff --git a/src/core/model/simulator-impl.h b/src/core/model/simulator-impl.h index 063a9deb5..4ac94c91d 100644 --- a/src/core/model/simulator-impl.h +++ b/src/core/model/simulator-impl.h @@ -24,9 +24,9 @@ #include "event-impl.h" #include "event-id.h" #include "nstime.h" -#include "ns3/object.h" -#include "ns3/object-factory.h" -#include "ns3/ptr.h" +#include "object.h" +#include "object-factory.h" +#include "ptr.h" namespace ns3 { diff --git a/src/core/model/simulator.cc b/src/core/model/simulator.cc index 729dc52a7..4aa4b3e08 100644 --- a/src/core/model/simulator.cc +++ b/src/core/model/simulator.cc @@ -24,12 +24,12 @@ #include "map-scheduler.h" #include "event-impl.h" -#include "ns3/ptr.h" -#include "ns3/string.h" -#include "ns3/object-factory.h" -#include "ns3/global-value.h" -#include "ns3/assert.h" -#include "ns3/log.h" +#include "ptr.h" +#include "string.h" +#include "object-factory.h" +#include "global-value.h" +#include "assert.h" +#include "log.h" #include #include diff --git a/src/core/model/simulator.h b/src/core/model/simulator.h index c0d008d6d..12a837ffb 100644 --- a/src/core/model/simulator.h +++ b/src/core/model/simulator.h @@ -26,8 +26,8 @@ #include "make-event.h" #include "nstime.h" -#include "ns3/deprecated.h" -#include "ns3/object-factory.h" +#include "deprecated.h" +#include "object-factory.h" #include #include diff --git a/src/core/model/synchronizer.h b/src/core/model/synchronizer.h index 14143bdc0..2b5010ca4 100644 --- a/src/core/model/synchronizer.h +++ b/src/core/model/synchronizer.h @@ -21,7 +21,7 @@ #include #include "nstime.h" -#include "ns3/object.h" +#include "object.h" namespace ns3 { diff --git a/src/core/model/time.cc b/src/core/model/time.cc index ddf6008ff..10b393428 100644 --- a/src/core/model/time.cc +++ b/src/core/model/time.cc @@ -20,12 +20,12 @@ * TimeStep support by Emmanuelle Laprise */ #include "nstime.h" -#include "ns3/abort.h" -#include "ns3/global-value.h" -#include "ns3/enum.h" -#include "ns3/string.h" -#include "ns3/object.h" -#include "ns3/config.h" +#include "abort.h" +#include "global-value.h" +#include "enum.h" +#include "string.h" +#include "object.h" +#include "config.h" #include #include diff --git a/src/core/model/timer-impl.h b/src/core/model/timer-impl.h index 75a4e2fa6..c42486485 100644 --- a/src/core/model/timer-impl.h +++ b/src/core/model/timer-impl.h @@ -21,9 +21,9 @@ #define TIMER_IMPL_H #include "simulator.h" -#include "ns3/type-traits.h" -#include "ns3/fatal-error.h" -#include "ns3/int-to-type.h" +#include "type-traits.h" +#include "fatal-error.h" +#include "int-to-type.h" namespace ns3 { diff --git a/src/core/model/timer.h b/src/core/model/timer.h index f4cb21e84..d74cd07b8 100644 --- a/src/core/model/timer.h +++ b/src/core/model/timer.h @@ -20,10 +20,10 @@ #ifndef TIMER_H #define TIMER_H -#include "ns3/fatal-error.h" +#include "fatal-error.h" #include "nstime.h" #include "event-id.h" -#include "ns3/int-to-type.h" +#include "int-to-type.h" namespace ns3 { diff --git a/src/core/model/unix-fd-reader.cc b/src/core/model/unix-fd-reader.cc index e5a6ae413..5637c51c4 100644 --- a/src/core/model/unix-fd-reader.cc +++ b/src/core/model/unix-fd-reader.cc @@ -24,11 +24,11 @@ #include #include -#include "ns3/log.h" -#include "ns3/fatal-error.h" -#include "ns3/simple-ref-count.h" -#include "ns3/system-thread.h" -#include "ns3/simulator.h" +#include "log.h" +#include "fatal-error.h" +#include "simple-ref-count.h" +#include "system-thread.h" +#include "simulator.h" #include "unix-fd-reader.h" diff --git a/src/core/model/unix-fd-reader.h b/src/core/model/unix-fd-reader.h index c642cf5ed..d5349c72f 100644 --- a/src/core/model/unix-fd-reader.h +++ b/src/core/model/unix-fd-reader.h @@ -23,9 +23,9 @@ #include -#include "ns3/callback.h" -#include "ns3/system-thread.h" -#include "ns3/event-id.h" +#include "callback.h" +#include "system-thread.h" +#include "event-id.h" namespace ns3 { diff --git a/src/core/model/vector.cc b/src/core/model/vector.cc index feb218e09..75ca81048 100644 --- a/src/core/model/vector.cc +++ b/src/core/model/vector.cc @@ -18,7 +18,7 @@ * Author: Mathieu Lacage */ #include "vector.h" -#include "ns3/fatal-error.h" +#include "fatal-error.h" #include #include diff --git a/src/core/model/vector.h b/src/core/model/vector.h index 1d5851dc9..ee0f0be29 100644 --- a/src/core/model/vector.h +++ b/src/core/model/vector.h @@ -20,8 +20,8 @@ #ifndef NS3_VECTOR_H #define NS3_VECTOR_H -#include "ns3/attribute.h" -#include "ns3/attribute-helper.h" +#include "attribute.h" +#include "attribute-helper.h" namespace ns3 { diff --git a/src/core/model/wall-clock-synchronizer.cc b/src/core/model/wall-clock-synchronizer.cc index 205421108..1682855ce 100644 --- a/src/core/model/wall-clock-synchronizer.cc +++ b/src/core/model/wall-clock-synchronizer.cc @@ -19,8 +19,8 @@ #include #include -#include "ns3/log.h" -#include "ns3/system-condition.h" +#include "log.h" +#include "system-condition.h" #include "wall-clock-synchronizer.h" diff --git a/src/core/model/wall-clock-synchronizer.h b/src/core/model/wall-clock-synchronizer.h index 015123ecc..46979a97f 100644 --- a/src/core/model/wall-clock-synchronizer.h +++ b/src/core/model/wall-clock-synchronizer.h @@ -19,7 +19,7 @@ #ifndef WALL_CLOCK_CLOCK_SYNCHRONIZER_H #define WALL_CLOCK_CLOCK_SYNCHRONIZER_H -#include "ns3/system-condition.h" +#include "system-condition.h" #include "synchronizer.h" namespace ns3 { From d80da9c6de2f04aeb9b8a7bddb9ffbefa64ce526 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Tue, 2 Aug 2011 05:04:37 -0700 Subject: [PATCH 039/202] bug 1230: -Idebug command-line argument munged on darwin --- src/wscript | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/wscript b/src/wscript index 99db8a9e8..541915dd5 100644 --- a/src/wscript +++ b/src/wscript @@ -204,10 +204,16 @@ class ns3module_taskgen(TaskGen.task_gen): # enable that flag for static builds only on x86-64 platforms # when gcc is present and only when we want python bindings # (it's more efficient to not use this option if we can avoid it) - cxxflags = '-mcmodel=large' - ccflags = '-mcmodel=large' - cxxdefines = "NS3_MODULE_COMPILATION" - ccdefines = "NS3_MODULE_COMPILATION" + cxxflags = ['-mcmodel=large'] + ccflags = ['-mcmodel=large'] + cxxdefines = ["NS3_MODULE_COMPILATION"] + ccdefines = ["NS3_MODULE_COMPILATION"] + + module.env.append_value('CXXFLAGS', cxxflags) + module.env.append_value('CCFLAGS', ccflags) + module.env.append_value('LINKFLAGS', linkflags) + module.env.append_value('CXXDEFINES', cxxdefines) + module.env.append_value('CCDEFINES', ccdefines) if len(module.source) > 0 and hasattr(self, 'ns3_dir_location'): uselib_cpppath = [] @@ -222,9 +228,8 @@ class ns3module_taskgen(TaskGen.task_gen): # XXX: calculate the features correctly here. obj = bld (source=[full_src], target=target, features='cxx cc', defines=['NS_TEST_SOURCEDIR="%s"' % path], - cxxflags = module.env['CXXFLAGS'] + cxxflags, - ccflags = module.env['CCFLAGS'] + ccflags, - includes=' '.join(uselib_cpppath)) + includes=' '.join(uselib_cpppath), + env = module.env) objects.append(target) last = module.source[-1] full_src = os.path.join(self.ns3_dir_location, last) @@ -240,11 +245,6 @@ class ns3module_taskgen(TaskGen.task_gen): module.target = '%s/ns3-%s' % (bld.srcnode.relpath_gen(self.path), name) # Set the libraries this module depends on. module.module_deps = list(dependencies) - module.env.append_value('CXXFLAGS', cxxflags) - module.env.append_value('CCFLAGS', ccflags) - module.env.append_value('LINKFLAGS', linkflags) - module.env.append_value('CXXDEFINES', cxxdefines) - module.env.append_value('CCDEFINES', ccdefines) module.install_path = "${LIBDIR}" From fe0667def860d0f07938aaa27eecd611a5631657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Mileti=C4=87?= Date: Tue, 2 Aug 2011 17:42:33 -0400 Subject: [PATCH 040/202] standardize emacs c++ mode comments --- src/applications/helper/ping6-helper.cc | 2 +- src/applications/helper/ping6-helper.h | 2 +- src/applications/model/bulk-send-application.cc | 2 +- src/applications/model/bulk-send-application.h | 2 +- src/applications/model/onoff-application.cc | 2 +- src/applications/model/onoff-application.h | 2 +- src/applications/model/ping6.cc | 2 +- src/applications/model/ping6.h | 2 +- src/applications/model/radvd-interface.cc | 2 +- src/applications/model/radvd-interface.h | 2 +- src/applications/model/radvd-prefix.cc | 2 +- src/applications/model/radvd-prefix.h | 2 +- src/applications/model/radvd.cc | 2 +- src/applications/model/radvd.h | 2 +- src/applications/model/seq-ts-header.cc | 2 +- src/applications/model/seq-ts-header.h | 2 +- src/click/model/ipv4-click-routing.cc | 2 +- src/click/model/ipv4-click-routing.h | 2 +- src/click/test/ipv4-click-routing-test.cc | 2 +- src/core/examples/main-random-variable.cc | 2 +- src/core/examples/sample-simulator.cc | 2 +- src/core/model/names.cc | 2 +- src/core/model/names.h | 2 +- src/core/model/unix-fd-reader.cc | 2 +- src/core/model/unix-fd-reader.h | 2 +- src/core/model/vector.cc | 2 +- src/core/model/vector.h | 2 +- src/energy/helper/basic-energy-source-helper.cc | 2 +- src/energy/helper/basic-energy-source-helper.h | 2 +- src/energy/helper/energy-model-helper.cc | 2 +- src/energy/helper/energy-model-helper.h | 2 +- src/energy/helper/energy-source-container.cc | 2 +- src/energy/helper/energy-source-container.h | 2 +- src/energy/helper/rv-battery-model-helper.cc | 2 +- src/energy/helper/rv-battery-model-helper.h | 2 +- src/energy/helper/wifi-radio-energy-model-helper.cc | 2 +- src/energy/helper/wifi-radio-energy-model-helper.h | 2 +- src/energy/model/basic-energy-source.cc | 2 +- src/energy/model/basic-energy-source.h | 2 +- src/energy/model/device-energy-model-container.cc | 2 +- src/energy/model/device-energy-model-container.h | 2 +- src/energy/model/device-energy-model.cc | 2 +- src/energy/model/device-energy-model.h | 2 +- src/energy/model/energy-source.cc | 2 +- src/energy/model/energy-source.h | 2 +- src/energy/model/rv-battery-model.cc | 2 +- src/energy/model/rv-battery-model.h | 2 +- src/energy/model/wifi-radio-energy-model.cc | 2 +- src/energy/model/wifi-radio-energy-model.h | 2 +- src/energy/test/basic-energy-model-test.cc | 2 +- src/energy/test/rv-battery-model-test.cc | 2 +- src/internet/helper/ipv4-address-helper.cc | 2 +- src/internet/helper/ipv4-address-helper.h | 2 +- src/internet/helper/ipv4-static-routing-helper.cc | 2 +- src/internet/helper/ipv4-static-routing-helper.h | 2 +- src/internet/helper/ipv6-address-helper.cc | 2 +- src/internet/helper/ipv6-address-helper.h | 2 +- src/internet/helper/ipv6-interface-container.cc | 2 +- src/internet/helper/ipv6-interface-container.h | 2 +- src/internet/helper/ipv6-static-routing-helper.cc | 2 +- src/internet/helper/ipv6-static-routing-helper.h | 2 +- src/internet/model/arp-cache.cc | 2 +- src/internet/model/arp-cache.h | 2 +- src/internet/model/arp-header.cc | 2 +- src/internet/model/arp-header.h | 2 +- src/internet/model/arp-l3-protocol.cc | 2 +- src/internet/model/arp-l3-protocol.h | 2 +- src/internet/model/icmpv4.cc | 2 +- src/internet/model/icmpv4.h | 2 +- src/internet/model/icmpv6-header.cc | 2 +- src/internet/model/icmpv6-header.h | 2 +- src/internet/model/icmpv6-l4-protocol.cc | 2 +- src/internet/model/icmpv6-l4-protocol.h | 2 +- src/internet/model/ipv4-address-generator.cc | 2 +- src/internet/model/ipv4-address-generator.h | 2 +- src/internet/model/ipv4-end-point-demux.cc | 2 +- src/internet/model/ipv4-end-point-demux.h | 2 +- src/internet/model/ipv4-end-point.cc | 2 +- src/internet/model/ipv4-end-point.h | 2 +- src/internet/model/ipv4-global-routing.cc | 2 +- src/internet/model/ipv4-global-routing.h | 2 +- src/internet/model/ipv4-header.cc | 2 +- src/internet/model/ipv4-header.h | 2 +- src/internet/model/ipv4-interface-address.cc | 2 +- src/internet/model/ipv4-interface-address.h | 2 +- src/internet/model/ipv4-interface.h | 2 +- src/internet/model/ipv4-l3-protocol.cc | 2 +- src/internet/model/ipv4-l3-protocol.h | 2 +- src/internet/model/ipv4-l4-protocol.cc | 2 +- src/internet/model/ipv4-l4-protocol.h | 2 +- src/internet/model/ipv4-list-routing.cc | 2 +- src/internet/model/ipv4-list-routing.h | 2 +- src/internet/model/ipv4-raw-socket-factory-impl.cc | 2 +- src/internet/model/ipv4-raw-socket-factory-impl.h | 2 +- src/internet/model/ipv4-raw-socket-impl.cc | 2 +- src/internet/model/ipv4-raw-socket-impl.h | 2 +- src/internet/model/ipv4-route.cc | 2 +- src/internet/model/ipv4-route.h | 2 +- src/internet/model/ipv4-routing-protocol.cc | 2 +- src/internet/model/ipv4-routing-protocol.h | 2 +- src/internet/model/ipv4-routing-table-entry.cc | 2 +- src/internet/model/ipv4-routing-table-entry.h | 2 +- src/internet/model/ipv4-static-routing.cc | 2 +- src/internet/model/ipv4-static-routing.h | 2 +- src/internet/model/ipv6-autoconfigured-prefix.cc | 2 +- src/internet/model/ipv6-autoconfigured-prefix.h | 2 +- src/internet/model/ipv6-end-point-demux.cc | 2 +- src/internet/model/ipv6-end-point-demux.h | 2 +- src/internet/model/ipv6-end-point.cc | 2 +- src/internet/model/ipv6-end-point.h | 2 +- src/internet/model/ipv6-extension-demux.cc | 2 +- src/internet/model/ipv6-extension-demux.h | 2 +- src/internet/model/ipv6-extension-header.cc | 2 +- src/internet/model/ipv6-extension-header.h | 2 +- src/internet/model/ipv6-extension.cc | 2 +- src/internet/model/ipv6-extension.h | 2 +- src/internet/model/ipv6-header.cc | 2 +- src/internet/model/ipv6-header.h | 2 +- src/internet/model/ipv6-interface-address.cc | 2 +- src/internet/model/ipv6-interface-address.h | 2 +- src/internet/model/ipv6-interface.cc | 2 +- src/internet/model/ipv6-interface.h | 2 +- src/internet/model/ipv6-l3-protocol.cc | 2 +- src/internet/model/ipv6-l3-protocol.h | 2 +- src/internet/model/ipv6-l4-protocol.cc | 2 +- src/internet/model/ipv6-l4-protocol.h | 2 +- src/internet/model/ipv6-list-routing.cc | 2 +- src/internet/model/ipv6-list-routing.h | 2 +- src/internet/model/ipv6-option-demux.cc | 2 +- src/internet/model/ipv6-option-demux.h | 2 +- src/internet/model/ipv6-option-header.cc | 2 +- src/internet/model/ipv6-option-header.h | 2 +- src/internet/model/ipv6-option.cc | 2 +- src/internet/model/ipv6-option.h | 2 +- src/internet/model/ipv6-raw-socket-factory-impl.cc | 2 +- src/internet/model/ipv6-raw-socket-factory-impl.h | 2 +- src/internet/model/ipv6-raw-socket-impl.cc | 2 +- src/internet/model/ipv6-raw-socket-impl.h | 2 +- src/internet/model/ipv6-route.cc | 2 +- src/internet/model/ipv6-route.h | 2 +- src/internet/model/ipv6-routing-protocol.cc | 2 +- src/internet/model/ipv6-routing-protocol.h | 2 +- src/internet/model/ipv6-routing-table-entry.cc | 2 +- src/internet/model/ipv6-routing-table-entry.h | 2 +- src/internet/model/ipv6-static-routing.cc | 2 +- src/internet/model/ipv6-static-routing.h | 2 +- src/internet/model/ndisc-cache.cc | 2 +- src/internet/model/ndisc-cache.h | 2 +- src/internet/model/nsc-sysctl.cc | 2 +- src/internet/model/nsc-sysctl.h | 2 +- src/internet/model/nsc-tcp-l4-protocol.cc | 2 +- src/internet/model/nsc-tcp-l4-protocol.h | 2 +- src/internet/model/nsc-tcp-socket-impl.cc | 2 +- src/internet/model/nsc-tcp-socket-impl.h | 2 +- src/internet/model/tcp-header.cc | 2 +- src/internet/model/tcp-header.h | 2 +- src/internet/model/tcp-l4-protocol.cc | 2 +- src/internet/model/tcp-l4-protocol.h | 2 +- src/internet/model/tcp-newreno.cc | 2 +- src/internet/model/tcp-newreno.h | 2 +- src/internet/model/tcp-reno.cc | 2 +- src/internet/model/tcp-reno.h | 2 +- src/internet/model/tcp-rfc793.cc | 2 +- src/internet/model/tcp-rfc793.h | 2 +- src/internet/model/tcp-socket-base.cc | 2 +- src/internet/model/tcp-socket-base.h | 2 +- src/internet/model/tcp-socket.cc | 2 +- src/internet/model/tcp-tahoe.cc | 2 +- src/internet/model/tcp-tahoe.h | 2 +- src/internet/model/udp-header.cc | 2 +- src/internet/model/udp-header.h | 2 +- src/internet/model/udp-l4-protocol.cc | 2 +- src/internet/model/udp-l4-protocol.h | 2 +- src/internet/model/udp-socket-impl.cc | 2 +- src/internet/model/udp-socket-impl.h | 2 +- src/internet/model/udp-socket.cc | 2 +- src/internet/test/ipv4-address-generator-test-suite.cc | 2 +- src/internet/test/ipv4-address-helper-test-suite.cc | 2 +- src/internet/test/ipv4-list-routing-test-suite.cc | 2 +- src/internet/test/ipv4-raw-test.cc | 2 +- src/internet/test/ipv4-test.cc | 2 +- src/internet/test/ipv6-list-routing-test-suite.cc | 2 +- src/internet/test/ipv6-test.cc | 2 +- src/internet/test/tcp-test.cc | 2 +- src/internet/test/udp-test.cc | 2 +- src/lte/examples/lte-amc.cc | 2 +- src/lte/examples/lte-channel-model.cc | 2 +- src/lte/examples/lte-phy-downlink.cc | 2 +- src/lte/examples/lte-phy-uplink.cc | 2 +- src/lte/helper/lte-helper.cc | 2 +- src/lte/helper/lte-helper.h | 2 +- src/lte/model/JakesTraces/multipath_v0_M10.h | 2 +- src/lte/model/JakesTraces/multipath_v0_M12.h | 2 +- src/lte/model/JakesTraces/multipath_v0_M6.h | 2 +- src/lte/model/JakesTraces/multipath_v0_M8.h | 2 +- src/lte/model/JakesTraces/multipath_v120_M10.h | 2 +- src/lte/model/JakesTraces/multipath_v120_M12.h | 2 +- src/lte/model/JakesTraces/multipath_v120_M6.h | 2 +- src/lte/model/JakesTraces/multipath_v120_M8.h | 2 +- src/lte/model/JakesTraces/multipath_v30_M10.h | 2 +- src/lte/model/JakesTraces/multipath_v30_M12.h | 2 +- src/lte/model/JakesTraces/multipath_v30_M6.h | 2 +- src/lte/model/JakesTraces/multipath_v30_M8.h | 2 +- src/lte/model/JakesTraces/multipath_v3_M10.h | 2 +- src/lte/model/JakesTraces/multipath_v3_M12.h | 2 +- src/lte/model/JakesTraces/multipath_v3_M6.h | 2 +- src/lte/model/JakesTraces/multipath_v3_M8.h | 2 +- src/lte/model/amc-module.cc | 2 +- src/lte/model/amc-module.h | 2 +- src/lte/model/bearer-qos-parameters.cc | 2 +- src/lte/model/bearer-qos-parameters.h | 2 +- src/lte/model/channel-realization.cc | 2 +- src/lte/model/channel-realization.h | 2 +- src/lte/model/discrete-time-loss-model.cc | 2 +- src/lte/model/discrete-time-loss-model.h | 2 +- src/lte/model/enb-lte-spectrum-phy.cc | 2 +- src/lte/model/enb-lte-spectrum-phy.h | 2 +- src/lte/model/enb-mac-entity.cc | 2 +- src/lte/model/enb-mac-entity.h | 2 +- src/lte/model/enb-net-device.cc | 2 +- src/lte/model/enb-net-device.h | 2 +- src/lte/model/enb-phy.cc | 2 +- src/lte/model/enb-phy.h | 2 +- src/lte/model/ideal-control-messages.cc | 2 +- src/lte/model/ideal-control-messages.h | 2 +- src/lte/model/jakes-fading-loss-model.cc | 2 +- src/lte/model/jakes-fading-loss-model.h | 2 +- src/lte/model/jakes-fading-realizations.h | 2 +- src/lte/model/lte-mac-header.cc | 2 +- src/lte/model/lte-mac-header.h | 2 +- src/lte/model/lte-mac-queue.cc | 2 +- src/lte/model/lte-mac-queue.h | 2 +- src/lte/model/lte-net-device.cc | 2 +- src/lte/model/lte-net-device.h | 2 +- src/lte/model/lte-phy.cc | 2 +- src/lte/model/lte-phy.h | 2 +- src/lte/model/lte-propagation-loss-model.cc | 2 +- src/lte/model/lte-propagation-loss-model.h | 2 +- src/lte/model/lte-spectrum-phy.cc | 2 +- src/lte/model/lte-spectrum-phy.h | 2 +- src/lte/model/lte-spectrum-value-helper.cc | 2 +- src/lte/model/lte-spectrum-value-helper.h | 2 +- src/lte/model/mac-entity.cc | 2 +- src/lte/model/mac-entity.h | 2 +- src/lte/model/packet-scheduler.cc | 2 +- src/lte/model/packet-scheduler.h | 2 +- src/lte/model/path-loss-model.cc | 2 +- src/lte/model/path-loss-model.h | 2 +- src/lte/model/penetration-loss-model.cc | 2 +- src/lte/model/penetration-loss-model.h | 2 +- src/lte/model/radio-bearer-instance.cc | 2 +- src/lte/model/radio-bearer-instance.h | 2 +- src/lte/model/rlc-entity.cc | 2 +- src/lte/model/rlc-entity.h | 2 +- src/lte/model/rrc-entity.cc | 2 +- src/lte/model/rrc-entity.h | 2 +- src/lte/model/shadowing-loss-model.cc | 2 +- src/lte/model/shadowing-loss-model.h | 2 +- src/lte/model/simple-packet-scheduler.cc | 2 +- src/lte/model/simple-packet-scheduler.h | 2 +- src/lte/model/ue-lte-spectrum-phy.cc | 2 +- src/lte/model/ue-lte-spectrum-phy.h | 2 +- src/lte/model/ue-mac-entity.cc | 2 +- src/lte/model/ue-mac-entity.h | 2 +- src/lte/model/ue-manager.cc | 2 +- src/lte/model/ue-manager.h | 2 +- src/lte/model/ue-net-device.cc | 2 +- src/lte/model/ue-net-device.h | 2 +- src/lte/model/ue-phy.cc | 2 +- src/lte/model/ue-phy.h | 2 +- src/lte/model/ue-record.cc | 2 +- src/lte/model/ue-record.h | 2 +- src/lte/test/lte-bearer-test.cc | 2 +- src/lte/test/lte-device-test.cc | 2 +- src/lte/test/lte-phy-test.cc | 2 +- src/lte/test/lte-propagation-loss-model-test.cc | 2 +- src/mesh/examples/mesh.cc | 2 +- src/mesh/helper/dot11s/dot11s-installer.cc | 2 +- src/mesh/helper/dot11s/dot11s-installer.h | 2 +- src/mesh/helper/flame/flame-installer.cc | 2 +- src/mesh/helper/flame/flame-installer.h | 2 +- src/mesh/helper/mesh-helper.cc | 2 +- src/mesh/helper/mesh-helper.h | 2 +- src/mesh/helper/mesh-stack-installer.h | 2 +- src/mesh/model/dot11s/dot11s-mac-header.cc | 2 +- src/mesh/model/dot11s/dot11s-mac-header.h | 2 +- src/mesh/model/dot11s/hwmp-protocol-mac.cc | 2 +- src/mesh/model/dot11s/hwmp-protocol-mac.h | 2 +- src/mesh/model/dot11s/hwmp-protocol.cc | 2 +- src/mesh/model/dot11s/hwmp-protocol.h | 2 +- src/mesh/model/dot11s/hwmp-rtable.cc | 2 +- src/mesh/model/dot11s/hwmp-rtable.h | 2 +- src/mesh/model/dot11s/hwmp-tag.cc | 2 +- src/mesh/model/dot11s/hwmp-tag.h | 2 +- src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-beacon-timing.h | 2 +- src/mesh/model/dot11s/ie-dot11s-configuration.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-configuration.h | 2 +- src/mesh/model/dot11s/ie-dot11s-id.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-id.h | 2 +- src/mesh/model/dot11s/ie-dot11s-metric-report.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-metric-report.h | 2 +- src/mesh/model/dot11s/ie-dot11s-peer-management.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-peer-management.h | 2 +- src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-peering-protocol.h | 2 +- src/mesh/model/dot11s/ie-dot11s-perr.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-perr.h | 2 +- src/mesh/model/dot11s/ie-dot11s-prep.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-prep.h | 2 +- src/mesh/model/dot11s/ie-dot11s-preq.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-preq.h | 2 +- src/mesh/model/dot11s/ie-dot11s-rann.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-rann.h | 2 +- src/mesh/model/dot11s/peer-management-protocol.cc | 2 +- src/mesh/model/dot11s/peer-management-protocol.h | 2 +- src/mesh/model/flame/flame-header.cc | 2 +- src/mesh/model/flame/flame-header.h | 2 +- src/mesh/model/flame/flame-protocol-mac.cc | 2 +- src/mesh/model/flame/flame-protocol-mac.h | 2 +- src/mesh/model/flame/flame-protocol.cc | 2 +- src/mesh/model/flame/flame-protocol.h | 2 +- src/mesh/model/flame/flame-rtable.cc | 2 +- src/mesh/model/flame/flame-rtable.h | 2 +- src/mesh/model/mesh-l2-routing-protocol.cc | 2 +- src/mesh/model/mesh-l2-routing-protocol.h | 2 +- src/mesh/model/mesh-point-device.cc | 2 +- src/mesh/model/mesh-point-device.h | 2 +- src/mobility/examples/main-grid-topology.cc | 2 +- src/mobility/helper/ns2-mobility-helper.cc | 2 +- src/mobility/helper/ns2-mobility-helper.h | 2 +- src/mobility/model/box.cc | 2 +- src/mobility/model/box.h | 2 +- src/mobility/model/constant-acceleration-mobility-model.cc | 2 +- src/mobility/model/constant-acceleration-mobility-model.h | 2 +- src/mobility/model/constant-position-mobility-model.cc | 2 +- src/mobility/model/constant-position-mobility-model.h | 2 +- src/mobility/model/constant-velocity-helper.cc | 2 +- src/mobility/model/constant-velocity-helper.h | 2 +- src/mobility/model/constant-velocity-mobility-model.cc | 2 +- src/mobility/model/constant-velocity-mobility-model.h | 2 +- src/mobility/model/gauss-markov-mobility-model.cc | 2 +- src/mobility/model/gauss-markov-mobility-model.h | 2 +- src/mobility/model/hierarchical-mobility-model.cc | 2 +- src/mobility/model/hierarchical-mobility-model.h | 2 +- src/mobility/model/mobility-model.cc | 2 +- src/mobility/model/mobility-model.h | 2 +- src/mobility/model/position-allocator.cc | 2 +- src/mobility/model/position-allocator.h | 2 +- src/mobility/model/random-direction-2d-mobility-model.cc | 2 +- src/mobility/model/random-direction-2d-mobility-model.h | 2 +- src/mobility/model/random-walk-2d-mobility-model.cc | 2 +- src/mobility/model/random-walk-2d-mobility-model.h | 2 +- src/mobility/model/random-waypoint-mobility-model.cc | 2 +- src/mobility/model/random-waypoint-mobility-model.h | 2 +- src/mobility/model/rectangle.cc | 2 +- src/mobility/model/rectangle.h | 2 +- .../model/steady-state-random-waypoint-mobility-model.cc | 2 +- .../model/steady-state-random-waypoint-mobility-model.h | 2 +- src/mobility/model/waypoint-mobility-model.cc | 2 +- src/mobility/model/waypoint-mobility-model.h | 2 +- src/mobility/model/waypoint.cc | 2 +- src/mobility/model/waypoint.h | 2 +- src/mobility/test/ns2-mobility-helper-test-suite.cc | 2 +- .../test/steady-state-random-waypoint-mobility-model-test.cc | 2 +- src/mobility/test/waypoint-mobility-model-test.cc | 2 +- src/netanim/model/canvas-location.cc | 2 +- src/netanim/model/canvas-location.h | 2 +- src/network/model/application.cc | 2 +- src/network/model/application.h | 2 +- src/network/model/channel-list.cc | 2 +- src/network/model/channel-list.h | 2 +- src/network/model/nix-vector.cc | 2 +- src/network/model/nix-vector.h | 2 +- src/network/model/node-list.cc | 2 +- src/network/model/node-list.h | 2 +- src/network/utils/address-utils.cc | 2 +- src/network/utils/address-utils.h | 2 +- src/network/utils/ethernet-header.cc | 2 +- src/network/utils/ethernet-header.h | 2 +- src/network/utils/ethernet-trailer.cc | 2 +- src/network/utils/ethernet-trailer.h | 2 +- src/network/utils/generic-phy.h | 2 +- src/network/utils/inet-socket-address.cc | 2 +- src/network/utils/inet-socket-address.h | 2 +- src/network/utils/inet6-socket-address.cc | 2 +- src/network/utils/inet6-socket-address.h | 2 +- src/network/utils/ipv4-address.cc | 2 +- src/network/utils/ipv4-address.h | 2 +- src/network/utils/ipv6-address.cc | 2 +- src/network/utils/ipv6-address.h | 2 +- src/network/utils/llc-snap-header.cc | 2 +- src/network/utils/llc-snap-header.h | 2 +- src/network/utils/mac48-address.cc | 2 +- src/network/utils/mac48-address.h | 2 +- src/network/utils/mac64-address.cc | 2 +- src/network/utils/mac64-address.h | 2 +- src/network/utils/output-stream-wrapper.cc | 2 +- src/network/utils/output-stream-wrapper.h | 2 +- src/network/utils/packet-socket-address.cc | 2 +- src/network/utils/packet-socket-address.h | 2 +- src/network/utils/packet-socket.cc | 2 +- src/network/utils/packet-socket.h | 2 +- src/network/utils/pcap-file-wrapper.cc | 2 +- src/network/utils/pcap-file-wrapper.h | 2 +- src/network/utils/pcap-file.cc | 2 +- src/network/utils/pcap-file.h | 2 +- src/network/utils/radiotap-header.cc | 2 +- src/network/utils/radiotap-header.h | 2 +- src/nix-vector-routing/doc/nix-vector-routing.h | 2 +- src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc | 2 +- src/nix-vector-routing/helper/ipv4-nix-vector-helper.h | 2 +- src/nix-vector-routing/model/ipv4-nix-vector-routing.cc | 2 +- src/nix-vector-routing/model/ipv4-nix-vector-routing.h | 2 +- src/olsr/examples/olsr-hna.cc | 2 +- src/olsr/model/olsr-header.cc | 2 +- src/olsr/model/olsr-header.h | 2 +- src/olsr/model/olsr-repositories.h | 2 +- src/olsr/model/olsr-routing-protocol.cc | 2 +- src/olsr/model/olsr-routing-protocol.h | 2 +- src/olsr/model/olsr-state.cc | 2 +- src/olsr/model/olsr-state.h | 2 +- src/olsr/test/olsr-header-test-suite.cc | 2 +- src/olsr/test/olsr-routing-protocol-test-suite.cc | 2 +- src/openflow/test/openflow-switch-test-suite.cc | 2 +- src/point-to-point/model/ppp-header.cc | 2 +- src/point-to-point/model/ppp-header.h | 2 +- src/propagation/examples/main-propagation-loss.cc | 2 +- src/propagation/model/jakes-propagation-loss-model.cc | 2 +- src/propagation/model/jakes-propagation-loss-model.h | 2 +- src/propagation/model/propagation-delay-model.cc | 2 +- src/propagation/model/propagation-delay-model.h | 2 +- src/propagation/model/propagation-loss-model.cc | 2 +- src/propagation/model/propagation-loss-model.h | 2 +- .../examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc | 2 +- src/spectrum/examples/adhoc-aloha-ideal-phy.cc | 2 +- src/spectrum/model/aloha-noack-mac-header.cc | 2 +- src/spectrum/model/aloha-noack-mac-header.h | 2 +- src/spectrum/model/friis-spectrum-propagation-loss.cc | 2 +- src/spectrum/model/friis-spectrum-propagation-loss.h | 2 +- src/spectrum/model/half-duplex-ideal-phy.cc | 2 +- src/spectrum/model/half-duplex-ideal-phy.h | 2 +- src/spectrum/model/microwave-oven-spectrum-value-helper.cc | 2 +- src/spectrum/model/microwave-oven-spectrum-value-helper.h | 2 +- src/spectrum/model/multi-model-spectrum-channel.cc | 2 +- src/spectrum/model/multi-model-spectrum-channel.h | 2 +- src/spectrum/model/single-model-spectrum-channel.cc | 2 +- src/spectrum/model/single-model-spectrum-channel.h | 2 +- src/spectrum/model/spectrum-analyzer.cc | 2 +- src/spectrum/model/spectrum-analyzer.h | 2 +- src/spectrum/model/spectrum-channel.cc | 2 +- src/spectrum/model/spectrum-channel.h | 2 +- src/spectrum/model/spectrum-converter.cc | 2 +- src/spectrum/model/spectrum-converter.h | 2 +- src/spectrum/model/spectrum-error-model.cc | 2 +- src/spectrum/model/spectrum-error-model.h | 2 +- src/spectrum/model/spectrum-interference.cc | 2 +- src/spectrum/model/spectrum-interference.h | 2 +- src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc | 2 +- src/spectrum/model/spectrum-model-300kHz-300GHz-log.h | 2 +- src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc | 2 +- src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h | 2 +- src/spectrum/model/spectrum-model.cc | 2 +- src/spectrum/model/spectrum-model.h | 2 +- src/spectrum/model/spectrum-phy.cc | 2 +- src/spectrum/model/spectrum-phy.h | 2 +- src/spectrum/model/spectrum-propagation-loss-model.cc | 2 +- src/spectrum/model/spectrum-propagation-loss-model.h | 2 +- src/spectrum/model/spectrum-type.cc | 2 +- src/spectrum/model/spectrum-type.h | 2 +- src/spectrum/model/spectrum-value.cc | 2 +- src/spectrum/model/spectrum-value.h | 2 +- src/spectrum/model/waveform-generator.cc | 2 +- src/spectrum/model/waveform-generator.h | 2 +- src/spectrum/model/wifi-spectrum-value-helper.cc | 2 +- src/spectrum/model/wifi-spectrum-value-helper.h | 2 +- src/spectrum/test/spectrum-interference-test.cc | 2 +- src/spectrum/test/spectrum-test.h | 2 +- src/spectrum/test/spectrum-value-test.cc | 2 +- src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc | 2 +- src/uan/examples/uan-cw-example.cc | 2 +- src/uan/examples/uan-cw-example.h | 2 +- src/uan/examples/uan-rc-example.cc | 2 +- src/uan/examples/uan-rc-example.h | 2 +- src/uan/helper/acoustic-modem-energy-model-helper.cc | 2 +- src/uan/helper/acoustic-modem-energy-model-helper.h | 2 +- src/uan/model/acoustic-modem-energy-model.cc | 2 +- src/uan/model/acoustic-modem-energy-model.h | 2 +- src/uan/model/uan-address.cc | 2 +- src/uan/model/uan-address.h | 2 +- src/uan/model/uan-channel.cc | 2 +- src/uan/model/uan-channel.h | 2 +- src/uan/model/uan-header-common.cc | 2 +- src/uan/model/uan-header-common.h | 2 +- src/uan/model/uan-header-rc.cc | 2 +- src/uan/model/uan-header-rc.h | 2 +- src/uan/model/uan-mac-aloha.cc | 2 +- src/uan/model/uan-mac-aloha.h | 2 +- src/uan/model/uan-mac-cw.cc | 2 +- src/uan/model/uan-mac-cw.h | 2 +- src/uan/model/uan-mac-rc-gw.cc | 2 +- src/uan/model/uan-mac-rc-gw.h | 2 +- src/uan/model/uan-mac-rc.cc | 2 +- src/uan/model/uan-mac-rc.h | 2 +- src/uan/model/uan-mac.h | 2 +- src/uan/model/uan-net-device.cc | 2 +- src/uan/model/uan-net-device.h | 2 +- src/uan/model/uan-noise-model-default.cc | 2 +- src/uan/model/uan-noise-model-default.h | 2 +- src/uan/model/uan-noise-model.cc | 2 +- src/uan/model/uan-noise-model.h | 2 +- src/uan/model/uan-phy-dual.cc | 2 +- src/uan/model/uan-phy-dual.h | 2 +- src/uan/model/uan-phy-gen.cc | 2 +- src/uan/model/uan-phy-gen.h | 2 +- src/uan/model/uan-phy.cc | 2 +- src/uan/model/uan-phy.h | 2 +- src/uan/model/uan-prop-model-ideal.cc | 2 +- src/uan/model/uan-prop-model-ideal.h | 2 +- src/uan/model/uan-prop-model-thorp.cc | 2 +- src/uan/model/uan-prop-model-thorp.h | 2 +- src/uan/model/uan-prop-model.cc | 2 +- src/uan/model/uan-prop-model.h | 2 +- src/uan/model/uan-transducer-hd.cc | 2 +- src/uan/model/uan-transducer-hd.h | 2 +- src/uan/model/uan-transducer.h | 2 +- src/uan/model/uan-tx-mode.cc | 2 +- src/uan/model/uan-tx-mode.h | 2 +- src/uan/test/uan-test.cc | 2 +- src/wifi/examples/wifi-phy-test.cc | 2 +- src/wifi/helper/athstats-helper.cc | 2 +- src/wifi/helper/athstats-helper.h | 2 +- src/wifi/helper/nqos-wifi-mac-helper.cc | 2 +- src/wifi/helper/nqos-wifi-mac-helper.h | 2 +- src/wifi/helper/qos-wifi-mac-helper.cc | 2 +- src/wifi/helper/qos-wifi-mac-helper.h | 2 +- src/wifi/model/aarf-wifi-manager.cc | 2 +- src/wifi/model/aarf-wifi-manager.h | 2 +- src/wifi/model/aarfcd-wifi-manager.cc | 2 +- src/wifi/model/aarfcd-wifi-manager.h | 2 +- src/wifi/model/adhoc-wifi-mac.cc | 2 +- src/wifi/model/adhoc-wifi-mac.h | 2 +- src/wifi/model/amrr-wifi-manager.cc | 2 +- src/wifi/model/amrr-wifi-manager.h | 2 +- src/wifi/model/amsdu-subframe-header.cc | 2 +- src/wifi/model/amsdu-subframe-header.h | 2 +- src/wifi/model/ap-wifi-mac.cc | 2 +- src/wifi/model/ap-wifi-mac.h | 2 +- src/wifi/model/arf-wifi-manager.cc | 2 +- src/wifi/model/arf-wifi-manager.h | 2 +- src/wifi/model/block-ack-agreement.cc | 2 +- src/wifi/model/block-ack-agreement.h | 2 +- src/wifi/model/block-ack-cache.cc | 2 +- src/wifi/model/block-ack-cache.h | 2 +- src/wifi/model/block-ack-manager.cc | 2 +- src/wifi/model/block-ack-manager.h | 2 +- src/wifi/model/capability-information.cc | 2 +- src/wifi/model/capability-information.h | 2 +- src/wifi/model/cara-wifi-manager.cc | 2 +- src/wifi/model/cara-wifi-manager.h | 2 +- src/wifi/model/constant-rate-wifi-manager.cc | 2 +- src/wifi/model/constant-rate-wifi-manager.h | 2 +- src/wifi/model/ctrl-headers.cc | 2 +- src/wifi/model/ctrl-headers.h | 2 +- src/wifi/model/dca-txop.cc | 2 +- src/wifi/model/dca-txop.h | 2 +- src/wifi/model/dcf-manager.cc | 2 +- src/wifi/model/dcf-manager.h | 2 +- src/wifi/model/dcf.cc | 2 +- src/wifi/model/dcf.h | 2 +- src/wifi/model/dsss-error-rate-model.cc | 2 +- src/wifi/model/dsss-error-rate-model.h | 2 +- src/wifi/model/edca-txop-n.cc | 2 +- src/wifi/model/edca-txop-n.h | 2 +- src/wifi/model/error-rate-model.cc | 2 +- src/wifi/model/error-rate-model.h | 2 +- src/wifi/model/ideal-wifi-manager.cc | 2 +- src/wifi/model/ideal-wifi-manager.h | 2 +- src/wifi/model/interference-helper.cc | 2 +- src/wifi/model/interference-helper.h | 2 +- src/wifi/model/mac-low.cc | 2 +- src/wifi/model/mac-low.h | 2 +- src/wifi/model/mac-rx-middle.cc | 2 +- src/wifi/model/mac-rx-middle.h | 2 +- src/wifi/model/mac-tx-middle.cc | 2 +- src/wifi/model/mac-tx-middle.h | 2 +- src/wifi/model/mgt-headers.cc | 2 +- src/wifi/model/mgt-headers.h | 2 +- src/wifi/model/msdu-aggregator.cc | 2 +- src/wifi/model/msdu-aggregator.h | 2 +- src/wifi/model/msdu-standard-aggregator.cc | 2 +- src/wifi/model/msdu-standard-aggregator.h | 2 +- src/wifi/model/nist-error-rate-model.cc | 2 +- src/wifi/model/nist-error-rate-model.h | 2 +- src/wifi/model/onoe-wifi-manager.cc | 2 +- src/wifi/model/onoe-wifi-manager.h | 2 +- src/wifi/model/originator-block-ack-agreement.cc | 2 +- src/wifi/model/originator-block-ack-agreement.h | 2 +- src/wifi/model/qos-blocked-destinations.cc | 2 +- src/wifi/model/qos-blocked-destinations.h | 2 +- src/wifi/model/qos-tag.cc | 2 +- src/wifi/model/qos-tag.h | 2 +- src/wifi/model/qos-utils.cc | 2 +- src/wifi/model/qos-utils.h | 2 +- src/wifi/model/random-stream.cc | 2 +- src/wifi/model/random-stream.h | 2 +- src/wifi/model/regular-wifi-mac.cc | 2 +- src/wifi/model/regular-wifi-mac.h | 2 +- src/wifi/model/rraa-wifi-manager.cc | 2 +- src/wifi/model/rraa-wifi-manager.h | 2 +- src/wifi/model/ssid.cc | 2 +- src/wifi/model/ssid.h | 2 +- src/wifi/model/sta-wifi-mac.cc | 2 +- src/wifi/model/sta-wifi-mac.h | 2 +- src/wifi/model/status-code.cc | 2 +- src/wifi/model/status-code.h | 2 +- src/wifi/model/supported-rates.cc | 2 +- src/wifi/model/supported-rates.h | 2 +- src/wifi/model/wifi-channel.cc | 2 +- src/wifi/model/wifi-channel.h | 2 +- src/wifi/model/wifi-mac-header.cc | 2 +- src/wifi/model/wifi-mac-header.h | 2 +- src/wifi/model/wifi-mac-queue.cc | 2 +- src/wifi/model/wifi-mac-queue.h | 2 +- src/wifi/model/wifi-mac-trailer.cc | 2 +- src/wifi/model/wifi-mac-trailer.h | 2 +- src/wifi/model/wifi-mac.cc | 2 +- src/wifi/model/wifi-mac.h | 2 +- src/wifi/model/wifi-mode.cc | 2 +- src/wifi/model/wifi-mode.h | 2 +- src/wifi/model/wifi-net-device.cc | 2 +- src/wifi/model/wifi-net-device.h | 2 +- src/wifi/model/wifi-phy-standard.h | 2 +- src/wifi/model/wifi-phy-state-helper.cc | 2 +- src/wifi/model/wifi-phy-state-helper.h | 2 +- src/wifi/model/wifi-phy.cc | 2 +- src/wifi/model/wifi-phy.h | 2 +- src/wifi/model/wifi-preamble.h | 2 +- src/wifi/model/wifi-remote-station-manager.cc | 2 +- src/wifi/model/wifi-remote-station-manager.h | 2 +- src/wifi/model/yans-error-rate-model.cc | 2 +- src/wifi/model/yans-error-rate-model.h | 2 +- src/wifi/model/yans-wifi-channel.cc | 2 +- src/wifi/model/yans-wifi-channel.h | 2 +- src/wifi/model/yans-wifi-phy.cc | 2 +- src/wifi/model/yans-wifi-phy.h | 2 +- src/wifi/test/block-ack-test-suite.cc | 2 +- src/wifi/test/dcf-manager-test.cc | 2 +- src/wifi/test/tx-duration-test.cc | 2 +- src/wifi/test/wifi-test.cc | 2 +- 650 files changed, 650 insertions(+), 650 deletions(-) diff --git a/src/applications/helper/ping6-helper.cc b/src/applications/helper/ping6-helper.cc index 895073ebd..211f96de6 100644 --- a/src/applications/helper/ping6-helper.cc +++ b/src/applications/helper/ping6-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/applications/helper/ping6-helper.h b/src/applications/helper/ping6-helper.h index c4a0bdd20..55f140b06 100644 --- a/src/applications/helper/ping6-helper.h +++ b/src/applications/helper/ping6-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/applications/model/bulk-send-application.cc b/src/applications/model/bulk-send-application.cc index b4b232f05..c76fdda8e 100644 --- a/src/applications/model/bulk-send-application.cc +++ b/src/applications/model/bulk-send-application.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Georgia Institute of Technology * diff --git a/src/applications/model/bulk-send-application.h b/src/applications/model/bulk-send-application.h index 8713974c1..287177035 100644 --- a/src/applications/model/bulk-send-application.h +++ b/src/applications/model/bulk-send-application.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Georgia Institute of Technology * diff --git a/src/applications/model/onoff-application.cc b/src/applications/model/onoff-application.cc index 32aed33e6..4ec63fbb4 100644 --- a/src/applications/model/onoff-application.cc +++ b/src/applications/model/onoff-application.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/applications/model/onoff-application.h b/src/applications/model/onoff-application.h index 6a153b6fe..990c80ea6 100644 --- a/src/applications/model/onoff-application.h +++ b/src/applications/model/onoff-application.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/applications/model/ping6.cc b/src/applications/model/ping6.cc index 2e71ac131..1dfa8de5a 100644 --- a/src/applications/model/ping6.cc +++ b/src/applications/model/ping6.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/applications/model/ping6.h b/src/applications/model/ping6.h index 84662d8e4..8f3d84314 100644 --- a/src/applications/model/ping6.h +++ b/src/applications/model/ping6.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/applications/model/radvd-interface.cc b/src/applications/model/radvd-interface.cc index a12f28e47..d5b9c5bfd 100644 --- a/src/applications/model/radvd-interface.cc +++ b/src/applications/model/radvd-interface.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Strasbourg University * diff --git a/src/applications/model/radvd-interface.h b/src/applications/model/radvd-interface.h index 521fa3a4b..f7faf53a6 100644 --- a/src/applications/model/radvd-interface.h +++ b/src/applications/model/radvd-interface.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Strasbourg University * diff --git a/src/applications/model/radvd-prefix.cc b/src/applications/model/radvd-prefix.cc index 2a8da80b6..7d7de505c 100644 --- a/src/applications/model/radvd-prefix.cc +++ b/src/applications/model/radvd-prefix.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Strasbourg University * diff --git a/src/applications/model/radvd-prefix.h b/src/applications/model/radvd-prefix.h index feaaaa254..31d731b73 100644 --- a/src/applications/model/radvd-prefix.h +++ b/src/applications/model/radvd-prefix.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Strasbourg University * diff --git a/src/applications/model/radvd.cc b/src/applications/model/radvd.cc index 22e446a70..841ca411a 100644 --- a/src/applications/model/radvd.cc +++ b/src/applications/model/radvd.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 Telecom Bretagne * Copyright (c) 2009 Strasbourg University diff --git a/src/applications/model/radvd.h b/src/applications/model/radvd.h index 53161ae75..9332bfe26 100644 --- a/src/applications/model/radvd.h +++ b/src/applications/model/radvd.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 Telecom Bretagne * Copyright (c) 2009 Strasbourg University diff --git a/src/applications/model/seq-ts-header.cc b/src/applications/model/seq-ts-header.cc index 9161ae0d1..f22976edf 100644 --- a/src/applications/model/seq-ts-header.cc +++ b/src/applications/model/seq-ts-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 INRIA * diff --git a/src/applications/model/seq-ts-header.h b/src/applications/model/seq-ts-header.h index b24301ce6..21c20a1eb 100644 --- a/src/applications/model/seq-ts-header.h +++ b/src/applications/model/seq-ts-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 INRIA * diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc index 235a7e8ff..6585700d7 100644 --- a/src/click/model/ipv4-click-routing.cc +++ b/src/click/model/ipv4-click-routing.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Lalith Suresh * diff --git a/src/click/model/ipv4-click-routing.h b/src/click/model/ipv4-click-routing.h index 0fafbb124..483831911 100644 --- a/src/click/model/ipv4-click-routing.h +++ b/src/click/model/ipv4-click-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Lalith Suresh * diff --git a/src/click/test/ipv4-click-routing-test.cc b/src/click/test/ipv4-click-routing-test.cc index 5e1a24945..d647018e9 100644 --- a/src/click/test/ipv4-click-routing-test.cc +++ b/src/click/test/ipv4-click-routing-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Lalith Suresh * diff --git a/src/core/examples/main-random-variable.cc b/src/core/examples/main-random-variable.cc index cca00e641..861e7adfc 100644 --- a/src/core/examples/main-random-variable.cc +++ b/src/core/examples/main-random-variable.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 Timo Bingmann * diff --git a/src/core/examples/sample-simulator.cc b/src/core/examples/sample-simulator.cc index ed2e3fd93..85ca62ae3 100644 --- a/src/core/examples/sample-simulator.cc +++ b/src/core/examples/sample-simulator.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 INRIA * diff --git a/src/core/model/names.cc b/src/core/model/names.cc index 8fc59627a..29e029d19 100644 --- a/src/core/model/names.cc +++ b/src/core/model/names.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/core/model/names.h b/src/core/model/names.h index 3ac74e151..09356c33a 100644 --- a/src/core/model/names.h +++ b/src/core/model/names.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/core/model/unix-fd-reader.cc b/src/core/model/unix-fd-reader.cc index 5637c51c4..103ff69e8 100644 --- a/src/core/model/unix-fd-reader.cc +++ b/src/core/model/unix-fd-reader.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 The Boeing Company diff --git a/src/core/model/unix-fd-reader.h b/src/core/model/unix-fd-reader.h index d5349c72f..cb9b64aa8 100644 --- a/src/core/model/unix-fd-reader.h +++ b/src/core/model/unix-fd-reader.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 The Boeing Company * diff --git a/src/core/model/vector.cc b/src/core/model/vector.cc index 75ca81048..66b12200b 100644 --- a/src/core/model/vector.cc +++ b/src/core/model/vector.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/core/model/vector.h b/src/core/model/vector.h index ee0f0be29..eaf081916 100644 --- a/src/core/model/vector.h +++ b/src/core/model/vector.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/energy/helper/basic-energy-source-helper.cc b/src/energy/helper/basic-energy-source-helper.cc index d2fb9fc2b..3bae7bf8b 100644 --- a/src/energy/helper/basic-energy-source-helper.cc +++ b/src/energy/helper/basic-energy-source-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/basic-energy-source-helper.h b/src/energy/helper/basic-energy-source-helper.h index bfad9807b..0a6acab2e 100644 --- a/src/energy/helper/basic-energy-source-helper.h +++ b/src/energy/helper/basic-energy-source-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/energy-model-helper.cc b/src/energy/helper/energy-model-helper.cc index 3eb6a1127..63b03919c 100644 --- a/src/energy/helper/energy-model-helper.cc +++ b/src/energy/helper/energy-model-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/energy-model-helper.h b/src/energy/helper/energy-model-helper.h index ff98839f7..8e2e287fb 100644 --- a/src/energy/helper/energy-model-helper.h +++ b/src/energy/helper/energy-model-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/energy-source-container.cc b/src/energy/helper/energy-source-container.cc index 03fff88e9..a4f30efeb 100644 --- a/src/energy/helper/energy-source-container.cc +++ b/src/energy/helper/energy-source-container.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. diff --git a/src/energy/helper/energy-source-container.h b/src/energy/helper/energy-source-container.h index a658a3890..b44407b1a 100644 --- a/src/energy/helper/energy-source-container.h +++ b/src/energy/helper/energy-source-container.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. diff --git a/src/energy/helper/rv-battery-model-helper.cc b/src/energy/helper/rv-battery-model-helper.cc index 3861c759e..70581f062 100644 --- a/src/energy/helper/rv-battery-model-helper.cc +++ b/src/energy/helper/rv-battery-model-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/rv-battery-model-helper.h b/src/energy/helper/rv-battery-model-helper.h index f2783f3e8..bd0b9574f 100644 --- a/src/energy/helper/rv-battery-model-helper.h +++ b/src/energy/helper/rv-battery-model-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/wifi-radio-energy-model-helper.cc b/src/energy/helper/wifi-radio-energy-model-helper.cc index 6ce9a4d95..8b9733a54 100644 --- a/src/energy/helper/wifi-radio-energy-model-helper.cc +++ b/src/energy/helper/wifi-radio-energy-model-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/helper/wifi-radio-energy-model-helper.h b/src/energy/helper/wifi-radio-energy-model-helper.h index 10c0b91de..86ebbff1f 100644 --- a/src/energy/helper/wifi-radio-energy-model-helper.h +++ b/src/energy/helper/wifi-radio-energy-model-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/basic-energy-source.cc b/src/energy/model/basic-energy-source.cc index b10242151..82f54c57f 100644 --- a/src/energy/model/basic-energy-source.cc +++ b/src/energy/model/basic-energy-source.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/basic-energy-source.h b/src/energy/model/basic-energy-source.h index 93efac27d..1b12b8972 100644 --- a/src/energy/model/basic-energy-source.h +++ b/src/energy/model/basic-energy-source.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/device-energy-model-container.cc b/src/energy/model/device-energy-model-container.cc index 825e84ab6..314ca767c 100644 --- a/src/energy/model/device-energy-model-container.cc +++ b/src/energy/model/device-energy-model-container.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. diff --git a/src/energy/model/device-energy-model-container.h b/src/energy/model/device-energy-model-container.h index 0307eb5a2..a8dae765d 100644 --- a/src/energy/model/device-energy-model-container.h +++ b/src/energy/model/device-energy-model-container.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. diff --git a/src/energy/model/device-energy-model.cc b/src/energy/model/device-energy-model.cc index 7ef3c9559..8f098e6dd 100644 --- a/src/energy/model/device-energy-model.cc +++ b/src/energy/model/device-energy-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/device-energy-model.h b/src/energy/model/device-energy-model.h index 96b7e0c37..cfd4247e8 100644 --- a/src/energy/model/device-energy-model.h +++ b/src/energy/model/device-energy-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/energy-source.cc b/src/energy/model/energy-source.cc index 9216f1894..bb2bb288c 100644 --- a/src/energy/model/energy-source.cc +++ b/src/energy/model/energy-source.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/energy-source.h b/src/energy/model/energy-source.h index 4be75b927..795725b1d 100644 --- a/src/energy/model/energy-source.h +++ b/src/energy/model/energy-source.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/rv-battery-model.cc b/src/energy/model/rv-battery-model.cc index f9d1dfba0..29d57e933 100644 --- a/src/energy/model/rv-battery-model.cc +++ b/src/energy/model/rv-battery-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/rv-battery-model.h b/src/energy/model/rv-battery-model.h index a9f0249ac..31bd5709c 100644 --- a/src/energy/model/rv-battery-model.h +++ b/src/energy/model/rv-battery-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/wifi-radio-energy-model.cc b/src/energy/model/wifi-radio-energy-model.cc index 05f5b7045..29a63eccf 100644 --- a/src/energy/model/wifi-radio-energy-model.cc +++ b/src/energy/model/wifi-radio-energy-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/model/wifi-radio-energy-model.h b/src/energy/model/wifi-radio-energy-model.h index 0733b6291..8de94db58 100644 --- a/src/energy/model/wifi-radio-energy-model.h +++ b/src/energy/model/wifi-radio-energy-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/test/basic-energy-model-test.cc b/src/energy/test/basic-energy-model-test.cc index 64c2aae5f..77839bc01 100644 --- a/src/energy/test/basic-energy-model-test.cc +++ b/src/energy/test/basic-energy-model-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/energy/test/rv-battery-model-test.cc b/src/energy/test/rv-battery-model-test.cc index 639a7eb14..22492bda8 100644 --- a/src/energy/test/rv-battery-model-test.cc +++ b/src/energy/test/rv-battery-model-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Network Security Lab, University of Washington, Seattle. * diff --git a/src/internet/helper/ipv4-address-helper.cc b/src/internet/helper/ipv4-address-helper.cc index 7228f7057..004a6fa3e 100644 --- a/src/internet/helper/ipv4-address-helper.cc +++ b/src/internet/helper/ipv4-address-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/helper/ipv4-address-helper.h b/src/internet/helper/ipv4-address-helper.h index 3892d636d..4508c221f 100644 --- a/src/internet/helper/ipv4-address-helper.h +++ b/src/internet/helper/ipv4-address-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/helper/ipv4-static-routing-helper.cc b/src/internet/helper/ipv4-static-routing-helper.cc index b0f6ec47a..42fef2c47 100644 --- a/src/internet/helper/ipv4-static-routing-helper.cc +++ b/src/internet/helper/ipv4-static-routing-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/helper/ipv4-static-routing-helper.h b/src/internet/helper/ipv4-static-routing-helper.h index 75204baab..a9cf875fa 100644 --- a/src/internet/helper/ipv4-static-routing-helper.h +++ b/src/internet/helper/ipv4-static-routing-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/helper/ipv6-address-helper.cc b/src/internet/helper/ipv6-address-helper.cc index 41903719f..6557b17ba 100644 --- a/src/internet/helper/ipv6-address-helper.cc +++ b/src/internet/helper/ipv6-address-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/internet/helper/ipv6-address-helper.h b/src/internet/helper/ipv6-address-helper.h index 487907657..d02329ba4 100644 --- a/src/internet/helper/ipv6-address-helper.h +++ b/src/internet/helper/ipv6-address-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/internet/helper/ipv6-interface-container.cc b/src/internet/helper/ipv6-interface-container.cc index f22177b59..57d559923 100644 --- a/src/internet/helper/ipv6-interface-container.cc +++ b/src/internet/helper/ipv6-interface-container.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/internet/helper/ipv6-interface-container.h b/src/internet/helper/ipv6-interface-container.h index 6eb2b2bfa..06d633a51 100644 --- a/src/internet/helper/ipv6-interface-container.h +++ b/src/internet/helper/ipv6-interface-container.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/internet/helper/ipv6-static-routing-helper.cc b/src/internet/helper/ipv6-static-routing-helper.cc index c375318c3..7f47e40e2 100644 --- a/src/internet/helper/ipv6-static-routing-helper.cc +++ b/src/internet/helper/ipv6-static-routing-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/helper/ipv6-static-routing-helper.h b/src/internet/helper/ipv6-static-routing-helper.h index bee0eb191..4b18c379a 100644 --- a/src/internet/helper/ipv6-static-routing-helper.h +++ b/src/internet/helper/ipv6-static-routing-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/arp-cache.cc b/src/internet/model/arp-cache.cc index 44d7f0093..4dad63eb9 100644 --- a/src/internet/model/arp-cache.cc +++ b/src/internet/model/arp-cache.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/internet/model/arp-cache.h b/src/internet/model/arp-cache.h index 07664f568..590bb8e23 100644 --- a/src/internet/model/arp-cache.h +++ b/src/internet/model/arp-cache.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc index 11f4d7cd2..2b9ce1a68 100644 --- a/src/internet/model/arp-header.cc +++ b/src/internet/model/arp-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/arp-header.h b/src/internet/model/arp-header.h index 27a8eabca..d12e0fcb7 100644 --- a/src/internet/model/arp-header.h +++ b/src/internet/model/arp-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc index f780c760e..ea33fbf02 100644 --- a/src/internet/model/arp-l3-protocol.cc +++ b/src/internet/model/arp-l3-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/internet/model/arp-l3-protocol.h b/src/internet/model/arp-l3-protocol.h index ebf7fcc00..6e185a887 100644 --- a/src/internet/model/arp-l3-protocol.h +++ b/src/internet/model/arp-l3-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/internet/model/icmpv4.cc b/src/internet/model/icmpv4.cc index 1d69d65ca..47455f1c7 100644 --- a/src/internet/model/icmpv4.cc +++ b/src/internet/model/icmpv4.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/internet/model/icmpv4.h b/src/internet/model/icmpv4.h index 70935a611..49cc0679f 100644 --- a/src/internet/model/icmpv4.h +++ b/src/internet/model/icmpv4.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/internet/model/icmpv6-header.cc b/src/internet/model/icmpv6-header.cc index d5afb1885..85cba19b2 100644 --- a/src/internet/model/icmpv6-header.cc +++ b/src/internet/model/icmpv6-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/icmpv6-header.h b/src/internet/model/icmpv6-header.h index ff9363848..c72ba33fd 100644 --- a/src/internet/model/icmpv6-header.h +++ b/src/internet/model/icmpv6-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index cc4746a23..f85fb0ff3 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/icmpv6-l4-protocol.h b/src/internet/model/icmpv6-l4-protocol.h index 2cfa7901e..9960effe2 100644 --- a/src/internet/model/icmpv6-l4-protocol.h +++ b/src/internet/model/icmpv6-l4-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv4-address-generator.cc b/src/internet/model/ipv4-address-generator.cc index 4703167d1..37c5e99a0 100644 --- a/src/internet/model/ipv4-address-generator.cc +++ b/src/internet/model/ipv4-address-generator.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/model/ipv4-address-generator.h b/src/internet/model/ipv4-address-generator.h index 50e1cb0ad..e8110c565 100644 --- a/src/internet/model/ipv4-address-generator.h +++ b/src/internet/model/ipv4-address-generator.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/model/ipv4-end-point-demux.cc b/src/internet/model/ipv4-end-point-demux.cc index 0ae869f0f..c30067199 100644 --- a/src/internet/model/ipv4-end-point-demux.cc +++ b/src/internet/model/ipv4-end-point-demux.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-end-point-demux.h b/src/internet/model/ipv4-end-point-demux.h index 3fe4bd006..a8d3a2d28 100644 --- a/src/internet/model/ipv4-end-point-demux.h +++ b/src/internet/model/ipv4-end-point-demux.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-end-point.cc b/src/internet/model/ipv4-end-point.cc index f8797802a..ece423e00 100644 --- a/src/internet/model/ipv4-end-point.cc +++ b/src/internet/model/ipv4-end-point.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-end-point.h b/src/internet/model/ipv4-end-point.h index d4c5c5306..691462eb7 100644 --- a/src/internet/model/ipv4-end-point.h +++ b/src/internet/model/ipv4-end-point.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc index e35d93e58..8800869dd 100644 --- a/src/internet/model/ipv4-global-routing.cc +++ b/src/internet/model/ipv4-global-routing.cc @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2008 University of Washington // diff --git a/src/internet/model/ipv4-global-routing.h b/src/internet/model/ipv4-global-routing.h index 77dcd0474..0289e7441 100644 --- a/src/internet/model/ipv4-global-routing.h +++ b/src/internet/model/ipv4-global-routing.h @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2008 University of Washington // diff --git a/src/internet/model/ipv4-header.cc b/src/internet/model/ipv4-header.cc index e54a222a3..71c8bd9b0 100644 --- a/src/internet/model/ipv4-header.cc +++ b/src/internet/model/ipv4-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-header.h b/src/internet/model/ipv4-header.h index 0d92fcf05..1dbda082a 100644 --- a/src/internet/model/ipv4-header.h +++ b/src/internet/model/ipv4-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-interface-address.cc b/src/internet/model/ipv4-interface-address.cc index b71b365d5..38098aeb6 100644 --- a/src/internet/model/ipv4-interface-address.cc +++ b/src/internet/model/ipv4-interface-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-interface-address.h b/src/internet/model/ipv4-interface-address.h index 52117f7bb..a48e0bcc7 100644 --- a/src/internet/model/ipv4-interface-address.h +++ b/src/internet/model/ipv4-interface-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/model/ipv4-interface.h b/src/internet/model/ipv4-interface.h index 3a49e05ec..055ac1ed2 100644 --- a/src/internet/model/ipv4-interface.h +++ b/src/internet/model/ipv4-interface.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index acc404159..ecbd865d3 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/internet/model/ipv4-l3-protocol.h b/src/internet/model/ipv4-l3-protocol.h index 609076e89..8fdb2fdb1 100644 --- a/src/internet/model/ipv4-l3-protocol.h +++ b/src/internet/model/ipv4-l3-protocol.h @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/internet/model/ipv4-l4-protocol.cc b/src/internet/model/ipv4-l4-protocol.cc index a51e16c68..6a3ef0dcb 100644 --- a/src/internet/model/ipv4-l4-protocol.cc +++ b/src/internet/model/ipv4-l4-protocol.cc @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/internet/model/ipv4-l4-protocol.h b/src/internet/model/ipv4-l4-protocol.h index 0ebdab8de..7becfdd1f 100644 --- a/src/internet/model/ipv4-l4-protocol.h +++ b/src/internet/model/ipv4-l4-protocol.h @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/internet/model/ipv4-list-routing.cc b/src/internet/model/ipv4-list-routing.cc index 1b7516505..f34e3b99b 100644 --- a/src/internet/model/ipv4-list-routing.cc +++ b/src/internet/model/ipv4-list-routing.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv4-list-routing.h b/src/internet/model/ipv4-list-routing.h index 0387b9724..f6477b577 100644 --- a/src/internet/model/ipv4-list-routing.h +++ b/src/internet/model/ipv4-list-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv4-raw-socket-factory-impl.cc b/src/internet/model/ipv4-raw-socket-factory-impl.cc index e3ea9476a..87a324388 100644 --- a/src/internet/model/ipv4-raw-socket-factory-impl.cc +++ b/src/internet/model/ipv4-raw-socket-factory-impl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/internet/model/ipv4-raw-socket-factory-impl.h b/src/internet/model/ipv4-raw-socket-factory-impl.h index d89d1412c..eef572296 100644 --- a/src/internet/model/ipv4-raw-socket-factory-impl.h +++ b/src/internet/model/ipv4-raw-socket-factory-impl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/internet/model/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc index 043c39523..dda5e1e6f 100644 --- a/src/internet/model/ipv4-raw-socket-impl.cc +++ b/src/internet/model/ipv4-raw-socket-impl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ #include #include "ipv4-raw-socket-impl.h" #include "ipv4-l3-protocol.h" diff --git a/src/internet/model/ipv4-raw-socket-impl.h b/src/internet/model/ipv4-raw-socket-impl.h index 6a8493d4c..129226534 100644 --- a/src/internet/model/ipv4-raw-socket-impl.h +++ b/src/internet/model/ipv4-raw-socket-impl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ #ifndef IPV4_RAW_SOCKET_IMPL_H #define IPV4_RAW_SOCKET_IMPL_H diff --git a/src/internet/model/ipv4-route.cc b/src/internet/model/ipv4-route.cc index 278b1d08c..1e1090504 100644 --- a/src/internet/model/ipv4-route.cc +++ b/src/internet/model/ipv4-route.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv4-route.h b/src/internet/model/ipv4-route.h index f87b113a0..a919bcff6 100644 --- a/src/internet/model/ipv4-route.h +++ b/src/internet/model/ipv4-route.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv4-routing-protocol.cc b/src/internet/model/ipv4-routing-protocol.cc index f90f7f923..774060baa 100644 --- a/src/internet/model/ipv4-routing-protocol.cc +++ b/src/internet/model/ipv4-routing-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv4-routing-protocol.h b/src/internet/model/ipv4-routing-protocol.h index 5bda83460..d5cb424ea 100644 --- a/src/internet/model/ipv4-routing-protocol.h +++ b/src/internet/model/ipv4-routing-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv4-routing-table-entry.cc b/src/internet/model/ipv4-routing-table-entry.cc index f74047c84..d89f1756f 100644 --- a/src/internet/model/ipv4-routing-table-entry.cc +++ b/src/internet/model/ipv4-routing-table-entry.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-routing-table-entry.h b/src/internet/model/ipv4-routing-table-entry.h index 9c280ef12..62c0dbe72 100644 --- a/src/internet/model/ipv4-routing-table-entry.h +++ b/src/internet/model/ipv4-routing-table-entry.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc index ab11b7b45..a9754f1b8 100644 --- a/src/internet/model/ipv4-static-routing.cc +++ b/src/internet/model/ipv4-static-routing.cc @@ -1,4 +1,4 @@ -// -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- +// -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- // // Copyright (c) 2006 Georgia Tech Research Corporation // diff --git a/src/internet/model/ipv4-static-routing.h b/src/internet/model/ipv4-static-routing.h index e74b2ed09..8ae679790 100644 --- a/src/internet/model/ipv4-static-routing.h +++ b/src/internet/model/ipv4-static-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 Georgia Tech Research Corporation * diff --git a/src/internet/model/ipv6-autoconfigured-prefix.cc b/src/internet/model/ipv6-autoconfigured-prefix.cc index e17789276..cdea5dac5 100644 --- a/src/internet/model/ipv6-autoconfigured-prefix.cc +++ b/src/internet/model/ipv6-autoconfigured-prefix.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Telecom Bretagne * diff --git a/src/internet/model/ipv6-autoconfigured-prefix.h b/src/internet/model/ipv6-autoconfigured-prefix.h index 186d5fb34..af8f4cc44 100644 --- a/src/internet/model/ipv6-autoconfigured-prefix.h +++ b/src/internet/model/ipv6-autoconfigured-prefix.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Telecom Bretagne * diff --git a/src/internet/model/ipv6-end-point-demux.cc b/src/internet/model/ipv6-end-point-demux.cc index 4bc540b52..466426966 100644 --- a/src/internet/model/ipv6-end-point-demux.cc +++ b/src/internet/model/ipv6-end-point-demux.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-end-point-demux.h b/src/internet/model/ipv6-end-point-demux.h index b02de0d3d..03d043c80 100644 --- a/src/internet/model/ipv6-end-point-demux.h +++ b/src/internet/model/ipv6-end-point-demux.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-end-point.cc b/src/internet/model/ipv6-end-point.cc index db6fb418b..d34ca9bac 100644 --- a/src/internet/model/ipv6-end-point.cc +++ b/src/internet/model/ipv6-end-point.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-end-point.h b/src/internet/model/ipv6-end-point.h index 688009ee9..9fc5c83a5 100644 --- a/src/internet/model/ipv6-end-point.h +++ b/src/internet/model/ipv6-end-point.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-extension-demux.cc b/src/internet/model/ipv6-extension-demux.cc index d02455cde..04688ae17 100644 --- a/src/internet/model/ipv6-extension-demux.cc +++ b/src/internet/model/ipv6-extension-demux.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-extension-demux.h b/src/internet/model/ipv6-extension-demux.h index bce769d9a..5ed9025ed 100644 --- a/src/internet/model/ipv6-extension-demux.h +++ b/src/internet/model/ipv6-extension-demux.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-extension-header.cc b/src/internet/model/ipv6-extension-header.cc index fb1cdc57c..05b00408d 100644 --- a/src/internet/model/ipv6-extension-header.cc +++ b/src/internet/model/ipv6-extension-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-extension-header.h b/src/internet/model/ipv6-extension-header.h index e7b53c602..0bba77324 100644 --- a/src/internet/model/ipv6-extension-header.h +++ b/src/internet/model/ipv6-extension-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-extension.cc b/src/internet/model/ipv6-extension.cc index 096fa4472..fc16d0aa5 100644 --- a/src/internet/model/ipv6-extension.cc +++ b/src/internet/model/ipv6-extension.cc @@ -1,4 +1,4 @@ -/* Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-extension.h b/src/internet/model/ipv6-extension.h index 6fe662055..2d433d7d5 100644 --- a/src/internet/model/ipv6-extension.h +++ b/src/internet/model/ipv6-extension.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-header.cc b/src/internet/model/ipv6-header.cc index 7399b841d..a7ea7a1a2 100644 --- a/src/internet/model/ipv6-header.cc +++ b/src/internet/model/ipv6-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2008 Louis Pasteur University * diff --git a/src/internet/model/ipv6-header.h b/src/internet/model/ipv6-header.h index 197cefd75..97a194bf8 100644 --- a/src/internet/model/ipv6-header.h +++ b/src/internet/model/ipv6-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2008 Louis Pasteur University * diff --git a/src/internet/model/ipv6-interface-address.cc b/src/internet/model/ipv6-interface-address.cc index ef7c7b062..e962ba648 100644 --- a/src/internet/model/ipv6-interface-address.cc +++ b/src/internet/model/ipv6-interface-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-interface-address.h b/src/internet/model/ipv6-interface-address.h index ee1475c92..6efc7497f 100644 --- a/src/internet/model/ipv6-interface-address.h +++ b/src/internet/model/ipv6-interface-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-interface.cc b/src/internet/model/ipv6-interface.cc index c79c2aa9c..7c2c14053 100644 --- a/src/internet/model/ipv6-interface.cc +++ b/src/internet/model/ipv6-interface.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-interface.h b/src/internet/model/ipv6-interface.h index af46d76a4..7051ce780 100644 --- a/src/internet/model/ipv6-interface.h +++ b/src/internet/model/ipv6-interface.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc index 3db0d9284..42e2bce4d 100644 --- a/src/internet/model/ipv6-l3-protocol.cc +++ b/src/internet/model/ipv6-l3-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-l3-protocol.h b/src/internet/model/ipv6-l3-protocol.h index c0f49edf4..1474e84f3 100644 --- a/src/internet/model/ipv6-l3-protocol.h +++ b/src/internet/model/ipv6-l3-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-l4-protocol.cc b/src/internet/model/ipv6-l4-protocol.cc index 86deb8cea..8bfd8cdf6 100644 --- a/src/internet/model/ipv6-l4-protocol.cc +++ b/src/internet/model/ipv6-l4-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-l4-protocol.h b/src/internet/model/ipv6-l4-protocol.h index 14d279ad8..34c5dda96 100644 --- a/src/internet/model/ipv6-l4-protocol.h +++ b/src/internet/model/ipv6-l4-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-list-routing.cc b/src/internet/model/ipv6-list-routing.cc index 5127ed560..9e24a8ca4 100644 --- a/src/internet/model/ipv6-list-routing.cc +++ b/src/internet/model/ipv6-list-routing.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv6-list-routing.h b/src/internet/model/ipv6-list-routing.h index bdeff3777..b255e26a6 100644 --- a/src/internet/model/ipv6-list-routing.h +++ b/src/internet/model/ipv6-list-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv6-option-demux.cc b/src/internet/model/ipv6-option-demux.cc index e40f6b4dd..b23dcffd6 100644 --- a/src/internet/model/ipv6-option-demux.cc +++ b/src/internet/model/ipv6-option-demux.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-option-demux.h b/src/internet/model/ipv6-option-demux.h index f5a90a7ab..e1e4a603e 100644 --- a/src/internet/model/ipv6-option-demux.h +++ b/src/internet/model/ipv6-option-demux.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-option-header.cc b/src/internet/model/ipv6-option-header.cc index 594f7add1..753cac9a5 100644 --- a/src/internet/model/ipv6-option-header.cc +++ b/src/internet/model/ipv6-option-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-option-header.h b/src/internet/model/ipv6-option-header.h index faa97c9a0..a180cff59 100644 --- a/src/internet/model/ipv6-option-header.h +++ b/src/internet/model/ipv6-option-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-option.cc b/src/internet/model/ipv6-option.cc index 7656aedcb..9a530d384 100644 --- a/src/internet/model/ipv6-option.cc +++ b/src/internet/model/ipv6-option.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-option.h b/src/internet/model/ipv6-option.h index dc9b47436..f4fb7d6fb 100644 --- a/src/internet/model/ipv6-option.h +++ b/src/internet/model/ipv6-option.h @@ -1,4 +1,4 @@ -/* -*-Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode: C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-raw-socket-factory-impl.cc b/src/internet/model/ipv6-raw-socket-factory-impl.cc index 086a48603..be3cb20c2 100644 --- a/src/internet/model/ipv6-raw-socket-factory-impl.cc +++ b/src/internet/model/ipv6-raw-socket-factory-impl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/internet/model/ipv6-raw-socket-factory-impl.h b/src/internet/model/ipv6-raw-socket-factory-impl.h index 91d53ed35..08077acc5 100644 --- a/src/internet/model/ipv6-raw-socket-factory-impl.h +++ b/src/internet/model/ipv6-raw-socket-factory-impl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/internet/model/ipv6-raw-socket-impl.cc b/src/internet/model/ipv6-raw-socket-impl.cc index b8e03ba8c..5e5367c36 100644 --- a/src/internet/model/ipv6-raw-socket-impl.cc +++ b/src/internet/model/ipv6-raw-socket-impl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-raw-socket-impl.h b/src/internet/model/ipv6-raw-socket-impl.h index cd279109a..1f80fd2d6 100644 --- a/src/internet/model/ipv6-raw-socket-impl.h +++ b/src/internet/model/ipv6-raw-socket-impl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-route.cc b/src/internet/model/ipv6-route.cc index 9ea3994d2..0ed19ebfa 100644 --- a/src/internet/model/ipv6-route.cc +++ b/src/internet/model/ipv6-route.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-route.h b/src/internet/model/ipv6-route.h index 1227c36b9..855ca97f1 100644 --- a/src/internet/model/ipv6-route.h +++ b/src/internet/model/ipv6-route.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-routing-protocol.cc b/src/internet/model/ipv6-routing-protocol.cc index e4d0a21d0..88cd22f07 100644 --- a/src/internet/model/ipv6-routing-protocol.cc +++ b/src/internet/model/ipv6-routing-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv6-routing-protocol.h b/src/internet/model/ipv6-routing-protocol.h index 90b32f2f3..29190b3c5 100644 --- a/src/internet/model/ipv6-routing-protocol.h +++ b/src/internet/model/ipv6-routing-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/model/ipv6-routing-table-entry.cc b/src/internet/model/ipv6-routing-table-entry.cc index 9479bf383..b297db4ce 100644 --- a/src/internet/model/ipv6-routing-table-entry.cc +++ b/src/internet/model/ipv6-routing-table-entry.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-routing-table-entry.h b/src/internet/model/ipv6-routing-table-entry.h index 2a7fbfeec..84c9a720e 100644 --- a/src/internet/model/ipv6-routing-table-entry.h +++ b/src/internet/model/ipv6-routing-table-entry.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-static-routing.cc b/src/internet/model/ipv6-static-routing.cc index 90533f991..0b762d458 100644 --- a/src/internet/model/ipv6-static-routing.cc +++ b/src/internet/model/ipv6-static-routing.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ipv6-static-routing.h b/src/internet/model/ipv6-static-routing.h index f6355d8fe..8a2112dbc 100644 --- a/src/internet/model/ipv6-static-routing.h +++ b/src/internet/model/ipv6-static-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ndisc-cache.cc b/src/internet/model/ndisc-cache.cc index 78cc96b7d..b91135abe 100644 --- a/src/internet/model/ndisc-cache.cc +++ b/src/internet/model/ndisc-cache.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/ndisc-cache.h b/src/internet/model/ndisc-cache.h index 1bc906346..8ea0fe734 100644 --- a/src/internet/model/ndisc-cache.h +++ b/src/internet/model/ndisc-cache.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2009 Strasbourg University * diff --git a/src/internet/model/nsc-sysctl.cc b/src/internet/model/nsc-sysctl.cc index 1a9c7636a..fd3b96c75 100644 --- a/src/internet/model/nsc-sysctl.cc +++ b/src/internet/model/nsc-sysctl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/model/nsc-sysctl.h b/src/internet/model/nsc-sysctl.h index 70747e477..ba8e59e0a 100644 --- a/src/internet/model/nsc-sysctl.h +++ b/src/internet/model/nsc-sysctl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/model/nsc-tcp-l4-protocol.cc b/src/internet/model/nsc-tcp-l4-protocol.cc index 9da58dfd0..da5742938 100644 --- a/src/internet/model/nsc-tcp-l4-protocol.cc +++ b/src/internet/model/nsc-tcp-l4-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/model/nsc-tcp-l4-protocol.h b/src/internet/model/nsc-tcp-l4-protocol.h index fb83541d3..dafcbafcd 100644 --- a/src/internet/model/nsc-tcp-l4-protocol.h +++ b/src/internet/model/nsc-tcp-l4-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/model/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc index fe4e53cf0..354a7e7fa 100644 --- a/src/internet/model/nsc-tcp-socket-impl.cc +++ b/src/internet/model/nsc-tcp-socket-impl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/model/nsc-tcp-socket-impl.h b/src/internet/model/nsc-tcp-socket-impl.h index 45de1c6d5..090e2ac75 100644 --- a/src/internet/model/nsc-tcp-socket-impl.h +++ b/src/internet/model/nsc-tcp-socket-impl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc index 0875399ec..14bf340c6 100644 --- a/src/internet/model/tcp-header.cc +++ b/src/internet/model/tcp-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Georgia Tech Research Corporation * diff --git a/src/internet/model/tcp-header.h b/src/internet/model/tcp-header.h index 6d4e2b4b1..4f7fb2bcf 100644 --- a/src/internet/model/tcp-header.h +++ b/src/internet/model/tcp-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Georgia Tech Research Corporation * diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc index e275a5376..a67821985 100644 --- a/src/internet/model/tcp-l4-protocol.cc +++ b/src/internet/model/tcp-l4-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Georgia Tech Research Corporation * diff --git a/src/internet/model/tcp-l4-protocol.h b/src/internet/model/tcp-l4-protocol.h index 67adbf212..78393ce27 100644 --- a/src/internet/model/tcp-l4-protocol.h +++ b/src/internet/model/tcp-l4-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Georgia Tech Research Corporation * diff --git a/src/internet/model/tcp-newreno.cc b/src/internet/model/tcp-newreno.cc index bb68e8333..9123a13a1 100644 --- a/src/internet/model/tcp-newreno.cc +++ b/src/internet/model/tcp-newreno.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-newreno.h b/src/internet/model/tcp-newreno.h index bcb3fc86b..fc00f29a2 100644 --- a/src/internet/model/tcp-newreno.h +++ b/src/internet/model/tcp-newreno.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-reno.cc b/src/internet/model/tcp-reno.cc index 559364b79..ff720cb40 100644 --- a/src/internet/model/tcp-reno.cc +++ b/src/internet/model/tcp-reno.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-reno.h b/src/internet/model/tcp-reno.h index 91eaf76e9..49adbdaac 100644 --- a/src/internet/model/tcp-reno.h +++ b/src/internet/model/tcp-reno.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-rfc793.cc b/src/internet/model/tcp-rfc793.cc index fcde5e315..0ff780e12 100644 --- a/src/internet/model/tcp-rfc793.cc +++ b/src/internet/model/tcp-rfc793.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-rfc793.h b/src/internet/model/tcp-rfc793.h index d734130e7..516f6d161 100644 --- a/src/internet/model/tcp-rfc793.h +++ b/src/internet/model/tcp-rfc793.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index 0fa2e1f82..53113796e 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-socket-base.h b/src/internet/model/tcp-socket-base.h index 0d676dd59..6a7a6a275 100644 --- a/src/internet/model/tcp-socket-base.h +++ b/src/internet/model/tcp-socket-base.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-socket.cc b/src/internet/model/tcp-socket.cc index 5ddccb873..f4f5c6b87 100644 --- a/src/internet/model/tcp-socket.cc +++ b/src/internet/model/tcp-socket.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/internet/model/tcp-tahoe.cc b/src/internet/model/tcp-tahoe.cc index f420165cf..a104ccc65 100644 --- a/src/internet/model/tcp-tahoe.cc +++ b/src/internet/model/tcp-tahoe.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/tcp-tahoe.h b/src/internet/model/tcp-tahoe.h index dbd9d06c5..029df7643 100644 --- a/src/internet/model/tcp-tahoe.h +++ b/src/internet/model/tcp-tahoe.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Adrian Sai-wah Tam * diff --git a/src/internet/model/udp-header.cc b/src/internet/model/udp-header.cc index 999eae0e3..26c10ddba 100644 --- a/src/internet/model/udp-header.cc +++ b/src/internet/model/udp-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/udp-header.h b/src/internet/model/udp-header.h index 3ce652e84..7cce9606e 100644 --- a/src/internet/model/udp-header.h +++ b/src/internet/model/udp-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc index c7db24749..3787505e8 100644 --- a/src/internet/model/udp-l4-protocol.cc +++ b/src/internet/model/udp-l4-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/internet/model/udp-l4-protocol.h b/src/internet/model/udp-l4-protocol.h index 8f5dc6cbd..47036b2ae 100644 --- a/src/internet/model/udp-l4-protocol.h +++ b/src/internet/model/udp-l4-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index 8d8fb333b..bb98d5424 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/internet/model/udp-socket-impl.h b/src/internet/model/udp-socket-impl.h index c1709443a..9387ffe62 100644 --- a/src/internet/model/udp-socket-impl.h +++ b/src/internet/model/udp-socket-impl.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/internet/model/udp-socket.cc b/src/internet/model/udp-socket.cc index f7918fd0a..e5021fffd 100644 --- a/src/internet/model/udp-socket.cc +++ b/src/internet/model/udp-socket.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/internet/test/ipv4-address-generator-test-suite.cc b/src/internet/test/ipv4-address-generator-test-suite.cc index 0d6f83c91..9dd5455ac 100644 --- a/src/internet/test/ipv4-address-generator-test-suite.cc +++ b/src/internet/test/ipv4-address-generator-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/test/ipv4-address-helper-test-suite.cc b/src/internet/test/ipv4-address-helper-test-suite.cc index 10f50a346..167fa301d 100644 --- a/src/internet/test/ipv4-address-helper-test-suite.cc +++ b/src/internet/test/ipv4-address-helper-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/internet/test/ipv4-list-routing-test-suite.cc b/src/internet/test/ipv4-list-routing-test-suite.cc index b0627124a..877010350 100644 --- a/src/internet/test/ipv4-list-routing-test-suite.cc +++ b/src/internet/test/ipv4-list-routing-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index 39a6f539a..bed926fd0 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Hajime Tazaki * diff --git a/src/internet/test/ipv4-test.cc b/src/internet/test/ipv4-test.cc index 7e6a793c0..5e6a77cb7 100644 --- a/src/internet/test/ipv4-test.cc +++ b/src/internet/test/ipv4-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/internet/test/ipv6-list-routing-test-suite.cc b/src/internet/test/ipv6-list-routing-test-suite.cc index 38467988b..1a16834a9 100644 --- a/src/internet/test/ipv6-list-routing-test-suite.cc +++ b/src/internet/test/ipv6-list-routing-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/internet/test/ipv6-test.cc b/src/internet/test/ipv6-test.cc index 1fda695e9..a14a09fc9 100644 --- a/src/internet/test/ipv6-test.cc +++ b/src/internet/test/ipv6-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Strasbourg University * diff --git a/src/internet/test/tcp-test.cc b/src/internet/test/tcp-test.cc index 6fe72989b..2f0363576 100644 --- a/src/internet/test/tcp-test.cc +++ b/src/internet/test/tcp-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Georgia Tech Research Corporation * Copyright (c) 2009 INRIA diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc index a00fa9267..33ac6ec45 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Georgia Tech Research Corporation * diff --git a/src/lte/examples/lte-amc.cc b/src/lte/examples/lte-amc.cc index c6507580a..35d713593 100644 --- a/src/lte/examples/lte-amc.cc +++ b/src/lte/examples/lte-amc.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/examples/lte-channel-model.cc b/src/lte/examples/lte-channel-model.cc index 34a304190..8c6022f78 100644 --- a/src/lte/examples/lte-channel-model.cc +++ b/src/lte/examples/lte-channel-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/examples/lte-phy-downlink.cc b/src/lte/examples/lte-phy-downlink.cc index 28317684a..5001f9e2a 100644 --- a/src/lte/examples/lte-phy-downlink.cc +++ b/src/lte/examples/lte-phy-downlink.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/examples/lte-phy-uplink.cc b/src/lte/examples/lte-phy-uplink.cc index 715009c23..626cb1c5b 100644 --- a/src/lte/examples/lte-phy-uplink.cc +++ b/src/lte/examples/lte-phy-uplink.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index 8be0c3cd2..cf0216997 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/helper/lte-helper.h b/src/lte/helper/lte-helper.h index 3ad8e1125..a70305caa 100644 --- a/src/lte/helper/lte-helper.h +++ b/src/lte/helper/lte-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v0_M10.h b/src/lte/model/JakesTraces/multipath_v0_M10.h index 6888a03ce..072f29a0b 100644 --- a/src/lte/model/JakesTraces/multipath_v0_M10.h +++ b/src/lte/model/JakesTraces/multipath_v0_M10.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v0_M12.h b/src/lte/model/JakesTraces/multipath_v0_M12.h index 166bad657..57de5c165 100644 --- a/src/lte/model/JakesTraces/multipath_v0_M12.h +++ b/src/lte/model/JakesTraces/multipath_v0_M12.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v0_M6.h b/src/lte/model/JakesTraces/multipath_v0_M6.h index 300ca96b9..e9f28fa44 100644 --- a/src/lte/model/JakesTraces/multipath_v0_M6.h +++ b/src/lte/model/JakesTraces/multipath_v0_M6.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v0_M8.h b/src/lte/model/JakesTraces/multipath_v0_M8.h index 4042155e7..fbcea576a 100644 --- a/src/lte/model/JakesTraces/multipath_v0_M8.h +++ b/src/lte/model/JakesTraces/multipath_v0_M8.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v120_M10.h b/src/lte/model/JakesTraces/multipath_v120_M10.h index eb5ec14d8..fd81d7932 100644 --- a/src/lte/model/JakesTraces/multipath_v120_M10.h +++ b/src/lte/model/JakesTraces/multipath_v120_M10.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v120_M12.h b/src/lte/model/JakesTraces/multipath_v120_M12.h index e661b0ba1..c29bc9b11 100644 --- a/src/lte/model/JakesTraces/multipath_v120_M12.h +++ b/src/lte/model/JakesTraces/multipath_v120_M12.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v120_M6.h b/src/lte/model/JakesTraces/multipath_v120_M6.h index 15b4ded32..08f6ed621 100644 --- a/src/lte/model/JakesTraces/multipath_v120_M6.h +++ b/src/lte/model/JakesTraces/multipath_v120_M6.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v120_M8.h b/src/lte/model/JakesTraces/multipath_v120_M8.h index 1bf4a711b..58c4ce8a3 100644 --- a/src/lte/model/JakesTraces/multipath_v120_M8.h +++ b/src/lte/model/JakesTraces/multipath_v120_M8.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v30_M10.h b/src/lte/model/JakesTraces/multipath_v30_M10.h index 2aadbeef3..0c655040c 100644 --- a/src/lte/model/JakesTraces/multipath_v30_M10.h +++ b/src/lte/model/JakesTraces/multipath_v30_M10.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v30_M12.h b/src/lte/model/JakesTraces/multipath_v30_M12.h index 1b5debb9a..e69ed4204 100644 --- a/src/lte/model/JakesTraces/multipath_v30_M12.h +++ b/src/lte/model/JakesTraces/multipath_v30_M12.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v30_M6.h b/src/lte/model/JakesTraces/multipath_v30_M6.h index bd41cb880..fa950ca7b 100644 --- a/src/lte/model/JakesTraces/multipath_v30_M6.h +++ b/src/lte/model/JakesTraces/multipath_v30_M6.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v30_M8.h b/src/lte/model/JakesTraces/multipath_v30_M8.h index 8907bda94..a52632d62 100644 --- a/src/lte/model/JakesTraces/multipath_v30_M8.h +++ b/src/lte/model/JakesTraces/multipath_v30_M8.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v3_M10.h b/src/lte/model/JakesTraces/multipath_v3_M10.h index e56003a06..674bcd513 100644 --- a/src/lte/model/JakesTraces/multipath_v3_M10.h +++ b/src/lte/model/JakesTraces/multipath_v3_M10.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v3_M12.h b/src/lte/model/JakesTraces/multipath_v3_M12.h index 6984c7d13..22fac0d97 100644 --- a/src/lte/model/JakesTraces/multipath_v3_M12.h +++ b/src/lte/model/JakesTraces/multipath_v3_M12.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v3_M6.h b/src/lte/model/JakesTraces/multipath_v3_M6.h index 72294e142..5a06a131a 100644 --- a/src/lte/model/JakesTraces/multipath_v3_M6.h +++ b/src/lte/model/JakesTraces/multipath_v3_M6.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/JakesTraces/multipath_v3_M8.h b/src/lte/model/JakesTraces/multipath_v3_M8.h index 9acb191fc..c055047e6 100644 --- a/src/lte/model/JakesTraces/multipath_v3_M8.h +++ b/src/lte/model/JakesTraces/multipath_v3_M8.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/amc-module.cc b/src/lte/model/amc-module.cc index 513bf1bcc..6d756de5c 100644 --- a/src/lte/model/amc-module.cc +++ b/src/lte/model/amc-module.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/amc-module.h b/src/lte/model/amc-module.h index c495fe174..f5407a57a 100644 --- a/src/lte/model/amc-module.h +++ b/src/lte/model/amc-module.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/bearer-qos-parameters.cc b/src/lte/model/bearer-qos-parameters.cc index 83dea576c..f84527cb0 100644 --- a/src/lte/model/bearer-qos-parameters.cc +++ b/src/lte/model/bearer-qos-parameters.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/bearer-qos-parameters.h b/src/lte/model/bearer-qos-parameters.h index c1b1ee612..8dd0104fb 100644 --- a/src/lte/model/bearer-qos-parameters.h +++ b/src/lte/model/bearer-qos-parameters.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/channel-realization.cc b/src/lte/model/channel-realization.cc index a4943f8b2..98db41b15 100644 --- a/src/lte/model/channel-realization.cc +++ b/src/lte/model/channel-realization.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/channel-realization.h b/src/lte/model/channel-realization.h index dc51780f6..783fa9b5f 100644 --- a/src/lte/model/channel-realization.h +++ b/src/lte/model/channel-realization.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/discrete-time-loss-model.cc b/src/lte/model/discrete-time-loss-model.cc index bffbbe5da..183d4886f 100644 --- a/src/lte/model/discrete-time-loss-model.cc +++ b/src/lte/model/discrete-time-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/discrete-time-loss-model.h b/src/lte/model/discrete-time-loss-model.h index 9d871309b..2a64e2bc9 100644 --- a/src/lte/model/discrete-time-loss-model.h +++ b/src/lte/model/discrete-time-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-lte-spectrum-phy.cc b/src/lte/model/enb-lte-spectrum-phy.cc index 1bab676ef..a430720b3 100644 --- a/src/lte/model/enb-lte-spectrum-phy.cc +++ b/src/lte/model/enb-lte-spectrum-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-lte-spectrum-phy.h b/src/lte/model/enb-lte-spectrum-phy.h index 889f7133f..4267afd39 100644 --- a/src/lte/model/enb-lte-spectrum-phy.h +++ b/src/lte/model/enb-lte-spectrum-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-mac-entity.cc b/src/lte/model/enb-mac-entity.cc index a4d1c8420..6abe560d4 100644 --- a/src/lte/model/enb-mac-entity.cc +++ b/src/lte/model/enb-mac-entity.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-mac-entity.h b/src/lte/model/enb-mac-entity.h index ab435f420..027bf8eb8 100644 --- a/src/lte/model/enb-mac-entity.h +++ b/src/lte/model/enb-mac-entity.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-net-device.cc b/src/lte/model/enb-net-device.cc index da2137723..9de1f0552 100644 --- a/src/lte/model/enb-net-device.cc +++ b/src/lte/model/enb-net-device.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-net-device.h b/src/lte/model/enb-net-device.h index 65f3e6391..699625353 100644 --- a/src/lte/model/enb-net-device.h +++ b/src/lte/model/enb-net-device.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-phy.cc b/src/lte/model/enb-phy.cc index 9000aba84..751a33af1 100644 --- a/src/lte/model/enb-phy.cc +++ b/src/lte/model/enb-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/enb-phy.h b/src/lte/model/enb-phy.h index b220abc68..7d085aa68 100644 --- a/src/lte/model/enb-phy.h +++ b/src/lte/model/enb-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ideal-control-messages.cc b/src/lte/model/ideal-control-messages.cc index 821809711..aed510a08 100644 --- a/src/lte/model/ideal-control-messages.cc +++ b/src/lte/model/ideal-control-messages.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ideal-control-messages.h b/src/lte/model/ideal-control-messages.h index 3039e000e..78155df60 100644 --- a/src/lte/model/ideal-control-messages.h +++ b/src/lte/model/ideal-control-messages.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/jakes-fading-loss-model.cc b/src/lte/model/jakes-fading-loss-model.cc index 9c1c5f3cf..740741880 100644 --- a/src/lte/model/jakes-fading-loss-model.cc +++ b/src/lte/model/jakes-fading-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/jakes-fading-loss-model.h b/src/lte/model/jakes-fading-loss-model.h index a643de17d..16777ce3e 100644 --- a/src/lte/model/jakes-fading-loss-model.h +++ b/src/lte/model/jakes-fading-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/jakes-fading-realizations.h b/src/lte/model/jakes-fading-realizations.h index 554fe17c6..ec2174052 100644 --- a/src/lte/model/jakes-fading-realizations.h +++ b/src/lte/model/jakes-fading-realizations.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-mac-header.cc b/src/lte/model/lte-mac-header.cc index 62f5f1dbf..17fe06252 100644 --- a/src/lte/model/lte-mac-header.cc +++ b/src/lte/model/lte-mac-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-mac-header.h b/src/lte/model/lte-mac-header.h index 4c9134a60..3e80f57e1 100644 --- a/src/lte/model/lte-mac-header.h +++ b/src/lte/model/lte-mac-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-mac-queue.cc b/src/lte/model/lte-mac-queue.cc index 6d2f0a3ed..1ef6039e8 100644 --- a/src/lte/model/lte-mac-queue.cc +++ b/src/lte/model/lte-mac-queue.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-mac-queue.h b/src/lte/model/lte-mac-queue.h index 8dc4187d4..173e720b2 100644 --- a/src/lte/model/lte-mac-queue.h +++ b/src/lte/model/lte-mac-queue.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-net-device.cc b/src/lte/model/lte-net-device.cc index 132b110b3..37b97ff7d 100644 --- a/src/lte/model/lte-net-device.cc +++ b/src/lte/model/lte-net-device.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-net-device.h b/src/lte/model/lte-net-device.h index 9e4a866cd..be260a164 100644 --- a/src/lte/model/lte-net-device.h +++ b/src/lte/model/lte-net-device.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-phy.cc b/src/lte/model/lte-phy.cc index 8ee1c07fe..95009761e 100644 --- a/src/lte/model/lte-phy.cc +++ b/src/lte/model/lte-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-phy.h b/src/lte/model/lte-phy.h index 77bb173b9..36c23479a 100644 --- a/src/lte/model/lte-phy.h +++ b/src/lte/model/lte-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-propagation-loss-model.cc b/src/lte/model/lte-propagation-loss-model.cc index aaa425888..77afa3906 100644 --- a/src/lte/model/lte-propagation-loss-model.cc +++ b/src/lte/model/lte-propagation-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-propagation-loss-model.h b/src/lte/model/lte-propagation-loss-model.h index 53609fd25..e9e555685 100644 --- a/src/lte/model/lte-propagation-loss-model.h +++ b/src/lte/model/lte-propagation-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index 42cdc34f2..4534666c0 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/lte/model/lte-spectrum-phy.h b/src/lte/model/lte-spectrum-phy.h index d1591dac8..dde4f6254 100644 --- a/src/lte/model/lte-spectrum-phy.h +++ b/src/lte/model/lte-spectrum-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/lte/model/lte-spectrum-value-helper.cc b/src/lte/model/lte-spectrum-value-helper.cc index 95df9fe63..afea2de55 100644 --- a/src/lte/model/lte-spectrum-value-helper.cc +++ b/src/lte/model/lte-spectrum-value-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/lte-spectrum-value-helper.h b/src/lte/model/lte-spectrum-value-helper.h index 8344b0f6d..738108283 100644 --- a/src/lte/model/lte-spectrum-value-helper.h +++ b/src/lte/model/lte-spectrum-value-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/mac-entity.cc b/src/lte/model/mac-entity.cc index c73f32318..da6ae2c7d 100644 --- a/src/lte/model/mac-entity.cc +++ b/src/lte/model/mac-entity.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/mac-entity.h b/src/lte/model/mac-entity.h index ec79130a2..f77df2ddb 100644 --- a/src/lte/model/mac-entity.h +++ b/src/lte/model/mac-entity.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/packet-scheduler.cc b/src/lte/model/packet-scheduler.cc index 8baa1ec6a..448d66901 100644 --- a/src/lte/model/packet-scheduler.cc +++ b/src/lte/model/packet-scheduler.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/packet-scheduler.h b/src/lte/model/packet-scheduler.h index eb6054ea4..06a9e70d9 100644 --- a/src/lte/model/packet-scheduler.h +++ b/src/lte/model/packet-scheduler.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/path-loss-model.cc b/src/lte/model/path-loss-model.cc index f9b640899..2a5e2fa62 100644 --- a/src/lte/model/path-loss-model.cc +++ b/src/lte/model/path-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/path-loss-model.h b/src/lte/model/path-loss-model.h index be7e1a24b..143163b67 100644 --- a/src/lte/model/path-loss-model.h +++ b/src/lte/model/path-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/penetration-loss-model.cc b/src/lte/model/penetration-loss-model.cc index 625b8a958..a0d63f7d1 100644 --- a/src/lte/model/penetration-loss-model.cc +++ b/src/lte/model/penetration-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/penetration-loss-model.h b/src/lte/model/penetration-loss-model.h index 0bd725e25..fe9d5b8a9 100644 --- a/src/lte/model/penetration-loss-model.h +++ b/src/lte/model/penetration-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/radio-bearer-instance.cc b/src/lte/model/radio-bearer-instance.cc index b4832a841..6f97c6465 100644 --- a/src/lte/model/radio-bearer-instance.cc +++ b/src/lte/model/radio-bearer-instance.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/radio-bearer-instance.h b/src/lte/model/radio-bearer-instance.h index c998fda94..36469dae2 100644 --- a/src/lte/model/radio-bearer-instance.h +++ b/src/lte/model/radio-bearer-instance.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/rlc-entity.cc b/src/lte/model/rlc-entity.cc index abf788645..de585def8 100644 --- a/src/lte/model/rlc-entity.cc +++ b/src/lte/model/rlc-entity.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/rlc-entity.h b/src/lte/model/rlc-entity.h index b29f25c8a..e0e369245 100644 --- a/src/lte/model/rlc-entity.h +++ b/src/lte/model/rlc-entity.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/rrc-entity.cc b/src/lte/model/rrc-entity.cc index bab740d8f..4f1c4cc18 100644 --- a/src/lte/model/rrc-entity.cc +++ b/src/lte/model/rrc-entity.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/rrc-entity.h b/src/lte/model/rrc-entity.h index 7c542cf61..bd52a4738 100644 --- a/src/lte/model/rrc-entity.h +++ b/src/lte/model/rrc-entity.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/shadowing-loss-model.cc b/src/lte/model/shadowing-loss-model.cc index 8d9a492a6..965b99ec3 100644 --- a/src/lte/model/shadowing-loss-model.cc +++ b/src/lte/model/shadowing-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/shadowing-loss-model.h b/src/lte/model/shadowing-loss-model.h index 23e7d53b8..14c769fa6 100644 --- a/src/lte/model/shadowing-loss-model.h +++ b/src/lte/model/shadowing-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/simple-packet-scheduler.cc b/src/lte/model/simple-packet-scheduler.cc index 8db68c2af..357c12e90 100644 --- a/src/lte/model/simple-packet-scheduler.cc +++ b/src/lte/model/simple-packet-scheduler.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/simple-packet-scheduler.h b/src/lte/model/simple-packet-scheduler.h index e7f381576..bae93af2a 100644 --- a/src/lte/model/simple-packet-scheduler.h +++ b/src/lte/model/simple-packet-scheduler.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-lte-spectrum-phy.cc b/src/lte/model/ue-lte-spectrum-phy.cc index c41ec529c..3a65f088c 100644 --- a/src/lte/model/ue-lte-spectrum-phy.cc +++ b/src/lte/model/ue-lte-spectrum-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-lte-spectrum-phy.h b/src/lte/model/ue-lte-spectrum-phy.h index dfa55fac1..a1f0c2e8e 100644 --- a/src/lte/model/ue-lte-spectrum-phy.h +++ b/src/lte/model/ue-lte-spectrum-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-mac-entity.cc b/src/lte/model/ue-mac-entity.cc index 170cb3c82..2c8a3226b 100644 --- a/src/lte/model/ue-mac-entity.cc +++ b/src/lte/model/ue-mac-entity.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-mac-entity.h b/src/lte/model/ue-mac-entity.h index f8f878676..8dfb93573 100644 --- a/src/lte/model/ue-mac-entity.h +++ b/src/lte/model/ue-mac-entity.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-manager.cc b/src/lte/model/ue-manager.cc index 716f130df..7a0b3b863 100644 --- a/src/lte/model/ue-manager.cc +++ b/src/lte/model/ue-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-manager.h b/src/lte/model/ue-manager.h index be206eade..8e6e69b65 100644 --- a/src/lte/model/ue-manager.h +++ b/src/lte/model/ue-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-net-device.cc b/src/lte/model/ue-net-device.cc index 948631068..1200c4030 100644 --- a/src/lte/model/ue-net-device.cc +++ b/src/lte/model/ue-net-device.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-net-device.h b/src/lte/model/ue-net-device.h index 311161788..92d552490 100644 --- a/src/lte/model/ue-net-device.h +++ b/src/lte/model/ue-net-device.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-phy.cc b/src/lte/model/ue-phy.cc index 3f06ab6aa..f06e99413 100644 --- a/src/lte/model/ue-phy.cc +++ b/src/lte/model/ue-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-phy.h b/src/lte/model/ue-phy.h index a0784ab83..173d9b464 100644 --- a/src/lte/model/ue-phy.h +++ b/src/lte/model/ue-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-record.cc b/src/lte/model/ue-record.cc index ad3f6a0ed..586e3feae 100644 --- a/src/lte/model/ue-record.cc +++ b/src/lte/model/ue-record.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/model/ue-record.h b/src/lte/model/ue-record.h index 3f6324e9e..e8cf2cdc7 100644 --- a/src/lte/model/ue-record.h +++ b/src/lte/model/ue-record.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/test/lte-bearer-test.cc b/src/lte/test/lte-bearer-test.cc index 5b9fcac63..a700cae0b 100644 --- a/src/lte/test/lte-bearer-test.cc +++ b/src/lte/test/lte-bearer-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/test/lte-device-test.cc b/src/lte/test/lte-device-test.cc index 733f910a7..a3a30dba8 100644 --- a/src/lte/test/lte-device-test.cc +++ b/src/lte/test/lte-device-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/test/lte-phy-test.cc b/src/lte/test/lte-phy-test.cc index 3e924da3a..07c1fa0d7 100644 --- a/src/lte/test/lte-phy-test.cc +++ b/src/lte/test/lte-phy-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/lte/test/lte-propagation-loss-model-test.cc b/src/lte/test/lte-propagation-loss-model-test.cc index c2bbacb46..6f601c095 100644 --- a/src/lte/test/lte-propagation-loss-model-test.cc +++ b/src/lte/test/lte-propagation-loss-model-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 TELEMATICS LAB, DEE - Politecnico di Bari * diff --git a/src/mesh/examples/mesh.cc b/src/mesh/examples/mesh.cc index e28236f1b..993ae330c 100644 --- a/src/mesh/examples/mesh.cc +++ b/src/mesh/examples/mesh.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/dot11s/dot11s-installer.cc b/src/mesh/helper/dot11s/dot11s-installer.cc index b82297fbc..b873bd4b5 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.cc +++ b/src/mesh/helper/dot11s/dot11s-installer.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/dot11s/dot11s-installer.h b/src/mesh/helper/dot11s/dot11s-installer.h index 40ca87552..4414e31cf 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.h +++ b/src/mesh/helper/dot11s/dot11s-installer.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/flame/flame-installer.cc b/src/mesh/helper/flame/flame-installer.cc index c7f09f97d..7cc89dd6a 100644 --- a/src/mesh/helper/flame/flame-installer.cc +++ b/src/mesh/helper/flame/flame-installer.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/flame/flame-installer.h b/src/mesh/helper/flame/flame-installer.h index d86c9af2b..4663ba0b7 100644 --- a/src/mesh/helper/flame/flame-installer.h +++ b/src/mesh/helper/flame/flame-installer.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/mesh-helper.cc b/src/mesh/helper/mesh-helper.cc index 261d2d509..2135baba4 100644 --- a/src/mesh/helper/mesh-helper.cc +++ b/src/mesh/helper/mesh-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/mesh-helper.h b/src/mesh/helper/mesh-helper.h index ced5ab084..d488b9650 100644 --- a/src/mesh/helper/mesh-helper.h +++ b/src/mesh/helper/mesh-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/helper/mesh-stack-installer.h b/src/mesh/helper/mesh-stack-installer.h index 112067983..d4093717f 100644 --- a/src/mesh/helper/mesh-stack-installer.h +++ b/src/mesh/helper/mesh-stack-installer.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/dot11s-mac-header.cc b/src/mesh/model/dot11s/dot11s-mac-header.cc index df225bbf2..ecd385973 100644 --- a/src/mesh/model/dot11s/dot11s-mac-header.cc +++ b/src/mesh/model/dot11s/dot11s-mac-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/dot11s/dot11s-mac-header.h b/src/mesh/model/dot11s/dot11s-mac-header.h index 9c9817728..b1c52e158 100644 --- a/src/mesh/model/dot11s/dot11s-mac-header.h +++ b/src/mesh/model/dot11s/dot11s-mac-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.cc b/src/mesh/model/dot11s/hwmp-protocol-mac.cc index 22b043270..5f79366b1 100644 --- a/src/mesh/model/dot11s/hwmp-protocol-mac.cc +++ b/src/mesh/model/dot11s/hwmp-protocol-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.h b/src/mesh/model/dot11s/hwmp-protocol-mac.h index 2de2519d4..b5e09195a 100644 --- a/src/mesh/model/dot11s/hwmp-protocol-mac.h +++ b/src/mesh/model/dot11s/hwmp-protocol-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc index c889262c4..ef91f18c9 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.cc +++ b/src/mesh/model/dot11s/hwmp-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-protocol.h b/src/mesh/model/dot11s/hwmp-protocol.h index 4535a1ef2..e4ce0ef75 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.h +++ b/src/mesh/model/dot11s/hwmp-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-rtable.cc b/src/mesh/model/dot11s/hwmp-rtable.cc index 330397c70..3eb9a9b38 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.cc +++ b/src/mesh/model/dot11s/hwmp-rtable.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-rtable.h b/src/mesh/model/dot11s/hwmp-rtable.h index daf7ccd84..36e42e8a3 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.h +++ b/src/mesh/model/dot11s/hwmp-rtable.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-tag.cc b/src/mesh/model/dot11s/hwmp-tag.cc index 737f63fb4..a6461362f 100644 --- a/src/mesh/model/dot11s/hwmp-tag.cc +++ b/src/mesh/model/dot11s/hwmp-tag.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/hwmp-tag.h b/src/mesh/model/dot11s/hwmp-tag.h index c638cc8cc..5171fb5b2 100644 --- a/src/mesh/model/dot11s/hwmp-tag.h +++ b/src/mesh/model/dot11s/hwmp-tag.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc index fabfb4490..f67cc35c1 100644 --- a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc +++ b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h index 43a3f4905..4f5efa366 100644 --- a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h +++ b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.cc b/src/mesh/model/dot11s/ie-dot11s-configuration.cc index ccb96b0d8..716c43ae1 100644 --- a/src/mesh/model/dot11s/ie-dot11s-configuration.cc +++ b/src/mesh/model/dot11s/ie-dot11s-configuration.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.h b/src/mesh/model/dot11s/ie-dot11s-configuration.h index d14e92701..7f7af886b 100644 --- a/src/mesh/model/dot11s/ie-dot11s-configuration.h +++ b/src/mesh/model/dot11s/ie-dot11s-configuration.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-id.cc b/src/mesh/model/dot11s/ie-dot11s-id.cc index 1c350884d..2a5757fec 100644 --- a/src/mesh/model/dot11s/ie-dot11s-id.cc +++ b/src/mesh/model/dot11s/ie-dot11s-id.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-id.h b/src/mesh/model/dot11s/ie-dot11s-id.h index 48c591e24..e5fd8694e 100644 --- a/src/mesh/model/dot11s/ie-dot11s-id.h +++ b/src/mesh/model/dot11s/ie-dot11s-id.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-metric-report.cc b/src/mesh/model/dot11s/ie-dot11s-metric-report.cc index 60ae77f63..c9860a818 100644 --- a/src/mesh/model/dot11s/ie-dot11s-metric-report.cc +++ b/src/mesh/model/dot11s/ie-dot11s-metric-report.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-metric-report.h b/src/mesh/model/dot11s/ie-dot11s-metric-report.h index add78f858..775342363 100644 --- a/src/mesh/model/dot11s/ie-dot11s-metric-report.h +++ b/src/mesh/model/dot11s/ie-dot11s-metric-report.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.cc b/src/mesh/model/dot11s/ie-dot11s-peer-management.cc index f7c2b15e7..60e4f75b2 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peer-management.cc +++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.h b/src/mesh/model/dot11s/ie-dot11s-peer-management.h index 676a07ab9..493297417 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peer-management.h +++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc index 294b47138..8f55c5bdb 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc +++ b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h index 614ccd3b1..5d9e22f85 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h +++ b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.cc b/src/mesh/model/dot11s/ie-dot11s-perr.cc index 4c8933e83..3d251616d 100644 --- a/src/mesh/model/dot11s/ie-dot11s-perr.cc +++ b/src/mesh/model/dot11s/ie-dot11s-perr.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.h b/src/mesh/model/dot11s/ie-dot11s-perr.h index 063ea956f..8d21d6671 100644 --- a/src/mesh/model/dot11s/ie-dot11s-perr.h +++ b/src/mesh/model/dot11s/ie-dot11s-perr.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.cc b/src/mesh/model/dot11s/ie-dot11s-prep.cc index 93bed2292..530baaa25 100644 --- a/src/mesh/model/dot11s/ie-dot11s-prep.cc +++ b/src/mesh/model/dot11s/ie-dot11s-prep.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.h b/src/mesh/model/dot11s/ie-dot11s-prep.h index e17d29b12..c7e3f4e72 100644 --- a/src/mesh/model/dot11s/ie-dot11s-prep.h +++ b/src/mesh/model/dot11s/ie-dot11s-prep.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.cc b/src/mesh/model/dot11s/ie-dot11s-preq.cc index ea2ae24c2..781f25a77 100644 --- a/src/mesh/model/dot11s/ie-dot11s-preq.cc +++ b/src/mesh/model/dot11s/ie-dot11s-preq.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.h b/src/mesh/model/dot11s/ie-dot11s-preq.h index f7aa524dd..d518779f2 100644 --- a/src/mesh/model/dot11s/ie-dot11s-preq.h +++ b/src/mesh/model/dot11s/ie-dot11s-preq.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-rann.cc b/src/mesh/model/dot11s/ie-dot11s-rann.cc index 7da66bb50..5050f9f0f 100644 --- a/src/mesh/model/dot11s/ie-dot11s-rann.cc +++ b/src/mesh/model/dot11s/ie-dot11s-rann.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/ie-dot11s-rann.h b/src/mesh/model/dot11s/ie-dot11s-rann.h index 2ec7bdba2..ef2333a31 100644 --- a/src/mesh/model/dot11s/ie-dot11s-rann.h +++ b/src/mesh/model/dot11s/ie-dot11s-rann.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc index a3eab778f..51f62b24a 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.cc +++ b/src/mesh/model/dot11s/peer-management-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/dot11s/peer-management-protocol.h b/src/mesh/model/dot11s/peer-management-protocol.h index 7dd835d63..aef61a567 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.h +++ b/src/mesh/model/dot11s/peer-management-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-header.cc b/src/mesh/model/flame/flame-header.cc index 346e18be7..8e49325b0 100644 --- a/src/mesh/model/flame/flame-header.cc +++ b/src/mesh/model/flame/flame-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-header.h b/src/mesh/model/flame/flame-header.h index 8879ea2b3..e1b34bd4d 100644 --- a/src/mesh/model/flame/flame-header.h +++ b/src/mesh/model/flame/flame-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-protocol-mac.cc b/src/mesh/model/flame/flame-protocol-mac.cc index 009f8c558..37647f155 100644 --- a/src/mesh/model/flame/flame-protocol-mac.cc +++ b/src/mesh/model/flame/flame-protocol-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-protocol-mac.h b/src/mesh/model/flame/flame-protocol-mac.h index 63de914fd..fc198a740 100644 --- a/src/mesh/model/flame/flame-protocol-mac.h +++ b/src/mesh/model/flame/flame-protocol-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc index 83f511250..23e70c3e4 100644 --- a/src/mesh/model/flame/flame-protocol.cc +++ b/src/mesh/model/flame/flame-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-protocol.h b/src/mesh/model/flame/flame-protocol.h index cbfacbaf7..bc1b59923 100644 --- a/src/mesh/model/flame/flame-protocol.h +++ b/src/mesh/model/flame/flame-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc index a4b01c9ad..bc657aab4 100644 --- a/src/mesh/model/flame/flame-rtable.cc +++ b/src/mesh/model/flame/flame-rtable.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/flame/flame-rtable.h b/src/mesh/model/flame/flame-rtable.h index 5c1378bb4..e0c4dbcdb 100644 --- a/src/mesh/model/flame/flame-rtable.h +++ b/src/mesh/model/flame/flame-rtable.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mesh/model/mesh-l2-routing-protocol.cc b/src/mesh/model/mesh-l2-routing-protocol.cc index 176ea222c..953a49c3a 100644 --- a/src/mesh/model/mesh-l2-routing-protocol.cc +++ b/src/mesh/model/mesh-l2-routing-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/mesh-l2-routing-protocol.h b/src/mesh/model/mesh-l2-routing-protocol.h index 1a9a81be4..c707b96d7 100644 --- a/src/mesh/model/mesh-l2-routing-protocol.h +++ b/src/mesh/model/mesh-l2-routing-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc index d503eabc1..2628d2725 100644 --- a/src/mesh/model/mesh-point-device.cc +++ b/src/mesh/model/mesh-point-device.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mesh/model/mesh-point-device.h b/src/mesh/model/mesh-point-device.h index 4509622cf..0b4b00d77 100644 --- a/src/mesh/model/mesh-point-device.h +++ b/src/mesh/model/mesh-point-device.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008,2009 IITP RAS * diff --git a/src/mobility/examples/main-grid-topology.cc b/src/mobility/examples/main-grid-topology.cc index 33dc59186..07fb87064 100644 --- a/src/mobility/examples/main-grid-topology.cc +++ b/src/mobility/examples/main-grid-topology.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ #include "ns3/core-module.h" #include "ns3/network-module.h" diff --git a/src/mobility/helper/ns2-mobility-helper.cc b/src/mobility/helper/ns2-mobility-helper.cc index 4caa81344..7b2888821 100644 --- a/src/mobility/helper/ns2-mobility-helper.cc +++ b/src/mobility/helper/ns2-mobility-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * 2009,2010 Contributors diff --git a/src/mobility/helper/ns2-mobility-helper.h b/src/mobility/helper/ns2-mobility-helper.h index 98d257789..76bf72e26 100644 --- a/src/mobility/helper/ns2-mobility-helper.h +++ b/src/mobility/helper/ns2-mobility-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * 2009,2010 Contributors diff --git a/src/mobility/model/box.cc b/src/mobility/model/box.cc index fcb4398fe..65d75307a 100644 --- a/src/mobility/model/box.cc +++ b/src/mobility/model/box.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Dan Broyles * diff --git a/src/mobility/model/box.h b/src/mobility/model/box.h index db4f0931d..e19082ab7 100644 --- a/src/mobility/model/box.h +++ b/src/mobility/model/box.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Dan Broyles * diff --git a/src/mobility/model/constant-acceleration-mobility-model.cc b/src/mobility/model/constant-acceleration-mobility-model.cc index 334fd9696..e11bc1021 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.cc +++ b/src/mobility/model/constant-acceleration-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/mobility/model/constant-acceleration-mobility-model.h b/src/mobility/model/constant-acceleration-mobility-model.h index 93fc73bc0..52a4563b0 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.h +++ b/src/mobility/model/constant-acceleration-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/src/mobility/model/constant-position-mobility-model.cc b/src/mobility/model/constant-position-mobility-model.cc index 7332a0175..1c23ac58c 100644 --- a/src/mobility/model/constant-position-mobility-model.cc +++ b/src/mobility/model/constant-position-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/constant-position-mobility-model.h b/src/mobility/model/constant-position-mobility-model.h index b5f481dfd..a30495f5f 100644 --- a/src/mobility/model/constant-position-mobility-model.h +++ b/src/mobility/model/constant-position-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/constant-velocity-helper.cc b/src/mobility/model/constant-velocity-helper.cc index 9b678ed90..4f587cc1e 100644 --- a/src/mobility/model/constant-velocity-helper.cc +++ b/src/mobility/model/constant-velocity-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/constant-velocity-helper.h b/src/mobility/model/constant-velocity-helper.h index e427ebff9..9c0bf790e 100644 --- a/src/mobility/model/constant-velocity-helper.h +++ b/src/mobility/model/constant-velocity-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/constant-velocity-mobility-model.cc b/src/mobility/model/constant-velocity-mobility-model.cc index 48faa4dac..344cb6731 100644 --- a/src/mobility/model/constant-velocity-mobility-model.cc +++ b/src/mobility/model/constant-velocity-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2007 INRIA * diff --git a/src/mobility/model/constant-velocity-mobility-model.h b/src/mobility/model/constant-velocity-mobility-model.h index db54cf4ef..353cf2362 100644 --- a/src/mobility/model/constant-velocity-mobility-model.h +++ b/src/mobility/model/constant-velocity-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2007 INRIA * diff --git a/src/mobility/model/gauss-markov-mobility-model.cc b/src/mobility/model/gauss-markov-mobility-model.cc index 8e52d6292..a42330dba 100644 --- a/src/mobility/model/gauss-markov-mobility-model.cc +++ b/src/mobility/model/gauss-markov-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Dan Broyles * diff --git a/src/mobility/model/gauss-markov-mobility-model.h b/src/mobility/model/gauss-markov-mobility-model.h index cafc5a8af..de4057141 100644 --- a/src/mobility/model/gauss-markov-mobility-model.h +++ b/src/mobility/model/gauss-markov-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Dan Broyles * diff --git a/src/mobility/model/hierarchical-mobility-model.cc b/src/mobility/model/hierarchical-mobility-model.cc index 7ecc7f19b..6382e9eee 100644 --- a/src/mobility/model/hierarchical-mobility-model.cc +++ b/src/mobility/model/hierarchical-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/hierarchical-mobility-model.h b/src/mobility/model/hierarchical-mobility-model.h index 7598307a5..bc0866331 100644 --- a/src/mobility/model/hierarchical-mobility-model.h +++ b/src/mobility/model/hierarchical-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/mobility-model.cc b/src/mobility/model/mobility-model.cc index bf585db44..9c64da2d5 100644 --- a/src/mobility/model/mobility-model.cc +++ b/src/mobility/model/mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/mobility-model.h b/src/mobility/model/mobility-model.h index ab86682c2..f8ca66d24 100644 --- a/src/mobility/model/mobility-model.h +++ b/src/mobility/model/mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/position-allocator.cc b/src/mobility/model/position-allocator.cc index aeccc11a7..992ab0e76 100644 --- a/src/mobility/model/position-allocator.cc +++ b/src/mobility/model/position-allocator.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/position-allocator.h b/src/mobility/model/position-allocator.h index 4fff3ab83..a0be5bcc8 100644 --- a/src/mobility/model/position-allocator.h +++ b/src/mobility/model/position-allocator.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/random-direction-2d-mobility-model.cc b/src/mobility/model/random-direction-2d-mobility-model.cc index c8fc5cf61..1ba7f593b 100644 --- a/src/mobility/model/random-direction-2d-mobility-model.cc +++ b/src/mobility/model/random-direction-2d-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/random-direction-2d-mobility-model.h b/src/mobility/model/random-direction-2d-mobility-model.h index 75a20b249..5174e8f37 100644 --- a/src/mobility/model/random-direction-2d-mobility-model.h +++ b/src/mobility/model/random-direction-2d-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/random-walk-2d-mobility-model.cc b/src/mobility/model/random-walk-2d-mobility-model.cc index 9bd44a8aa..e09ff69e8 100644 --- a/src/mobility/model/random-walk-2d-mobility-model.cc +++ b/src/mobility/model/random-walk-2d-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/random-walk-2d-mobility-model.h b/src/mobility/model/random-walk-2d-mobility-model.h index b6096d068..3bfc542d4 100644 --- a/src/mobility/model/random-walk-2d-mobility-model.h +++ b/src/mobility/model/random-walk-2d-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/mobility/model/random-waypoint-mobility-model.cc b/src/mobility/model/random-waypoint-mobility-model.cc index dee36c2b5..7d6b906ca 100644 --- a/src/mobility/model/random-waypoint-mobility-model.cc +++ b/src/mobility/model/random-waypoint-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/random-waypoint-mobility-model.h b/src/mobility/model/random-waypoint-mobility-model.h index 4b757530b..1e9389686 100644 --- a/src/mobility/model/random-waypoint-mobility-model.h +++ b/src/mobility/model/random-waypoint-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/rectangle.cc b/src/mobility/model/rectangle.cc index d83fcef17..8437a0816 100644 --- a/src/mobility/model/rectangle.cc +++ b/src/mobility/model/rectangle.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/rectangle.h b/src/mobility/model/rectangle.h index 9ed1cf757..ece8f2492 100644 --- a/src/mobility/model/rectangle.h +++ b/src/mobility/model/rectangle.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc index d95ed71ff..09be43e7c 100644 --- a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc +++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mobility/model/steady-state-random-waypoint-mobility-model.h b/src/mobility/model/steady-state-random-waypoint-mobility-model.h index 03a706119..4f990ba06 100644 --- a/src/mobility/model/steady-state-random-waypoint-mobility-model.h +++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mobility/model/waypoint-mobility-model.cc b/src/mobility/model/waypoint-mobility-model.cc index 5a6bdebf8..420f5ccf4 100644 --- a/src/mobility/model/waypoint-mobility-model.cc +++ b/src/mobility/model/waypoint-mobility-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Phillip Sitbon * diff --git a/src/mobility/model/waypoint-mobility-model.h b/src/mobility/model/waypoint-mobility-model.h index 6787cea6e..a650d8ad9 100644 --- a/src/mobility/model/waypoint-mobility-model.h +++ b/src/mobility/model/waypoint-mobility-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Phillip Sitbon * diff --git a/src/mobility/model/waypoint.cc b/src/mobility/model/waypoint.cc index 59f1b2943..f4254c165 100644 --- a/src/mobility/model/waypoint.cc +++ b/src/mobility/model/waypoint.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Phillip Sitbon * diff --git a/src/mobility/model/waypoint.h b/src/mobility/model/waypoint.h index 709dd5e2c..b962d7e28 100644 --- a/src/mobility/model/waypoint.h +++ b/src/mobility/model/waypoint.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Phillip Sitbon * diff --git a/src/mobility/test/ns2-mobility-helper-test-suite.cc b/src/mobility/test/ns2-mobility-helper-test-suite.cc index ea647c8ec..146b21bf3 100644 --- a/src/mobility/test/ns2-mobility-helper-test-suite.cc +++ b/src/mobility/test/ns2-mobility-helper-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * 2009,2010 Contributors diff --git a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc index 688b50d64..18e0dd61b 100644 --- a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc +++ b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 IITP RAS * diff --git a/src/mobility/test/waypoint-mobility-model-test.cc b/src/mobility/test/waypoint-mobility-model-test.cc index 98808eb7d..b01af993b 100644 --- a/src/mobility/test/waypoint-mobility-model-test.cc +++ b/src/mobility/test/waypoint-mobility-model-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Phillip Sitbon * diff --git a/src/netanim/model/canvas-location.cc b/src/netanim/model/canvas-location.cc index e2c3d4cdd..d6f07f056 100644 --- a/src/netanim/model/canvas-location.cc +++ b/src/netanim/model/canvas-location.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Georgia Institute of Technology * diff --git a/src/netanim/model/canvas-location.h b/src/netanim/model/canvas-location.h index 3949dcb8d..a03626b35 100644 --- a/src/netanim/model/canvas-location.h +++ b/src/netanim/model/canvas-location.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 Georgia Institute of Technology * diff --git a/src/network/model/application.cc b/src/network/model/application.cc index 69304fc13..ac7c7077d 100644 --- a/src/network/model/application.cc +++ b/src/network/model/application.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 Georgia Tech Research Corporation * diff --git a/src/network/model/application.h b/src/network/model/application.h index 246d56fe0..a9efd69c6 100644 --- a/src/network/model/application.h +++ b/src/network/model/application.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 Georgia Tech Research Corporation * diff --git a/src/network/model/channel-list.cc b/src/network/model/channel-list.cc index b258f2902..c3cf34725 100644 --- a/src/network/model/channel-list.cc +++ b/src/network/model/channel-list.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/network/model/channel-list.h b/src/network/model/channel-list.h index ee2893525..9244fd2ae 100644 --- a/src/network/model/channel-list.h +++ b/src/network/model/channel-list.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/network/model/nix-vector.cc b/src/network/model/nix-vector.cc index 79dc8cddb..36fbddff4 100644 --- a/src/network/model/nix-vector.cc +++ b/src/network/model/nix-vector.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/network/model/nix-vector.h b/src/network/model/nix-vector.h index b1bc0bb42..871030e60 100644 --- a/src/network/model/nix-vector.h +++ b/src/network/model/nix-vector.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/network/model/node-list.cc b/src/network/model/node-list.cc index 59c1e61a6..203b49fbb 100644 --- a/src/network/model/node-list.cc +++ b/src/network/model/node-list.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/model/node-list.h b/src/network/model/node-list.h index e457e2c61..679d17980 100644 --- a/src/network/model/node-list.h +++ b/src/network/model/node-list.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/address-utils.cc b/src/network/utils/address-utils.cc index 078da244c..28bb11b46 100644 --- a/src/network/utils/address-utils.cc +++ b/src/network/utils/address-utils.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/network/utils/address-utils.h b/src/network/utils/address-utils.h index ac136b548..154c5a686 100644 --- a/src/network/utils/address-utils.h +++ b/src/network/utils/address-utils.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/network/utils/ethernet-header.cc b/src/network/utils/ethernet-header.cc index 9b98f1653..53f38ebba 100644 --- a/src/network/utils/ethernet-header.cc +++ b/src/network/utils/ethernet-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/ethernet-header.h b/src/network/utils/ethernet-header.h index a1dc233e6..672eaa6c7 100644 --- a/src/network/utils/ethernet-header.h +++ b/src/network/utils/ethernet-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Emmanuelle Laprise * diff --git a/src/network/utils/ethernet-trailer.cc b/src/network/utils/ethernet-trailer.cc index 4b4cccb1f..58c008570 100644 --- a/src/network/utils/ethernet-trailer.cc +++ b/src/network/utils/ethernet-trailer.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/ethernet-trailer.h b/src/network/utils/ethernet-trailer.h index 884e6acf5..c7de33fc5 100644 --- a/src/network/utils/ethernet-trailer.h +++ b/src/network/utils/ethernet-trailer.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Emmanuelle Laprise * diff --git a/src/network/utils/generic-phy.h b/src/network/utils/generic-phy.h index e47a4e65d..e3c3ebb9c 100644 --- a/src/network/utils/generic-phy.h +++ b/src/network/utils/generic-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 CTTC * diff --git a/src/network/utils/inet-socket-address.cc b/src/network/utils/inet-socket-address.cc index 82a8b8f82..774676eba 100644 --- a/src/network/utils/inet-socket-address.cc +++ b/src/network/utils/inet-socket-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/inet-socket-address.h b/src/network/utils/inet-socket-address.h index e8d715baf..e11b7a1cb 100644 --- a/src/network/utils/inet-socket-address.h +++ b/src/network/utils/inet-socket-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/inet6-socket-address.cc b/src/network/utils/inet6-socket-address.cc index d307f23e7..cd9f04290 100644 --- a/src/network/utils/inet6-socket-address.cc +++ b/src/network/utils/inet6-socket-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2008 Louis Pasteur University * diff --git a/src/network/utils/inet6-socket-address.h b/src/network/utils/inet6-socket-address.h index 47c1abdeb..83054b90f 100644 --- a/src/network/utils/inet6-socket-address.h +++ b/src/network/utils/inet6-socket-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2008 Louis Pasteur University * diff --git a/src/network/utils/ipv4-address.cc b/src/network/utils/ipv4-address.cc index b2f070fe0..00c92ae70 100644 --- a/src/network/utils/ipv4-address.cc +++ b/src/network/utils/ipv4-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/ipv4-address.h b/src/network/utils/ipv4-address.h index 86f303486..4fd3e87cd 100644 --- a/src/network/utils/ipv4-address.h +++ b/src/network/utils/ipv4-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/ipv6-address.cc b/src/network/utils/ipv6-address.cc index 455183e24..4d268dd75 100644 --- a/src/network/utils/ipv6-address.cc +++ b/src/network/utils/ipv6-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2008 Louis Pasteur University * diff --git a/src/network/utils/ipv6-address.h b/src/network/utils/ipv6-address.h index 116db440d..e88467b03 100644 --- a/src/network/utils/ipv6-address.h +++ b/src/network/utils/ipv6-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007-2008 Louis Pasteur University * diff --git a/src/network/utils/llc-snap-header.cc b/src/network/utils/llc-snap-header.cc index 3f1012f58..18afe1ba2 100644 --- a/src/network/utils/llc-snap-header.cc +++ b/src/network/utils/llc-snap-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/llc-snap-header.h b/src/network/utils/llc-snap-header.h index a2551c053..a0dab044d 100644 --- a/src/network/utils/llc-snap-header.h +++ b/src/network/utils/llc-snap-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/network/utils/mac48-address.cc b/src/network/utils/mac48-address.cc index 22d4930f6..613bb1cf0 100644 --- a/src/network/utils/mac48-address.cc +++ b/src/network/utils/mac48-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/mac48-address.h b/src/network/utils/mac48-address.h index a532d0d33..8a714a0df 100644 --- a/src/network/utils/mac48-address.h +++ b/src/network/utils/mac48-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/mac64-address.cc b/src/network/utils/mac64-address.cc index 3d020676d..210a497e2 100644 --- a/src/network/utils/mac64-address.cc +++ b/src/network/utils/mac64-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/mac64-address.h b/src/network/utils/mac64-address.h index f4509243d..0462c9f10 100644 --- a/src/network/utils/mac64-address.h +++ b/src/network/utils/mac64-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/output-stream-wrapper.cc b/src/network/utils/output-stream-wrapper.cc index 9f52faf6c..5b2ff88a7 100644 --- a/src/network/utils/output-stream-wrapper.cc +++ b/src/network/utils/output-stream-wrapper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 University of Washington * diff --git a/src/network/utils/output-stream-wrapper.h b/src/network/utils/output-stream-wrapper.h index ba3916969..372501417 100644 --- a/src/network/utils/output-stream-wrapper.h +++ b/src/network/utils/output-stream-wrapper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 University of Washington * diff --git a/src/network/utils/packet-socket-address.cc b/src/network/utils/packet-socket-address.cc index b27168dbf..cdf6307d1 100644 --- a/src/network/utils/packet-socket-address.cc +++ b/src/network/utils/packet-socket-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/packet-socket-address.h b/src/network/utils/packet-socket-address.h index 3420e52f2..f2389b488 100644 --- a/src/network/utils/packet-socket-address.h +++ b/src/network/utils/packet-socket-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/network/utils/packet-socket.cc b/src/network/utils/packet-socket.cc index 5308ca9fa..6076ed447 100644 --- a/src/network/utils/packet-socket.cc +++ b/src/network/utils/packet-socket.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Emmanuelle Laprise, INRIA * diff --git a/src/network/utils/packet-socket.h b/src/network/utils/packet-socket.h index 9457e94b1..ba65e98e3 100644 --- a/src/network/utils/packet-socket.h +++ b/src/network/utils/packet-socket.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 Emmanuelle Laprise, INRIA * diff --git a/src/network/utils/pcap-file-wrapper.cc b/src/network/utils/pcap-file-wrapper.cc index 3a989de2e..d0721683a 100644 --- a/src/network/utils/pcap-file-wrapper.cc +++ b/src/network/utils/pcap-file-wrapper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/network/utils/pcap-file-wrapper.h b/src/network/utils/pcap-file-wrapper.h index 239689313..9a58ccdd5 100644 --- a/src/network/utils/pcap-file-wrapper.h +++ b/src/network/utils/pcap-file-wrapper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/network/utils/pcap-file.cc b/src/network/utils/pcap-file.cc index fb3999e95..8ba6b76d9 100644 --- a/src/network/utils/pcap-file.cc +++ b/src/network/utils/pcap-file.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/network/utils/pcap-file.h b/src/network/utils/pcap-file.h index 9edddb8a0..37d4f984d 100644 --- a/src/network/utils/pcap-file.h +++ b/src/network/utils/pcap-file.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/network/utils/radiotap-header.cc b/src/network/utils/radiotap-header.cc index 3b7604bb6..ec880a3c3 100644 --- a/src/network/utils/radiotap-header.cc +++ b/src/network/utils/radiotap-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/network/utils/radiotap-header.h b/src/network/utils/radiotap-header.h index 45358145f..7c69e4e6e 100644 --- a/src/network/utils/radiotap-header.h +++ b/src/network/utils/radiotap-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/nix-vector-routing/doc/nix-vector-routing.h b/src/nix-vector-routing/doc/nix-vector-routing.h index 835140b26..6cb4b82fd 100644 --- a/src/nix-vector-routing/doc/nix-vector-routing.h +++ b/src/nix-vector-routing/doc/nix-vector-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc index 46eb4369b..3913843be 100644 --- a/src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc +++ b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h index efd928d27..3e15f1ac3 100644 --- a/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h +++ b/src/nix-vector-routing/helper/ipv4-nix-vector-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc index 807203248..00d366cc8 100644 --- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc +++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h index d652d6f3b..ee03cb4b2 100644 --- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h +++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 The Georgia Institute of Technology * diff --git a/src/olsr/examples/olsr-hna.cc b/src/olsr/examples/olsr-hna.cc index d1e2a543f..c2fc2a229 100644 --- a/src/olsr/examples/olsr-hna.cc +++ b/src/olsr/examples/olsr-hna.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * * This program is free software; you can redistribute it and/or modify diff --git a/src/olsr/model/olsr-header.cc b/src/olsr/model/olsr-header.cc index ca159ad58..656a0febc 100644 --- a/src/olsr/model/olsr-header.cc +++ b/src/olsr/model/olsr-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INESC Porto * diff --git a/src/olsr/model/olsr-header.h b/src/olsr/model/olsr-header.h index 74c726362..d9e7f0b92 100644 --- a/src/olsr/model/olsr-header.h +++ b/src/olsr/model/olsr-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INESC Porto * diff --git a/src/olsr/model/olsr-repositories.h b/src/olsr/model/olsr-repositories.h index f6b9a8d0a..80a98990b 100644 --- a/src/olsr/model/olsr-repositories.h +++ b/src/olsr/model/olsr-repositories.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004 Francisco J. Ros * Copyright (c) 2007 INESC Porto diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc index b63b6f7c2..9d22661cb 100644 --- a/src/olsr/model/olsr-routing-protocol.cc +++ b/src/olsr/model/olsr-routing-protocol.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004 Francisco J. Ros * Copyright (c) 2007 INESC Porto diff --git a/src/olsr/model/olsr-routing-protocol.h b/src/olsr/model/olsr-routing-protocol.h index cf8aeb02c..f7ff2a31f 100644 --- a/src/olsr/model/olsr-routing-protocol.h +++ b/src/olsr/model/olsr-routing-protocol.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004 Francisco J. Ros * Copyright (c) 2007 INESC Porto diff --git a/src/olsr/model/olsr-state.cc b/src/olsr/model/olsr-state.cc index 188866e47..c3a9f9559 100644 --- a/src/olsr/model/olsr-state.cc +++ b/src/olsr/model/olsr-state.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004 Francisco J. Ros * Copyright (c) 2007 INESC Porto diff --git a/src/olsr/model/olsr-state.h b/src/olsr/model/olsr-state.h index 406229a8b..ca6abae0c 100644 --- a/src/olsr/model/olsr-state.h +++ b/src/olsr/model/olsr-state.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004 Francisco J. Ros * Copyright (c) 2007 INESC Porto diff --git a/src/olsr/test/olsr-header-test-suite.cc b/src/olsr/test/olsr-header-test-suite.cc index 9c0cac138..f8ac1b0cf 100644 --- a/src/olsr/test/olsr-header-test-suite.cc +++ b/src/olsr/test/olsr-header-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INESC Porto * diff --git a/src/olsr/test/olsr-routing-protocol-test-suite.cc b/src/olsr/test/olsr-routing-protocol-test-suite.cc index c07a4d4d1..4ea7ce37f 100644 --- a/src/olsr/test/olsr-routing-protocol-test-suite.cc +++ b/src/olsr/test/olsr-routing-protocol-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004 Francisco J. Ros * Copyright (c) 2007 INESC Porto diff --git a/src/openflow/test/openflow-switch-test-suite.cc b/src/openflow/test/openflow-switch-test-suite.cc index ff8648113..1c386fb2b 100644 --- a/src/openflow/test/openflow-switch-test-suite.cc +++ b/src/openflow/test/openflow-switch-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2011 Blake Hurd * diff --git a/src/point-to-point/model/ppp-header.cc b/src/point-to-point/model/ppp-header.cc index d1b506ccd..4650fb069 100644 --- a/src/point-to-point/model/ppp-header.cc +++ b/src/point-to-point/model/ppp-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/point-to-point/model/ppp-header.h b/src/point-to-point/model/ppp-header.h index 160602171..e43f87b1f 100644 --- a/src/point-to-point/model/ppp-header.h +++ b/src/point-to-point/model/ppp-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 University of Washington * diff --git a/src/propagation/examples/main-propagation-loss.cc b/src/propagation/examples/main-propagation-loss.cc index e7cac50d8..36c3f9ad4 100644 --- a/src/propagation/examples/main-propagation-loss.cc +++ b/src/propagation/examples/main-propagation-loss.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 Timo Bingmann * diff --git a/src/propagation/model/jakes-propagation-loss-model.cc b/src/propagation/model/jakes-propagation-loss-model.cc index 881bb5764..e482bc010 100644 --- a/src/propagation/model/jakes-propagation-loss-model.cc +++ b/src/propagation/model/jakes-propagation-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/propagation/model/jakes-propagation-loss-model.h b/src/propagation/model/jakes-propagation-loss-model.h index e152469d1..89477d79f 100644 --- a/src/propagation/model/jakes-propagation-loss-model.h +++ b/src/propagation/model/jakes-propagation-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/propagation/model/propagation-delay-model.cc b/src/propagation/model/propagation-delay-model.cc index 25b751332..af420422d 100644 --- a/src/propagation/model/propagation-delay-model.cc +++ b/src/propagation/model/propagation-delay-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/propagation/model/propagation-delay-model.h b/src/propagation/model/propagation-delay-model.h index 04ff11399..1cba81e03 100644 --- a/src/propagation/model/propagation-delay-model.h +++ b/src/propagation/model/propagation-delay-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/propagation/model/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc index 11e57797f..188bf3c26 100644 --- a/src/propagation/model/propagation-loss-model.cc +++ b/src/propagation/model/propagation-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/propagation/model/propagation-loss-model.h b/src/propagation/model/propagation-loss-model.h index 608236135..25b636b96 100644 --- a/src/propagation/model/propagation-loss-model.h +++ b/src/propagation/model/propagation-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc index 0ab9755c9..65a3e8260 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 CTTC * diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc index 98627f07f..c0b3f1f59 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 CTTC * diff --git a/src/spectrum/model/aloha-noack-mac-header.cc b/src/spectrum/model/aloha-noack-mac-header.cc index 80cf5fb47..0fa11df62 100644 --- a/src/spectrum/model/aloha-noack-mac-header.cc +++ b/src/spectrum/model/aloha-noack-mac-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/aloha-noack-mac-header.h b/src/spectrum/model/aloha-noack-mac-header.h index 1946a89e6..493808a44 100644 --- a/src/spectrum/model/aloha-noack-mac-header.h +++ b/src/spectrum/model/aloha-noack-mac-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009, 2010 CTTC * diff --git a/src/spectrum/model/friis-spectrum-propagation-loss.cc b/src/spectrum/model/friis-spectrum-propagation-loss.cc index 9c4cc5896..ee04e9447 100644 --- a/src/spectrum/model/friis-spectrum-propagation-loss.cc +++ b/src/spectrum/model/friis-spectrum-propagation-loss.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/friis-spectrum-propagation-loss.h b/src/spectrum/model/friis-spectrum-propagation-loss.h index dee5d94ed..a3979d19f 100644 --- a/src/spectrum/model/friis-spectrum-propagation-loss.h +++ b/src/spectrum/model/friis-spectrum-propagation-loss.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc index 2ae2c427a..a565c8c65 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.cc +++ b/src/spectrum/model/half-duplex-ideal-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/half-duplex-ideal-phy.h b/src/spectrum/model/half-duplex-ideal-phy.h index ad2d9291a..c7ad14f8a 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.h +++ b/src/spectrum/model/half-duplex-ideal-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.cc b/src/spectrum/model/microwave-oven-spectrum-value-helper.cc index 8e3e00ab5..414ba0995 100644 --- a/src/spectrum/model/microwave-oven-spectrum-value-helper.cc +++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.h b/src/spectrum/model/microwave-oven-spectrum-value-helper.h index f1beaf7cf..e2398d6b4 100644 --- a/src/spectrum/model/microwave-oven-spectrum-value-helper.h +++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/multi-model-spectrum-channel.cc b/src/spectrum/model/multi-model-spectrum-channel.cc index 5bddf80b5..acba76ca0 100644 --- a/src/spectrum/model/multi-model-spectrum-channel.cc +++ b/src/spectrum/model/multi-model-spectrum-channel.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/multi-model-spectrum-channel.h b/src/spectrum/model/multi-model-spectrum-channel.h index 2720353d2..3fea2d0fd 100644 --- a/src/spectrum/model/multi-model-spectrum-channel.h +++ b/src/spectrum/model/multi-model-spectrum-channel.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/single-model-spectrum-channel.cc b/src/spectrum/model/single-model-spectrum-channel.cc index 9426296e8..0af9aedcb 100644 --- a/src/spectrum/model/single-model-spectrum-channel.cc +++ b/src/spectrum/model/single-model-spectrum-channel.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/single-model-spectrum-channel.h b/src/spectrum/model/single-model-spectrum-channel.h index ea6bc6692..fac5b7c2f 100644 --- a/src/spectrum/model/single-model-spectrum-channel.h +++ b/src/spectrum/model/single-model-spectrum-channel.h @@ -1,4 +1,4 @@ -//* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-analyzer.cc b/src/spectrum/model/spectrum-analyzer.cc index e51cbe6b3..98d29c729 100644 --- a/src/spectrum/model/spectrum-analyzer.cc +++ b/src/spectrum/model/spectrum-analyzer.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-analyzer.h b/src/spectrum/model/spectrum-analyzer.h index d31a6d436..42d5cd8c4 100644 --- a/src/spectrum/model/spectrum-analyzer.h +++ b/src/spectrum/model/spectrum-analyzer.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-channel.cc b/src/spectrum/model/spectrum-channel.cc index 6928b6292..c82c65638 100644 --- a/src/spectrum/model/spectrum-channel.cc +++ b/src/spectrum/model/spectrum-channel.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-channel.h b/src/spectrum/model/spectrum-channel.h index 91850130a..45f08d7c8 100644 --- a/src/spectrum/model/spectrum-channel.h +++ b/src/spectrum/model/spectrum-channel.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-converter.cc b/src/spectrum/model/spectrum-converter.cc index 0a48e5e30..9c9e390c3 100644 --- a/src/spectrum/model/spectrum-converter.cc +++ b/src/spectrum/model/spectrum-converter.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-converter.h b/src/spectrum/model/spectrum-converter.h index 75be37970..fbc6e5b1f 100644 --- a/src/spectrum/model/spectrum-converter.h +++ b/src/spectrum/model/spectrum-converter.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-error-model.cc b/src/spectrum/model/spectrum-error-model.cc index b6d90b7d5..81144acf5 100644 --- a/src/spectrum/model/spectrum-error-model.cc +++ b/src/spectrum/model/spectrum-error-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-error-model.h b/src/spectrum/model/spectrum-error-model.h index 3d9ebb6c5..50b239ce8 100644 --- a/src/spectrum/model/spectrum-error-model.h +++ b/src/spectrum/model/spectrum-error-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-interference.cc b/src/spectrum/model/spectrum-interference.cc index 0f5216d07..1eb67a896 100644 --- a/src/spectrum/model/spectrum-interference.cc +++ b/src/spectrum/model/spectrum-interference.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-interference.h b/src/spectrum/model/spectrum-interference.h index 36c07f526..b2dd177e3 100644 --- a/src/spectrum/model/spectrum-interference.h +++ b/src/spectrum/model/spectrum-interference.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc index 8ee2020f5..a9806323f 100644 --- a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc +++ b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h index 91e21f696..ccb4acc6f 100644 --- a/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h +++ b/src/spectrum/model/spectrum-model-300kHz-300GHz-log.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc index 8c4cbae0d..6dfa9bb51 100644 --- a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc +++ b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h index ad4581d49..36b5ff36a 100644 --- a/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h +++ b/src/spectrum/model/spectrum-model-ism2400MHz-res1MHz.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-model.cc b/src/spectrum/model/spectrum-model.cc index 268cf3ec7..2c5cf3aa7 100644 --- a/src/spectrum/model/spectrum-model.cc +++ b/src/spectrum/model/spectrum-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC diff --git a/src/spectrum/model/spectrum-model.h b/src/spectrum/model/spectrum-model.h index 56188599f..da7a54f12 100644 --- a/src/spectrum/model/spectrum-model.h +++ b/src/spectrum/model/spectrum-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-phy.cc b/src/spectrum/model/spectrum-phy.cc index 644e4b2f8..04cc6e749 100644 --- a/src/spectrum/model/spectrum-phy.cc +++ b/src/spectrum/model/spectrum-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-phy.h b/src/spectrum/model/spectrum-phy.h index c39010bf0..4271f764a 100644 --- a/src/spectrum/model/spectrum-phy.h +++ b/src/spectrum/model/spectrum-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-propagation-loss-model.cc b/src/spectrum/model/spectrum-propagation-loss-model.cc index 9dba1f6ed..3bbb371de 100644 --- a/src/spectrum/model/spectrum-propagation-loss-model.cc +++ b/src/spectrum/model/spectrum-propagation-loss-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 CTTC * diff --git a/src/spectrum/model/spectrum-propagation-loss-model.h b/src/spectrum/model/spectrum-propagation-loss-model.h index e285d5eaa..778fea787 100644 --- a/src/spectrum/model/spectrum-propagation-loss-model.h +++ b/src/spectrum/model/spectrum-propagation-loss-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-type.cc b/src/spectrum/model/spectrum-type.cc index 177992ee8..53ef2b6cb 100644 --- a/src/spectrum/model/spectrum-type.cc +++ b/src/spectrum/model/spectrum-type.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 CTTC * diff --git a/src/spectrum/model/spectrum-type.h b/src/spectrum/model/spectrum-type.h index 841676bf7..1c6a78c07 100644 --- a/src/spectrum/model/spectrum-type.h +++ b/src/spectrum/model/spectrum-type.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/spectrum-value.cc b/src/spectrum/model/spectrum-value.cc index 30d74dc56..7edea361f 100644 --- a/src/spectrum/model/spectrum-value.cc +++ b/src/spectrum/model/spectrum-value.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC diff --git a/src/spectrum/model/spectrum-value.h b/src/spectrum/model/spectrum-value.h index 45b378fe0..cba4d0a17 100644 --- a/src/spectrum/model/spectrum-value.h +++ b/src/spectrum/model/spectrum-value.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/waveform-generator.cc b/src/spectrum/model/waveform-generator.cc index dcc5443c1..2d2c70b92 100644 --- a/src/spectrum/model/waveform-generator.cc +++ b/src/spectrum/model/waveform-generator.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/waveform-generator.h b/src/spectrum/model/waveform-generator.h index 3e4f2c73f..7b43c442f 100644 --- a/src/spectrum/model/waveform-generator.h +++ b/src/spectrum/model/waveform-generator.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/wifi-spectrum-value-helper.cc b/src/spectrum/model/wifi-spectrum-value-helper.cc index a4e3267f4..410aae177 100644 --- a/src/spectrum/model/wifi-spectrum-value-helper.cc +++ b/src/spectrum/model/wifi-spectrum-value-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/model/wifi-spectrum-value-helper.h b/src/spectrum/model/wifi-spectrum-value-helper.h index f7a649ab4..e676933a6 100644 --- a/src/spectrum/model/wifi-spectrum-value-helper.h +++ b/src/spectrum/model/wifi-spectrum-value-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/test/spectrum-interference-test.cc b/src/spectrum/test/spectrum-interference-test.cc index 7d592c74f..2996c976c 100644 --- a/src/spectrum/test/spectrum-interference-test.cc +++ b/src/spectrum/test/spectrum-interference-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/spectrum/test/spectrum-test.h b/src/spectrum/test/spectrum-test.h index e4fd32222..a51f58ace 100644 --- a/src/spectrum/test/spectrum-test.h +++ b/src/spectrum/test/spectrum-test.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * Copyright (c) 2011 CTTC diff --git a/src/spectrum/test/spectrum-value-test.cc b/src/spectrum/test/spectrum-value-test.cc index 4ee9d4b14..172e484cd 100644 --- a/src/spectrum/test/spectrum-value-test.cc +++ b/src/spectrum/test/spectrum-value-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc index 0f1002693..476f7b2f7 100644 --- a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc +++ b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Dean Armstrong * diff --git a/src/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc index f0ee508e5..ffefdf3a5 100644 --- a/src/uan/examples/uan-cw-example.cc +++ b/src/uan/examples/uan-cw-example.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/examples/uan-cw-example.h b/src/uan/examples/uan-cw-example.h index 87de21ae6..a37fb0bf9 100644 --- a/src/uan/examples/uan-cw-example.h +++ b/src/uan/examples/uan-cw-example.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc index 80a6a78c5..0efcbbb11 100644 --- a/src/uan/examples/uan-rc-example.cc +++ b/src/uan/examples/uan-rc-example.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/examples/uan-rc-example.h b/src/uan/examples/uan-rc-example.h index a1b310383..9520acf68 100644 --- a/src/uan/examples/uan-rc-example.h +++ b/src/uan/examples/uan-rc-example.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/helper/acoustic-modem-energy-model-helper.cc b/src/uan/helper/acoustic-modem-energy-model-helper.cc index 8ac35bea8..8bc931fcf 100644 --- a/src/uan/helper/acoustic-modem-energy-model-helper.cc +++ b/src/uan/helper/acoustic-modem-energy-model-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Andrea Sacco * diff --git a/src/uan/helper/acoustic-modem-energy-model-helper.h b/src/uan/helper/acoustic-modem-energy-model-helper.h index 0bea28781..3ee2fce5f 100644 --- a/src/uan/helper/acoustic-modem-energy-model-helper.h +++ b/src/uan/helper/acoustic-modem-energy-model-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Andrea Sacco * diff --git a/src/uan/model/acoustic-modem-energy-model.cc b/src/uan/model/acoustic-modem-energy-model.cc index 0aeab0154..da226c847 100644 --- a/src/uan/model/acoustic-modem-energy-model.cc +++ b/src/uan/model/acoustic-modem-energy-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Andrea Sacco * diff --git a/src/uan/model/acoustic-modem-energy-model.h b/src/uan/model/acoustic-modem-energy-model.h index ea5cdd210..445872bdd 100644 --- a/src/uan/model/acoustic-modem-energy-model.h +++ b/src/uan/model/acoustic-modem-energy-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 Andrea Sacco * diff --git a/src/uan/model/uan-address.cc b/src/uan/model/uan-address.cc index 376c877f3..73f6d9b10 100644 --- a/src/uan/model/uan-address.cc +++ b/src/uan/model/uan-address.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-address.h b/src/uan/model/uan-address.h index 5fa6b3651..4e37a2a51 100644 --- a/src/uan/model/uan-address.h +++ b/src/uan/model/uan-address.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-channel.cc b/src/uan/model/uan-channel.cc index 7b4060f45..f737313da 100644 --- a/src/uan/model/uan-channel.cc +++ b/src/uan/model/uan-channel.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-channel.h b/src/uan/model/uan-channel.h index 19062099d..f55692266 100644 --- a/src/uan/model/uan-channel.h +++ b/src/uan/model/uan-channel.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-header-common.cc b/src/uan/model/uan-header-common.cc index 0ffdd51cb..461ee8b39 100644 --- a/src/uan/model/uan-header-common.cc +++ b/src/uan/model/uan-header-common.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-header-common.h b/src/uan/model/uan-header-common.h index 7988d2f27..9231e303a 100644 --- a/src/uan/model/uan-header-common.h +++ b/src/uan/model/uan-header-common.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-header-rc.cc b/src/uan/model/uan-header-rc.cc index 6f55ea9a3..14b9af783 100644 --- a/src/uan/model/uan-header-rc.cc +++ b/src/uan/model/uan-header-rc.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-header-rc.h b/src/uan/model/uan-header-rc.h index 7be3c27e0..d90cf195e 100644 --- a/src/uan/model/uan-header-rc.h +++ b/src/uan/model/uan-header-rc.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-aloha.cc b/src/uan/model/uan-mac-aloha.cc index 0e6cd476f..b0a257bf4 100644 --- a/src/uan/model/uan-mac-aloha.cc +++ b/src/uan/model/uan-mac-aloha.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-aloha.h b/src/uan/model/uan-mac-aloha.h index 9ea79ed76..5bc7dd6c0 100644 --- a/src/uan/model/uan-mac-aloha.h +++ b/src/uan/model/uan-mac-aloha.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-cw.cc b/src/uan/model/uan-mac-cw.cc index 078de9dac..7276b1830 100644 --- a/src/uan/model/uan-mac-cw.cc +++ b/src/uan/model/uan-mac-cw.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-cw.h b/src/uan/model/uan-mac-cw.h index e5822e047..6d1c2ea05 100644 --- a/src/uan/model/uan-mac-cw.h +++ b/src/uan/model/uan-mac-cw.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-rc-gw.cc b/src/uan/model/uan-mac-rc-gw.cc index 396b8c5cf..c2ec94ba7 100644 --- a/src/uan/model/uan-mac-rc-gw.cc +++ b/src/uan/model/uan-mac-rc-gw.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-rc-gw.h b/src/uan/model/uan-mac-rc-gw.h index 013f326f8..0ca7a7ade 100644 --- a/src/uan/model/uan-mac-rc-gw.h +++ b/src/uan/model/uan-mac-rc-gw.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-rc.cc b/src/uan/model/uan-mac-rc.cc index 723738b0b..83e008a49 100644 --- a/src/uan/model/uan-mac-rc.cc +++ b/src/uan/model/uan-mac-rc.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac-rc.h b/src/uan/model/uan-mac-rc.h index 9b793d57c..30f6081b6 100644 --- a/src/uan/model/uan-mac-rc.h +++ b/src/uan/model/uan-mac-rc.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-mac.h b/src/uan/model/uan-mac.h index 38ebf8526..bca6a4261 100644 --- a/src/uan/model/uan-mac.h +++ b/src/uan/model/uan-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-net-device.cc b/src/uan/model/uan-net-device.cc index 2319df084..861918b60 100644 --- a/src/uan/model/uan-net-device.cc +++ b/src/uan/model/uan-net-device.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-net-device.h b/src/uan/model/uan-net-device.h index 625fe7e35..adaa08431 100644 --- a/src/uan/model/uan-net-device.h +++ b/src/uan/model/uan-net-device.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-noise-model-default.cc b/src/uan/model/uan-noise-model-default.cc index 8adc228b4..91ff8fed0 100644 --- a/src/uan/model/uan-noise-model-default.cc +++ b/src/uan/model/uan-noise-model-default.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-noise-model-default.h b/src/uan/model/uan-noise-model-default.h index 26dffcfee..22c0dfef6 100644 --- a/src/uan/model/uan-noise-model-default.h +++ b/src/uan/model/uan-noise-model-default.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-noise-model.cc b/src/uan/model/uan-noise-model.cc index 7cceff67d..ea5577528 100644 --- a/src/uan/model/uan-noise-model.cc +++ b/src/uan/model/uan-noise-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-noise-model.h b/src/uan/model/uan-noise-model.h index 19143f18e..b02948a39 100644 --- a/src/uan/model/uan-noise-model.h +++ b/src/uan/model/uan-noise-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-phy-dual.cc b/src/uan/model/uan-phy-dual.cc index 24fe69638..076b8be24 100644 --- a/src/uan/model/uan-phy-dual.cc +++ b/src/uan/model/uan-phy-dual.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h index 51857b357..306b4c768 100644 --- a/src/uan/model/uan-phy-dual.h +++ b/src/uan/model/uan-phy-dual.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-phy-gen.cc b/src/uan/model/uan-phy-gen.cc index b48330fba..c910e6a84 100644 --- a/src/uan/model/uan-phy-gen.cc +++ b/src/uan/model/uan-phy-gen.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-phy-gen.h b/src/uan/model/uan-phy-gen.h index e5cf59b82..232b1556a 100644 --- a/src/uan/model/uan-phy-gen.h +++ b/src/uan/model/uan-phy-gen.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-phy.cc b/src/uan/model/uan-phy.cc index 3194aa284..be5befe30 100644 --- a/src/uan/model/uan-phy.cc +++ b/src/uan/model/uan-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index dae7bc87d..fe6b55f0c 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-prop-model-ideal.cc b/src/uan/model/uan-prop-model-ideal.cc index 6ef01a40c..e4297c9fc 100644 --- a/src/uan/model/uan-prop-model-ideal.cc +++ b/src/uan/model/uan-prop-model-ideal.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-prop-model-ideal.h b/src/uan/model/uan-prop-model-ideal.h index 95ce969a6..200bd06c5 100644 --- a/src/uan/model/uan-prop-model-ideal.h +++ b/src/uan/model/uan-prop-model-ideal.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-prop-model-thorp.cc b/src/uan/model/uan-prop-model-thorp.cc index 68d0463e4..fae41dac2 100644 --- a/src/uan/model/uan-prop-model-thorp.cc +++ b/src/uan/model/uan-prop-model-thorp.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-prop-model-thorp.h b/src/uan/model/uan-prop-model-thorp.h index 49e29d7ff..2e17387df 100644 --- a/src/uan/model/uan-prop-model-thorp.h +++ b/src/uan/model/uan-prop-model-thorp.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-prop-model.cc b/src/uan/model/uan-prop-model.cc index abfb18200..02cd4ffc0 100644 --- a/src/uan/model/uan-prop-model.cc +++ b/src/uan/model/uan-prop-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-prop-model.h b/src/uan/model/uan-prop-model.h index 826acfcc0..c811447bd 100644 --- a/src/uan/model/uan-prop-model.h +++ b/src/uan/model/uan-prop-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-transducer-hd.cc b/src/uan/model/uan-transducer-hd.cc index c08da0069..095ec758a 100644 --- a/src/uan/model/uan-transducer-hd.cc +++ b/src/uan/model/uan-transducer-hd.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-transducer-hd.h b/src/uan/model/uan-transducer-hd.h index 74721f918..77d258f57 100644 --- a/src/uan/model/uan-transducer-hd.h +++ b/src/uan/model/uan-transducer-hd.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-transducer.h b/src/uan/model/uan-transducer.h index 3c4763b5d..ba69e9cb3 100644 --- a/src/uan/model/uan-transducer.h +++ b/src/uan/model/uan-transducer.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-tx-mode.cc b/src/uan/model/uan-tx-mode.cc index 3c7b3bd58..ca2d6656c 100644 --- a/src/uan/model/uan-tx-mode.cc +++ b/src/uan/model/uan-tx-mode.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/model/uan-tx-mode.h b/src/uan/model/uan-tx-mode.h index 2fa14e161..7da2ba760 100644 --- a/src/uan/model/uan-tx-mode.h +++ b/src/uan/model/uan-tx-mode.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/uan/test/uan-test.cc b/src/uan/test/uan-test.cc index 302c9df48..591bd6590 100644 --- a/src/uan/test/uan-test.cc +++ b/src/uan/test/uan-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 University of Washington * diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc index f538b6e16..28ac94b15 100644 --- a/src/wifi/examples/wifi-phy-test.cc +++ b/src/wifi/examples/wifi-phy-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/helper/athstats-helper.cc b/src/wifi/helper/athstats-helper.cc index 96da705a9..4b1afe5a2 100644 --- a/src/wifi/helper/athstats-helper.cc +++ b/src/wifi/helper/athstats-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/wifi/helper/athstats-helper.h b/src/wifi/helper/athstats-helper.h index 891ee47e2..6669b2051 100644 --- a/src/wifi/helper/athstats-helper.h +++ b/src/wifi/helper/athstats-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/wifi/helper/nqos-wifi-mac-helper.cc b/src/wifi/helper/nqos-wifi-mac-helper.cc index 2a63e3c19..8e6d1949a 100644 --- a/src/wifi/helper/nqos-wifi-mac-helper.cc +++ b/src/wifi/helper/nqos-wifi-mac-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/helper/nqos-wifi-mac-helper.h b/src/wifi/helper/nqos-wifi-mac-helper.h index a41ee6f91..185d8435f 100644 --- a/src/wifi/helper/nqos-wifi-mac-helper.h +++ b/src/wifi/helper/nqos-wifi-mac-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/helper/qos-wifi-mac-helper.cc b/src/wifi/helper/qos-wifi-mac-helper.cc index 1000255be..38a3db6b1 100644 --- a/src/wifi/helper/qos-wifi-mac-helper.cc +++ b/src/wifi/helper/qos-wifi-mac-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/helper/qos-wifi-mac-helper.h b/src/wifi/helper/qos-wifi-mac-helper.h index 5ce3409d0..a9ded97e2 100644 --- a/src/wifi/helper/qos-wifi-mac-helper.h +++ b/src/wifi/helper/qos-wifi-mac-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/aarf-wifi-manager.cc b/src/wifi/model/aarf-wifi-manager.cc index a258a3941..89ecf0ebe 100644 --- a/src/wifi/model/aarf-wifi-manager.cc +++ b/src/wifi/model/aarf-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004,2005,2006 INRIA * diff --git a/src/wifi/model/aarf-wifi-manager.h b/src/wifi/model/aarf-wifi-manager.h index 514b589ae..085599b90 100644 --- a/src/wifi/model/aarf-wifi-manager.h +++ b/src/wifi/model/aarf-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/aarfcd-wifi-manager.cc b/src/wifi/model/aarfcd-wifi-manager.cc index 4b06771ff..3b60872dc 100644 --- a/src/wifi/model/aarfcd-wifi-manager.cc +++ b/src/wifi/model/aarfcd-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004,2005,2006 INRIA * diff --git a/src/wifi/model/aarfcd-wifi-manager.h b/src/wifi/model/aarfcd-wifi-manager.h index bd3779045..aff4c947e 100644 --- a/src/wifi/model/aarfcd-wifi-manager.h +++ b/src/wifi/model/aarfcd-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/adhoc-wifi-mac.cc b/src/wifi/model/adhoc-wifi-mac.cc index 27ff71899..64c633a47 100644 --- a/src/wifi/model/adhoc-wifi-mac.cc +++ b/src/wifi/model/adhoc-wifi-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/adhoc-wifi-mac.h b/src/wifi/model/adhoc-wifi-mac.h index 77341cfd9..465c04f1c 100644 --- a/src/wifi/model/adhoc-wifi-mac.h +++ b/src/wifi/model/adhoc-wifi-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/amrr-wifi-manager.cc b/src/wifi/model/amrr-wifi-manager.cc index 65e3f7717..aa5514c47 100644 --- a/src/wifi/model/amrr-wifi-manager.cc +++ b/src/wifi/model/amrr-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2003,2007 INRIA * diff --git a/src/wifi/model/amrr-wifi-manager.h b/src/wifi/model/amrr-wifi-manager.h index 1142feaac..96352338a 100644 --- a/src/wifi/model/amrr-wifi-manager.h +++ b/src/wifi/model/amrr-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2003,2007 INRIA * diff --git a/src/wifi/model/amsdu-subframe-header.cc b/src/wifi/model/amsdu-subframe-header.cc index 442590b15..eefe8615f 100644 --- a/src/wifi/model/amsdu-subframe-header.cc +++ b/src/wifi/model/amsdu-subframe-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/amsdu-subframe-header.h b/src/wifi/model/amsdu-subframe-header.h index 63b41fd7c..74c5041e4 100644 --- a/src/wifi/model/amsdu-subframe-header.h +++ b/src/wifi/model/amsdu-subframe-header.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc index 2af531eb1..444935783 100644 --- a/src/wifi/model/ap-wifi-mac.cc +++ b/src/wifi/model/ap-wifi-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/ap-wifi-mac.h b/src/wifi/model/ap-wifi-mac.h index 4175bca94..679e5a083 100644 --- a/src/wifi/model/ap-wifi-mac.h +++ b/src/wifi/model/ap-wifi-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc index 1e37b1e81..e7a0986fc 100644 --- a/src/wifi/model/arf-wifi-manager.cc +++ b/src/wifi/model/arf-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004,2005,2006 INRIA * diff --git a/src/wifi/model/arf-wifi-manager.h b/src/wifi/model/arf-wifi-manager.h index 50fc3837a..7233dd7de 100644 --- a/src/wifi/model/arf-wifi-manager.h +++ b/src/wifi/model/arf-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/block-ack-agreement.cc b/src/wifi/model/block-ack-agreement.cc index b264f9896..f818c75cc 100644 --- a/src/wifi/model/block-ack-agreement.cc +++ b/src/wifi/model/block-ack-agreement.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/block-ack-agreement.h b/src/wifi/model/block-ack-agreement.h index c0364ea36..e77c5f2d7 100644 --- a/src/wifi/model/block-ack-agreement.h +++ b/src/wifi/model/block-ack-agreement.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/block-ack-cache.cc b/src/wifi/model/block-ack-cache.cc index 095bf044c..cbd63d79b 100644 --- a/src/wifi/model/block-ack-cache.cc +++ b/src/wifi/model/block-ack-cache.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 MIRKO BANCHI * diff --git a/src/wifi/model/block-ack-cache.h b/src/wifi/model/block-ack-cache.h index affee0fa3..780109e48 100644 --- a/src/wifi/model/block-ack-cache.h +++ b/src/wifi/model/block-ack-cache.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 MIRKO BANCHI * diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc index 2387002d7..fc5794bbc 100644 --- a/src/wifi/model/block-ack-manager.cc +++ b/src/wifi/model/block-ack-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009, 2010 MIRKO BANCHI * diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h index 3eb2edb25..5c851d966 100644 --- a/src/wifi/model/block-ack-manager.h +++ b/src/wifi/model/block-ack-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009, 2010 MIRKO BANCHI * diff --git a/src/wifi/model/capability-information.cc b/src/wifi/model/capability-information.cc index 07483ce02..da42cd913 100644 --- a/src/wifi/model/capability-information.cc +++ b/src/wifi/model/capability-information.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/capability-information.h b/src/wifi/model/capability-information.h index 7ba7170b2..f332de994 100644 --- a/src/wifi/model/capability-information.h +++ b/src/wifi/model/capability-information.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc index 0d9d6f34a..89904337e 100644 --- a/src/wifi/model/cara-wifi-manager.cc +++ b/src/wifi/model/cara-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004,2005,2006 INRIA * diff --git a/src/wifi/model/cara-wifi-manager.h b/src/wifi/model/cara-wifi-manager.h index 2085116d1..1b999197a 100644 --- a/src/wifi/model/cara-wifi-manager.h +++ b/src/wifi/model/cara-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/constant-rate-wifi-manager.cc b/src/wifi/model/constant-rate-wifi-manager.cc index a9e56b571..c5f8a8a11 100644 --- a/src/wifi/model/constant-rate-wifi-manager.cc +++ b/src/wifi/model/constant-rate-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004,2005 INRIA * diff --git a/src/wifi/model/constant-rate-wifi-manager.h b/src/wifi/model/constant-rate-wifi-manager.h index 802e95a1a..ee1a43e51 100644 --- a/src/wifi/model/constant-rate-wifi-manager.h +++ b/src/wifi/model/constant-rate-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc index 448c3337e..0be04f9e5 100644 --- a/src/wifi/model/ctrl-headers.cc +++ b/src/wifi/model/ctrl-headers.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/ctrl-headers.h b/src/wifi/model/ctrl-headers.h index 8b6e53e2b..5f2ad256d 100644 --- a/src/wifi/model/ctrl-headers.h +++ b/src/wifi/model/ctrl-headers.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/dca-txop.cc b/src/wifi/model/dca-txop.cc index c12cd6d5b..9ef37253b 100644 --- a/src/wifi/model/dca-txop.cc +++ b/src/wifi/model/dca-txop.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h index 81a1d8a7d..24dbff7e8 100644 --- a/src/wifi/model/dca-txop.h +++ b/src/wifi/model/dca-txop.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/wifi/model/dcf-manager.cc b/src/wifi/model/dcf-manager.cc index 2f3b805f9..655f0e584 100644 --- a/src/wifi/model/dcf-manager.cc +++ b/src/wifi/model/dcf-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/dcf-manager.h b/src/wifi/model/dcf-manager.h index 22b95ba53..34c6e8b2a 100644 --- a/src/wifi/model/dcf-manager.h +++ b/src/wifi/model/dcf-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/dcf.cc b/src/wifi/model/dcf.cc index cf7d22e4f..2cfa4985b 100644 --- a/src/wifi/model/dcf.cc +++ b/src/wifi/model/dcf.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/wifi/model/dcf.h b/src/wifi/model/dcf.h index cc09e4e72..6e3b27f54 100644 --- a/src/wifi/model/dcf.h +++ b/src/wifi/model/dcf.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/wifi/model/dsss-error-rate-model.cc b/src/wifi/model/dsss-error-rate-model.cc index 4dbab9fb6..1ea067841 100644 --- a/src/wifi/model/dsss-error-rate-model.cc +++ b/src/wifi/model/dsss-error-rate-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 The Boeing Company * diff --git a/src/wifi/model/dsss-error-rate-model.h b/src/wifi/model/dsss-error-rate-model.h index 08a65f846..643e7c396 100644 --- a/src/wifi/model/dsss-error-rate-model.h +++ b/src/wifi/model/dsss-error-rate-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 The Boeing Company * diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 1cb017ef8..464cc187b 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/edca-txop-n.h b/src/wifi/model/edca-txop-n.h index 8acea5605..c3309bd56 100644 --- a/src/wifi/model/edca-txop-n.h +++ b/src/wifi/model/edca-txop-n.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/error-rate-model.cc b/src/wifi/model/error-rate-model.cc index 0f4214f75..8cc49a563 100644 --- a/src/wifi/model/error-rate-model.cc +++ b/src/wifi/model/error-rate-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/error-rate-model.h b/src/wifi/model/error-rate-model.h index 1e328e4c7..81c1a3bf9 100644 --- a/src/wifi/model/error-rate-model.h +++ b/src/wifi/model/error-rate-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/ideal-wifi-manager.cc b/src/wifi/model/ideal-wifi-manager.cc index 37073eecf..e28f0fc62 100644 --- a/src/wifi/model/ideal-wifi-manager.cc +++ b/src/wifi/model/ideal-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/ideal-wifi-manager.h b/src/wifi/model/ideal-wifi-manager.h index 838eb26dc..048baab32 100644 --- a/src/wifi/model/ideal-wifi-manager.h +++ b/src/wifi/model/ideal-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc index d998e314d..dd26619be 100644 --- a/src/wifi/model/interference-helper.cc +++ b/src/wifi/model/interference-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h index df83090a2..685b6fb4b 100644 --- a/src/wifi/model/interference-helper.h +++ b/src/wifi/model/interference-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index 2f8e9c115..a8e09b128 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/mac-low.h b/src/wifi/model/mac-low.h index 75103761b..2bfeedd9e 100644 --- a/src/wifi/model/mac-low.h +++ b/src/wifi/model/mac-low.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2006 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/mac-rx-middle.cc b/src/wifi/model/mac-rx-middle.cc index 24dc3eafd..cefd899a9 100644 --- a/src/wifi/model/mac-rx-middle.cc +++ b/src/wifi/model/mac-rx-middle.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/wifi/model/mac-rx-middle.h b/src/wifi/model/mac-rx-middle.h index c59cd8a85..c0570c47a 100644 --- a/src/wifi/model/mac-rx-middle.h +++ b/src/wifi/model/mac-rx-middle.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005 INRIA * diff --git a/src/wifi/model/mac-tx-middle.cc b/src/wifi/model/mac-tx-middle.cc index 14582dad3..5b0fd8efc 100644 --- a/src/wifi/model/mac-tx-middle.cc +++ b/src/wifi/model/mac-tx-middle.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/mac-tx-middle.h b/src/wifi/model/mac-tx-middle.h index 719bf1b3c..0a0e017d2 100644 --- a/src/wifi/model/mac-tx-middle.h +++ b/src/wifi/model/mac-tx-middle.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc index 051c291c3..38950c33b 100644 --- a/src/wifi/model/mgt-headers.cc +++ b/src/wifi/model/mgt-headers.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/mgt-headers.h b/src/wifi/model/mgt-headers.h index 6f900ba51..fc087f427 100644 --- a/src/wifi/model/mgt-headers.h +++ b/src/wifi/model/mgt-headers.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc index 20f48a4d3..a79074bab 100644 --- a/src/wifi/model/msdu-aggregator.cc +++ b/src/wifi/model/msdu-aggregator.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/msdu-aggregator.h b/src/wifi/model/msdu-aggregator.h index 709ac8437..9932985d4 100644 --- a/src/wifi/model/msdu-aggregator.h +++ b/src/wifi/model/msdu-aggregator.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc index 6e6560ccb..6780aa493 100644 --- a/src/wifi/model/msdu-standard-aggregator.cc +++ b/src/wifi/model/msdu-standard-aggregator.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/msdu-standard-aggregator.h b/src/wifi/model/msdu-standard-aggregator.h index abba6587f..6d5b3562d 100644 --- a/src/wifi/model/msdu-standard-aggregator.h +++ b/src/wifi/model/msdu-standard-aggregator.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/nist-error-rate-model.cc b/src/wifi/model/nist-error-rate-model.cc index 362fc9986..24132fac5 100644 --- a/src/wifi/model/nist-error-rate-model.cc +++ b/src/wifi/model/nist-error-rate-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 The Boeing Company * diff --git a/src/wifi/model/nist-error-rate-model.h b/src/wifi/model/nist-error-rate-model.h index 8e4859e0e..fb0376106 100644 --- a/src/wifi/model/nist-error-rate-model.h +++ b/src/wifi/model/nist-error-rate-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2010 The Boeing Company * diff --git a/src/wifi/model/onoe-wifi-manager.cc b/src/wifi/model/onoe-wifi-manager.cc index 60fecccc4..c5d28c715 100644 --- a/src/wifi/model/onoe-wifi-manager.cc +++ b/src/wifi/model/onoe-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2003,2007 INRIA * diff --git a/src/wifi/model/onoe-wifi-manager.h b/src/wifi/model/onoe-wifi-manager.h index 2d1e82165..622842d4a 100644 --- a/src/wifi/model/onoe-wifi-manager.h +++ b/src/wifi/model/onoe-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2003,2007 INRIA * diff --git a/src/wifi/model/originator-block-ack-agreement.cc b/src/wifi/model/originator-block-ack-agreement.cc index fcba89115..593dae1fa 100644 --- a/src/wifi/model/originator-block-ack-agreement.cc +++ b/src/wifi/model/originator-block-ack-agreement.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009, 2010 MIRKO BANCHI * diff --git a/src/wifi/model/originator-block-ack-agreement.h b/src/wifi/model/originator-block-ack-agreement.h index 26da1f5af..fc2aea55b 100644 --- a/src/wifi/model/originator-block-ack-agreement.h +++ b/src/wifi/model/originator-block-ack-agreement.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009, 2010 MIRKO BANCHI * diff --git a/src/wifi/model/qos-blocked-destinations.cc b/src/wifi/model/qos-blocked-destinations.cc index 7220c57ef..02b39b3ac 100644 --- a/src/wifi/model/qos-blocked-destinations.cc +++ b/src/wifi/model/qos-blocked-destinations.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/qos-blocked-destinations.h b/src/wifi/model/qos-blocked-destinations.h index 10f60998e..183efc0db 100644 --- a/src/wifi/model/qos-blocked-destinations.h +++ b/src/wifi/model/qos-blocked-destinations.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/qos-tag.cc b/src/wifi/model/qos-tag.cc index 97ab79219..256f5e206 100644 --- a/src/wifi/model/qos-tag.cc +++ b/src/wifi/model/qos-tag.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/qos-tag.h b/src/wifi/model/qos-tag.h index c53e3e452..ed808f8a4 100644 --- a/src/wifi/model/qos-tag.h +++ b/src/wifi/model/qos-tag.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/qos-utils.cc b/src/wifi/model/qos-utils.cc index 148be49ab..305611263 100644 --- a/src/wifi/model/qos-utils.cc +++ b/src/wifi/model/qos-utils.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/qos-utils.h b/src/wifi/model/qos-utils.h index 7aa58bdf4..dc02d3c72 100644 --- a/src/wifi/model/qos-utils.h +++ b/src/wifi/model/qos-utils.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 MIRKO BANCHI * diff --git a/src/wifi/model/random-stream.cc b/src/wifi/model/random-stream.cc index 34ba66c14..7f6f1828e 100644 --- a/src/wifi/model/random-stream.cc +++ b/src/wifi/model/random-stream.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/wifi/model/random-stream.h b/src/wifi/model/random-stream.h index b72bfae11..a9887081a 100644 --- a/src/wifi/model/random-stream.h +++ b/src/wifi/model/random-stream.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc index 4ef8e463f..cfe325f62 100644 --- a/src/wifi/model/regular-wifi-mac.cc +++ b/src/wifi/model/regular-wifi-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/wifi/model/regular-wifi-mac.h b/src/wifi/model/regular-wifi-mac.h index 93e50a564..f501adf0e 100644 --- a/src/wifi/model/regular-wifi-mac.h +++ b/src/wifi/model/regular-wifi-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc index eb8d8947a..bf1e16a31 100644 --- a/src/wifi/model/rraa-wifi-manager.cc +++ b/src/wifi/model/rraa-wifi-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2004,2005,2006 INRIA * diff --git a/src/wifi/model/rraa-wifi-manager.h b/src/wifi/model/rraa-wifi-manager.h index a32fdad84..5187301db 100644 --- a/src/wifi/model/rraa-wifi-manager.h +++ b/src/wifi/model/rraa-wifi-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/ssid.cc b/src/wifi/model/ssid.cc index ee1ea1414..d511f9ece 100644 --- a/src/wifi/model/ssid.cc +++ b/src/wifi/model/ssid.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/ssid.h b/src/wifi/model/ssid.h index 5647c8195..f5fc93554 100644 --- a/src/wifi/model/ssid.h +++ b/src/wifi/model/ssid.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc index 3572c867d..f0d649c56 100644 --- a/src/wifi/model/sta-wifi-mac.cc +++ b/src/wifi/model/sta-wifi-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/sta-wifi-mac.h b/src/wifi/model/sta-wifi-mac.h index 510fc8387..046cd2385 100644 --- a/src/wifi/model/sta-wifi-mac.h +++ b/src/wifi/model/sta-wifi-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/status-code.cc b/src/wifi/model/status-code.cc index 361778f30..a7720828c 100644 --- a/src/wifi/model/status-code.cc +++ b/src/wifi/model/status-code.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/status-code.h b/src/wifi/model/status-code.h index 9beb4ac48..54c5e8738 100644 --- a/src/wifi/model/status-code.h +++ b/src/wifi/model/status-code.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/supported-rates.cc b/src/wifi/model/supported-rates.cc index 8d0756cbf..6e54a7840 100644 --- a/src/wifi/model/supported-rates.cc +++ b/src/wifi/model/supported-rates.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/supported-rates.h b/src/wifi/model/supported-rates.h index 4d90218c3..f5766c6f0 100644 --- a/src/wifi/model/supported-rates.h +++ b/src/wifi/model/supported-rates.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/wifi-channel.cc b/src/wifi/model/wifi-channel.cc index f6c342395..59295d842 100644 --- a/src/wifi/model/wifi-channel.cc +++ b/src/wifi/model/wifi-channel.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/wifi/model/wifi-channel.h b/src/wifi/model/wifi-channel.h index 51bef9c5f..cbdd5b785 100644 --- a/src/wifi/model/wifi-channel.h +++ b/src/wifi/model/wifi-channel.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/wifi/model/wifi-mac-header.cc b/src/wifi/model/wifi-mac-header.cc index 9eca0feb1..5f10f7c2b 100644 --- a/src/wifi/model/wifi-mac-header.cc +++ b/src/wifi/model/wifi-mac-header.cc @@ -1,4 +1,4 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/wifi-mac-header.h b/src/wifi/model/wifi-mac-header.h index f16a03f8c..ebe438228 100644 --- a/src/wifi/model/wifi-mac-header.h +++ b/src/wifi/model/wifi-mac-header.h @@ -1,4 +1,4 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/wifi-mac-queue.cc b/src/wifi/model/wifi-mac-queue.cc index 7f4c28d10..4965b8ee5 100644 --- a/src/wifi/model/wifi-mac-queue.cc +++ b/src/wifi/model/wifi-mac-queue.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/wifi-mac-queue.h b/src/wifi/model/wifi-mac-queue.h index 5e8e0c885..609b0d13d 100644 --- a/src/wifi/model/wifi-mac-queue.h +++ b/src/wifi/model/wifi-mac-queue.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005, 2009 INRIA * Copyright (c) 2009 MIRKO BANCHI diff --git a/src/wifi/model/wifi-mac-trailer.cc b/src/wifi/model/wifi-mac-trailer.cc index 7b081070c..bb4579e42 100644 --- a/src/wifi/model/wifi-mac-trailer.cc +++ b/src/wifi/model/wifi-mac-trailer.cc @@ -1,4 +1,4 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/wifi-mac-trailer.h b/src/wifi/model/wifi-mac-trailer.h index fb5c34b42..4370756b9 100644 --- a/src/wifi/model/wifi-mac-trailer.h +++ b/src/wifi/model/wifi-mac-trailer.h @@ -1,4 +1,4 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006 INRIA * diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 61208d65c..45d7542ce 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/wifi/model/wifi-mac.h b/src/wifi/model/wifi-mac.h index a208abb4a..eb8473643 100644 --- a/src/wifi/model/wifi-mac.h +++ b/src/wifi/model/wifi-mac.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2008 INRIA * diff --git a/src/wifi/model/wifi-mode.cc b/src/wifi/model/wifi-mode.cc index 9ec1cfb2f..4abe14875 100644 --- a/src/wifi/model/wifi-mode.cc +++ b/src/wifi/model/wifi-mode.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/wifi/model/wifi-mode.h b/src/wifi/model/wifi-mode.h index 5f87e836f..0fe340880 100644 --- a/src/wifi/model/wifi-mode.h +++ b/src/wifi/model/wifi-mode.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/wifi/model/wifi-net-device.cc b/src/wifi/model/wifi-net-device.cc index 6b654b14e..bdf06f5ec 100644 --- a/src/wifi/model/wifi-net-device.cc +++ b/src/wifi/model/wifi-net-device.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/wifi-net-device.h b/src/wifi/model/wifi-net-device.h index 4aaf76a96..40dbe7e0d 100644 --- a/src/wifi/model/wifi-net-device.h +++ b/src/wifi/model/wifi-net-device.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/wifi-phy-standard.h b/src/wifi/model/wifi-phy-standard.h index 0f11c2a12..03daf3e03 100644 --- a/src/wifi/model/wifi-phy-standard.h +++ b/src/wifi/model/wifi-phy-standard.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2007 INRIA * diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc index 8391dc58c..7ba666abd 100644 --- a/src/wifi/model/wifi-phy-state-helper.cc +++ b/src/wifi/model/wifi-phy-state-helper.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/wifi-phy-state-helper.h b/src/wifi/model/wifi-phy-state-helper.h index 2d497b62b..18f323e41 100644 --- a/src/wifi/model/wifi-phy-state-helper.h +++ b/src/wifi/model/wifi-phy-state-helper.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 8040ef791..da0a541bd 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index b165faa54..224b57856 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/wifi-preamble.h b/src/wifi/model/wifi-preamble.h index 45063def7..71c6cea2f 100644 --- a/src/wifi/model/wifi-preamble.h +++ b/src/wifi/model/wifi-preamble.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index 60c430201..ebbeeda7d 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/wifi/model/wifi-remote-station-manager.h b/src/wifi/model/wifi-remote-station-manager.h index e78859c61..bef8bd410 100644 --- a/src/wifi/model/wifi-remote-station-manager.h +++ b/src/wifi/model/wifi-remote-station-manager.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006,2007 INRIA * diff --git a/src/wifi/model/yans-error-rate-model.cc b/src/wifi/model/yans-error-rate-model.cc index 09d7bc531..a7ff3f41b 100644 --- a/src/wifi/model/yans-error-rate-model.cc +++ b/src/wifi/model/yans-error-rate-model.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/yans-error-rate-model.h b/src/wifi/model/yans-error-rate-model.h index 70552fd18..905147184 100644 --- a/src/wifi/model/yans-error-rate-model.h +++ b/src/wifi/model/yans-error-rate-model.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/yans-wifi-channel.cc b/src/wifi/model/yans-wifi-channel.cc index 7e6dc9175..51370a28c 100644 --- a/src/wifi/model/yans-wifi-channel.cc +++ b/src/wifi/model/yans-wifi-channel.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/wifi/model/yans-wifi-channel.h b/src/wifi/model/yans-wifi-channel.h index 1f00140fb..109a95a71 100644 --- a/src/wifi/model/yans-wifi-channel.h +++ b/src/wifi/model/yans-wifi-channel.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2006,2007 INRIA * diff --git a/src/wifi/model/yans-wifi-phy.cc b/src/wifi/model/yans-wifi-phy.cc index 8465fd806..586aa4e95 100644 --- a/src/wifi/model/yans-wifi-phy.cc +++ b/src/wifi/model/yans-wifi-phy.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/model/yans-wifi-phy.h b/src/wifi/model/yans-wifi-phy.h index ccbad43ef..814e977c3 100644 --- a/src/wifi/model/yans-wifi-phy.h +++ b/src/wifi/model/yans-wifi-phy.h @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/test/block-ack-test-suite.cc b/src/wifi/test/block-ack-test-suite.cc index 8b5e4c1e6..7e8a317fc 100644 --- a/src/wifi/test/block-ack-test-suite.cc +++ b/src/wifi/test/block-ack-test-suite.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009, 2010 MIRKO BANCHI * diff --git a/src/wifi/test/dcf-manager-test.cc b/src/wifi/test/dcf-manager-test.cc index fc18eb1ec..3e8ecceb4 100644 --- a/src/wifi/test/dcf-manager-test.cc +++ b/src/wifi/test/dcf-manager-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc index ff793d81e..6a7f5e9d9 100644 --- a/src/wifi/test/tx-duration-test.cc +++ b/src/wifi/test/tx-duration-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2009 CTTC * diff --git a/src/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc index d92c0a713..9ec79be81 100644 --- a/src/wifi/test/wifi-test.cc +++ b/src/wifi/test/wifi-test.cc @@ -1,4 +1,4 @@ -/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * Copyright (c) 2005,2006 INRIA * 2010 NICTA From 0538e655aa664a1332aec043418f218da5e8fef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Mileti=C4=87?= Date: Tue, 2 Aug 2011 17:43:32 -0400 Subject: [PATCH 041/202] standardize ns-3 namespace declaration format --- src/core/model/breakpoint.cc | 2 +- src/core/model/breakpoint.h | 2 +- src/core/model/event-id.cc | 2 +- src/core/model/event-id.h | 2 +- src/core/model/names.cc | 2 +- src/core/model/names.h | 2 +- src/core/model/ptr.h | 2 +- src/core/model/realtime-simulator-impl.cc | 2 +- src/core/model/rng-stream.cc | 2 +- src/core/model/rng-stream.h | 2 +- src/core/model/simulation-singleton.h | 2 +- src/core/model/synchronizer.h | 2 +- src/core/model/system-condition.h | 2 +- src/core/model/system-mutex.h | 2 +- src/core/model/system-thread.h | 2 +- src/core/model/system-wall-clock-ms.h | 2 +- src/core/model/traced-callback.h | 2 +- src/core/model/type-name.cc | 2 +- src/core/model/type-name.h | 2 +- src/core/model/unix-system-wall-clock-ms.cc | 2 +- src/core/model/wall-clock-synchronizer.cc | 2 +- src/core/model/wall-clock-synchronizer.h | 2 +- src/core/model/win32-system-wall-clock-ms.cc | 2 +- src/csma/model/csma-net-device.h | 2 +- src/internet/helper/ipv4-address-helper.h | 2 +- .../helper/ipv4-static-routing-helper.cc | 2 +- .../helper/ipv6-static-routing-helper.cc | 2 +- src/internet/model/arp-cache.h | 2 +- src/internet/model/arp-header.cc | 2 +- src/internet/model/arp-header.h | 2 +- src/internet/model/arp-l3-protocol.cc | 2 +- src/internet/model/arp-l3-protocol.h | 2 +- src/internet/model/ipv4-address-generator.h | 2 +- src/internet/model/ipv4-end-point-demux.cc | 2 +- src/internet/model/ipv4-end-point.cc | 2 +- src/internet/model/ipv4-end-point.h | 2 +- src/internet/model/ipv4-global-routing.cc | 2 +- src/internet/model/ipv4-header.cc | 2 +- src/internet/model/ipv4-interface.cc | 2 +- src/internet/model/ipv4-l3-protocol.cc | 2 +- src/internet/model/ipv4-l4-protocol.cc | 2 +- src/internet/model/ipv4-list-routing.h | 2 +- src/internet/model/ipv4-packet-info-tag.cc | 2 +- src/internet/model/ipv4-packet-info-tag.h | 2 +- src/internet/model/ipv4-route.cc | 2 +- src/internet/model/ipv4-route.h | 2 +- src/internet/model/ipv4-routing-protocol.cc | 2 +- src/internet/model/ipv4-routing-protocol.h | 2 +- src/internet/model/ipv4-routing-table-entry.cc | 2 +- src/internet/model/ipv4-routing-table-entry.h | 2 +- src/internet/model/ipv4-static-routing.cc | 2 +- src/internet/model/ipv6-list-routing.h | 2 +- src/internet/model/ipv6-packet-info-tag.cc | 2 +- src/internet/model/ipv6-packet-info-tag.h | 2 +- src/internet/model/ipv6-routing-protocol.h | 2 +- src/internet/model/nsc-tcp-l4-protocol.cc | 2 +- src/internet/model/nsc-tcp-l4-protocol.h | 2 +- src/internet/model/nsc-tcp-socket-impl.cc | 2 +- src/internet/model/nsc-tcp-socket-impl.h | 2 +- src/internet/model/rtt-estimator.h | 2 +- src/internet/model/tcp-header.cc | 2 +- src/internet/model/tcp-header.h | 2 +- src/internet/model/tcp-l4-protocol.cc | 2 +- src/internet/model/tcp-l4-protocol.h | 2 +- src/internet/model/tcp-socket.cc | 2 +- src/internet/model/tcp-socket.h | 2 +- src/internet/model/udp-header.cc | 2 +- src/internet/model/udp-l4-protocol.cc | 2 +- src/internet/model/udp-l4-protocol.h | 2 +- src/internet/model/udp-socket-impl.cc | 2 +- src/internet/model/udp-socket-impl.h | 2 +- src/internet/model/udp-socket.cc | 2 +- src/internet/model/udp-socket.h | 2 +- src/internet/test/ipv4-raw-test.cc | 2 +- src/internet/test/ipv4-test.cc | 3 +-- src/internet/test/udp-test.cc | 2 +- src/lte/model/ue-record.cc | 3 +-- src/lte/model/ue-record.h | 3 +-- src/mesh/helper/dot11s/dot11s-installer.cc | 2 +- src/mesh/helper/dot11s/dot11s-installer.h | 2 +- src/mesh/helper/flame/flame-installer.cc | 2 +- src/mesh/helper/flame/flame-installer.h | 2 +- src/mesh/helper/mesh-helper.cc | 2 +- src/mesh/helper/mesh-helper.h | 2 +- src/mesh/model/dot11s/airtime-metric.cc | 4 ++-- src/mesh/model/dot11s/airtime-metric.h | 4 ++-- src/mesh/model/dot11s/dot11s-mac-header.cc | 2 +- src/mesh/model/dot11s/dot11s-mac-header.h | 2 +- src/mesh/model/dot11s/hwmp-protocol-mac.cc | 4 ++-- src/mesh/model/dot11s/hwmp-protocol-mac.h | 4 ++-- src/mesh/model/dot11s/hwmp-protocol.cc | 4 ++-- src/mesh/model/dot11s/hwmp-protocol.h | 4 ++-- src/mesh/model/dot11s/hwmp-rtable.cc | 4 ++-- src/mesh/model/dot11s/hwmp-rtable.h | 4 ++-- src/mesh/model/dot11s/hwmp-tag.cc | 4 ++-- src/mesh/model/dot11s/hwmp-tag.h | 4 ++-- .../model/dot11s/ie-dot11s-beacon-timing.cc | 2 +- .../model/dot11s/ie-dot11s-beacon-timing.h | 2 +- .../model/dot11s/ie-dot11s-configuration.cc | 2 +- .../model/dot11s/ie-dot11s-configuration.h | 2 +- src/mesh/model/dot11s/ie-dot11s-id.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-id.h | 2 +- .../model/dot11s/ie-dot11s-metric-report.cc | 2 +- .../model/dot11s/ie-dot11s-metric-report.h | 2 +- .../model/dot11s/ie-dot11s-peer-management.cc | 2 +- .../model/dot11s/ie-dot11s-peer-management.h | 2 +- .../model/dot11s/ie-dot11s-peering-protocol.cc | 2 +- .../model/dot11s/ie-dot11s-peering-protocol.h | 2 +- src/mesh/model/dot11s/ie-dot11s-perr.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-perr.h | 2 +- src/mesh/model/dot11s/ie-dot11s-prep.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-prep.h | 2 +- src/mesh/model/dot11s/ie-dot11s-preq.cc | 2 +- src/mesh/model/dot11s/ie-dot11s-preq.h | 2 +- src/mesh/model/dot11s/ie-dot11s-rann.h | 2 +- src/mesh/model/dot11s/peer-link-frame.cc | 2 +- src/mesh/model/dot11s/peer-link-frame.h | 4 ++-- src/mesh/model/dot11s/peer-link.cc | 2 +- src/mesh/model/dot11s/peer-link.h | 2 +- .../dot11s/peer-management-protocol-mac.cc | 2 +- .../dot11s/peer-management-protocol-mac.h | 2 +- .../model/dot11s/peer-management-protocol.cc | 2 +- .../model/dot11s/peer-management-protocol.h | 2 +- src/mesh/model/flame/flame-header.cc | 2 +- src/mesh/model/flame/flame-header.h | 4 ++-- src/mesh/model/flame/flame-protocol-mac.cc | 4 ++-- src/mesh/model/flame/flame-protocol-mac.h | 4 ++-- src/mesh/model/flame/flame-protocol.cc | 4 ++-- src/mesh/model/flame/flame-protocol.h | 4 ++-- src/mesh/model/flame/flame-rtable.cc | 4 ++-- src/mesh/model/flame/flame-rtable.h | 4 ++-- .../model/mesh-information-element-vector.cc | 2 +- src/mesh/model/mesh-l2-routing-protocol.h | 2 +- src/mesh/model/mesh-point-device.h | 2 +- ...sh-information-element-vector-test-suite.cc | 2 +- .../constant-acceleration-mobility-model.cc | 2 +- .../constant-acceleration-mobility-model.h | 2 +- .../model/constant-position-mobility-model.cc | 2 +- .../model/constant-position-mobility-model.h | 2 +- .../model/constant-velocity-mobility-model.cc | 2 +- .../model/constant-velocity-mobility-model.h | 2 +- src/mobility/model/mobility-model.h | 2 +- src/netanim/model/canvas-location.h | 2 +- src/network/model/application.cc | 2 +- src/network/model/application.h | 2 +- src/network/model/channel-list.cc | 2 +- src/network/model/channel-list.h | 2 +- src/network/model/node-list.cc | 2 +- src/network/model/node-list.h | 2 +- src/network/model/node.cc | 2 +- src/network/model/node.h | 2 +- src/network/model/packet-metadata.h | 2 +- src/network/model/socket.cc | 2 +- src/network/model/socket.h | 2 +- src/network/test/packet-metadata-test.cc | 2 +- src/network/utils/data-rate.cc | 2 +- src/network/utils/data-rate.h | 2 +- src/network/utils/drop-tail-queue.h | 2 +- src/network/utils/error-model.cc | 2 +- src/network/utils/error-model.h | 2 +- src/network/utils/ethernet-header.h | 2 +- src/network/utils/ethernet-trailer.cc | 2 +- src/network/utils/ipv4-address.cc | 2 +- src/network/utils/output-stream-wrapper.cc | 2 +- src/network/utils/output-stream-wrapper.h | 2 +- src/network/utils/packet-socket.cc | 2 +- src/network/utils/packet-socket.h | 2 +- src/network/utils/pcap-file-wrapper.cc | 2 +- src/network/utils/pcap-file-wrapper.h | 2 +- src/network/utils/pcap-file.cc | 2 +- src/network/utils/pcap-file.h | 2 +- src/network/utils/queue.h | 2 +- src/olsr/model/olsr-repositories.h | 2 +- src/point-to-point/model/ppp-header.h | 2 +- .../microwave-oven-spectrum-value-helper.cc | 2 +- .../microwave-oven-spectrum-value-helper.h | 2 +- .../model/wifi-spectrum-value-helper.cc | 2 +- .../model/wifi-spectrum-value-helper.h | 2 +- src/tools/model/event-garbage-collector.h | 2 +- src/uan/model/uan-noise-model.cc | 2 +- src/uan/model/uan-phy.cc | 2 +- .../model/virtual-net-device.h | 2 +- src/wifi/helper/nqos-wifi-mac-helper.cc | 2 +- src/wifi/helper/nqos-wifi-mac-helper.h | 2 +- src/wifi/helper/qos-wifi-mac-helper.cc | 2 +- src/wifi/helper/qos-wifi-mac-helper.h | 2 +- src/wifi/model/amsdu-subframe-header.cc | 2 +- src/wifi/model/amsdu-subframe-header.h | 2 +- src/wifi/model/block-ack-agreement.cc | 2 +- src/wifi/model/block-ack-agreement.h | 2 +- src/wifi/model/block-ack-cache.cc | 2 +- src/wifi/model/block-ack-cache.h | 2 +- src/wifi/model/block-ack-manager.cc | 2 +- src/wifi/model/block-ack-manager.h | 2 +- src/wifi/model/ctrl-headers.cc | 2 +- src/wifi/model/ctrl-headers.h | 2 +- src/wifi/model/dca-txop.h | 2 +- src/wifi/model/edca-txop-n.cc | 2 +- src/wifi/model/edca-txop-n.h | 2 +- src/wifi/model/minstrel-wifi-manager.cc | 2 +- src/wifi/model/msdu-aggregator.cc | 2 +- src/wifi/model/msdu-aggregator.h | 2 +- src/wifi/model/msdu-standard-aggregator.cc | 2 +- src/wifi/model/msdu-standard-aggregator.h | 2 +- .../model/originator-block-ack-agreement.cc | 2 +- .../model/originator-block-ack-agreement.h | 2 +- src/wifi/model/qos-blocked-destinations.cc | 2 +- src/wifi/model/qos-blocked-destinations.h | 2 +- src/wifi/model/qos-tag.cc | 2 +- src/wifi/model/qos-tag.h | 2 +- src/wifi/model/qos-utils.cc | 2 +- src/wifi/model/qos-utils.h | 2 +- .../model/wifi-information-element-vector.cc | 2 +- src/wifi/test/tx-duration-test.cc | 2 +- src/wimax/model/connection-manager.h | 3 +-- src/wimax/model/dl-mac-messages.cc | 3 +-- src/wimax/model/dl-mac-messages.h | 18 ++++++------------ src/wimax/model/ipcs-classifier-record.cc | 3 +-- src/wimax/model/ipcs-classifier-record.h | 3 +-- src/wimax/model/ipcs-classifier.h | 3 +-- src/wimax/model/mac-messages.h | 3 +-- src/wimax/model/ofdm-downlink-frame-prefix.cc | 3 +-- src/wimax/model/ofdm-downlink-frame-prefix.h | 6 ++---- src/wimax/model/ul-job.cc | 3 +-- src/wimax/model/ul-mac-messages.cc | 3 +-- src/wimax/model/wimax-mac-header.cc | 3 +-- src/wimax/model/wimax-mac-header.h | 15 +++++---------- 227 files changed, 255 insertions(+), 281 deletions(-) diff --git a/src/core/model/breakpoint.cc b/src/core/model/breakpoint.cc index 511526710..0ea80d47d 100644 --- a/src/core/model/breakpoint.cc +++ b/src/core/model/breakpoint.cc @@ -54,4 +54,4 @@ BreakpointFallback (void) #endif // HAVE_SIGNAL_H -} //namespace ns3 +} // namespace ns3 diff --git a/src/core/model/breakpoint.h b/src/core/model/breakpoint.h index c3f3e656f..0f06349e2 100644 --- a/src/core/model/breakpoint.h +++ b/src/core/model/breakpoint.h @@ -69,7 +69,7 @@ namespace ns3 { void BreakpointFallback (void); -} //namespace ns3 +} // namespace ns3 #endif /* BREAKPOINT_H */ diff --git a/src/core/model/event-id.cc b/src/core/model/event-id.cc index d0a8436f5..4653ccce8 100644 --- a/src/core/model/event-id.cc +++ b/src/core/model/event-id.cc @@ -89,4 +89,4 @@ bool operator != (const EventId &a, const EventId &b) -}; // namespace ns3 +} // namespace ns3 diff --git a/src/core/model/event-id.h b/src/core/model/event-id.h index 312de66e7..c9cf4c396 100644 --- a/src/core/model/event-id.h +++ b/src/core/model/event-id.h @@ -85,6 +85,6 @@ private: bool operator == (const EventId &a, const EventId &b); bool operator != (const EventId &a, const EventId &b); -}; // namespace ns3 +} // namespace ns3 #endif /* EVENT_ID_H */ diff --git a/src/core/model/names.cc b/src/core/model/names.cc index 29e029d19..4d36a3d75 100644 --- a/src/core/model/names.cc +++ b/src/core/model/names.cc @@ -682,4 +682,4 @@ Names::FindInternal (Ptr context, std::string name) return NamesPriv::Get ()->Find (context, name); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/core/model/names.h b/src/core/model/names.h index 09356c33a..77d6f338b 100644 --- a/src/core/model/names.h +++ b/src/core/model/names.h @@ -456,6 +456,6 @@ Names::Find (Ptr context, std::string name) } } -} //namespace ns3 +} // namespace ns3 #endif /* OBJECT_NAMES_H */ diff --git a/src/core/model/ptr.h b/src/core/model/ptr.h index 0dbbef776..e60c59f5b 100644 --- a/src/core/model/ptr.h +++ b/src/core/model/ptr.h @@ -521,6 +521,6 @@ Ptr::operator Tester * () const } -}; // namespace ns3 +} // namespace ns3 #endif /* PTR_H */ diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index c4cd7fd4c..d76564cd9 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -869,4 +869,4 @@ RealtimeSimulatorImpl::GetHardLimit (void) const return m_hardLimit; } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/core/model/rng-stream.cc b/src/core/model/rng-stream.cc index 96f7287bb..9b61b41b6 100644 --- a/src/core/model/rng-stream.cc +++ b/src/core/model/rng-stream.cc @@ -562,4 +562,4 @@ int32_t RngStream::RandInt (int32_t low, int32_t high) return low + static_cast ((high - low + 1) * RandU01 ()); }; -} //namespace ns3 +} // namespace ns3 diff --git a/src/core/model/rng-stream.h b/src/core/model/rng-stream.h index 97fef149e..86367550c 100644 --- a/src/core/model/rng-stream.h +++ b/src/core/model/rng-stream.h @@ -70,7 +70,7 @@ private: //static data static double nextSeed[6]; }; -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/core/model/simulation-singleton.h b/src/core/model/simulation-singleton.h index 8269e780f..ee433552f 100644 --- a/src/core/model/simulation-singleton.h +++ b/src/core/model/simulation-singleton.h @@ -45,7 +45,7 @@ private: static void DeleteObject (void); }; -} //namespace ns3 +} // namespace ns3 #include "simulator.h" diff --git a/src/core/model/synchronizer.h b/src/core/model/synchronizer.h index 2b5010ca4..202800ac5 100644 --- a/src/core/model/synchronizer.h +++ b/src/core/model/synchronizer.h @@ -329,6 +329,6 @@ private: uint64_t NanosecondToTimeStep (uint64_t ns); }; -}; // namespace ns3 +} // namespace ns3 #endif /* SYNCHRONIZER_H */ diff --git a/src/core/model/system-condition.h b/src/core/model/system-condition.h index 2cfbe83c2..255539c4a 100644 --- a/src/core/model/system-condition.h +++ b/src/core/model/system-condition.h @@ -101,7 +101,7 @@ private: SystemConditionPrivate * m_priv; }; -} //namespace ns3 +} // namespace ns3 #endif /* SYSTEM_CONDITION_H */ diff --git a/src/core/model/system-mutex.h b/src/core/model/system-mutex.h index 7fc298c40..8c35fbf3d 100644 --- a/src/core/model/system-mutex.h +++ b/src/core/model/system-mutex.h @@ -115,6 +115,6 @@ private: SystemMutex &m_mutex; }; -} //namespace ns3 +} // namespace ns3 #endif /* SYSTEM_MUTEX_H */ diff --git a/src/core/model/system-thread.h b/src/core/model/system-thread.h index 55038017c..eb6eb275a 100644 --- a/src/core/model/system-thread.h +++ b/src/core/model/system-thread.h @@ -168,7 +168,7 @@ private: bool m_break; }; -} //namespace ns3 +} // namespace ns3 #endif /* SYSTEM_THREAD_H */ diff --git a/src/core/model/system-wall-clock-ms.h b/src/core/model/system-wall-clock-ms.h index 2895f3dd8..ca90ad5a6 100644 --- a/src/core/model/system-wall-clock-ms.h +++ b/src/core/model/system-wall-clock-ms.h @@ -76,6 +76,6 @@ private: class SystemWallClockMsPrivate *m_priv; }; -}; // namespace ns3 +} // namespace ns3 #endif /* SYSTEM_WALL_CLOCK_MS_H */ diff --git a/src/core/model/traced-callback.h b/src/core/model/traced-callback.h index ddf16bc29..cb772c617 100644 --- a/src/core/model/traced-callback.h +++ b/src/core/model/traced-callback.h @@ -280,6 +280,6 @@ TracedCallback::operator() (T1 a1, T2 a2, T3 a3, T4 a4, } } -} //namespace ns3 +} // namespace ns3 #endif /* TRACED_CALLBACK_H */ diff --git a/src/core/model/type-name.cc b/src/core/model/type-name.cc index aad188bd4..58f099e76 100644 --- a/src/core/model/type-name.cc +++ b/src/core/model/type-name.cc @@ -23,4 +23,4 @@ DEF_TYPE (float); DEF_TYPE (double); -} //namespace ns3 +} // namespace ns3 diff --git a/src/core/model/type-name.h b/src/core/model/type-name.h index 9971abc4b..4bd94aa5d 100644 --- a/src/core/model/type-name.h +++ b/src/core/model/type-name.h @@ -31,6 +31,6 @@ DEF_TYPE (double); #undef DEF_TYPE -} //namespace ns3 +} // namespace ns3 #endif /* TYPE_NAME_H */ diff --git a/src/core/model/unix-system-wall-clock-ms.cc b/src/core/model/unix-system-wall-clock-ms.cc index c4f6cc938..68f70fb98 100644 --- a/src/core/model/unix-system-wall-clock-ms.cc +++ b/src/core/model/unix-system-wall-clock-ms.cc @@ -159,4 +159,4 @@ SystemWallClockMs::GetElapsedSystem (void) const return m_priv->GetElapsedSystem (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/core/model/wall-clock-synchronizer.cc b/src/core/model/wall-clock-synchronizer.cc index 1682855ce..393ab2427 100644 --- a/src/core/model/wall-clock-synchronizer.cc +++ b/src/core/model/wall-clock-synchronizer.cc @@ -420,4 +420,4 @@ WallClockSynchronizer::TimevalAdd ( } } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/core/model/wall-clock-synchronizer.h b/src/core/model/wall-clock-synchronizer.h index 46979a97f..64755e008 100644 --- a/src/core/model/wall-clock-synchronizer.h +++ b/src/core/model/wall-clock-synchronizer.h @@ -191,6 +191,6 @@ protected: SystemCondition m_condition; }; -}; // namespace ns3 +} // namespace ns3 #endif /* WALL_CLOCK_SYNCHRONIZER_H */ diff --git a/src/core/model/win32-system-wall-clock-ms.cc b/src/core/model/win32-system-wall-clock-ms.cc index 812c882b5..076d9ebd7 100644 --- a/src/core/model/win32-system-wall-clock-ms.cc +++ b/src/core/model/win32-system-wall-clock-ms.cc @@ -152,4 +152,4 @@ SystemWallClockMs::GetElapsedSystem (void) const return m_priv->GetElapsedSystem (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/csma/model/csma-net-device.h b/src/csma/model/csma-net-device.h index 170362f78..56f3491f1 100644 --- a/src/csma/model/csma-net-device.h +++ b/src/csma/model/csma-net-device.h @@ -710,6 +710,6 @@ private: uint32_t m_mtu; }; -}; // namespace ns3 +} // namespace ns3 #endif /* CSMA_NET_DEVICE_H */ diff --git a/src/internet/helper/ipv4-address-helper.h b/src/internet/helper/ipv4-address-helper.h index 4508c221f..1b6e6ac2a 100644 --- a/src/internet/helper/ipv4-address-helper.h +++ b/src/internet/helper/ipv4-address-helper.h @@ -189,6 +189,6 @@ private: uint32_t m_max; }; -}; // namespace ns3 +} // namespace ns3 #endif /* IPV4_ADDRESS_HELPER_H */ diff --git a/src/internet/helper/ipv4-static-routing-helper.cc b/src/internet/helper/ipv4-static-routing-helper.cc index 42fef2c47..d8be29548 100644 --- a/src/internet/helper/ipv4-static-routing-helper.cc +++ b/src/internet/helper/ipv4-static-routing-helper.cc @@ -208,4 +208,4 @@ Ipv4StaticRoutingHelper::SetDefaultMulticastRoute ( SetDefaultMulticastRoute (n, nd); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/helper/ipv6-static-routing-helper.cc b/src/internet/helper/ipv6-static-routing-helper.cc index 7f47e40e2..a094db19e 100644 --- a/src/internet/helper/ipv6-static-routing-helper.cc +++ b/src/internet/helper/ipv6-static-routing-helper.cc @@ -211,4 +211,4 @@ Ipv6StaticRoutingHelper::SetDefaultMulticastRoute ( } #endif -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/arp-cache.h b/src/internet/model/arp-cache.h index 590bb8e23..d6aa3a8b0 100644 --- a/src/internet/model/arp-cache.h +++ b/src/internet/model/arp-cache.h @@ -233,6 +233,6 @@ private: }; -}; // namespace ns3 +} // namespace ns3 #endif /* ARP_CACHE_H */ diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc index 2b9ce1a68..5dcec772c 100644 --- a/src/internet/model/arp-header.cc +++ b/src/internet/model/arp-header.cc @@ -172,4 +172,4 @@ ArpHeader::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/arp-header.h b/src/internet/model/arp-header.h index d12e0fcb7..bf27cd3f5 100644 --- a/src/internet/model/arp-header.h +++ b/src/internet/model/arp-header.h @@ -67,6 +67,6 @@ public: Ipv4Address m_ipv4Dest; }; -}; // namespace ns3 +} // namespace ns3 #endif /* ARP_HEADER_H */ diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc index ea33fbf02..bd94ea1cf 100644 --- a/src/internet/model/arp-l3-protocol.cc +++ b/src/internet/model/arp-l3-protocol.cc @@ -344,4 +344,4 @@ ArpL3Protocol::SendArpReply (Ptr cache, Ipv4Address myIp, Ipv4Ad cache->GetDevice ()->Send (packet, toMac, PROT_NUMBER); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/arp-l3-protocol.h b/src/internet/model/arp-l3-protocol.h index 6e185a887..6ea710680 100644 --- a/src/internet/model/arp-l3-protocol.h +++ b/src/internet/model/arp-l3-protocol.h @@ -95,7 +95,7 @@ private: TracedCallback > m_dropTrace; }; -} //namespace ns3 +} // namespace ns3 #endif /* ARP_L3_PROTOCOL_H */ diff --git a/src/internet/model/ipv4-address-generator.h b/src/internet/model/ipv4-address-generator.h index e8110c565..1a073ddf7 100644 --- a/src/internet/model/ipv4-address-generator.h +++ b/src/internet/model/ipv4-address-generator.h @@ -47,6 +47,6 @@ public: static void TestMode (void); }; -}; // namespace ns3 +} // namespace ns3 #endif /* IPV4_ADDRESS_GENERATOR_H */ diff --git a/src/internet/model/ipv4-end-point-demux.cc b/src/internet/model/ipv4-end-point-demux.cc index c30067199..9bfd2f712 100644 --- a/src/internet/model/ipv4-end-point-demux.cc +++ b/src/internet/model/ipv4-end-point-demux.cc @@ -368,5 +368,5 @@ Ipv4EndPointDemux::AllocateEphemeralPort (void) return 0; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-end-point.cc b/src/internet/model/ipv4-end-point.cc index ece423e00..31cc177ac 100644 --- a/src/internet/model/ipv4-end-point.cc +++ b/src/internet/model/ipv4-end-point.cc @@ -144,4 +144,4 @@ Ipv4EndPoint::DoForwardIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, m_icmpCallback (icmpSource,icmpTtl,icmpType,icmpCode,icmpInfo); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-end-point.h b/src/internet/model/ipv4-end-point.h index 691462eb7..38790daf6 100644 --- a/src/internet/model/ipv4-end-point.h +++ b/src/internet/model/ipv4-end-point.h @@ -91,7 +91,7 @@ private: Callback m_destroyCallback; }; -}; // namespace ns3 +} // namespace ns3 #endif /* IPV4_END_POINT_H */ diff --git a/src/internet/model/ipv4-global-routing.cc b/src/internet/model/ipv4-global-routing.cc index 8800869dd..3fe07989c 100644 --- a/src/internet/model/ipv4-global-routing.cc +++ b/src/internet/model/ipv4-global-routing.cc @@ -597,4 +597,4 @@ Ipv4GlobalRouting::SetIpv4 (Ptr ipv4) } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-header.cc b/src/internet/model/ipv4-header.cc index 71c8bd9b0..7914d214e 100644 --- a/src/internet/model/ipv4-header.cc +++ b/src/internet/model/ipv4-header.cc @@ -324,4 +324,4 @@ Ipv4Header::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-interface.cc b/src/internet/model/ipv4-interface.cc index 992777d0e..c238ef9ac 100644 --- a/src/internet/model/ipv4-interface.cc +++ b/src/internet/model/ipv4-interface.cc @@ -340,5 +340,5 @@ Ipv4Interface::RemoveAddress (uint32_t index) return (addr); // quiet compiler } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index ecbd865d3..7c2a8f7e5 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -1394,4 +1394,4 @@ Ipv4L3Protocol::HandleFragmentsTimeout (std::pair key, Ipv4H m_fragmentsTimers.erase (key); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-l4-protocol.cc b/src/internet/model/ipv4-l4-protocol.cc index 6a3ef0dcb..ac741a3cd 100644 --- a/src/internet/model/ipv4-l4-protocol.cc +++ b/src/internet/model/ipv4-l4-protocol.cc @@ -52,4 +52,4 @@ Ipv4L4Protocol::ReceiveIcmp (Ipv4Address icmpSource, uint8_t icmpTtl, const uint8_t payload[8]) {} -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-list-routing.h b/src/internet/model/ipv4-list-routing.h index f6477b577..044ec0580 100644 --- a/src/internet/model/ipv4-list-routing.h +++ b/src/internet/model/ipv4-list-routing.h @@ -100,6 +100,6 @@ private: }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV4_LIST_ROUTING_H */ diff --git a/src/internet/model/ipv4-packet-info-tag.cc b/src/internet/model/ipv4-packet-info-tag.cc index 2bb04efa2..e9054268f 100644 --- a/src/internet/model/ipv4-packet-info-tag.cc +++ b/src/internet/model/ipv4-packet-info-tag.cc @@ -136,5 +136,5 @@ Ipv4PacketInfoTag::Print (std::ostream &os) const os << ", TTL:" << (uint32_t) m_ttl; os << "] "; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-packet-info-tag.h b/src/internet/model/ipv4-packet-info-tag.h index f243c5c9d..935cc3875 100644 --- a/src/internet/model/ipv4-packet-info-tag.h +++ b/src/internet/model/ipv4-packet-info-tag.h @@ -84,6 +84,6 @@ private: // Uset for IP_RECVTTL, though not implemented yet. uint8_t m_ttl; }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV4_PACKET_INFO_TAG_H */ diff --git a/src/internet/model/ipv4-route.cc b/src/internet/model/ipv4-route.cc index 1e1090504..44582d204 100644 --- a/src/internet/model/ipv4-route.cc +++ b/src/internet/model/ipv4-route.cc @@ -157,4 +157,4 @@ Ipv4MulticastRoute::GetOutputTtlMap () const return(m_ttls); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-route.h b/src/internet/model/ipv4-route.h index a919bcff6..5fb44d42e 100644 --- a/src/internet/model/ipv4-route.h +++ b/src/internet/model/ipv4-route.h @@ -163,6 +163,6 @@ private: std::map m_ttls; }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV4_ROUTE_H */ diff --git a/src/internet/model/ipv4-routing-protocol.cc b/src/internet/model/ipv4-routing-protocol.cc index 774060baa..613eeba17 100644 --- a/src/internet/model/ipv4-routing-protocol.cc +++ b/src/internet/model/ipv4-routing-protocol.cc @@ -32,4 +32,4 @@ TypeId Ipv4RoutingProtocol::GetTypeId (void) return tid; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-routing-protocol.h b/src/internet/model/ipv4-routing-protocol.h index d5cb424ea..57f18c9d0 100644 --- a/src/internet/model/ipv4-routing-protocol.h +++ b/src/internet/model/ipv4-routing-protocol.h @@ -145,6 +145,6 @@ public: virtual void PrintRoutingTable (Ptr stream) const = 0; }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV4_ROUTING_PROTOCOL_H */ diff --git a/src/internet/model/ipv4-routing-table-entry.cc b/src/internet/model/ipv4-routing-table-entry.cc index d89f1756f..386ddd58b 100644 --- a/src/internet/model/ipv4-routing-table-entry.cc +++ b/src/internet/model/ipv4-routing-table-entry.cc @@ -337,4 +337,4 @@ operator<< (std::ostream& os, Ipv4MulticastRoutingTableEntry const& route) return os; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv4-routing-table-entry.h b/src/internet/model/ipv4-routing-table-entry.h index 62c0dbe72..9b98ec094 100644 --- a/src/internet/model/ipv4-routing-table-entry.h +++ b/src/internet/model/ipv4-routing-table-entry.h @@ -226,6 +226,6 @@ private: std::ostream& operator<< (std::ostream& os, Ipv4MulticastRoutingTableEntry const& route); -} //namespace ns3 +} // namespace ns3 #endif /* IPV4_ROUTING_TABLE_ENTRY_H */ diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc index a9754f1b8..278440352 100644 --- a/src/internet/model/ipv4-static-routing.cc +++ b/src/internet/model/ipv4-static-routing.cc @@ -775,4 +775,4 @@ Ipv4StaticRouting::SourceAddressSelection (uint32_t interfaceIdx, Ipv4Address de return candidate; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv6-list-routing.h b/src/internet/model/ipv6-list-routing.h index b255e26a6..77b2b18f9 100644 --- a/src/internet/model/ipv6-list-routing.h +++ b/src/internet/model/ipv6-list-routing.h @@ -133,7 +133,7 @@ private: Ptr m_ipv6; }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV6_LIST_ROUTING_H */ diff --git a/src/internet/model/ipv6-packet-info-tag.cc b/src/internet/model/ipv6-packet-info-tag.cc index 11a378a82..1d09e759b 100644 --- a/src/internet/model/ipv6-packet-info-tag.cc +++ b/src/internet/model/ipv6-packet-info-tag.cc @@ -134,5 +134,5 @@ Ipv6PacketInfoTag::Print (std::ostream &os) const os << ", TClass:" << (uint32_t) m_tclass; os << "] "; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/ipv6-packet-info-tag.h b/src/internet/model/ipv6-packet-info-tag.h index cb60a3515..821c0029b 100644 --- a/src/internet/model/ipv6-packet-info-tag.h +++ b/src/internet/model/ipv6-packet-info-tag.h @@ -89,7 +89,7 @@ private: uint8_t m_hoplimit; uint8_t m_tclass; }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV6_PACKET_INFO_TAG_H */ diff --git a/src/internet/model/ipv6-routing-protocol.h b/src/internet/model/ipv6-routing-protocol.h index 29190b3c5..4713b3155 100644 --- a/src/internet/model/ipv6-routing-protocol.h +++ b/src/internet/model/ipv6-routing-protocol.h @@ -173,7 +173,7 @@ public: virtual void SetIpv6 (Ptr ipv6) = 0; }; -} //namespace ns3 +} // namespace ns3 #endif /* IPV6_ROUTING_PROTOCOL_H */ diff --git a/src/internet/model/nsc-tcp-l4-protocol.cc b/src/internet/model/nsc-tcp-l4-protocol.cc index da5742938..71db61f5f 100644 --- a/src/internet/model/nsc-tcp-l4-protocol.cc +++ b/src/internet/model/nsc-tcp-l4-protocol.cc @@ -468,5 +468,5 @@ NscTcpL4Protocol::GetDownTarget (void) const return m_downTarget; } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/nsc-tcp-l4-protocol.h b/src/internet/model/nsc-tcp-l4-protocol.h index dafcbafcd..43fc57517 100644 --- a/src/internet/model/nsc-tcp-l4-protocol.h +++ b/src/internet/model/nsc-tcp-l4-protocol.h @@ -126,6 +126,6 @@ private: Ipv4L4Protocol::DownTargetCallback m_downTarget; }; -}; // namespace ns3 +} // namespace ns3 #endif /* NSC_TCP_L4_PROTOCOL_H */ diff --git a/src/internet/model/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc index 354a7e7fa..5fe43ec7d 100644 --- a/src/internet/model/nsc-tcp-socket-impl.cc +++ b/src/internet/model/nsc-tcp-socket-impl.cc @@ -860,4 +860,4 @@ NscTcpSocketImpl::GetAllowBroadcast () const return false; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/nsc-tcp-socket-impl.h b/src/internet/model/nsc-tcp-socket-impl.h index 090e2ac75..7d645ed37 100644 --- a/src/internet/model/nsc-tcp-socket-impl.h +++ b/src/internet/model/nsc-tcp-socket-impl.h @@ -180,6 +180,6 @@ private: uint32_t m_rcvBufSize; // maximum receive socket buffer size }; -} //namespace ns3 +} // namespace ns3 #endif /* NSC_TCP_SOCKET_IMPL_H */ diff --git a/src/internet/model/rtt-estimator.h b/src/internet/model/rtt-estimator.h index cb9c5e248..b5f83fee0 100644 --- a/src/internet/model/rtt-estimator.h +++ b/src/internet/model/rtt-estimator.h @@ -113,6 +113,6 @@ public: double gain; // Filter gain int64x64_t variance; // Current variance }; -} //namespace ns3 +} // namespace ns3 #endif /* RTT_ESTIMATOR_H */ diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc index 14bf340c6..e304a6b26 100644 --- a/src/internet/model/tcp-header.cc +++ b/src/internet/model/tcp-header.cc @@ -254,4 +254,4 @@ uint32_t TcpHeader::Deserialize (Buffer::Iterator start) } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/tcp-header.h b/src/internet/model/tcp-header.h index 4f7fb2bcf..62c48df35 100644 --- a/src/internet/model/tcp-header.h +++ b/src/internet/model/tcp-header.h @@ -169,6 +169,6 @@ private: bool m_goodChecksum; }; -}; // namespace ns3 +} // namespace ns3 #endif /* TCP_HEADER */ diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc index a67821985..cb9ba66b0 100644 --- a/src/internet/model/tcp-l4-protocol.cc +++ b/src/internet/model/tcp-l4-protocol.cc @@ -401,5 +401,5 @@ TcpL4Protocol::GetDownTarget (void) const return m_downTarget; } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/tcp-l4-protocol.h b/src/internet/model/tcp-l4-protocol.h index 78393ce27..0016a26e6 100644 --- a/src/internet/model/tcp-l4-protocol.h +++ b/src/internet/model/tcp-l4-protocol.h @@ -130,6 +130,6 @@ private: Ipv4L4Protocol::DownTargetCallback m_downTarget; }; -}; // namespace ns3 +} // namespace ns3 #endif /* TCP_L4_PROTOCOL_H */ diff --git a/src/internet/model/tcp-socket.cc b/src/internet/model/tcp-socket.cc index f4f5c6b87..076ddc41a 100644 --- a/src/internet/model/tcp-socket.cc +++ b/src/internet/model/tcp-socket.cc @@ -113,4 +113,4 @@ TcpSocket::~TcpSocket () NS_LOG_FUNCTION_NOARGS (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/tcp-socket.h b/src/internet/model/tcp-socket.h index f1c08200d..2c78b0c98 100644 --- a/src/internet/model/tcp-socket.h +++ b/src/internet/model/tcp-socket.h @@ -95,7 +95,7 @@ private: }; -} //namespace ns3 +} // namespace ns3 #endif /* TCP_SOCKET_H */ diff --git a/src/internet/model/udp-header.cc b/src/internet/model/udp-header.cc index 26c10ddba..a58a5babe 100644 --- a/src/internet/model/udp-header.cc +++ b/src/internet/model/udp-header.cc @@ -177,4 +177,4 @@ UdpHeader::Deserialize (Buffer::Iterator start) } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc index 3787505e8..84d5711c9 100644 --- a/src/internet/model/udp-l4-protocol.cc +++ b/src/internet/model/udp-l4-protocol.cc @@ -311,5 +311,5 @@ UdpL4Protocol::GetDownTarget (void) const return m_downTarget; } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/udp-l4-protocol.h b/src/internet/model/udp-l4-protocol.h index 47036b2ae..cf124666d 100644 --- a/src/internet/model/udp-l4-protocol.h +++ b/src/internet/model/udp-l4-protocol.h @@ -130,6 +130,6 @@ private: Ipv4L4Protocol::DownTargetCallback m_downTarget; }; -}; // namespace ns3 +} // namespace ns3 #endif /* UDP_L4_PROTOCOL_H */ diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index bb98d5424..6160faa10 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -759,4 +759,4 @@ UdpSocketImpl::GetAllowBroadcast () const } -} //namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/udp-socket-impl.h b/src/internet/model/udp-socket-impl.h index 9387ffe62..6586f76a7 100644 --- a/src/internet/model/udp-socket-impl.h +++ b/src/internet/model/udp-socket-impl.h @@ -138,6 +138,6 @@ private: Callback m_icmpCallback; }; -} //namespace ns3 +} // namespace ns3 #endif /* UDP_SOCKET_IMPL_H */ diff --git a/src/internet/model/udp-socket.cc b/src/internet/model/udp-socket.cc index e5021fffd..a544151b9 100644 --- a/src/internet/model/udp-socket.cc +++ b/src/internet/model/udp-socket.cc @@ -86,4 +86,4 @@ UdpSocket::~UdpSocket () NS_LOG_FUNCTION_NOARGS (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/model/udp-socket.h b/src/internet/model/udp-socket.h index d3257f691..7cf8cacdc 100644 --- a/src/internet/model/udp-socket.h +++ b/src/internet/model/udp-socket.h @@ -113,7 +113,7 @@ private: virtual bool GetMtuDiscover (void) const = 0; }; -} //namespace ns3 +} // namespace ns3 #endif /* UDP_SOCKET_H */ diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index bed926fd0..d9ddb3a48 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -327,4 +327,4 @@ public: } } g_ipv4rawTestSuite; -}; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/test/ipv4-test.cc b/src/internet/test/ipv4-test.cc index 5e6a77cb7..cbbbfafee 100644 --- a/src/internet/test/ipv4-test.cc +++ b/src/internet/test/ipv4-test.cc @@ -107,5 +107,4 @@ public: } } g_ipv4protocolTestSuite; -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc index 33ac6ec45..418a27dc8 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -331,4 +331,4 @@ public: } } g_udpTestSuite; -}; // namespace ns3 +} // namespace ns3 diff --git a/src/lte/model/ue-record.cc b/src/lte/model/ue-record.cc index 586e3feae..7d88c1390 100644 --- a/src/lte/model/ue-record.cc +++ b/src/lte/model/ue-record.cc @@ -94,5 +94,4 @@ UeRecord::GetCqiFeedbacks (void) return m_cqiFeedbacks; } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/lte/model/ue-record.h b/src/lte/model/ue-record.h index e8cf2cdc7..3642333f2 100644 --- a/src/lte/model/ue-record.h +++ b/src/lte/model/ue-record.h @@ -115,7 +115,6 @@ private: CqiFeedbacks m_cqiFeedbacks; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* UE_RECORD_H */ diff --git a/src/mesh/helper/dot11s/dot11s-installer.cc b/src/mesh/helper/dot11s/dot11s-installer.cc index b873bd4b5..80e0f98b7 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.cc +++ b/src/mesh/helper/dot11s/dot11s-installer.cc @@ -122,4 +122,4 @@ Dot11sStack::ResetStats (const Ptr mp) NS_ASSERT (pmp != 0); pmp->ResetStats (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/helper/dot11s/dot11s-installer.h b/src/mesh/helper/dot11s/dot11s-installer.h index 4414e31cf..e24c1a6fe 100644 --- a/src/mesh/helper/dot11s/dot11s-installer.h +++ b/src/mesh/helper/dot11s/dot11s-installer.h @@ -72,7 +72,7 @@ private: Mac48Address m_root; }; -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/helper/flame/flame-installer.cc b/src/mesh/helper/flame/flame-installer.cc index 7cc89dd6a..ec23cb06a 100644 --- a/src/mesh/helper/flame/flame-installer.cc +++ b/src/mesh/helper/flame/flame-installer.cc @@ -70,4 +70,4 @@ FlameStack::ResetStats (const Ptr mp) flame->ResetStats (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/helper/flame/flame-installer.h b/src/mesh/helper/flame/flame-installer.h index 4663ba0b7..f962033fe 100644 --- a/src/mesh/helper/flame/flame-installer.h +++ b/src/mesh/helper/flame/flame-installer.h @@ -73,7 +73,7 @@ public: void ResetStats (const Ptr mp); }; -} //namespace ns3 +} // namespace ns3 #endif /* FLAME_INSTALLER_H */ diff --git a/src/mesh/helper/mesh-helper.cc b/src/mesh/helper/mesh-helper.cc index 2135baba4..b4fded099 100644 --- a/src/mesh/helper/mesh-helper.cc +++ b/src/mesh/helper/mesh-helper.cc @@ -207,5 +207,5 @@ MeshHelper::ResetStats (const ns3::Ptr& device) NS_ASSERT (mp != 0); m_stack->ResetStats (mp); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/helper/mesh-helper.h b/src/mesh/helper/mesh-helper.h index d488b9650..50e0ecfd7 100644 --- a/src/mesh/helper/mesh-helper.h +++ b/src/mesh/helper/mesh-helper.h @@ -207,7 +207,7 @@ private: enum WifiPhyStandard m_standard; ///\} }; -} //namespace ns3 +} // namespace ns3 #endif /* MESH_HELPER_H */ diff --git a/src/mesh/model/dot11s/airtime-metric.cc b/src/mesh/model/dot11s/airtime-metric.cc index 747622223..d112e9437 100644 --- a/src/mesh/model/dot11s/airtime-metric.cc +++ b/src/mesh/model/dot11s/airtime-metric.cc @@ -102,5 +102,5 @@ AirtimeLinkMetricCalculator::CalculateMetric (Mac48Address peerAddress, Ptr m_testFrame; WifiMacHeader m_testHeader; }; -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/dot11s-mac-header.cc b/src/mesh/model/dot11s/dot11s-mac-header.cc index ecd385973..825d13e40 100644 --- a/src/mesh/model/dot11s/dot11s-mac-header.cc +++ b/src/mesh/model/dot11s/dot11s-mac-header.cc @@ -174,5 +174,5 @@ operator== (const MeshHeader & a, const MeshHeader & b) && (a.m_meshSeqno == b.m_meshSeqno) && (a.m_addr4 == b.m_addr4) && (a.m_addr5 == b.m_addr5) && (a.m_addr6 == b.m_addr6)); } -} //namespace dot11s +} // namespace dot11s } // namespace ns3 diff --git a/src/mesh/model/dot11s/dot11s-mac-header.h b/src/mesh/model/dot11s/dot11s-mac-header.h index b1c52e158..710ed45a7 100644 --- a/src/mesh/model/dot11s/dot11s-mac-header.h +++ b/src/mesh/model/dot11s/dot11s-mac-header.h @@ -73,6 +73,6 @@ private: }; bool operator== (const MeshHeader & a, const MeshHeader & b); -} //namespace dot11s +} // namespace dot11s } // namespace ns3 #endif /* MESH_WIFI_MAC_HEADER_H */ diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.cc b/src/mesh/model/dot11s/hwmp-protocol-mac.cc index 5f79366b1..a4d140d10 100644 --- a/src/mesh/model/dot11s/hwmp-protocol-mac.cc +++ b/src/mesh/model/dot11s/hwmp-protocol-mac.cc @@ -476,5 +476,5 @@ HwmpProtocolMac::ResetStats () m_stats = Statistics (); } -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 diff --git a/src/mesh/model/dot11s/hwmp-protocol-mac.h b/src/mesh/model/dot11s/hwmp-protocol-mac.h index b5e09195a..3cb85f9e8 100644 --- a/src/mesh/model/dot11s/hwmp-protocol-mac.h +++ b/src/mesh/model/dot11s/hwmp-protocol-mac.h @@ -135,6 +135,6 @@ private: /// Receive action management frame bool ReceiveAction (Ptr packet, const WifiMacHeader & header); }; -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc index ef91f18c9..9a5659974 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.cc +++ b/src/mesh/model/dot11s/hwmp-protocol.cc @@ -1168,5 +1168,5 @@ HwmpProtocol::QueuedPacket::QueuedPacket () : inInterface (0) { } -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 diff --git a/src/mesh/model/dot11s/hwmp-protocol.h b/src/mesh/model/dot11s/hwmp-protocol.h index e4ce0ef75..a234d9e2e 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.h +++ b/src/mesh/model/dot11s/hwmp-protocol.h @@ -269,6 +269,6 @@ private: ///\} Callback , uint32_t> m_neighboursCallback; }; -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/hwmp-rtable.cc b/src/mesh/model/dot11s/hwmp-rtable.cc index 3eb9a9b38..e02cfda0b 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.cc +++ b/src/mesh/model/dot11s/hwmp-rtable.cc @@ -239,5 +239,5 @@ HwmpRtable::LookupResult::IsValid () const return !(retransmitter == Mac48Address::GetBroadcast () && ifIndex == INTERFACE_ANY && metric == MAX_METRIC && seqnum == 0); } -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 diff --git a/src/mesh/model/dot11s/hwmp-rtable.h b/src/mesh/model/dot11s/hwmp-rtable.h index 36e42e8a3..26b80ffbf 100644 --- a/src/mesh/model/dot11s/hwmp-rtable.h +++ b/src/mesh/model/dot11s/hwmp-rtable.h @@ -141,6 +141,6 @@ private: /// Path to proactive tree root MP ProactiveRoute m_root; }; -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/hwmp-tag.cc b/src/mesh/model/dot11s/hwmp-tag.cc index a6461362f..88fe7fd06 100644 --- a/src/mesh/model/dot11s/hwmp-tag.cc +++ b/src/mesh/model/dot11s/hwmp-tag.cc @@ -147,5 +147,5 @@ HwmpTag::DecrementTtl () { m_ttl--; } -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 diff --git a/src/mesh/model/dot11s/hwmp-tag.h b/src/mesh/model/dot11s/hwmp-tag.h index 5171fb5b2..a969297ba 100644 --- a/src/mesh/model/dot11s/hwmp-tag.h +++ b/src/mesh/model/dot11s/hwmp-tag.h @@ -72,6 +72,6 @@ private: uint32_t m_metric; uint32_t m_seqno; }; -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc index f67cc35c1..54fb803aa 100644 --- a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc +++ b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.cc @@ -219,5 +219,5 @@ operator << (std::ostream &os, const IeBeaconTiming &a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h index 4f5efa366..0f5ed303f 100644 --- a/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h +++ b/src/mesh/model/dot11s/ie-dot11s-beacon-timing.h @@ -111,5 +111,5 @@ private: bool operator== (const IeBeaconTimingUnit & a, const IeBeaconTimingUnit & b); std::ostream &operator << (std::ostream &os, const IeBeaconTiming &beaconTiming); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.cc b/src/mesh/model/dot11s/ie-dot11s-configuration.cc index 716c43ae1..fddfd5ecf 100644 --- a/src/mesh/model/dot11s/ie-dot11s-configuration.cc +++ b/src/mesh/model/dot11s/ie-dot11s-configuration.cc @@ -224,5 +224,5 @@ operator << (std::ostream &os, const IeConfiguration &a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.h b/src/mesh/model/dot11s/ie-dot11s-configuration.h index 7f7af886b..8b532884f 100644 --- a/src/mesh/model/dot11s/ie-dot11s-configuration.h +++ b/src/mesh/model/dot11s/ie-dot11s-configuration.h @@ -138,5 +138,5 @@ bool operator== (const IeConfiguration & a, const IeConfiguration & b); bool operator== (const Dot11sMeshCapability & a, const Dot11sMeshCapability & b); std::ostream &operator << (std::ostream &os, const IeConfiguration &config); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-id.cc b/src/mesh/model/dot11s/ie-dot11s-id.cc index 2a5757fec..67bd4faaa 100644 --- a/src/mesh/model/dot11s/ie-dot11s-id.cc +++ b/src/mesh/model/dot11s/ie-dot11s-id.cc @@ -154,5 +154,5 @@ std::istream &operator >> (std::istream &is, IeMeshId &a) ATTRIBUTE_HELPER_CPP (IeMeshId); -} //namespace dot11s +} // namespace dot11s } // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-id.h b/src/mesh/model/dot11s/ie-dot11s-id.h index e5fd8694e..fa9ccdc76 100644 --- a/src/mesh/model/dot11s/ie-dot11s-id.h +++ b/src/mesh/model/dot11s/ie-dot11s-id.h @@ -66,6 +66,6 @@ std::ostream &operator << (std::ostream &os, const IeMeshId &meshId); */ ATTRIBUTE_HELPER_HEADER (IeMeshId); -} //namespace dot11s +} // namespace dot11s } // namespace ns3 #endif /* MESH_ID_H */ diff --git a/src/mesh/model/dot11s/ie-dot11s-metric-report.cc b/src/mesh/model/dot11s/ie-dot11s-metric-report.cc index c9860a818..2632a0115 100644 --- a/src/mesh/model/dot11s/ie-dot11s-metric-report.cc +++ b/src/mesh/model/dot11s/ie-dot11s-metric-report.cc @@ -91,5 +91,5 @@ operator << (std::ostream &os, const IeLinkMetricReport &a) a.Print (os); return os; } -} //namespace dot11s +} // namespace dot11s } // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-metric-report.h b/src/mesh/model/dot11s/ie-dot11s-metric-report.h index 775342363..90a77be5a 100644 --- a/src/mesh/model/dot11s/ie-dot11s-metric-report.h +++ b/src/mesh/model/dot11s/ie-dot11s-metric-report.h @@ -59,6 +59,6 @@ bool operator== (const IeLinkMetricReport & a, const IeLinkMetricReport & b); bool operator> (const IeLinkMetricReport & a, const IeLinkMetricReport & b); bool operator< (const IeLinkMetricReport & a, const IeLinkMetricReport & b); std::ostream &operator << (std::ostream &os, const IeLinkMetricReport &linkMetricReport); -} //namespace dot11s +} // namespace dot11s } // namespace ns3 #endif /* METRIC_REPORT_H */ diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.cc b/src/mesh/model/dot11s/ie-dot11s-peer-management.cc index 60e4f75b2..3d472c515 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peer-management.cc +++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.cc @@ -172,5 +172,5 @@ operator << (std::ostream &os, const IePeerManagement &a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-peer-management.h b/src/mesh/model/dot11s/ie-dot11s-peer-management.h index 493297417..ad048e73e 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peer-management.h +++ b/src/mesh/model/dot11s/ie-dot11s-peer-management.h @@ -97,6 +97,6 @@ private: bool operator== (const IePeerManagement & a, const IePeerManagement & b); std::ostream &operator << (std::ostream &os, const IePeerManagement &peerMan); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif /* IE_DOT11S_PEER_MANAGEMENT_H */ diff --git a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc index 8f55c5bdb..fae240306 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc +++ b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.cc @@ -61,5 +61,5 @@ operator << (std::ostream &os, const IePeeringProtocol &a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h index 5d9e22f85..b08972c55 100644 --- a/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h +++ b/src/mesh/model/dot11s/ie-dot11s-peering-protocol.h @@ -45,5 +45,5 @@ private: uint8_t m_protocol; }; } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.cc b/src/mesh/model/dot11s/ie-dot11s-perr.cc index 3d251616d..e04f8c3cd 100644 --- a/src/mesh/model/dot11s/ie-dot11s-perr.cc +++ b/src/mesh/model/dot11s/ie-dot11s-perr.cc @@ -160,6 +160,6 @@ operator << (std::ostream & os, const IePerr & a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-perr.h b/src/mesh/model/dot11s/ie-dot11s-perr.h index 8d21d6671..c9c974aa4 100644 --- a/src/mesh/model/dot11s/ie-dot11s-perr.h +++ b/src/mesh/model/dot11s/ie-dot11s-perr.h @@ -59,5 +59,5 @@ private: bool operator== (const IePerr & a, const IePerr & b); std::ostream &operator << (std::ostream &os, const IePerr &perr); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.cc b/src/mesh/model/dot11s/ie-dot11s-prep.cc index 530baaa25..e0fc34a4d 100644 --- a/src/mesh/model/dot11s/ie-dot11s-prep.cc +++ b/src/mesh/model/dot11s/ie-dot11s-prep.cc @@ -211,5 +211,5 @@ operator << (std::ostream &os, const IePrep &a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.h b/src/mesh/model/dot11s/ie-dot11s-prep.h index c7e3f4e72..44c7cbfbc 100644 --- a/src/mesh/model/dot11s/ie-dot11s-prep.h +++ b/src/mesh/model/dot11s/ie-dot11s-prep.h @@ -82,6 +82,6 @@ private: bool operator== (const IePrep & a, const IePrep & b); std::ostream &operator << (std::ostream &os, const IePrep &prep); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.cc b/src/mesh/model/dot11s/ie-dot11s-preq.cc index 781f25a77..0f32ee58d 100644 --- a/src/mesh/model/dot11s/ie-dot11s-preq.cc +++ b/src/mesh/model/dot11s/ie-dot11s-preq.cc @@ -441,5 +441,5 @@ operator << (std::ostream &os, const IePreq &a) return os; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.h b/src/mesh/model/dot11s/ie-dot11s-preq.h index d518779f2..dbbc705f1 100644 --- a/src/mesh/model/dot11s/ie-dot11s-preq.h +++ b/src/mesh/model/dot11s/ie-dot11s-preq.h @@ -155,6 +155,6 @@ bool operator== (const IePreq & a, const IePreq & b); std::ostream &operator << (std::ostream &os, const IePreq &preq); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/ie-dot11s-rann.h b/src/mesh/model/dot11s/ie-dot11s-rann.h index ef2333a31..b16744ff4 100644 --- a/src/mesh/model/dot11s/ie-dot11s-rann.h +++ b/src/mesh/model/dot11s/ie-dot11s-rann.h @@ -73,6 +73,6 @@ private: bool operator== (const IeRann & a, const IeRann & b); std::ostream &operator << (std::ostream &os, const IeRann &rann); } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/peer-link-frame.cc b/src/mesh/model/dot11s/peer-link-frame.cc index cf9e70709..a1e3bdf14 100644 --- a/src/mesh/model/dot11s/peer-link-frame.cc +++ b/src/mesh/model/dot11s/peer-link-frame.cc @@ -232,5 +232,5 @@ operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b) && (a.m_reasonCode == b.m_reasonCode)); } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/peer-link-frame.h b/src/mesh/model/dot11s/peer-link-frame.h index f94c32769..2cff59ad9 100644 --- a/src/mesh/model/dot11s/peer-link-frame.h +++ b/src/mesh/model/dot11s/peer-link-frame.h @@ -92,6 +92,6 @@ private: }; bool operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b); -} //namespace dot11s -} //namespace ns3 +} // namespace dot11s +} // namespace ns3 #endif diff --git a/src/mesh/model/dot11s/peer-link.cc b/src/mesh/model/dot11s/peer-link.cc index 6e3d6d043..6257dcbbe 100644 --- a/src/mesh/model/dot11s/peer-link.cc +++ b/src/mesh/model/dot11s/peer-link.cc @@ -702,5 +702,5 @@ PeerLink::Report (std::ostream & os) const "/>" << std::endl; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/peer-link.h b/src/mesh/model/dot11s/peer-link.h index 3f3a3a052..c12a0adb4 100644 --- a/src/mesh/model/dot11s/peer-link.h +++ b/src/mesh/model/dot11s/peer-link.h @@ -259,6 +259,6 @@ private: }; } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif /* PEER_LINK_H */ diff --git a/src/mesh/model/dot11s/peer-management-protocol-mac.cc b/src/mesh/model/dot11s/peer-management-protocol-mac.cc index 135f04d9f..d3a541703 100644 --- a/src/mesh/model/dot11s/peer-management-protocol-mac.cc +++ b/src/mesh/model/dot11s/peer-management-protocol-mac.cc @@ -317,5 +317,5 @@ PeerManagementProtocolMac::GetLinkMetric (Mac48Address peerAddress) return m_parent->GetLinkMetric (peerAddress); } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/peer-management-protocol-mac.h b/src/mesh/model/dot11s/peer-management-protocol-mac.h index 5dd40d041..a8f6f557d 100644 --- a/src/mesh/model/dot11s/peer-management-protocol-mac.h +++ b/src/mesh/model/dot11s/peer-management-protocol-mac.h @@ -130,7 +130,7 @@ private: }; } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif /* PEER_MANAGEMENT_PROTOCOL_MAC_H */ diff --git a/src/mesh/model/dot11s/peer-management-protocol.cc b/src/mesh/model/dot11s/peer-management-protocol.cc index 51f62b24a..e91e6275b 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.cc +++ b/src/mesh/model/dot11s/peer-management-protocol.cc @@ -576,5 +576,5 @@ PeerManagementProtocol::GetBeaconCollisionAvoidance () const return m_enableBca; } } // namespace dot11s -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/dot11s/peer-management-protocol.h b/src/mesh/model/dot11s/peer-management-protocol.h index aef61a567..08983bcb3 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.h +++ b/src/mesh/model/dot11s/peer-management-protocol.h @@ -262,5 +262,5 @@ private: }; } // namespace dot11s -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/flame/flame-header.cc b/src/mesh/model/flame/flame-header.cc index 8e49325b0..af7b48637 100644 --- a/src/mesh/model/flame/flame-header.cc +++ b/src/mesh/model/flame/flame-header.cc @@ -145,5 +145,5 @@ operator== (const FlameHeader & a, const FlameHeader & b) == b.m_origSrc) && (a.m_protocol == b.m_protocol)); } -} //namespace flame +} // namespace flame } // namespace ns3 diff --git a/src/mesh/model/flame/flame-header.h b/src/mesh/model/flame/flame-header.h index e1b34bd4d..b91e48458 100644 --- a/src/mesh/model/flame/flame-header.h +++ b/src/mesh/model/flame/flame-header.h @@ -75,6 +75,6 @@ private: friend bool operator== (const FlameHeader & a, const FlameHeader & b); }; bool operator== (const FlameHeader & a, const FlameHeader & b); -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 #endif /* FLAME_HEADER_H */ diff --git a/src/mesh/model/flame/flame-protocol-mac.cc b/src/mesh/model/flame/flame-protocol-mac.cc index 37647f155..810661035 100644 --- a/src/mesh/model/flame/flame-protocol-mac.cc +++ b/src/mesh/model/flame/flame-protocol-mac.cc @@ -126,5 +126,5 @@ FlameProtocolMac::ResetStats () m_stats = Statistics (); } -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 diff --git a/src/mesh/model/flame/flame-protocol-mac.h b/src/mesh/model/flame/flame-protocol-mac.h index fc198a740..8c9d81c93 100644 --- a/src/mesh/model/flame/flame-protocol-mac.h +++ b/src/mesh/model/flame/flame-protocol-mac.h @@ -75,6 +75,6 @@ private: ///\} }; -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 #endif /* FLAME_PROTOCOL_MAC_H */ diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc index 23e70c3e4..e900a1973 100644 --- a/src/mesh/model/flame/flame-protocol.cc +++ b/src/mesh/model/flame/flame-protocol.cc @@ -383,5 +383,5 @@ FlameProtocol::ResetStats () } } -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 diff --git a/src/mesh/model/flame/flame-protocol.h b/src/mesh/model/flame/flame-protocol.h index bc1b59923..285a51d50 100644 --- a/src/mesh/model/flame/flame-protocol.h +++ b/src/mesh/model/flame/flame-protocol.h @@ -153,6 +153,6 @@ private: ///\} }; -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 #endif /* FLAME_PROTOCOL_H */ diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc index bc657aab4..92d585d92 100644 --- a/src/mesh/model/flame/flame-rtable.cc +++ b/src/mesh/model/flame/flame-rtable.cc @@ -109,5 +109,5 @@ FlameRtable::LookupResult::IsValid () const && seqnum == 0); } -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 diff --git a/src/mesh/model/flame/flame-rtable.h b/src/mesh/model/flame/flame-rtable.h index e0c4dbcdb..8f44de9f8 100644 --- a/src/mesh/model/flame/flame-rtable.h +++ b/src/mesh/model/flame/flame-rtable.h @@ -101,6 +101,6 @@ private: std::map m_routes; }; -} //namespace flame -} //namespace ns3 +} // namespace flame +} // namespace ns3 #endif /* FLAME_PROTOCOL_H */ diff --git a/src/mesh/model/mesh-information-element-vector.cc b/src/mesh/model/mesh-information-element-vector.cc index b0eb53704..f89c767c8 100644 --- a/src/mesh/model/mesh-information-element-vector.cc +++ b/src/mesh/model/mesh-information-element-vector.cc @@ -92,4 +92,4 @@ MeshInformationElementVector::DeserializeSingleIe (Buffer::Iterator start) } -} //namespace ns3 +} // namespace ns3 diff --git a/src/mesh/model/mesh-l2-routing-protocol.h b/src/mesh/model/mesh-l2-routing-protocol.h index c707b96d7..bbd9ec43d 100644 --- a/src/mesh/model/mesh-l2-routing-protocol.h +++ b/src/mesh/model/mesh-l2-routing-protocol.h @@ -122,5 +122,5 @@ protected: /// Host mesh point Ptr m_mp; }; -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/model/mesh-point-device.h b/src/mesh/model/mesh-point-device.h index 0b4b00d77..6fcb988f8 100644 --- a/src/mesh/model/mesh-point-device.h +++ b/src/mesh/model/mesh-point-device.h @@ -181,5 +181,5 @@ private: Statistics m_rxStats, m_txStats, m_fwdStats; ///\} }; -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/mesh/test/mesh-information-element-vector-test-suite.cc b/src/mesh/test/mesh-information-element-vector-test-suite.cc index 8130558a3..c2025b559 100644 --- a/src/mesh/test/mesh-information-element-vector-test-suite.cc +++ b/src/mesh/test/mesh-information-element-vector-test-suite.cc @@ -156,4 +156,4 @@ MeshTestSuite::MeshTestSuite () static MeshTestSuite g_meshTestSuite; -} //namespace ns3 +} // namespace ns3 diff --git a/src/mobility/model/constant-acceleration-mobility-model.cc b/src/mobility/model/constant-acceleration-mobility-model.cc index e11bc1021..6b123944a 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.cc +++ b/src/mobility/model/constant-acceleration-mobility-model.cc @@ -78,4 +78,4 @@ ConstantAccelerationMobilityModel::SetVelocityAndAcceleration (const Vector &vel } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/mobility/model/constant-acceleration-mobility-model.h b/src/mobility/model/constant-acceleration-mobility-model.h index 52a4563b0..dc69e9971 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.h +++ b/src/mobility/model/constant-acceleration-mobility-model.h @@ -51,6 +51,6 @@ private: Vector m_acceleration; }; -}; // namespace ns3 +} // namespace ns3 #endif /* CONSTANT_ACCELERATION_MOBILITY_MODEL_H */ diff --git a/src/mobility/model/constant-position-mobility-model.cc b/src/mobility/model/constant-position-mobility-model.cc index 1c23ac58c..72a000a3b 100644 --- a/src/mobility/model/constant-position-mobility-model.cc +++ b/src/mobility/model/constant-position-mobility-model.cc @@ -57,4 +57,4 @@ ConstantPositionMobilityModel::DoGetVelocity (void) const return Vector (0.0, 0.0, 0.0); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/mobility/model/constant-position-mobility-model.h b/src/mobility/model/constant-position-mobility-model.h index a30495f5f..679d54464 100644 --- a/src/mobility/model/constant-position-mobility-model.h +++ b/src/mobility/model/constant-position-mobility-model.h @@ -47,6 +47,6 @@ private: Vector m_position; }; -}; // namespace ns3 +} // namespace ns3 #endif /* CONSTANT_POSITION_MOBILITY_MODEL_H */ diff --git a/src/mobility/model/constant-velocity-mobility-model.cc b/src/mobility/model/constant-velocity-mobility-model.cc index 344cb6731..7a92bb00c 100644 --- a/src/mobility/model/constant-velocity-mobility-model.cc +++ b/src/mobility/model/constant-velocity-mobility-model.cc @@ -68,4 +68,4 @@ ConstantVelocityMobilityModel::DoGetVelocity (void) const return m_helper.GetVelocity (); } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/mobility/model/constant-velocity-mobility-model.h b/src/mobility/model/constant-velocity-mobility-model.h index 353cf2362..260e09c3e 100644 --- a/src/mobility/model/constant-velocity-mobility-model.h +++ b/src/mobility/model/constant-velocity-mobility-model.h @@ -58,6 +58,6 @@ private: ConstantVelocityHelper m_helper; }; -}; // namespace ns3 +} // namespace ns3 #endif /* CONSTANT_VELOCITY_POSITION */ diff --git a/src/mobility/model/mobility-model.h b/src/mobility/model/mobility-model.h index f8ca66d24..cd9423314 100644 --- a/src/mobility/model/mobility-model.h +++ b/src/mobility/model/mobility-model.h @@ -97,6 +97,6 @@ private: }; -}; // namespace ns3 +} // namespace ns3 #endif /* MOBILITY_MODEL_H */ diff --git a/src/netanim/model/canvas-location.h b/src/netanim/model/canvas-location.h index a03626b35..4ec10385a 100644 --- a/src/netanim/model/canvas-location.h +++ b/src/netanim/model/canvas-location.h @@ -59,6 +59,6 @@ private: Vector m_location; }; -}; // namespace ns3 +} // namespace ns3 #endif /* CANVAS_LOCATION_H */ diff --git a/src/network/model/application.cc b/src/network/model/application.cc index ac7c7077d..7d2f38f35 100644 --- a/src/network/model/application.cc +++ b/src/network/model/application.cc @@ -115,6 +115,6 @@ void Application::StopApplication () { // Provide null functionality in case subclass is not interested } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/model/application.h b/src/network/model/application.h index a9efd69c6..c9f6e61a3 100644 --- a/src/network/model/application.h +++ b/src/network/model/application.h @@ -130,6 +130,6 @@ protected: EventId m_stopEvent; }; -} //namespace ns3 +} // namespace ns3 #endif /* APPLICATION_H */ diff --git a/src/network/model/channel-list.cc b/src/network/model/channel-list.cc index c3cf34725..e71177478 100644 --- a/src/network/model/channel-list.cc +++ b/src/network/model/channel-list.cc @@ -185,4 +185,4 @@ ChannelList::GetNChannels (void) return ChannelListPriv::Get ()->GetNChannels (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/model/channel-list.h b/src/network/model/channel-list.h index 9244fd2ae..31725cee4 100644 --- a/src/network/model/channel-list.h +++ b/src/network/model/channel-list.h @@ -69,6 +69,6 @@ public: static uint32_t GetNChannels (void); }; -} //namespace ns3 +} // namespace ns3 #endif /* CHANNEL_LIST_H */ diff --git a/src/network/model/node-list.cc b/src/network/model/node-list.cc index 203b49fbb..5f65365d3 100644 --- a/src/network/model/node-list.cc +++ b/src/network/model/node-list.cc @@ -188,4 +188,4 @@ NodeList::GetNNodes (void) return NodeListPriv::Get ()->GetNNodes (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/model/node-list.h b/src/network/model/node-list.h index 679d17980..65988c02a 100644 --- a/src/network/model/node-list.h +++ b/src/network/model/node-list.h @@ -71,7 +71,7 @@ public: static uint32_t GetNNodes (void); }; -} //namespace ns3 +} // namespace ns3 #endif /* NODE_LIST_H */ diff --git a/src/network/model/node.cc b/src/network/model/node.cc index 19244390d..89afdafb9 100644 --- a/src/network/model/node.cc +++ b/src/network/model/node.cc @@ -331,4 +331,4 @@ Node::NotifyDeviceAdded (Ptr device) } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/model/node.h b/src/network/model/node.h index a67d70487..1afc3223c 100644 --- a/src/network/model/node.h +++ b/src/network/model/node.h @@ -237,6 +237,6 @@ private: DeviceAdditionListenerList m_deviceAdditionListeners; }; -} //namespace ns3 +} // namespace ns3 #endif /* NODE_H */ diff --git a/src/network/model/packet-metadata.h b/src/network/model/packet-metadata.h index 8bf17b566..547362d8f 100644 --- a/src/network/model/packet-metadata.h +++ b/src/network/model/packet-metadata.h @@ -351,7 +351,7 @@ public: uint64_t m_packetUid; }; -}; // namespace ns3 +} // namespace ns3 namespace ns3 { diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc index 0fb41104d..84927a3a5 100644 --- a/src/network/model/socket.cc +++ b/src/network/model/socket.cc @@ -503,4 +503,4 @@ SocketSetDontFragmentTag::Print (std::ostream &os) const os << (m_dontFragment ? "true" : "false"); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/model/socket.h b/src/network/model/socket.h index 30ea808b0..0993d7997 100644 --- a/src/network/model/socket.h +++ b/src/network/model/socket.h @@ -686,6 +686,6 @@ private: bool m_dontFragment; }; -} //namespace ns3 +} // namespace ns3 #endif /* NS3_SOCKET_H */ diff --git a/src/network/test/packet-metadata-test.cc b/src/network/test/packet-metadata-test.cc index 655484666..4fd77466e 100644 --- a/src/network/test/packet-metadata-test.cc +++ b/src/network/test/packet-metadata-test.cc @@ -835,4 +835,4 @@ PacketMetadataTestSuite::PacketMetadataTestSuite () } PacketMetadataTestSuite g_packetMetadataTest; -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/data-rate.cc b/src/network/utils/data-rate.cc index 8ecd06697..e1a976b78 100644 --- a/src/network/utils/data-rate.cc +++ b/src/network/utils/data-rate.cc @@ -271,4 +271,4 @@ double operator* (const Time& lhs, const DataRate& rhs) return lhs.GetSeconds ()*rhs.GetBitRate (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/data-rate.h b/src/network/utils/data-rate.h index 9d980da17..cc131c651 100644 --- a/src/network/utils/data-rate.h +++ b/src/network/utils/data-rate.h @@ -128,6 +128,6 @@ ATTRIBUTE_HELPER_HEADER (DataRate); double operator* (const DataRate& lhs, const Time& rhs); double operator* (const Time& lhs, const DataRate& rhs); -} //namespace ns3 +} // namespace ns3 #endif /* DATA_RATE_H */ diff --git a/src/network/utils/drop-tail-queue.h b/src/network/utils/drop-tail-queue.h index c9c045088..93a020fca 100644 --- a/src/network/utils/drop-tail-queue.h +++ b/src/network/utils/drop-tail-queue.h @@ -81,6 +81,6 @@ private: Mode m_mode; }; -}; // namespace ns3 +} // namespace ns3 #endif /* DROPTAIL_H */ diff --git a/src/network/utils/error-model.cc b/src/network/utils/error-model.cc index 1c8d2d1ad..d53bd05e5 100644 --- a/src/network/utils/error-model.cc +++ b/src/network/utils/error-model.cc @@ -367,4 +367,4 @@ ReceiveListErrorModel::DoReset (void) } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/error-model.h b/src/network/utils/error-model.h index 04f532054..919d1b97d 100644 --- a/src/network/utils/error-model.h +++ b/src/network/utils/error-model.h @@ -272,5 +272,5 @@ private: }; -} //namespace ns3 +} // namespace ns3 #endif diff --git a/src/network/utils/ethernet-header.h b/src/network/utils/ethernet-header.h index 672eaa6c7..c3a6bdbcb 100644 --- a/src/network/utils/ethernet-header.h +++ b/src/network/utils/ethernet-header.h @@ -124,7 +124,7 @@ private: Mac48Address m_destination; /// Destination address }; -}; // namespace ns3 +} // namespace ns3 #endif /* ETHERNET_HEADER_H */ diff --git a/src/network/utils/ethernet-trailer.cc b/src/network/utils/ethernet-trailer.cc index 58c008570..9e6fb3f8f 100644 --- a/src/network/utils/ethernet-trailer.cc +++ b/src/network/utils/ethernet-trailer.cc @@ -159,4 +159,4 @@ EthernetTrailer::DoCalcFcs (uint8_t const *buffer, size_t len) const return ~crc; } -}; // namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/ipv4-address.cc b/src/network/utils/ipv4-address.cc index 00c92ae70..3ca499cc9 100644 --- a/src/network/utils/ipv4-address.cc +++ b/src/network/utils/ipv4-address.cc @@ -55,7 +55,7 @@ AsciiToIpv4Host (char const *address) return host; } -} //namespace ns3 +} // namespace ns3 namespace ns3 { diff --git a/src/network/utils/output-stream-wrapper.cc b/src/network/utils/output-stream-wrapper.cc index 5b2ff88a7..ef1914973 100644 --- a/src/network/utils/output-stream-wrapper.cc +++ b/src/network/utils/output-stream-wrapper.cc @@ -57,4 +57,4 @@ OutputStreamWrapper::GetStream (void) return m_ostream; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/output-stream-wrapper.h b/src/network/utils/output-stream-wrapper.h index 372501417..c1a966d1c 100644 --- a/src/network/utils/output-stream-wrapper.h +++ b/src/network/utils/output-stream-wrapper.h @@ -88,6 +88,6 @@ private: bool m_destroyable; }; -} //namespace ns3 +} // namespace ns3 #endif /* OUTPUT_STREAM_WRAPPER_H */ diff --git a/src/network/utils/packet-socket.cc b/src/network/utils/packet-socket.cc index 6076ed447..9f5acc2b5 100644 --- a/src/network/utils/packet-socket.cc +++ b/src/network/utils/packet-socket.cc @@ -488,4 +488,4 @@ PacketSocket::GetAllowBroadcast () const return false; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/packet-socket.h b/src/network/utils/packet-socket.h index ba65e98e3..a2aea47fb 100644 --- a/src/network/utils/packet-socket.h +++ b/src/network/utils/packet-socket.h @@ -140,7 +140,7 @@ private: }; -} //namespace ns3 +} // namespace ns3 #endif /* PACKET_SOCKET_H */ diff --git a/src/network/utils/pcap-file-wrapper.cc b/src/network/utils/pcap-file-wrapper.cc index d0721683a..9c42ee34b 100644 --- a/src/network/utils/pcap-file-wrapper.cc +++ b/src/network/utils/pcap-file-wrapper.cc @@ -172,4 +172,4 @@ PcapFileWrapper::GetDataLinkType (void) return m_file.GetDataLinkType (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/pcap-file-wrapper.h b/src/network/utils/pcap-file-wrapper.h index 9a58ccdd5..f1cbff047 100644 --- a/src/network/utils/pcap-file-wrapper.h +++ b/src/network/utils/pcap-file-wrapper.h @@ -199,6 +199,6 @@ private: uint32_t m_snapLen; }; -} //namespace ns3 +} // namespace ns3 #endif /* PCAP_FILE_WRAPPER_H */ diff --git a/src/network/utils/pcap-file.cc b/src/network/utils/pcap-file.cc index 8ba6b76d9..a1a040d5c 100644 --- a/src/network/utils/pcap-file.cc +++ b/src/network/utils/pcap-file.cc @@ -534,4 +534,4 @@ PcapFile::Diff (std::string const & f1, std::string const & f2, return diff; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/network/utils/pcap-file.h b/src/network/utils/pcap-file.h index 37d4f984d..7993af04f 100644 --- a/src/network/utils/pcap-file.h +++ b/src/network/utils/pcap-file.h @@ -292,6 +292,6 @@ private: bool m_swapMode; }; -} //namespace ns3 +} // namespace ns3 #endif /* PCAP_FILE_H */ diff --git a/src/network/utils/queue.h b/src/network/utils/queue.h index 753e2c229..824722c81 100644 --- a/src/network/utils/queue.h +++ b/src/network/utils/queue.h @@ -162,6 +162,6 @@ private: uint32_t m_nTotalDroppedPackets; }; -}; // namespace ns3 +} // namespace ns3 #endif /* QUEUE_H */ diff --git a/src/olsr/model/olsr-repositories.h b/src/olsr/model/olsr-repositories.h index 80a98990b..72d4268ef 100644 --- a/src/olsr/model/olsr-repositories.h +++ b/src/olsr/model/olsr-repositories.h @@ -299,6 +299,6 @@ namespace ns3 { namespace olsr { typedef std::vector Associations; ///< Association Set type. - }}; // namespace ns3, olsr + }} // namespace ns3, olsr #endif /* OLSR_REPOSITORIES_H */ diff --git a/src/point-to-point/model/ppp-header.h b/src/point-to-point/model/ppp-header.h index e43f87b1f..e1c298ffe 100644 --- a/src/point-to-point/model/ppp-header.h +++ b/src/point-to-point/model/ppp-header.h @@ -92,7 +92,7 @@ private: uint16_t m_protocol; }; -}; // namespace ns3 +} // namespace ns3 #endif /* PPP_HEADER_H */ diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.cc b/src/spectrum/model/microwave-oven-spectrum-value-helper.cc index 414ba0995..10f24faab 100644 --- a/src/spectrum/model/microwave-oven-spectrum-value-helper.cc +++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.cc @@ -162,4 +162,4 @@ MicrowaveOvenSpectrumValueHelper::CreatePowerSpectralDensityMwo2 () -} //namespace ns3 +} // namespace ns3 diff --git a/src/spectrum/model/microwave-oven-spectrum-value-helper.h b/src/spectrum/model/microwave-oven-spectrum-value-helper.h index e2398d6b4..d925734f7 100644 --- a/src/spectrum/model/microwave-oven-spectrum-value-helper.h +++ b/src/spectrum/model/microwave-oven-spectrum-value-helper.h @@ -61,7 +61,7 @@ public: -} //namespace ns3 +} // namespace ns3 diff --git a/src/spectrum/model/wifi-spectrum-value-helper.cc b/src/spectrum/model/wifi-spectrum-value-helper.cc index 410aae177..b665606c6 100644 --- a/src/spectrum/model/wifi-spectrum-value-helper.cc +++ b/src/spectrum/model/wifi-spectrum-value-helper.cc @@ -114,4 +114,4 @@ WifiSpectrumValue5MhzFactory::CreateRfFilter (uint32_t channel) } -} //namespace ns3 +} // namespace ns3 diff --git a/src/spectrum/model/wifi-spectrum-value-helper.h b/src/spectrum/model/wifi-spectrum-value-helper.h index e676933a6..4cc260dee 100644 --- a/src/spectrum/model/wifi-spectrum-value-helper.h +++ b/src/spectrum/model/wifi-spectrum-value-helper.h @@ -92,7 +92,7 @@ public: -} //namespace ns3 +} // namespace ns3 diff --git a/src/tools/model/event-garbage-collector.h b/src/tools/model/event-garbage-collector.h index ca19e74a0..5d4670122 100644 --- a/src/tools/model/event-garbage-collector.h +++ b/src/tools/model/event-garbage-collector.h @@ -68,6 +68,6 @@ private: void Shrink (); }; -}; // namespace ns3 +} // namespace ns3 #endif /* EVENT_GARBAGE_COLLECTOR_H */ diff --git a/src/uan/model/uan-noise-model.cc b/src/uan/model/uan-noise-model.cc index ea5577528..27ef21920 100644 --- a/src/uan/model/uan-noise-model.cc +++ b/src/uan/model/uan-noise-model.cc @@ -36,4 +36,4 @@ UanNoiseModel::DoDispose (void) -} //namespace ns3 +} // namespace ns3 diff --git a/src/uan/model/uan-phy.cc b/src/uan/model/uan-phy.cc index be5befe30..e7c85dcc3 100644 --- a/src/uan/model/uan-phy.cc +++ b/src/uan/model/uan-phy.cc @@ -46,4 +46,4 @@ UanPhyPer::DoDispose () Object::DoDispose (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/virtual-net-device/model/virtual-net-device.h b/src/virtual-net-device/model/virtual-net-device.h index e9a7a6439..9b8ef6a7a 100644 --- a/src/virtual-net-device/model/virtual-net-device.h +++ b/src/virtual-net-device/model/virtual-net-device.h @@ -170,7 +170,7 @@ private: bool m_isPointToPoint; }; -}; // namespace ns3 +} // namespace ns3 #endif diff --git a/src/wifi/helper/nqos-wifi-mac-helper.cc b/src/wifi/helper/nqos-wifi-mac-helper.cc index 8e6d1949a..0afd5a8ad 100644 --- a/src/wifi/helper/nqos-wifi-mac-helper.cc +++ b/src/wifi/helper/nqos-wifi-mac-helper.cc @@ -75,4 +75,4 @@ NqosWifiMacHelper::Create (void) const return mac; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/helper/nqos-wifi-mac-helper.h b/src/wifi/helper/nqos-wifi-mac-helper.h index 185d8435f..2c00dd268 100644 --- a/src/wifi/helper/nqos-wifi-mac-helper.h +++ b/src/wifi/helper/nqos-wifi-mac-helper.h @@ -93,6 +93,6 @@ private: ObjectFactory m_mac; }; -} //namespace ns3 +} // namespace ns3 #endif /* NQOS_WIFI_MAC_HELPER_H */ diff --git a/src/wifi/helper/qos-wifi-mac-helper.cc b/src/wifi/helper/qos-wifi-mac-helper.cc index 38a3db6b1..8df5247b5 100644 --- a/src/wifi/helper/qos-wifi-mac-helper.cc +++ b/src/wifi/helper/qos-wifi-mac-helper.cc @@ -150,4 +150,4 @@ QosWifiMacHelper::Create (void) const return mac; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/helper/qos-wifi-mac-helper.h b/src/wifi/helper/qos-wifi-mac-helper.h index a9ded97e2..c00b9b448 100644 --- a/src/wifi/helper/qos-wifi-mac-helper.h +++ b/src/wifi/helper/qos-wifi-mac-helper.h @@ -152,6 +152,6 @@ private: std::map m_bAckInactivityTimeouts; }; -} //namespace ns3 +} // namespace ns3 #endif /* QOS_WIFI_MAC_HELPER_H */ diff --git a/src/wifi/model/amsdu-subframe-header.cc b/src/wifi/model/amsdu-subframe-header.cc index eefe8615f..e7c65a568 100644 --- a/src/wifi/model/amsdu-subframe-header.cc +++ b/src/wifi/model/amsdu-subframe-header.cc @@ -115,4 +115,4 @@ AmsduSubframeHeader::GetLength (void) const return m_length; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/amsdu-subframe-header.h b/src/wifi/model/amsdu-subframe-header.h index 74c5041e4..d0baec94e 100644 --- a/src/wifi/model/amsdu-subframe-header.h +++ b/src/wifi/model/amsdu-subframe-header.h @@ -56,6 +56,6 @@ private: uint16_t m_length; }; -} //namespace ns3 +} // namespace ns3 #endif /* AMSDU_SUBFRAME_HEADER_H */ diff --git a/src/wifi/model/block-ack-agreement.cc b/src/wifi/model/block-ack-agreement.cc index f818c75cc..e85726059 100644 --- a/src/wifi/model/block-ack-agreement.cc +++ b/src/wifi/model/block-ack-agreement.cc @@ -118,4 +118,4 @@ BlockAckAgreement::IsAmsduSupported (void) const return (m_amsduSupported == 1) ? true : false; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/block-ack-agreement.h b/src/wifi/model/block-ack-agreement.h index e77c5f2d7..0becac294 100644 --- a/src/wifi/model/block-ack-agreement.h +++ b/src/wifi/model/block-ack-agreement.h @@ -63,6 +63,6 @@ protected: EventId m_inactivityEvent; }; -} //namespace ns3 +} // namespace ns3 #endif /* BLOCK_ACK_AGREEMENT_H */ diff --git a/src/wifi/model/block-ack-cache.cc b/src/wifi/model/block-ack-cache.cc index cbd63d79b..bc8a45c4f 100644 --- a/src/wifi/model/block-ack-cache.cc +++ b/src/wifi/model/block-ack-cache.cc @@ -131,4 +131,4 @@ BlockAckCache::FillBlockAckBitmap (CtrlBAckResponseHeader *blockAckHeader) } } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/block-ack-cache.h b/src/wifi/model/block-ack-cache.h index 780109e48..c16acfd26 100644 --- a/src/wifi/model/block-ack-cache.h +++ b/src/wifi/model/block-ack-cache.h @@ -52,6 +52,6 @@ private: uint16_t m_bitmap[4096]; }; -} //namespace ns3 +} // namespace ns3 #endif /* BLOCK_ACK_CACHE_H */ diff --git a/src/wifi/model/block-ack-manager.cc b/src/wifi/model/block-ack-manager.cc index fc5794bbc..8333361d8 100644 --- a/src/wifi/model/block-ack-manager.cc +++ b/src/wifi/model/block-ack-manager.cc @@ -649,4 +649,4 @@ BlockAckManager::GetSeqNumOfNextRetryPacket (Mac48Address recipient, uint8_t tid return 4096; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h index 5c851d966..0f1161950 100644 --- a/src/wifi/model/block-ack-manager.h +++ b/src/wifi/model/block-ack-manager.h @@ -315,6 +315,6 @@ private: Callback m_unblockPackets; }; -} //namespace ns3 +} // namespace ns3 #endif /* BLOCK_ACK_MANAGER_H */ diff --git a/src/wifi/model/ctrl-headers.cc b/src/wifi/model/ctrl-headers.cc index 0be04f9e5..11552e8c6 100644 --- a/src/wifi/model/ctrl-headers.cc +++ b/src/wifi/model/ctrl-headers.cc @@ -726,4 +726,4 @@ CtrlBAckResponseHeader::ResetBitmap (void) memset (&bitmap, 0, sizeof (bitmap)); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/ctrl-headers.h b/src/wifi/model/ctrl-headers.h index 5f2ad256d..6cddf9aaa 100644 --- a/src/wifi/model/ctrl-headers.h +++ b/src/wifi/model/ctrl-headers.h @@ -186,6 +186,6 @@ private: } bitmap; }; -} //namespace ns3 +} // namespace ns3 #endif /* CTRL_HEADERS_H */ diff --git a/src/wifi/model/dca-txop.h b/src/wifi/model/dca-txop.h index 24dbff7e8..d3c9559a0 100644 --- a/src/wifi/model/dca-txop.h +++ b/src/wifi/model/dca-txop.h @@ -170,7 +170,7 @@ private: uint8_t m_fragmentNumber; }; -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/edca-txop-n.cc b/src/wifi/model/edca-txop-n.cc index 464cc187b..0d270b8d9 100644 --- a/src/wifi/model/edca-txop-n.cc +++ b/src/wifi/model/edca-txop-n.cc @@ -1111,4 +1111,4 @@ EdcaTxopN::DoStart () m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ())); ns3::Dcf::DoStart (); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/edca-txop-n.h b/src/wifi/model/edca-txop-n.h index c3309bd56..0cc5b2c05 100644 --- a/src/wifi/model/edca-txop-n.h +++ b/src/wifi/model/edca-txop-n.h @@ -227,6 +227,6 @@ private: struct Bar m_currentBar; }; -} //namespace ns3 +} // namespace ns3 #endif /* EDCA_TXOP_N_H */ diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index ec0314901..42071084d 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -787,7 +787,7 @@ MinstrelWifiManager::PrintTable (MinstrelWifiRemoteStation *station) } } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/msdu-aggregator.cc b/src/wifi/model/msdu-aggregator.cc index a79074bab..fb5eb2446 100644 --- a/src/wifi/model/msdu-aggregator.cc +++ b/src/wifi/model/msdu-aggregator.cc @@ -73,4 +73,4 @@ MsduAggregator::Deaggregate (Ptr aggregatedPacket) return set; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/msdu-aggregator.h b/src/wifi/model/msdu-aggregator.h index 9932985d4..12d04a1ff 100644 --- a/src/wifi/model/msdu-aggregator.h +++ b/src/wifi/model/msdu-aggregator.h @@ -53,6 +53,6 @@ public: static DeaggregatedMsdus Deaggregate (Ptr aggregatedPacket); }; -} //namespace ns3 +} // namespace ns3 #endif /* MSDU_AGGREGATOR_H */ diff --git a/src/wifi/model/msdu-standard-aggregator.cc b/src/wifi/model/msdu-standard-aggregator.cc index 6780aa493..c77516506 100644 --- a/src/wifi/model/msdu-standard-aggregator.cc +++ b/src/wifi/model/msdu-standard-aggregator.cc @@ -87,4 +87,4 @@ MsduStandardAggregator::CalculatePadding (Ptr packet) return (4 - (packet->GetSize () % 4 )) % 4; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/msdu-standard-aggregator.h b/src/wifi/model/msdu-standard-aggregator.h index 6d5b3562d..05a5ce350 100644 --- a/src/wifi/model/msdu-standard-aggregator.h +++ b/src/wifi/model/msdu-standard-aggregator.h @@ -56,6 +56,6 @@ private: uint32_t m_maxAmsduLength; }; -} //namespace ns3 +} // namespace ns3 #endif /* MSDU_STANDARD_AGGREGATOR_H */ diff --git a/src/wifi/model/originator-block-ack-agreement.cc b/src/wifi/model/originator-block-ack-agreement.cc index 593dae1fa..4fedcddbf 100644 --- a/src/wifi/model/originator-block-ack-agreement.cc +++ b/src/wifi/model/originator-block-ack-agreement.cc @@ -93,4 +93,4 @@ OriginatorBlockAckAgreement::CompleteExchange (void) m_sentMpdus = 0; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/originator-block-ack-agreement.h b/src/wifi/model/originator-block-ack-agreement.h index fc2aea55b..417f8304c 100644 --- a/src/wifi/model/originator-block-ack-agreement.h +++ b/src/wifi/model/originator-block-ack-agreement.h @@ -115,6 +115,6 @@ private: bool m_needBlockAckReq; }; -} //namespace ns3 +} // namespace ns3 #endif /* ORIGINATOR_BLOCK_ACK_AGREEMENT_H */ diff --git a/src/wifi/model/qos-blocked-destinations.cc b/src/wifi/model/qos-blocked-destinations.cc index 02b39b3ac..7778d9336 100644 --- a/src/wifi/model/qos-blocked-destinations.cc +++ b/src/wifi/model/qos-blocked-destinations.cc @@ -65,4 +65,4 @@ QosBlockedDestinations::Unblock (Mac48Address dest, uint8_t tid) } } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/qos-blocked-destinations.h b/src/wifi/model/qos-blocked-destinations.h index 183efc0db..eed99d378 100644 --- a/src/wifi/model/qos-blocked-destinations.h +++ b/src/wifi/model/qos-blocked-destinations.h @@ -43,6 +43,6 @@ private: BlockedPackets m_blockedQosPackets; }; -} //namespace ns3 +} // namespace ns3 #endif /* QOS_BLOCKED_DESTINATIONS_H */ diff --git a/src/wifi/model/qos-tag.cc b/src/wifi/model/qos-tag.cc index 256f5e206..bbc2a4125 100644 --- a/src/wifi/model/qos-tag.cc +++ b/src/wifi/model/qos-tag.cc @@ -96,4 +96,4 @@ QosTag::Print (std::ostream &os) const os << "Tid=" << m_tid; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/qos-tag.h b/src/wifi/model/qos-tag.h index ed808f8a4..46ec01c22 100644 --- a/src/wifi/model/qos-tag.h +++ b/src/wifi/model/qos-tag.h @@ -106,6 +106,6 @@ private: uint8_t m_tid; }; -} //namespace ns3 +} // namespace ns3 #endif /* QOS_TAG_H */ diff --git a/src/wifi/model/qos-utils.cc b/src/wifi/model/qos-utils.cc index 305611263..b444f11bb 100644 --- a/src/wifi/model/qos-utils.cc +++ b/src/wifi/model/qos-utils.cc @@ -91,4 +91,4 @@ QosUtilsIsOldPacket (uint16_t startingSeq, uint16_t seqNumber) return (distance >= 2048); } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/model/qos-utils.h b/src/wifi/model/qos-utils.h index dc02d3c72..b689ff718 100644 --- a/src/wifi/model/qos-utils.h +++ b/src/wifi/model/qos-utils.h @@ -106,6 +106,6 @@ uint32_t QosUtilsMapSeqControlToUniqueInteger (uint16_t seqControl, uint16_t end */ bool QosUtilsIsOldPacket (uint16_t startingSeq, uint16_t seqNumber); -} //namespace ns3 +} // namespace ns3 #endif /* QOS_UTILS_H */ diff --git a/src/wifi/model/wifi-information-element-vector.cc b/src/wifi/model/wifi-information-element-vector.cc index 3547cf77a..4e6aba20e 100644 --- a/src/wifi/model/wifi-information-element-vector.cc +++ b/src/wifi/model/wifi-information-element-vector.cc @@ -190,4 +190,4 @@ WifiInformationElementVector::operator== (const WifiInformationElementVector & a return true; } -} //namespace ns3 +} // namespace ns3 diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc index 6a7f5e9d9..1cc2e7e19 100644 --- a/src/wifi/test/tx-duration-test.cc +++ b/src/wifi/test/tx-duration-test.cc @@ -192,5 +192,5 @@ TxDurationTestSuite::TxDurationTestSuite () } static TxDurationTestSuite g_txDurationTestSuite; -} //namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/connection-manager.h b/src/wimax/model/connection-manager.h index 469807b9b..9153ff2c8 100644 --- a/src/wimax/model/connection-manager.h +++ b/src/wimax/model/connection-manager.h @@ -87,8 +87,7 @@ private: CidFactory *m_cidFactory; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* CONNECTION_MANAGER_H */ diff --git a/src/wimax/model/dl-mac-messages.cc b/src/wimax/model/dl-mac-messages.cc index b109d9143..ae0fd6d51 100644 --- a/src/wimax/model/dl-mac-messages.cc +++ b/src/wimax/model/dl-mac-messages.cc @@ -676,6 +676,5 @@ DlMap::Deserialize (Buffer::Iterator start) return i.GetDistanceFrom (start); } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/dl-mac-messages.h b/src/wimax/model/dl-mac-messages.h index 38cf85bb7..2982ceacc 100644 --- a/src/wimax/model/dl-mac-messages.h +++ b/src/wimax/model/dl-mac-messages.h @@ -64,8 +64,7 @@ private: }; -} -; // namespace ns3 +} // namespace ns3 #endif /* DCD_CHANNEL_ENCODINGS_H */ @@ -123,8 +122,7 @@ private: uint32_t m_frameNumber; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* OFDM_DCD_CHANNEL_ENCODINGS_H */ @@ -194,8 +192,7 @@ private: uint8_t m_fecCodeType; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* OFDM_DL_BURST_PROFILE_H */ @@ -248,8 +245,7 @@ private: uint8_t m_nrDlBurstProfiles; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* DCD_H */ @@ -297,8 +293,7 @@ private: }; -} -; // namespace ns3 +} // namespace ns3 #endif /* OFDM_DL_MAP_IE_H */ @@ -349,7 +344,6 @@ private: // m_paddingNibble; //fields to be implemented later on: }; -} -; // namespace ns3 +} // namespace ns3 #endif /* DL_MAP_H */ diff --git a/src/wimax/model/ipcs-classifier-record.cc b/src/wimax/model/ipcs-classifier-record.cc index df4c4ca3a..e7774e15e 100644 --- a/src/wimax/model/ipcs-classifier-record.cc +++ b/src/wimax/model/ipcs-classifier-record.cc @@ -349,5 +349,4 @@ IpcsClassifierRecord::ToTlv (void) const return tmp_tlv; } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/ipcs-classifier-record.h b/src/wimax/model/ipcs-classifier-record.h index 071cef42b..850064905 100644 --- a/src/wimax/model/ipcs-classifier-record.h +++ b/src/wimax/model/ipcs-classifier-record.h @@ -165,7 +165,6 @@ private: uint16_t m_cid; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* IPCS_CLASSIFIER_RECORD_H */ diff --git a/src/wimax/model/ipcs-classifier.h b/src/wimax/model/ipcs-classifier.h index 2ad52e122..37bdf6d2b 100644 --- a/src/wimax/model/ipcs-classifier.h +++ b/src/wimax/model/ipcs-classifier.h @@ -48,7 +48,6 @@ public: */ ServiceFlow * Classify (Ptr packet, Ptr sfm, ServiceFlow::Direction dir); }; -} -; // namespace ns3 +} // namespace ns3 #endif /* IPCS_CLASSIFIER_H */ diff --git a/src/wimax/model/mac-messages.h b/src/wimax/model/mac-messages.h index 876ddb4ac..cfc453f5a 100644 --- a/src/wimax/model/mac-messages.h +++ b/src/wimax/model/mac-messages.h @@ -76,8 +76,7 @@ private: uint8_t m_type; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* MANAGEMENT_MESSAGE_TYPE_H */ diff --git a/src/wimax/model/ofdm-downlink-frame-prefix.cc b/src/wimax/model/ofdm-downlink-frame-prefix.cc index 98fe7d147..ccfeb7d31 100644 --- a/src/wimax/model/ofdm-downlink-frame-prefix.cc +++ b/src/wimax/model/ofdm-downlink-frame-prefix.cc @@ -279,6 +279,5 @@ OfdmDownlinkFramePrefix::Deserialize (Buffer::Iterator start) return GetSerializedSize (); } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/ofdm-downlink-frame-prefix.h b/src/wimax/model/ofdm-downlink-frame-prefix.h index c27b5cff9..dce9171a6 100644 --- a/src/wimax/model/ofdm-downlink-frame-prefix.h +++ b/src/wimax/model/ofdm-downlink-frame-prefix.h @@ -64,8 +64,7 @@ private: }; -} -; // namespace ns3 +} // namespace ns3 #endif /* DL_FRAME_PREFIX_IE_H */ @@ -109,7 +108,6 @@ private: uint8_t m_hcs; // Header Check Sequence }; -} -; // namespace ns3 +} // namespace ns3 #endif /* OFDM_DOWNLINK_FRAME_PREFIX_H */ diff --git a/src/wimax/model/ul-job.cc b/src/wimax/model/ul-job.cc index db0b9105d..4584a7e5e 100644 --- a/src/wimax/model/ul-job.cc +++ b/src/wimax/model/ul-job.cc @@ -164,5 +164,4 @@ PriorityUlJob::SetUlJob (Ptr job) m_job = job; } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/ul-mac-messages.cc b/src/wimax/model/ul-mac-messages.cc index a22d89b7a..fae6080a7 100644 --- a/src/wimax/model/ul-mac-messages.cc +++ b/src/wimax/model/ul-mac-messages.cc @@ -711,5 +711,4 @@ UlMap::Deserialize (Buffer::Iterator start) return i.GetDistanceFrom (start); } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/wimax-mac-header.cc b/src/wimax/model/wimax-mac-header.cc index 77a8155b2..afa1602c7 100644 --- a/src/wimax/model/wimax-mac-header.cc +++ b/src/wimax/model/wimax-mac-header.cc @@ -657,5 +657,4 @@ FragmentationSubheader::Deserialize (Buffer::Iterator start) return i.GetDistanceFrom (start); } -} -; // namespace ns3 +} // namespace ns3 diff --git a/src/wimax/model/wimax-mac-header.h b/src/wimax/model/wimax-mac-header.h index e2202f09d..9a587ef11 100644 --- a/src/wimax/model/wimax-mac-header.h +++ b/src/wimax/model/wimax-mac-header.h @@ -61,8 +61,7 @@ private: uint8_t m_type; }; -} -; // namespace ns3 +} // namespace ns3 #endif /* MAC_HEADER_TYPE_H */ @@ -129,8 +128,7 @@ private: }; -} -; // namespace ns3 +} // namespace ns3 #endif /* GENERIC_MAC_HEADER */ @@ -193,8 +191,7 @@ private: }; -} -; // namespace ns3 +} // namespace ns3 #endif /* BANDWIDTH_REQUEST_HEADER_H */ @@ -244,8 +241,7 @@ private: uint16_t m_pbr; // PiggyBack Request }; -} -; // namespace ns3 +} // namespace ns3 #endif /* GRANT_MANAGEMENT_SUBHEADER_H */ @@ -289,7 +285,6 @@ private: uint8_t m_fc; // Fragment Control uint8_t m_fsn; // Fragment Sequence Number }; -} -; // namespace ns3 +} // namespace ns3 #endif /* FRAGMENTATION_SUBHEADER_H */ From 3984ef251d0db94809ecaa403eff7c6df691aa1d Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Tue, 2 Aug 2011 15:32:22 -0700 Subject: [PATCH 042/202] Bug 1232 - Buildbots are failing because pcap trace files have changed --- src/olsr/test/bug780-2-0.pcap | Bin 103402 -> 104122 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/olsr/test/bug780-2-0.pcap b/src/olsr/test/bug780-2-0.pcap index 2543e01793eaa34db666caad09c095d1fa754f9b..6ef24a19c59a82d395678035a1178ec13a853a68 100644 GIT binary patch literal 104122 zcmd6Q37BP7b?)x!?&=a5ssWj7p~MD78OkAeRD^@Hpo}FPph1RW9t0_8QN+t2;t(w- z9O6)-IN(&GAqGrRieRF?SQ<2uB)-x_jYhFTUU()^dF$WzoO9PYXRTWGon5cf`{Q;u zweQ{Q-)sN>T5Iof&aHdzy6wY5VNIyoLl1>;N%=olQcpqu#%rV(!b7pe&XMZRTW?*B z-tg=Y#__X!eF)pETD6*94-MThbVt}gKioNlRX2oD{CpMO6xQNHu|4k>rj2#+4fLmB zW5}>E#BB`GAa`Cd6war=@oLPYv@yzUp@JKiI71$8FNTLm<21JNNb1&R)N9IX_~T zF~8Mpe)KMVez5uOw|esvHnT9W*<3%^tmYSOZqxT^oFB+=^9#K7%jNuN0gU;rVe_MR z>GOll<1bt7te>!%foR71!DcnTXp_&6{vG!DnCHt0KEEuiHEpeBw&-1JS2u0_>T&DB zRb&&dhVDwO3tO9+t%24z(T5KSYlnUo=QTtjaV^#t`i?pr!~mj-?&ED~h-)8B= zp8EV?^JRbR@mAQ(!oX&8ey~~1FZz_vZwIpVjF+skG(zvEwywwLmr)vQ&u=5WZ$lVi zTzVMi5{4P2*CXy<<@j=%+sebk6kGiq^)Tj3nv(8I*nDW*!mw<&6qaqj<;7bu|11pV-}E)+U-_EeC4IdM&HM1b-=uwAF;rg-*#+%6w37Z?M^n2oEUOq+yb|m1@czQ zW^B#Y*I+GZJzzTwbuHT{503E>C^3*PopNdPxqwh z{p6XeoESIC=eIeKw_5Y-$GG*3D?4$nuz6Eh)#nW?&;FvPOR>HgTi@oqvAz|TqE`64 z$H>+}3*Nep@pA- zuci{~nz40l+FH+SMXhjO!q!F4@O(KgeYunA%bl1nDLv?1c?{V+V!apRa&9xjc|~je z`Y~>2#@k&vZ^;ZD4}|cw-+Q&k1h3;t$dz~81%!QaZKG1hUP9zgTE=GSHnDEF!}e0~`Uvex|iF>VjW z+dVmN$xJwqUMC;x)p0^28PiB}Uc0h+k&uL(o_pI5uFFpRS>{0!sWN!23#7hm`G=pSfw zV$|>b45~o-H(nz>aTTGow$QZJN3;&s`qvz|wcCmRwzc1oe_lzJ@Y3hDSXsk0iz1MM zbFv3pl@G9EAk8Hj7UTVF+c8^y}PII4R zVG#S8d`9f6_#E>n=kt?k-ggqW^wmM{<@ENYS7(%ar3j=`Wp(=e=(t8tSrR3BeUxJo z<(P`HubBjtFS^>RCC53AJUm+AP(SwV$+$u#v7RR}_s^W_amCCdO|I<0xI)=R#`ZrT zTQ*nF>#su2XI});fWj3zx9{E#rjObv(d(m}kSNLf3d%LzF@^vfANY~Sl}U~x$7ZD! zZ~9!>i*beCrE>)~zxY#gUsawxh}@j9+}z{}a&r||Vol8B%2Uafy$a~{S7D0Jz6krM zt3a``cIbAUrV^Mz}9`%7RqnGUw^!gr|=17Y0Sk)sj zi^F1<1{_y?+Pii;!*S$+HeoG~^m+Mc#!K>>&P&+5`b={bN?wYZD#JYrrOhTUQBzgC zjQb1D%cqeodlk^@ufi;!eG&FkSE0`x8m~)xI(^7SiC!P&oJ9F}6=mPIT_DnDfaBD= zy*=7I$B~C8)ay35cH8I5-i#~6Y@I8xx%MD)-&As?u7y!AX0cwRik51{CRZNCxDxk; zoGZ^DTlOlT*I$JNKKmljOqEPRSH!xvL+GP6O7!|D7bQyCoGK{EHQgI<9QF-wk5=z0 z`s+5RubbKfBZ8 zba034^&xL7;9^!1zPIPyScsj+^KW9vuN zj=p}ddB`igYanBipL^FfoBTvgU-6UPCHYCU`4X#uUVjx9`0NX+*0fciE0x{bk@QiU zE9mu6E=rVC_9Cx|{=e7k=S?N#(|ohxCDsClWlX>lbIAneB??Lj=!G7eFN zr*jBces_k)p>fF}oU!RO(_2F z>!Tc#D03C%F5NMP037!p?p?bZ=Q#2}DZa&_e!h4-;|f*bI#*zGkHb8!FvVwI;7CJR1-c^Fy#dF4A2RRet?FxzBSWfatpaII31i^s+sI zUf(0r97z!h1zK$~;hDFj#gV zV;SxEb(X>A^^@kQSGj&7x@Ro9WBvM1lJ?^Yc8-X&xc%g@O%=h`pIz%k^(m=X8l{|H zQ?ZpTJmuN4bpqM)d1=ON&P%#l(7geN%}ez9yjCx-ljRqJZ8`Sj%lE`ekQ4Q`q10s zxZddhG$}>yBUP9q3Nlgzhw(^y9wGJ>EU+-DR~_>{2N}v|<@m zlC;-9h}A0x^LmBFI6A}AW8Cv-2%o<*+~-Bi-ZT@$GM1z0B)@wD4x7K|_4zx>Jyrw? zAPRqzQQG`Hkx=@+oRz*D)E(THV>DFf1{}68(d+wiO!|^!qWE&GGer6za4hZ1*}pQc zCX}&Yj{7plcC6G$GZySuY5}oeKcq_%kiz56z&J_xm=hc_RL3^NjK5B(mxAbe{XRh_zH(^N*&XIyd03d5T`2 zr#WAZ0;E!SnvBxsX+bD`Uz$}4*F2pJcW=O9`x3prFDIlgX#o^pCZk;1m&bn7tno`N z%t$Rf-qb>M@&+x?yK4Panx`N4zai%2*P3xA?mfb~N$!~(Un^s1{)tTUbj7B&S$!Kx zZS$MoHcySp*e0s6JfIp|U+3KZzM`-BYMzK~+B{cdo+s1G=V{>cECOl{8nlt;>GZjK z0}h*~==FIzB~j9c6rLudw0R1YCtP7(RWCWy<0!LmO1*xAJHGn+!Y8r%?diOJgO}-J z%UCzF^5O9X);c%fu-6T}{<=+bj}+llb={It+Uo|C-~EKC^-_0Z9A%CTf}y+Wv=+L1 z0@HdGU!v|{^NNGLy8~yW&CRvV0ayB3e=>_Nbd6JwFR=O0^`^}-j?T(BN;5EOifW#S zquM;_$8>)Kz5Mtx&gWUg+Nm91=oGqp0}h*~==FIzD^Z@N@-!Kx%~M+bW%x3eCu{4mcwlZWTmHk+D%3e!AY*{^MingTY*5Ate?3274*o?cT_^F(aZ<{4uf z31b;No#Zx)SUa^fPiK_f8*tb>MX%4(1&Q(um8Z!lZJv@aLT`9Pa3r+p~ z0n;Ddv!d${o|$}uslPJL%*!})Ky9;mj#ymn$4(r3RBDA=`^>=D?QFrI-ls?fWzh~dVQXbat0LPY?Y_UC~clnkXeQ= zXQVGF&?|c~+V^#Dz+w9my}mEUq%S9Hlu#29Dz;>lOZ)OON0?^^rRK*u$~>G?>#wQ# zgPG>({;*nqBIm+0qu(-ZmYQFXnm@3%+0=Y>O%j@?chxq9=3(;(-!o%dsrgyXnLMC^ z)$@F16HBDojGCtaz6_quahnAaiNaIbKXh-vVe=HdK2LMbfFhh*qvSkIMrreu(#$e^ zIWK*Q+K?8gaSlUuS@#AUwlC4^`*K41^1K=)_hmB5rG2^Gr_AexrRFC&${e>4ms)6Q z{;5p!boXPeKcRVeX7i6so2BL#rREQ+Z8kN3P-zpIr+3vhh2~-Ns~<405tN!=;GD_v z^(}_xE1S@~W;1G@lHoFVYF2tY&r>bYy#a^KQ}p^go#G5A!UZZ%lTq3{og|b!x3(Ac zXc6ntw&p2DcW;yQQQMd3^?liszPwQNWira8efhwH-rjneqs+rawHBJ1&zRbfBGH_mKUnveQ}&4WK?+AQNt;CIyL7_GF~j5C!@#2L*d z{h00;q?garF+R^COx6tGny0wZy#a^KQ}p^goslRnu2J&bl#J5mDHRsW@a4EfNmEnu zJgryv1{}68(d+wiR-(M5M#+7djB;sTKJ_@W&Mx!(97malO9^Ga=51>JX-xBnGyMt8 z!!y7Ck!iEk->B5z6Kk7I{Z-cmp+9<;p66lnpr?3wK9}>P4;gW$vWYmO*^F`KJhJI) zeuCR90)0r~DcR`WfWzh~dVQYGOO!9DQF5LpqqKQSrR6ewIVn-19;F3p)b>y6?#Vu9 zZC?VV@5=>=^0FEw_hmB5rG2@>eWw0O%`bA4dAOWVu8+QKYX0d=^Uq@X6Pkx-e)U}Q zJgwCHnAAM^z{t5zVzoWJOV>PX9&?jvv#c$qepU^P0`o;1zv*89eQA zn?)E@dOXiR8RK+^J+GoT1Bs!?*DCZn`@O3S|t zU(QKiq8@E){@|{D#OHv+_9c3KU*^)6FRoE?UnZkm+LuR@mJBVFyqxF0%mXSrU4PZJ za_EmDm99T{X7R_S%@OJ*QRY&AG@7Bm$|m%u*^K&w&0X#`^L$^0>n8YWjTLpOQX%_gP(sO~WIS6!cn{^(u0{@|ID=(p|}`YYqiEcZ+v zuB>e~bMB!m&K${Xiku6ZkAAVI`Eh9z6|AoLYM#)%HqWSeI`&uwPjhaw2!l$GYyKHD zRObd9Hc!#(^K?$4e3i=6WRx~fDf}+OmlF~t>a@1z59#bk`XF%FzC^F@%Xx|N)ip}4 z`DBz!`||ed&7526Z-JxC@lb53g{J-vWBNPF(jPqYUAmHHXujM}OiG)mCUyN)_XI$H zR9&{>Ow=E2KJi~nn`Lb=C1V?nX2iD2CSsdrlYUIk6ws@;#@o+N@p%?uQ0Z~a(>;yd z8*tb>MX%4(MTzn?Do>M9+B~I{y$oOWBudnyZOtFr-ID=FSxfj5y}mEQh&T_ux<<)0 zpNw*8U!HZjnR841O>kpn;_dU~Q8D~bhXY%mcT7S(rle0MU z9A;DGdDxuzil_OW)I80=(0nydXkMFV)I605%i!q@_ice+TB7juFdC|J0}fmB==FIz z##f^Vy&5IwX);Qir&Rtd!_d9|s%(E`z7@+_yy-RC+wmACB?5HsG*%ie8_m z6MQv_aGlE2WRx~fi7w0V<%0Aj>QP#W#`Sr+hTOdYhwV%B`o5f$zP!Fh$u*yh@{lNdjxrCgtF_S7-?Nzhj<)m%o3Hv?b3akm7NVNW1FA_q&Q$jVAkNUq zhaP8ObM1G$JU=5fPoo){uWUl|noas~K$*S_o|=^&*ZdI}uWJJio2TgYdD`O)D8daY zPm@vFJf$*y8NL*?VG(P?w&pi=^&>t99JVjf>-%zA`ttRvFOyL&?aOCxZ)(2O-xx=k zhhD7(@RC1oR$ZTm{^&$U*B?Cd&zHN;vP=EZXomhOo6w(TGwKgEKlgs~46m#$X5>6? ztZg=9+Yv0b9mD1+Y708tUItIcxy>S6Q!{{Tp00s(Z@^*m6umxAXC=xv)F^pwN=9k( zl(sy}@MSJhqBf+}Z{+zSyL+;KHe>q|D1BefNtAD_QF31jTul`rF<}I}_&r#;# zO@y+abDLV&#I$g%r3HBATOTpwOj&2oNzKzarlI-jS~)aN?`p-FsCn4@CH?Bx^XYHA zMtb6&oHDje$a$iI)oY8&CSsdrb2XX3rG{njbduXF!u2%+xaN<-cwHNC*gQqA&(j5o z^363$&eLR+Hcx3gxeQ-UNtCEZ+nT2{pY9DfY+s_+_vNBQ`G+-1?#pD9OZ#%oKbU*# zQVTtfGLMy=u7&FQJhVWkxGnufExr!6gd|* zpZ_vb^JScwmvM$>V8oefo`^HrJn6>)Tk~b`bej9N2(Pahz%@_j6x|ze+(x@Q#67%5 zZY+PBcHh(G8gCgK8+P3~aD4VrTL+FQI``Zf*5zobHns*F$A0909>-Ork=`1Hqx$Xh zLN7B?w>PS~rSpyM4LEMyp5ah+yJc|PxckvqfVGzsvqhKMijI9GlL5B-V$L9b4JiVIq;@2|sQnxtM zp#ao4AEPsz?hQEhb@w1!2FHx6+bx6R_&q&-Y#AK8xi!R=!SPkfQA_J(%iwtPm$nWZ z|8}K$7F*U83tYE(z)755S5)^?qOPDFXRD@)bpXUVNt-H2V54m}ewqEfe_fJ<2hfQOi^|QOjsH>BkhC=yl@_<~64BTxML>GHs|g*x@}C8~rQRfEbT{Engg~ zKVEsQs9$lGejBa)R*grWpjQ8Ot^UaP5yrcpK1;{g@pW&H{(%-pLhn33&8be>`*zAI zS9q)lsQw6lV|Pl`UiStZ_Ysa3%7_5HhwQ+8BJLL`eKOYc31OrbeNy{4`U&IxdS^af z>Er%LB~S8-C(_63XxxXNk(keLE%k@d`bDX>;`PVT6CBef*6L z3d)E8DBm;2eIk5Z`edT%6T(O>`lR-8&Es!~@x(RHa@Kh@Yw64YyHVQK9g|RO!x~rE6iywc#ZUgk4v9SG=0+dvE*_58GQ1R zC-U(Gk4yC$JdUx424GPG0`&fJt>Q}&6Q-mu38fMfl2Lw~P6b;l zUiI?kx0Cp`0xcX;PX)7&#TMl))# z$|h>CXp1*EP zDL+pl8{Hdl*qTSLulX6i8buiJbVX6xng>c>^V59&3Y<-p@sn#l*_XEFfpWhcJjIWK)lC>35Nquht?7}9eQP@eEQ^PcZAug`K{=HcCDj6Ryh zXhN;WXxQBG)#iCXKUWWnxRS@XvcA>=&wtf3Y{-Alvhp8nzT@xB^MHO8GqS)}Bgbe) z{;O;v|3#Zx{-fKRm!Wx+r##A^L_>9Mz+r11y}srbxo3(n;OUB@v^5WuzUJpRPmAy# zRrATdv^5WuC%c*t{5OU~l#1q)QLZ;Ne*>ZPbCJ+|5jEe=MFkDjxdDgGOZ57@9F@ML z$fV?=WRx~9fzs#YyyWG3RbD2ew0Q}XcT@DNujp52BE!@{m3#lsG3iS}sqiuxpX^Ip^FX=Q%|#Q^mxNN$d@{}J)UKzYJt z=I?YbH9yHwW?@sUg~9Lp*hm9y2%E~^>Aw1*K<^^)ReLAu4L8#3o!6PRO05gsWlVQq zSHJEoZISMF!}z3iLNw4_W$VCiufeYai?7D{?mE0DtP9()=c=;s{(4>mjrVOGTiO~T zTNHuYwobd0B{sA0zJVCD? zPkP)lQK?D|k&IIPew4U2KzX`*wmQnWQiKnv@gy1L`R3UwP~PL#5Yy6^gi?to$tdj_ z;*EsT&vQa|MbsUUy^0lm!Ngy~PNQ{ez+v+ey*@8zq%SEtD7>V5lDaqGuz87IpO<5j zmmgGlnT*orB~bowN3XV>mA)jD3NMpUzSqoiK>4#@c+cg`ag=#D(u~p7b0Ub*^e#O{ z!{$xjTy5o`GT(`~lEt{vtZn-_2zjB(cQG$)!>%vD)^@*HYuPIE-8kn;7CuzZubJA5K4uY$td5jyS2vx%3BUug|B#yuaTa1 zugNG!xj7tF$L7Hvi*`Bmttv;cJ=Rftk3}(ijA|(4q~};U30Q8T-|1@Xi^`lN;!PIg zjh>T`2dkVE^B~Vju$AvMY}qPv(j@0l7H+QR-ONeHvz&BFGbhm_3CqyF$yXljpHD+| zZopw{AHBZz$2b#;FyQNoqO`RSl)m<-__`J0BdYe3eQ9eSDEDx+KQ4VqC>8A|qx_zk zlioro{hTB;P(%%oh#UJMNVanW4x5+g^?8{~Uy@RloRo~x<|R=2yzEI{epKaUGD@45 zK>47{%L(aALaFdF8Rh5AoCK6-{7L_83}zZRsmudH<5|?Wo(J%(S(OJUbIJVzY<-jN zeS#guR+$H;`MPD{7Bdf=!14f{WVCJVyMuW>p*)M5b`U2)aP0`^{q57 zU*je(c~n1>hU(ma!`3)@eT`3X&lF+6%N0dwYaA$jjn8nd6yam4#*=+%YaA$danC$@ z(wBr%(Reb-@9b*TozsNU=cUkH5p~zjJ!jESof~l2yhN|h%W3ILiVjNdNk(b&5-5FM z&PrZ>T;*jlN}HEJ>FA4j-sLHKzU&r@YZ-cEh z%IRxA)0MVNUh=4ZHVxIe0f((|^!gf~<11c-0WVh+rLA$G^ff-uIZ}jAsv1xBrLA$G z+-7HG#rtdBU-yxD=}SVXXgnF^-DZ6Wl<&XCJo_$DE^w3?)Z5bdMjB{CIGUY#9K+8% zs28{9FGB-D+eOrNJI_sGysiy6Yz?5-*T5q8NJOdRxyh~w@j2kIHGp1U0}E0Ex2hVL zq@g-D;IK7--uu^k8VK??S`bP_1CyO0(g%U#R?<4p0^4us#nTKN(4eU-md&<4mB458Oe5$tD%yZ9Ud5%u*WuAkrU+wChC5m{N#dt|8SDtO~ z`#F%ut2`I?T0GCagKYVE&g3P}Am`9fof~l28b`0M@iD&QMHujMMN!%s2TEV#;o|a@b zO>&euvP!G|+MlMoG2s5U>e|wAR_=jkh6^(vl(}b&uU{5ETia~ro)cN_p{sK;_rTWB zG3%@|#d6;xVptYqn4Wv^+)R~wj&9m|7uoVPZt{{x_48<`&J8$hjicAs_!M99A`E!B zq9|>R1EsI=an6wR8VqHGD@45Ka*i5@4nFnBN!&v{mimT|~BR%cjidpWF&4DslE6;7B z4<8baW9JOV^K%B4|4y*-AFw=ocW>`C!8w$L&(~O*`R^o_|L6*}ocFuQmYa^@6E&U^}Gi67WVgfxW}&A z=S^67?!5%x*SN_`9@Q_3zUcS|aM&70udne@?wKMCc)6k|ZH)t^ukmTl%Od=-s_|rB z+8PH+{~3=l=}SVXXgnF^`*ySLcX%J6^m!>XUPO(zbI-*zRObd9HZRfZ^KxAJk|L3k zdy-MwyaY<0mot)=x2wENMrrdBC?9ZZqFnltP%6AkM)}z#dAaQs-t(ao9AzG8m(kjz z^kX#cf2(5j^Q;&R&#Zr=dGB?ZgG5}(VqDR4Q1v_za!@?~w~{BZI!uomUATw ze^Sq{x$ild`PnYK4z-qx`<9aiE;rXr6hDP&W=IILa(gh1JqHjY0Q2 zOt5o^6Zts=hIv1|d<_V_6;W^PJa;L^>)L?B)&P2a4NP;7M3hRNOGasH04RM8%u5aY zsj7iwl(q(da>&hdGt!rYQqe#%%0J)Ls=t78-6`h2r_2Kj+?QFnqt-w(51hjC0Nsr! z^8jppG zKS1;IHE!~fXOI`rP@Nla*cwN#ukktVnIa5$xuPg-jRU2x@kP$dBHXEJJlU7F#({Df z=X=tZgi_IXGD`b=?}LQW=cUki5jEb-#`SzqJ!6D? z5U=-a!@g?)w*KiC-gh|%{{2&VIMK`pxX+==2ZfanU~|nP_+7XGZZ+03n{ zvfN5{0n2>%A+qIb+~g&X>X*|{of~l28b`0M@ln1CMHujMMN!%s2TEV#V|?9;@aL+= zlYMDx94P&BlriZ`LaAsx8Kr%WGD9eRUJ4BqQ3LJV^FkV`bDN=0+Pp-s&&zS?OH!(m zdy-MwyaY<0m*bL`f1&a+8KuojpuFAP_vF%-gi_&UGRha5dw-z(!AHGoOF8#t7Us;@ zyqU%3$!2VZtq0bxcD_quf_r3hpj}35FVer?;Usp>a56tMudn?{zB)x1@O4E|+S&(7 zU;7iBuSNKZs{LeN+S&(7|GM&&^d+HGw4aR9zOH;Tq4aqvv|mK+uWH@@Jw-!xZopyl z61_ezd(xM4wJ$j@lTq5d1WKQmlaiNTRe70=(&i;lUg+keY3WNssqiux<=$pa0?OZA z=Is}zxG%GCSDh!C`-Rh3PCBQVlVIyJr+DXMGu$INzD2c_llG^9HU`{VQSFCLwQ>(^ z{`lSIHK#K7h!~c|7^df*>NzLm9y+;``=O7JEnnj%FS&YNL_>9Mz+r0~y}rh0`6?7) zz{?dyX=@xPeU0}xFN^RsRpZINv^5Tt{`cL@Nna95MdQgRe_?9;qlD7urOTw}A3%o6LKz%RC_BNfzS?t+nzDYW2(!^1zAOy6tzj_d9GBxkvJF za?O$Ey>__Ip~`cctvq)N&Cl1k;AIhc+1B_=XsFH&IBboh*VlO9PaQ{;C0Dq{lTq3l z2TDKp%u3yTUDaJON;~%e<*Rn|bT=w}NhlTFC8Io;^snmYP16!B>llT4Q6Wk+tpxskTZ~Z+MuK!fI=X5Lgz~)O&F!xxoN(k%b zIajjqSGCP%P4s-SiRZZRJ2cK~&hO)7%h$NcORn*k(NLWmaM&70udne*z6wPc@Nz{_ z+8PH+U*ijW-HPxHRpZINv^5Ttk9YIjl=LN`R5YH9@~7rKO`jl?J}-p^il~8h{q=Gh zs&fMlo0sVIdD)Y`B&903CmE&9OQ7_5xhQ%0O_i6)C~aN>rT^VR)6$oOQsHGXO8dKo zfbz3+1$OD&BQ%~xjqACmdY%cnr)b7z*!tjqo3_?bH};I%vHMiA@GUbBoWb(I`I@b3 zKkDtVX1Mor{H7Qq&*55HmFJ#s<+)E1d|%@xFL_jdMf63-KY+v5IC_1J&vMTcVZh53 zMQLjsD1D8Oa;_BNf2kTz_NA?Hp!Co1=cF$QrK0gGN_-^75}$UM8coc?pys+sWJeFGyb!N`;rnD9<(T zwFAmyt~2vNx$hAg&!Wcl+*3X8gWN->W%Ak!Z2kH^(^i>##`(Hs;oEgSXzoGIWVz=8 z&DLJu7Mudn?e@2np1bwyFy+6PKs`#I-O5$09xC;QUYK2TomYJXJvl29tzPe%Fl-K}%K zPZLU?mqL$4)MGm*y^4nF+xLh|xEDld~!+PnnH zJ$LqU(zx^`p;UO8jPkxEdHIiY?Z&ZyZ`_k4p zQ2KS}r1T}BR5YH9(ylu{ODKI_3cVFkZ|&T36%Ez70f)^?^!mJN&hK+%%h$NcOCHr<1MFQJaM&70udneLz6wPc@Nz{_+8PH+U*j`;-HPyi zRpZINv^5TtC%V^xW~DC)rK0gi<|TNJlXQ| zoXJa`L0(Hkb#B06YaG44#)G_KJK*JtqO>&*l)lF2`MMS12dc)CeQ9ePDDPYEouiCO zUlK}14jP z-k2i%gR1dlU)mZ6O8>isCZ#V4rK0gX|s?T)Ofm@AIJJ(`9Ji1%(SbEF9WTh)HDFKz7urT?Acv(lG@Qqg`gO8Yy-Zzq&~P7-=6 zqTbp$>3SNfa{~^Wm+19*IVXKdQ9;Q`$tZ1J0;SK(T=H^33@e1msBw!l&5VY1Ex&3yyTs;YfMyf04MH^Ao2`cYI9Iapqk4YLJa-<;b1!Jx`V+F{Yuw}|kLs_Zp*lC< zur-ceU*n5>#fz{|^KwN|+8PH+U*nT}-HPyIRpZINv^5Tt{&!jizQd0w6^$pOw7=8x zON7$rrO-eTHPFsIH_%X>8*tdXM6b`wQRz!ks*-z>QQEu&N}rcgl9&Ia@-i8v%}b#4 zuLF%qUlK}%m&qvY>p(zxH(d~=%bQC)_bN1=MUCrupn4t%d4PtLc>uPqe$YD~8|NO$ z!#Q;xXy!Sb#Z`IkLf9Hs?stIAr##ZjJw48qEc|nAvzdF&XSwIH=KTJYZ21~DdC8;t z>uIRY4LEF#qu1AX&R3xb175BuN?YSV>1%wNuUip*qG~+Zm$t@%(*I7&3F%8hsc1YI zrTv|jKzTr6)_Udr4wD>Z7S63TFwosb8fZf}mz{ZB#Lqma7hey)3=Igq6;W^PJa;3; z>)L?B)&P2a4NP&5M3hRNOGasH04RM8%t#IVRMkK-N?QX!`QT389;+vPNhlQ!B%{1- zck5axP_DYi%RSQ^WsYw)Xr24@ugzc&QsthDt=t2f;bQNe@>#xqS@>CPvzdD?V7ce= zX6}Kl-|ppof2)X>S&Wx@984 zi!k8jilVeN4wSye=Qu}-@Gq*ylYMDx94P%g)~xg;p;R=UjMCm?eVI`DycBvXqTbrM z=Z!Q}=LQ@$FVXAsa!&e^qJolpl2O{c1WKQm^OBc8S9zI?(&i;l`pxmp?)@A$0U9|Kd#fs^UIJU>nAZL4e@5_qjhnpWQT+^TJlU7F#)0wdy-MwyaY<0mthBSAI>jTUM8coc?p#McRP+r zUlK}%m&qvY?{);rsomE)--9sDQEmF}(^i=WM>&VG@T+>>&Arz}EDv7MwDlKc%h$fi zS03&EkcR5qfWy{4dVTHZoC!r3@O4E|+S&(7U;ATx-HLF(s{LeN+S&(7|32FZ=}SVX zXg?XHeV^?dq4aqvG*Cnhv~$v1XsFI@jy`Gg61_ezC#5e*sY*^tMrrdBD1BazOJ4q3 zYLjX=@xP{cBD$ z(wBr%(ReaS`SMrrdBD1BZ| zN?tyo@-i8v%}b!X)ZM4gNna95g_p@F_cizFK$(5jyACwZQRd+yGe%=yP{ruWtr!iP zhfaCdW<*@cVqDR4Q1uKFa?m-=90Xh6-01ClrZ`u!@bC5fn){whSZ;k$)7D*N%h$Nc zOCHtVMniROz+r0~y}rg5_=*={z{?dyX=@xPeU10{x)tI7s2Wf9rLA$G^uO0`QTmcl zDjH8lX@9RBP@Z$TdC$)Xb<@dm;J(ZPUBzvkOZV@0xR{-JypW%HV3@Db%h!O=TM_lv z&U0_acwHNC*cw2uuYpnSk%&^sbIB-e4FILDfoX~IKU57QqqH>ul>RlRu@*{21IZ}u zYfeDlJW*Lco7QUp?uqVZ&uw#I?d*Z8bN`F~Z7C!@4A4wU{LYodix z(ReaSdyjPwq4aqvG*Cnhv~$lpX{gQ(IBZ^`*XQM=^d%`(;bk&Po0mZ8^Kwq2{Ef=X zWRx~9f$|$WdiUB*wNNU&Oh$RbZq~haKzZ#;yzg)Aag=$uw2sZqb1=l_D)&rTxd%31 zd8T*Y!#uZ{h5xK=HuJ#?SU#Yc$ZJcm^}8`I&xsh81;j8t&sEPeAURJA&RtynpHsg-;d1;pUy~!}?k`%=Ia&Yt!4IxwuX~zv z)BLw=H|KU-vt}(`_fLF!;?r(3{&7#|)?DkR`0s1@Cbym+D%u0~-JsdnSiAv$DmEq* z8xzvT1O|Eh$<93wfAbZe$CR|ucNk!79$WC?&2A0mv3E5OylXw@Gl~CCGmd|JZ+XI< zhrjs>Y*q8|Y-Pe$JD&sb;Vp%&9><0aX=_bov+yBT?tm-T8uRP<^8-+2eiLGTc-Q*1 z8^ru*>xTbcZ_LlLmC-4ct#E#{RnJe_T2t99=7;}w-@?DF?9*vEzs%v2ip{mcCf?P| zZ_MV~w`??g>e=iIn=SXZ0Q_c0n>A+&n>z}hQb^y~yw0$d$@%puS7rUy30rvA`n930 zZ=SKy@TF%f6Sl(jqpf=V3R~5>dA@{wclnX)-PQP;uec@#a(>&~`euHu&7<+*t#19q zcMD%mAWW^N&!LYsg&tchfDvC;VtL;c*1CFF`T|S1uIq)bf!O!;&aidepIWhCDCeCy zAXj+1LHHVRBtAddy!UKtexA*~uo=#eHf!D%K9yYB1Y7&uYRzxPpC6Db^V=xq2T8=| zN1JO7v|^oSv+r7);rwW`o?qcpIloxsLly2Sg@Hjd={`bdN0^V@>=ZFZA_w>wDQ za+oQ+{{HzBMhsAGh4Y#e^D2BP=S5pf?^tKVfLS@O%{dliw&1Am^Pq z1gWukmt5Le%nwqJbBQ)jywr*Tp0E4D*Wvtj67wt8SI%#5*t&X?Wy_miU(7GG#rf5~ zgcp3?($*^vwe~rSzAwQ7#h1GXUm}#neYp>8e)@KmD^-kJk~aGeD>G)ZjB%R;Z>J=0 zVaDx?*HJrKac5cD${di7*($lRtC$~79P#-^}g zYhSEuXp8Gw+rsMmF@UxX`j0gRhkDY-nFBkrI9bZ4%T)T(0ejbVu4)0hr!k@U$tUfCg;~@y<*I#WsKWX@OCfB zTbRL--MJ%Au;%5hUtg?WI4`bW&6Oes$a&G$lV53_disI|` z2-tks7uFbi3y&*(*K#GCAGuP`5AX7|KwJMkvi253e|}(`GQS6k`62Da=l3YseDA+m zT35Le&TmgKzao~&^`or|PM9#_>5QD;Hn&$~eq}t}OYm}E$xAWs{j_;M8dw%yW$l?q z5=-X562;eh3!6w$abMHsS%16U;F8DRzTj`@Yx1||QW5Kc#)Y;Hyvf?<%=*3rBNbonBYgQF&6fvZet-Wlb$-=8Zcf_lb3-;}vy5^33NAfZ zatUVKZ{hWmf3&zVFKuNG%p0>+#-07d{2rpsk2a6pM~&e)aL$!dn!*0eW8WW7PU}wrHHGNE41~*p#mp#pwkA=-sP&do) zH(!&Zt@slS6&|#TD~q+w4Q|b(+px|}l)ZJO+ihUojsM2+?!XFQ!&tn&KEi*n72~n@ z1*{(6Z@wl+-c^M9gb`XRMs^!%t-R(St$lOnm8^XnJAkWTiLdzFmTPOgW|2FnDuX@R zs;%IoNsY5Ucas&{-Gn#`Y;)Muj;(7M+aDzK_)w`wvEKWywBDEhmlbDcrBC{F$pMvq?+C3|g@Js)K+in7#9 z0?K>;MvduJ%u{1}xNiH3bwlL$V;<-H!k=1ut!X*u%sn*1*D|I*Snv|t?|A-y0&MDB zVXwUknM9O3XduEB#JcY7P<&KJ$zB`fz()y>L{LIC-5YVd_Cw`0$Mf*t@hCf#I5Hkq z#^O!6eh(4rhj+!-k2cTQ*Q)8x`*Ee+2Za3OKA?^(#XeQWl_$cMz6$KMS7AoZK6ej~ zt^%&&bZ^9Q+1J!vN|ozI5=YK-Pd`lDo27kotwi1YO@456iX{CMdtk^G3 zBXR9>&s1}$sAEX&)7CE!u&xbF%QlenGp5O}J<;NS^ zTK5pECNz|D&KwSKWAUcs%EJX$kS*g}ITAMYRba2Z3NsQ>?r?yMtOBmCb#KIR+Lz4z zwZzePIHrtwrrcjYLPX*NWh5rTqwvx_!d}}Wvl2<}a6E{3WQx|hHsUzs71p)8If*0V z(P7LZC08CPxPq)5=L&6p_*8Wjs<=7jYvG}d%}@*6XV-BP@A9?qRM^s2fxY%B%*)y5 z4x94GDj=qJZ%phuO7_|)7krf1m_|_U-W{WJ#Bs(ySzK9^I5LNAslt^<39ewb6XyzT ze(XC|jiBdqW&g%z$QADCYp&p3K3A|eUtty4Yp=qRoPCbnT5J_?rLuc_IzFm%g}pY) zWgjKBeG#tg*&U;E#PPP{)*9C)-8yg2i%rfLS4e=Z?f?;K50;Tua0olRIERSkm1kJF zciQI=Yi#j-+QS5g@GhT2&wwp`b=YgK&Xn{@?y%8{tPZYFc5lbvqdH3V+9-QI$}EcV zf!#4WM;v>7-a5}uOB|U)iXY=pnVTLhxPqN=oGY}s{$T4`N9J>7OJg&PH{55}@doem zx$;cd(pQ1K_9|p@_Bl5l5w7fop*pu?@kt#edu@~hA0^Um1m)hHA>xC?@#Xu>`nAN7 zF`+43d5qu+&Ma}R(B|InvT8pApDPbvq5%$_1nUzR#hwvQn z$iB4JwGqcRZn5@Ea}r0!z&GZR12NDRcaY#EPHb^r(&p7iSTStq^YRgm&5)Om5WK{@ zd|sXaTly-n*ItErIs4op@I_VuS9H3!6Yl`1}y~SSJTMNFo5QHM$N=A9}4v}l{g|~=u|83S4nHis5k5t*k6Js6q@GhTSwDtZ^ zTIyMp9?2YnkfNU766!&9A+Da2VAJNxjI=3ZspJYO_}v?E=v-m1&6On|B?3c)D@iB^ zz+rpKi}-mF@z*rZ-POu^aCcuhM;yAh*lT-h+4mNLSHxS%D0O8K3xOoX@m* z{vN#AeW~VesbbVI zyEo#{eaT+imjmCISb&HxlTohh%QJqaL6{b#02e!@JsCjsMSQW$_p8SHR2WjF+=>9yzMjkeor?vU?*AoipsU zIWr?yBj?m2oJmG`{TXUxtRnwN;^@2QG%M78YeX4^A1ih^PnJ6z`Vk*n#mcCA1GzG^ z*0~XfzB25!S7ugvBzLDqS0)*yu4baV<8bpXJc%-M+al{$D(i7V&A1j7S2JzydxTnP zuGBp5tNAgF%}~vC^^j`DyW(nwV^_hMX*til*qLBZMg&olK((-YBMzN2?6o;F@1r~| z%9&)8I%lx_tMFy!qil1&^d%}>-5YV}zGScM%LO0h=}})Mqg>gSUpm1276FMebI)zG z(8kSDe~%aX!`0BZ{^*&@zpvV?^ta&a595#RVoRF`RyL_W{7YPaAn7VNGnDhpi(SLG z{!q8--iSlz40~Fq`V_%0t0bp zxt89hXU^W)dg^>p>aWky#`IV2m1wiBJQX%~ENxBHwtju{M(fUi4PNEx%*Iw5UyjCT zTip}HzU(l$FB5SG_Z7tB4#JijfiG9#Z@!wR{YoxWzMhr7mOCQJTb!1=H{#HF%U+we zQ_^F(J1ffDWRyB@5p-7J%Q@ed2>g-L2~I%W8*%8qWUuYZp6|3L19$eX^{_w82{%CW*8&%C$`EN;bCgYO3XNH{Q6G<&WYuIf`A~7)g|mcNaA4 z*Y2fy7+`PL$6jhr))nr@mk>GZi|YO15ZxnlpX8*S+<{z?*n(Wpy$$hEea+Zwui31R z^1=qCj4jD1^)(~PnS0cG8Y<0ANt9W!o7=64({g`bUy-8brXxBpG)J3DFH>VnwV#;t zZC(`NNtxT9B;wgo!loC`X!H1YtKTkFo#~yt6FK7yl>J0KPsX#@Jn_#s!{BA}v?u48 zyJ5os8Cwv)x;Ns`dCFd!r}I9_iyM@Zr^zUFo?-*D3SUn9C^5B&=CNMg8*%8qWUuYZ z1s~-l4NB?DWRxrW^7ubj_w$t&rhF|N0+glZ!`xn9p`sS>u6S;zXC8318fPlaFG|m3 z?)i<)HaC=-f3nd0Q-w`W^R)S9d{Z8_Lb0puRcyONtCuP zmwl8kXi!RDCZk;0mnU7S>aWtmj6|6gJILLldH%7L{-_0@9@G3<`kS7){x;QSrFpke z)YdY089Y>-)0ZHOoEI%9VZjtE1FAQK~#Y?P~#Rt7xIVc1Dq`x=P7$_o@UZBxqDHAQs$;)lsZqb{HyTgg73?A*DN)EXjeb- zbHt(hlD)Ps2fi;~9Q9=~%9VZDJ6FxQlbolU%zVuw1}U1aua{HvcvoEW^vuJ*qS~x9 zzbMyF?(IX(*EXs7n9V}-wD~dp8hxetp1iJFT?J2<UQ_a@qG~yK9!d?00q~K1dw;{SNH4 z?{^sazI#&61~2BK)q6 zICP$}*XHS*kMgQ0Pm@vVJVhv6g)e(P%68W*efi|Be&pwfL-!?nZC}p&C|?%!WirZ@ zeR=0sRn1pgn3gEzo;TD&eNCQP!0u#B^Mw}ZnSO4jGU4<_PKFW62EPc7Ps~`C};?RA`UfY*TKFX`3zD!2BvM+!2EmeP& z=7$oc-1CN-ukQn(=CRX@Yo4Cj9lsvHx*A`TBk!7SrTH0O^B7Ihd~K7OkJ&6VPn-Q) zt?Pr!{ycxXu^DPU6Pkafn5UHFvL-!?nZC_6LzI;{Gm&qts_T{Ny?aKNa`TE0I zL(yMf?CtTcG0hkHqi6o^c2$2>oSBvDC-?SYoT+Ux&ctjMdkfn9F@6C}nP-*fdvY~0 zH)`e?YW_%}`D4XAJnPOEj zOfpKHr$l+=uHxS1H<RWJ|SvzZsOT0*+0 zDtNjm=b5{9Z!dXzB!=qTh(qTodu^T$rDt;Y+9*$xQR+NJ(RUTTT=IR{?(L;7kLv75 ze2_SFU$WQs<&5vk*F}AqjPiGP(Bdai-h;4;Bv?M7Qb+kx1(p7OGrpXNMfm~&Q9g1P z>&!CeM<l*m-yYsAQecf}(UZN76Cb!WH) zMyacbC@(YjOureFABw4|U@Z=2t61?V-Shiy!hEZwzY{e5(dLVG6wz=L+w;y#o4I>qlx4}DnFo&eo|h;O{S!4xR27_gKN_MUs6@m1 zE-Xevyel3JY4c9}PWgHGo3Eg1RON}D^i1YPjmeW1rS)#A}wov=69&Z9~hw=JZg>q#66Y`ph+`Hw#!war*!xd0l-`Oj`zsEVkrhuy`8%;)b>S_d zJPZ@y-+Tp;rdshO-IAhR9b70-6`%=Q1O+ARIEVJO#6RtUmuSKDN^D{LZZ zFm_HL#W#6{Hm^KL&9D_`mVKLVY33Q8H=ZW;J12^Hdgl!k!d9XA8EI3V_oe2afuTA# z;?OnEUR(21k^u$Eh~|?~>Y69YgRr0({^l#-X|;ZChw4gBo%za4>i>>(v0LGICwb#l znY0|K%5A-R*7bN3_?TdoYjP^bJARjl%8HTLyZi1U7WliB3jI`#zRXc?#Z1dgDkE01 zkM{?Tc*G*gPog)&-+To=u6!~b`lR%+zgsE(jpOZvjL5P0YT|S`Ql;}z&41s=&F_o1 z8s>QW#WHL$5_{jO?*l6IS&hE&amC~9>f__~i}<)efa2;ZV!~|glM-cHw~{g87!1|9 z5r-ZV*lWjxf$vM8jKqXwlzL1c%IH3zTqPz=T%s_lK zDk%A1Vx1iNz68n$FOyNe1pAROlm!B!eDR%D4RA)H%p9(XE2rN2{$TC{@UHkifHr^j zQndzH#fLem1z7_O_W`v{?gI*&v3&q-E?s8r1EwWsGIw1w&u|~`bg>UOiSw*%u916> zSHPyd_n(*Z%-!o7o=VN*%69ig9J=P&YioWa8Bm~%Xg(RGu6d%gHJ{1#%iV0_OBv;p zQRU_?@OSJ@G=?Y->t~Y-+!ld-`=9+ zWmeRQQ6s8qd-6Lr>U-sx7jWlM6QjNJAw6@i`Hj#E(lZ%HQ}SPJlliZ(3E>xK(&}&g zGk)ab_pD!)U6v^O#cwN?ns2{jV+#h_?2f3uS90zBn21~7#Dxj;@&-@0`z7ixN>=;M zWvPL_dvl|^cHddqg6{ZznT#*EW32hU+M>=tTVMVwbzfa+d?Y!NxwkjALX96IG=8$C zaoQZ1SFoJ_ynIbI1A`2CZUt{Yyf) ze%QSchaOkhYsZx->6rp$B(5Z*)Z+?K+Hqyp_vJepU&^?Wj8cy)MEN=MT-)<~36znz zl8o}V)wnVON_&qx<@@rjjW1=sI}t;5ZXUQYYI1j-06lTqrtBubl?bG|R% z+4xfOG8v`LOQO8b+<(^k#ezwM^<^1xZrh`F)+=CiU_eLDL#@TCYd?-Crpp0ld8KtgqqO>)>;QR93 zQH>{~)HP0&_BnRO_a#t9G@gu7KgV7Jlr}Fj-gmqcmva?$tYO;KJZqttmxly>f!^?eDH5nd*v)N>C}zWf8$`DY+~*>~4B`5-+1 zFhm&qt~UJ|9vOShxC3+RT{SizCt`CR#%9{u>3`I^dzF)xrAIRN)W%kulgj#7 z{p<by6Sy6cNNV3>3HR9u~Nj|%698!=X)@mXmrcWwPhY8-j3 zdm|2A*Mlf2B`d!rgp_NA_IqO>(W<@*vSBN|UescZaN zptN((oX^X)ek4~Mn(p3+L+2%XZC>_#U$*t5?TS+8B~jYEoc4M7dr@8{`%>p6QQFs@ zrhQ)mWrUZ>DD`VkM7iY~>ix)7KFB1>jFDcs_FF#-#eDEIEg#V4^!L{A=U9qYaIfVC z{4<`inU`AVyS64rmdRfkXAY|K0Wy_;4T`qTexG{YtIj={tV~*_=22Q?%Mj1R1e1P-iSljID2i459Ep$C?osJWR$wbiPF~iK(1TvZi#9<8Ktgq zqO>(W^nD4G5sfFK)HP0&|NA_3e_3gKMxyLfy<-~Rf`K->r-?em(`6k3y?jh^6&hId zHPF_oqz0bD@wztR&^5qbTLUBMk=(Vls_lw0`fUWonh@pTu~T)?TR%lJ^fhp6R0GMr zJP|nXzvA`v5&na1BmW@En`0=;I9_6%ob`PPlo1UiqdaYo2+9HhQQos{Ld!YDOx(s9 z>C3+R{YC>}9ymed0igDC4sCt)9o89ZPI@GBPj766XRP`@TjtbfXgQTOm#Mtq*G3$=#@TCYd|s|X zfijZkl2Pg!CrVr6BgxC$y)UZqWR$wbiSn;ajW77V1j>lUlTlu$Y8(0R#To0p5eFWZ{bc15Z4k|=Fn&icN*Ey~MeU+TOh$~#P6F8RI$$_Ou$ zQR;PPq8#AHw3W|0Q_`2Rz8A)3K7U!qX6(}Z+(TQpy;MD0Re5gCw{?4yd%`?-qR4Yl z?zpY@zes(aq{zE&a#?ymV+I@BSC+NJ`W{~9xns0Ehg%U>q4A!apR7qq^_+&GIyd6b zHO^jJ<4%6tPJuF#dy-M=8YfCyQpYO=`QM)OksiHZK=^Uw$CU%Vb~byd=tR zo4IG&_a#t9c$tjy7IjZVlwbX!nh&aTK_-1E>tA8+;aQ~4Jvg!W`GB^b@{kGReuqqY zWE&&>SU$js1NS=|BkBy#lywGRsPD->R?8E_vh_9Ud8o>Ri~hX-purO6!IMND#7@DV zH*Q8K2h4*U-EtV!Kn6=QR>bxXMo0rSJFaI#g%Vb~byd=sWZHlaTxz^>nPmX+F0%e4k$td-E@Q8Bl{#H(! zk-n6*xG*R2+)(EvoG$#>Oj|eJs6J0wd1O|4By-Pf@<3RNkhkFJ=8ms^<(0)wvOeu5tF-8lRJ^P@s(D zo@A7|#);C__>^3?+`#)5+S`TyNC<=A;Jt?)Ju3nCJNXYn|tCY8tn7 z<3Cv6+`1⩰bK#?D>`0`wNg`@8Ercf6M8uE$$#jnB*ZKZ3XTjQDJW$xx1UvkfYvT4zhQR*5eO1l>4hLTG)btHoN0Q9pVI8hoHA_z{}Rag0F!OH0vfa$dKc8ZN#B# zfW5W`deS4g1Ima7hFuZzbHt%*fW5W`2EGRFYDi1cF`DDwgDd#m%oiCR9O&CegE>aIHX4CVUu-5)hJ z!*kEGs(i<1ZBZrh^Bry7w#mw^i&A%e*VgyK+*&`^%OHx=pKt3%*s?XgByHuctw~9Z zpN*k9H{#GW&R$#N1G(Y_%8163QR*5eN?YSIk|VkMXjJ3LD0Ph!bxXMo0lV>mmiDr zGTE0pFNxAV`;UBI0%e4k$tXXzA}`-Cvg&(I`cl@v!q{9tYs%P+6N?|4>5=`vYSr3i zeOn(_bIvIu=b!>QZtJwWto!E zGNSQhl;2P_{!XB@dD-)QiE2;e?0+7H>fDG!=Oue>UM~2)Y->_dJ;^9_UJ|9v%X#0I zpJ;q3&ppW~bzTys&C5mKmp~ceWirZ@d3p5@)qCx#GsuGUW#4_WiP7O1Bp3Mr)p9={ z&?7(p(puwwhb8HeZ4RfWu`|}u7-*|IQPdd*vd$p##K~HoAeJ>hx6VV;{=D0|W|(v9 zXNZ||Q5o^){Vv$DwVz2_vQ{Nkbv}mb+=xThK6`ELFU!@DwW{rkQrA9F+S*_Aefg=V z_LF_7Yo93X+P?Ge_y@{}_LEV*Ud>7G21=Wk1K*cz{Yb9(1sJMxBMzOH?6rA0<@>U& zA8l8ZIxmUR=H-&_%TGsnne0oQmqcmbgV*zY36v3DCZoJ{MP8or@^!}V3{6XvnZt=- zEKiiRINpm^pBtW~yMlHg*o@xBIn{tpr3ngf-PI)Gt!oB#mnuAQr9?9 z+8TE|i~Ce^_nD~1lYOacoG9-%YjFeLmp~cOcrwbnRgJ#~C~aPjd|tNoBe~)iVW`fH zICNgJ*XHHW_hnl@+O8;dUJ|9v%PF6icSm`d>`R@OL}_0Oo$-AMlo4Jgqx{y2yc}Q! zc{?9plOw39X!t+PJ)pCamwor~CN^`$Wge)Xdu1L#Wy_Dv^vLICt!Hd|a^3pwvyH7V z4?IWY0bDH}xAll!)$bOcEM_-3lHSkUps^L!;&_i;ol{TIa_aA3P+Q}3(wDirtKp?o z&&374j(-q`u5tF-8lRP(DNsgoPclkf<3wp|d|GlPcb{u~DQh0dD0Ph!rCsxw^L+`F z5sfFK)N39@`OjZdYv7d@<|WF$LnUEsf4Kz%ZFVP%Iz%q(5a@L`<7I1L-q*k{UmR@RdoYl`?7Kf{G!W*VQ$_9>hPj8fZobFLJxkIf8NV%jOmF3Rj`um# zx#!th?xD>$pQLIWmyXajEJ)qSx@MTi>*soz$5D~=bL;P7C|l!;(pK(1)$mek{P~2{ zwGoG|arW98UzV#-pp0ld8KtgqqO>(Wl)TK{=Nn&2jVGhjHBOZF8O!;15&&gH8Tm+eE%QJIn{P^{qXvTH> zaVO^`Yf@6GD@A7L}~MK z&iCa#jW1>HNk*yjk|^!7|BUZTpp5V`8Kr*qC(0Xkvhu*Z^kv_Dsfo>D9ym?p0o)NZES^kpnk5Ec>tBUaa(6UW213z#YlR8o68$pZGEr2w;~rcjZo_q-1%ZC=j!zWhStOUcU@VW`fHICNgJ*XE^@ zm5bZ~WrUZ>D0N;ErOivXi+3N+R~ui-+>?w_=Ot0v-}61?`w}Q4yi7)Ux|(~4a`{g6 z*`um1HYI)8cVAOu^K(UPJ}->TwDs*5s@I&VYceCL0a=3!^IZMBEA!m5VzzF5z4cwI zJ?Z_-p?av~Io?}Q=eg6hJa-%BXKQ>`&M$Xu{YYy3#Tcq{BMx2T?6oyMEj?49jA%R= zrLJ+Jv^Cz7yv*HSL^Ym_Qr9?9+V?bNzAu3?qVZ&u`aMlVIdiRgziD;9!$6|!yHg`t z*n)vJyHiDN;JLCkfL?byUbY72d=0dYJ3B_`5RGEce1V- z=GOYTUgp+QLR;_0P`1Vwq^;bwH7Tj_D+*j4{~!)s( zS?alGBf9b1P&3k(efKwN9ymkffeXUeOj{qnP_fDG!*FJk~?N3W46euG(DH)}%eWJ9rKkxhU@1ojIMyYF`C@0N*XXg77C?ncW zMtP6A@B9!@+Ps|hec9HJBrji%p*lC>(0R#To0kLMmu>xMyQ0*2Nt8A(7kpoSBg)HU zU+TOhN}HEM-KZ3XTjNW`#);DY4wqTqmp~cO zcrr@;J6!GnN}HEM-BT~X@1Bubl?%f2uFADE03ECdz-mSgns$wK%s)+&j{D|JcOn@C-5(x#!|AAJEo^ zpJUa>7Nkcqe(8jg4|x5j&Ie~}`G7X>eY~iIyd6bHO^jJt97^bob;uv zVuca5ev*_Cc3T)>Y3oMVVu6sa$^q$Y4+H`W8_hbG3C( zc~7Fu+?f%*mFFJT_3Au#u9oL$^Rr)6^IVn3rzKbV?w=c*VIDtQm&$ z`Q@&yNlA^r3PW{n#Gz}Py|%`u$52Kzo{Uo0I8oXf&*Zx0ZYiqqWR$wbiPFC2l=;2{ z%82fgQR>&6{s<^-UM~13QSFI*r}zj%b#BC=^OC(bF9%~NBfK1ShKLUmht5m(+Pob2 zy!=+4~N;9sr#`evl9%$?Qbf%duAGWW2SSmz$x))23`(dI?RTe)W_xzcz4 z(%1}h&p9IZJU^V@M`6p>_>!Do?%JA^%ssEhP@Nlb=o)9Qt?|(q%8163QR*5eN?YSI za@}$VZdLJ8YCIXGu5qHYuPe{`z68pM#*m&qts=H)JbY~Am$AW?2} z!zMPj`QT_wcdHwUv;X<>>@V`f1zMh<$8PvfD-SxkuCmq`=E3^8SLVUf!#qJ-d);Q` zq*>qAzcup?bJDpYCtVua`Z#Ra+MklPWUWeS|1}t@b0ZF2`|P!~zbKhdpp0lg8Ktg$ zqO`R?=lk+IQSB$A)U{8P_V1_#yAYs^Xg?XH{yS=S0j15$p6^RkOCsl?*J7y7jW~2( zve)KikU86$j#N)FN}ZQPY4dX4_vLpRU&_5wGD@A7L}@>JT}`~LE(F1Fy?`ktBx&J%gy1u*~cXnf|&9&v(i#53V>~$e+p~yLQ|Mw>_FI(f8oS&>8N%g!ALv?P%p=+GIw#I`< zwAAo&yQ0)JPL#IB7kyuTKdSL$U+NksO1tLasV8?p8PRw$O1c@ukc?$tZPR5~cm@QLy4b8R2Cz zO8wa*qWmTz_j&l6ugOvDx!0leW#-ONV>D}3b&M|Vwc8Mh(X{#P`_${NRSsH~Hv8^} zjm_{Za=yqxmxVcqwvO0iqn7Ug4{d`tKUs?lb8G#KEpsbUsQ=wUpTbbK#%JWbWc^5L z{PhK{j(-q`u5tF-8Xrd)(ReaSUE@S)YuxQB?!(F5eNl}kqtrD{l=gG4BY(w#GNSQh zl=^e8M0pM_St)zI>MHT9MA>)eHhOFKVOucJW_PZrd0Z@O9_V!_>#srsfk(dGtee!p z8#rFqMjW~Z*lTNGPI@GFKpD|MGD=+oL}_ba%Gbb;8ehshmyA-^08!feuX*2>KpD|M zGD>~_MU;C@Oc;4?L88p~X60Txo_p#%SKJQ}%X75(o)230687Z!_1%vfn_-^2K;*g0 z!`wq#Coib=y(-TI8gJ`+VVA!eS#olkzAL-}+S8V}U-orafE<8Q=Jof~oJ8fUMq z@kP1fxdY0G#*l)A==@(%mHKHrx>8PRw$O8vgR&j6*p z{|X|}cN(|6y4FL!f}_l*R<8CXBp%Giv%OcqujhW(?K25r?jE_SzcvGQX@zZC8}K#);C__)xA}?*60krPO$`FLjL* zrG0HF$dEu8(ReaS{o2xJfzsyXk{{K7(D+iW_**bk=SCblFWGDJGKlIx8Oc4#D0N;E zrOnG3pO-&vd?|UEj8f+%QQG%Acu_BRKpEj>GD`h^2cq2n)-}fWJ9rx3<}QFQ%iPoE zgQGFfR(F9o`(G;0{vuBl*MVYrf>>_9%gTe^&PUe$!aP_%*ULPJJNEoMNLx?4!ul?W zk>pU{{j8aHn3FCNIq8L=tT<~AoCh=H~^o)_vf%4LkrvD`zOU-^hyAKQp-e8-+=v+sV{*bMW*#UdZP zD9i^79P29Unp02CPuBgyJXb$M%se*?ZT$&M*&3ggwq*TCYWzCF?%Ie$*EoA^jW3L$ zjA%R=rLJ+Jv^5@}{LiSylTqp#CrZ2CzUccBC?gtAMyc1^KM#~PFEbxyTR)P#oW)R` z8*%8oWUtN3r7@HdUM8c|c}bKuFM}2TRg{;>D0N;ErOnG_-E zHzlqsXYQgV4}`gg=Yl%-T(0FFdgh%6sAmzRE3^#*=^0rc3-dw!EGqNC*_hqk@|TeilBa$d52BsG3LUC^}=hput<+8UpdD_)?CXgnFE zu5qHYH6EzvzoHsXMyYF@DD8TC&-W!zMl_y`Qm?lY<(3aw_d85Wlzn$`qk&fATQJaO zcd@8>%*dJtdifL3tI)uVuYtB!B{gsZ$LrdNL)QR%Z4G47BeGVtT~X>9AWB;UUTn_Y ze@8Wt>`Pq(L}_ba;QJCNBN|9XscV2J56Z3k9flHR<}Qh7pgdzS57c??g<77Y&E0>g z=DF&OUn0uZta?eY`+(TQB+FQ+YRZbmA-O2i1m{aR#Y?)Kf32l85w(LAN zD{U3kp2%|}H)5#HjW~3Tv)9)6j9hV9lad-wMyYF@C~b`g8RUPX8c#;4Yn&)=+hl#O z%E-;SX=H{#HF$zGe6v%W8ZGP3_lMyd0X zC~aO&`zY^^@-i8v&P$@SbI;ru$_Ou$QR=yeDA(L$<(_$oGIO}QVCfBS* z+BQV)L7>f_ooC%so=Ka1#QNH1n0qc2x#x;7AJEqFX6rj+=cVpsEiueJ^|Q3hJ?DnD zz64vg#uucm+_g0+squGUsLqWzbd9su*7$<-et|Ng@nn>`#);C__`pNSMTvaBLo!NT V<3wrSQ@%KcGNSQhl=?m8{|7E&g$V!v From 14b865d674a07c1e752771d2fa4e0065c49f4e35 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 3 Aug 2011 08:28:15 -0400 Subject: [PATCH 043/202] kill dead code --- src/core/model/attribute-list.cc | 56 -------------------------------- src/core/model/attribute-list.h | 15 --------- 2 files changed, 71 deletions(-) diff --git a/src/core/model/attribute-list.cc b/src/core/model/attribute-list.cc index 251ccdba8..e22e7e001 100644 --- a/src/core/model/attribute-list.cc +++ b/src/core/model/attribute-list.cc @@ -258,60 +258,4 @@ AttributeList::DeserializeFromString (std::string str) return true; } -UnsafeAttributeList::UnsafeAttributeList () -{ -} -UnsafeAttributeList::UnsafeAttributeList (const UnsafeAttributeList &o) -{ - for (uint32_t i = 0; i < o.m_attributes.size (); ++i) - { - Set (o.m_attributes[i].first, *(o.m_attributes[i].second)); - } -} -UnsafeAttributeList & -UnsafeAttributeList::operator = (const UnsafeAttributeList &o) -{ - m_attributes.clear (); - for (uint32_t i = 0; i < o.m_attributes.size (); ++i) - { - Set (o.m_attributes[i].first, *(o.m_attributes[i].second)); - } - return *this; -} - -UnsafeAttributeList::~UnsafeAttributeList () -{ - m_attributes.clear (); -} -void -UnsafeAttributeList::Set (std::string name, const AttributeValue ¶m) -{ - if (name == "") - { - return; - } - for (uint32_t i = 0; i < m_attributes.size (); ++i) - { - if (m_attributes[i].first == name) - { - m_attributes[i].second = param.Copy (); - return; - } - } - m_attributes.push_back (std::make_pair (name, param.Copy ())); -} - -AttributeList -UnsafeAttributeList::GetSafe (std::string tidName) const -{ - AttributeList list; - for (uint32_t i = 0; i < m_attributes.size (); ++i) - { - TypeId tid = TypeId::LookupByName (tidName); - list.SetWithTid (tid, m_attributes[i].first, *m_attributes[i].second); - } - return list; -} - - } // namespace ns3 diff --git a/src/core/model/attribute-list.h b/src/core/model/attribute-list.h index 00ee0b3e0..be2583f43 100644 --- a/src/core/model/attribute-list.h +++ b/src/core/model/attribute-list.h @@ -108,21 +108,6 @@ private: Attrs m_attributes; }; -class UnsafeAttributeList -{ -public: - UnsafeAttributeList (); - UnsafeAttributeList (const UnsafeAttributeList &o); - UnsafeAttributeList &operator = (const UnsafeAttributeList &o); - ~UnsafeAttributeList (); - - void Set (std::string name, const AttributeValue ¶m); - - AttributeList GetSafe (std::string name) const; -private: - std::vector > > m_attributes; -}; - } // namespace ns3 #endif /* ATTRIBUTE_LIST_H */ From a0df125410010c752178ba9ea071ced4f96eb504 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 3 Aug 2011 09:35:03 -0400 Subject: [PATCH 044/202] export information data structure in API. --- src/core/model/type-id.cc | 52 +++++++++++++++++++++++++-------------- src/core/model/type-id.h | 24 ++++++++++++++++++ 2 files changed, 57 insertions(+), 19 deletions(-) diff --git a/src/core/model/type-id.cc b/src/core/model/type-id.cc index d52b803a6..d1d46fdf8 100644 --- a/src/core/model/type-id.cc +++ b/src/core/model/type-id.cc @@ -54,6 +54,7 @@ public: ns3::Ptr spec, ns3::Ptr checker); uint32_t GetAttributeN (uint16_t uid) const; + struct ns3::TypeId::AttributeInformation GetAttribute(uint16_t uid, uint32_t i) const; std::string GetAttributeName (uint16_t uid, uint32_t i) const; std::string GetAttributeHelp (uint16_t uid, uint32_t i) const; uint32_t GetAttributeFlags (uint16_t uid, uint32_t i) const; @@ -65,6 +66,7 @@ public: std::string help, ns3::Ptr accessor); uint32_t GetTraceSourceN (uint16_t uid) const; + struct ns3::TypeId::TraceSourceInformation GetTraceSource(uint16_t uid, uint32_t i) const; std::string GetTraceSourceName (uint16_t uid, uint32_t i) const; std::string GetTraceSourceHelp (uint16_t uid, uint32_t i) const; ns3::Ptr GetTraceSourceAccessor (uint16_t uid, uint32_t i) const; @@ -74,19 +76,6 @@ private: bool HasTraceSource (uint16_t uid, std::string name); bool HasAttribute (uint16_t uid, std::string name); - struct AttributeInformation { - std::string name; - std::string help; - uint32_t flags; - ns3::Ptr initialValue; - ns3::Ptr param; - ns3::Ptr checker; - }; - struct TraceSourceInformation { - std::string name; - std::string help; - ns3::Ptr accessor; - }; struct IidInformation { std::string name; uint16_t parent; @@ -94,8 +83,8 @@ private: bool hasConstructor; ns3::Callback constructor; bool mustHideFromDocumentation; - std::vector attributes; - std::vector traceSources; + std::vector attributes; + std::vector traceSources; }; typedef std::vector::const_iterator Iterator; @@ -242,7 +231,7 @@ IidManager::HasAttribute (uint16_t uid, struct IidInformation *information = LookupInformation (uid); while (true) { - for (std::vector::const_iterator i = information->attributes.begin (); + for (std::vector::const_iterator i = information->attributes.begin (); i != information->attributes.end (); ++i) { if (i->name == name) @@ -277,7 +266,7 @@ IidManager::AddAttribute (uint16_t uid, NS_FATAL_ERROR ("Attribute \"" << name << "\" already registered on tid=\"" << information->name << "\""); } - struct AttributeInformation param; + struct ns3::TypeId::AttributeInformation param; param.name = name; param.help = help; param.flags = flags; @@ -294,6 +283,13 @@ IidManager::GetAttributeN (uint16_t uid) const struct IidInformation *information = LookupInformation (uid); return information->attributes.size (); } +struct ns3::TypeId::AttributeInformation +IidManager::GetAttribute(uint16_t uid, uint32_t i) const +{ + struct IidInformation *information = LookupInformation (uid); + NS_ASSERT (i < information->attributes.size ()); + return information->attributes[i]; +} std::string IidManager::GetAttributeName (uint16_t uid, uint32_t i) const { @@ -344,7 +340,7 @@ IidManager::HasTraceSource (uint16_t uid, struct IidInformation *information = LookupInformation (uid); while (true) { - for (std::vector::const_iterator i = information->traceSources.begin (); + for (std::vector::const_iterator i = information->traceSources.begin (); i != information->traceSources.end (); ++i) { if (i->name == name) @@ -376,7 +372,7 @@ IidManager::AddTraceSource (uint16_t uid, NS_FATAL_ERROR ("Trace source \"" << name << "\" already registered on tid=\"" << information->name << "\""); } - struct TraceSourceInformation source; + struct ns3::TypeId::TraceSourceInformation source; source.name = name; source.help = help; source.accessor = accessor; @@ -388,6 +384,13 @@ IidManager::GetTraceSourceN (uint16_t uid) const struct IidInformation *information = LookupInformation (uid); return information->traceSources.size (); } +struct ns3::TypeId::TraceSourceInformation +IidManager::GetTraceSource(uint16_t uid, uint32_t i) const +{ + struct IidInformation *information = LookupInformation (uid); + NS_ASSERT (i < information->traceSources.size ()); + return information->traceSources[i]; +} std::string IidManager::GetTraceSourceName (uint16_t uid, uint32_t i) const { @@ -612,6 +615,11 @@ TypeId::GetAttributeN (void) const uint32_t n = Singleton::Get ()->GetAttributeN (m_tid); return n; } +struct TypeId::AttributeInformation +TypeId::GetAttribute(uint32_t i) const +{ + return Singleton::Get ()->GetAttribute(m_tid, i); +} std::string TypeId::GetAttributeName (uint32_t i) const { @@ -662,6 +670,12 @@ TypeId::GetTraceSourceN (void) const { return Singleton::Get ()->GetTraceSourceN (m_tid); } +struct TypeId::TraceSourceInformation +TypeId::GetTraceSource(uint32_t i) const +{ + return Singleton::Get ()->GetTraceSource(m_tid, i); +} + std::string TypeId::GetTraceSourceName (uint32_t i) const { diff --git a/src/core/model/type-id.h b/src/core/model/type-id.h index f79514a1e..0b96ca1c8 100644 --- a/src/core/model/type-id.h +++ b/src/core/model/type-id.h @@ -53,6 +53,19 @@ public: ATTR_CONSTRUCT = 1<<2, /**< The attribute can be written at construction-time */ ATTR_SGC = ATTR_GET | ATTR_SET | ATTR_CONSTRUCT, /**< The attribute can be read, and written at any time */ }; + struct AttributeInformation { + std::string name; + std::string help; + uint32_t flags; + ns3::Ptr initialValue; + ns3::Ptr param; + ns3::Ptr checker; + }; + struct TraceSourceInformation { + std::string name; + std::string help; + ns3::Ptr accessor; + }; /** * \param name the name of the requested TypeId @@ -132,6 +145,12 @@ public: * \returns the number of attributes associated to this TypeId */ uint32_t GetAttributeN (void) const; + /** + * \param i index into attribute array + * \returns the information associated to attribute whose + * index is i. + */ + struct TypeId::AttributeInformation GetAttribute(uint32_t i) const; /** * \param i index into attribute array * \returns the name associated to the attribute whose @@ -190,6 +209,11 @@ public: * \returns the number of trace sources defined in this TypeId. */ uint32_t GetTraceSourceN (void) const; + /** + * \param i index into trace source array. + * \returns detailed information about the requested trace source. + */ + struct TypeId::TraceSourceInformation GetTraceSource(uint32_t i) const; /** * \param i index into trace source array. * \returns the name of the requested trace source. From b735008d61e005630cb78c3baeb95966f1f0f086 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 3 Aug 2011 09:42:01 -0400 Subject: [PATCH 045/202] use correct name instead of _very_ old names --- src/core/model/type-id.cc | 32 ++++++++++++++++---------------- src/core/model/type-id.h | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/core/model/type-id.cc b/src/core/model/type-id.cc index d1d46fdf8..48a459164 100644 --- a/src/core/model/type-id.cc +++ b/src/core/model/type-id.cc @@ -257,7 +257,7 @@ IidManager::AddAttribute (uint16_t uid, std::string help, uint32_t flags, ns3::Ptr initialValue, - ns3::Ptr spec, + ns3::Ptr accessor, ns3::Ptr checker) { struct IidInformation *information = LookupInformation (uid); @@ -266,14 +266,14 @@ IidManager::AddAttribute (uint16_t uid, NS_FATAL_ERROR ("Attribute \"" << name << "\" already registered on tid=\"" << information->name << "\""); } - struct ns3::TypeId::AttributeInformation param; - param.name = name; - param.help = help; - param.flags = flags; - param.initialValue = initialValue; - param.param = spec; - param.checker = checker; - information->attributes.push_back (param); + struct ns3::TypeId::AttributeInformation info; + info.name = name; + info.help = help; + info.flags = flags; + info.initialValue = initialValue; + info.accessor = accessor; + info.checker = checker; + information->attributes.push_back (info); } @@ -323,7 +323,7 @@ IidManager::GetAttributeAccessor (uint16_t uid, uint32_t i) const { struct IidInformation *information = LookupInformation (uid); NS_ASSERT (i < information->attributes.size ()); - return information->attributes[i].param; + return information->attributes[i].accessor; } ns3::Ptr IidManager::GetAttributeChecker (uint16_t uid, uint32_t i) const @@ -576,10 +576,10 @@ TypeId TypeId::AddAttribute (std::string name, std::string help, const AttributeValue &initialValue, - Ptr param, + Ptr accessor, Ptr checker) { - Singleton::Get ()->AddAttribute (m_tid, name, help, ATTR_SGC, initialValue.Copy (), param, checker); + Singleton::Get ()->AddAttribute (m_tid, name, help, ATTR_SGC, initialValue.Copy (), accessor, checker); return *this; } @@ -588,10 +588,10 @@ TypeId::AddAttribute (std::string name, std::string help, uint32_t flags, const AttributeValue &initialValue, - Ptr param, + Ptr accessor, Ptr checker) { - Singleton::Get ()->AddAttribute (m_tid, name, help, flags, initialValue.Copy (), param, checker); + Singleton::Get ()->AddAttribute (m_tid, name, help, flags, initialValue.Copy (), accessor, checker); return *this; } @@ -647,8 +647,8 @@ Ptr TypeId::GetAttributeAccessor (uint32_t i) const { // Used exclusively by the Object class. - Ptr param = Singleton::Get ()->GetAttributeAccessor (m_tid, i); - return param; + Ptr accessor = Singleton::Get ()->GetAttributeAccessor (m_tid, i); + return accessor; } uint32_t TypeId::GetAttributeFlags (uint32_t i) const diff --git a/src/core/model/type-id.h b/src/core/model/type-id.h index 0b96ca1c8..ef2bf1af5 100644 --- a/src/core/model/type-id.h +++ b/src/core/model/type-id.h @@ -58,7 +58,7 @@ public: std::string help; uint32_t flags; ns3::Ptr initialValue; - ns3::Ptr param; + ns3::Ptr accessor; ns3::Ptr checker; }; struct TraceSourceInformation { From 10a4ade82a21dcba81b742c23a02273aca46d612 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 3 Aug 2011 09:42:10 -0400 Subject: [PATCH 046/202] use new API --- src/core/model/object-base.cc | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/core/model/object-base.cc b/src/core/model/object-base.cc index a0ec39708..ea2d17cce 100644 --- a/src/core/model/object-base.cc +++ b/src/core/model/object-base.cc @@ -66,12 +66,10 @@ ObjectBase::ConstructSelf (const AttributeList &attributes) NS_LOG_DEBUG ("construct tid="<checker == checker) + if (j->checker == info.checker) { // We have a matching attribute value. - if (DoSet (accessor, checker, *j->value)) + if (DoSet (info.accessor, info.checker, *j->value)) { NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< - tid.GetAttributeName (i)<<"\""); + info.name<<"\""); found = true; break; } @@ -98,13 +96,13 @@ ObjectBase::ConstructSelf (const AttributeList &attributes) for (AttributeList::Attrs::const_iterator j = AttributeList::GetGlobal ()->m_attributes.begin (); j != AttributeList::GetGlobal ()->m_attributes.end (); j++) { - if (j->checker == checker) + if (j->checker == info.checker) { // We have a matching attribute value. - if (DoSet (accessor, checker, *j->value)) + if (DoSet (info.accessor, info.checker, *j->value)) { NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< - tid.GetAttributeName (i)<<"\" from global"); + info.name <<"\" from global"); found = true; break; } @@ -132,10 +130,10 @@ ObjectBase::ConstructSelf (const AttributeList &attributes) std::string value = tmp.substr (equal+1, tmp.size () - equal - 1); if (name == tid.GetAttributeFullName (i)) { - if (DoSet (accessor, checker, StringValue (value))) + if (DoSet (info.accessor, info.checker, StringValue (value))) { NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< - tid.GetAttributeName (i)<<"\" from env var"); + info.name <<"\" from env var"); found = true; break; } @@ -149,9 +147,9 @@ ObjectBase::ConstructSelf (const AttributeList &attributes) if (!found) { // No matching attribute value so we try to set the default value. - DoSet (accessor, checker, *initial); + DoSet (info.accessor, info.checker, *info.initialValue); NS_LOG_DEBUG ("construct \""<< tid.GetName ()<<"::"<< - tid.GetAttributeName (i)<<"\" from initial value."); + info.name <<"\" from initial value."); } } tid = tid.GetParent (); From aef38c492b4e443d3cf5672a8d9b73a733e2d3e8 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 3 Aug 2011 10:04:56 -0400 Subject: [PATCH 047/202] use new API. kill old one. --- .../model/attribute-default-iterator.cc | 23 ++++++------ src/config-store/model/attribute-iterator.cc | 28 +++++++-------- src/core/model/attribute-list.cc | 13 +++---- src/core/model/attribute-list.h | 2 +- src/core/model/command-line.cc | 7 ++-- src/core/model/config.cc | 2 +- src/core/model/object-base.cc | 14 ++++---- src/core/model/type-id.cc | 34 +++--------------- src/core/model/type-id.h | 36 +++---------------- utils/print-introspected-doxygen.cc | 35 +++++++++--------- 10 files changed, 67 insertions(+), 127 deletions(-) diff --git a/src/config-store/model/attribute-default-iterator.cc b/src/config-store/model/attribute-default-iterator.cc index aec678839..ddf366b39 100644 --- a/src/config-store/model/attribute-default-iterator.cc +++ b/src/config-store/model/attribute-default-iterator.cc @@ -43,43 +43,40 @@ AttributeDefaultIterator::Iterate (void) bool calledStart = false; for (uint32_t j = 0; j < tid.GetAttributeN (); j++) { - uint32_t flags = tid.GetAttributeFlags (j); - if (!(flags & TypeId::ATTR_CONSTRUCT)) + struct TypeId::AttributeInformation info = tid.GetAttribute (j); + if (!(info.flags & TypeId::ATTR_CONSTRUCT)) { // we can't construct the attribute, so, there is no // initial value for the attribute continue; } - Ptr accessor = tid.GetAttributeAccessor (j); //No accessor, go to next attribute - if (accessor == 0) + if (info.accessor == 0) { continue; } - if (!accessor->HasSetter ()) + if (!info.accessor->HasSetter ()) { //skip this attribute it doesn't have an setter continue; } - Ptr checker = tid.GetAttributeChecker (j); - if (checker == 0) + if (info.checker == 0) { //skip, it doesn't have a checker continue; } - Ptr value = tid.GetAttributeInitialValue (j); - if (value == 0) + if (info.initialValue == 0) { //No value, check next attribute continue; } - Ptr vector = DynamicCast (value); + Ptr vector = DynamicCast (info.initialValue); if (vector != 0) { //a vector value, won't take it continue; } - Ptr pointer = DynamicCast (value); + Ptr pointer = DynamicCast (info.initialValue); if (pointer != 0) { //pointer value, won't take it @@ -88,9 +85,9 @@ AttributeDefaultIterator::Iterate (void) //We take only values, no pointers or vectors if (!calledStart) { - StartVisitTypeId (tid.GetName ()); + StartVisitTypeId (info.name); } - VisitAttribute (tid, tid.GetAttributeName (j), value->SerializeToString (checker), j); + VisitAttribute (tid, info.name, info.initialValue->SerializeToString (info.checker), j); calledStart = true; } if (calledStart) diff --git a/src/config-store/model/attribute-iterator.cc b/src/config-store/model/attribute-iterator.cc index a6cd0c77c..fe6d634d6 100644 --- a/src/config-store/model/attribute-iterator.cc +++ b/src/config-store/model/attribute-iterator.cc @@ -203,17 +203,17 @@ AttributeIterator::DoIterate (Ptr object) NS_LOG_DEBUG ("store " << tid.GetName ()); for (uint32_t i = 0; i < tid.GetAttributeN (); ++i) { - Ptr checker = tid.GetAttributeChecker (i); - const PointerChecker *ptrChecker = dynamic_cast (PeekPointer (checker)); + struct TypeId::AttributeInformation info = tid.GetAttribute(i); + const PointerChecker *ptrChecker = dynamic_cast (PeekPointer (info.checker)); if (ptrChecker != 0) { - NS_LOG_DEBUG ("pointer attribute " << tid.GetAttributeName (i)); + NS_LOG_DEBUG ("pointer attribute " << info.name); PointerValue ptr; - object->GetAttribute (tid.GetAttributeName (i), ptr); + object->GetAttribute (info.name, ptr); Ptr tmp = ptr.Get (); if (tmp != 0) { - StartVisitPointerAttribute (object, tid.GetAttributeName (i), + StartVisitPointerAttribute (object, info.name, tmp); m_examined.push_back (object); DoIterate (tmp); @@ -223,13 +223,13 @@ AttributeIterator::DoIterate (Ptr object) continue; } // attempt to cast to an object vector. - const ObjectVectorChecker *vectorChecker = dynamic_cast (PeekPointer (checker)); + const ObjectVectorChecker *vectorChecker = dynamic_cast (PeekPointer (info.checker)); if (vectorChecker != 0) { - NS_LOG_DEBUG ("vector attribute " << tid.GetAttributeName (i)); + NS_LOG_DEBUG ("vector attribute " << info.name); ObjectVectorValue vector; - object->GetAttribute (tid.GetAttributeName (i), vector); - StartVisitArrayAttribute (object, tid.GetAttributeName (i), vector); + object->GetAttribute (info.name, vector); + StartVisitArrayAttribute (object, info.name, vector); for (uint32_t j = 0; j < vector.GetN (); ++j) { NS_LOG_DEBUG ("vector attribute item " << j); @@ -243,16 +243,14 @@ AttributeIterator::DoIterate (Ptr object) EndVisitArrayAttribute (); continue; } - uint32_t flags = tid.GetAttributeFlags (i); - Ptr accessor = tid.GetAttributeAccessor (i); - if ((flags & TypeId::ATTR_GET) && accessor->HasGetter () && - (flags & TypeId::ATTR_SET) && accessor->HasSetter ()) + if ((info.flags & TypeId::ATTR_GET) && info.accessor->HasGetter () && + (info.flags & TypeId::ATTR_SET) && info.accessor->HasSetter ()) { - VisitAttribute (object, tid.GetAttributeName (i)); + VisitAttribute (object, info.name); } else { - NS_LOG_DEBUG ("could not store " << tid.GetAttributeName (i)); + NS_LOG_DEBUG ("could not store " << info.name); } } } diff --git a/src/core/model/attribute-list.cc b/src/core/model/attribute-list.cc index e22e7e001..16c2f6b25 100644 --- a/src/core/model/attribute-list.cc +++ b/src/core/model/attribute-list.cc @@ -62,7 +62,7 @@ AttributeList::~AttributeList () void AttributeList::Set (std::string name, const AttributeValue &value) { - struct TypeId::AttributeInfo info; + struct TypeId::AttributeInformation info; bool ok = TypeId::LookupAttributeByFullName (name, &info); if (!ok) { @@ -77,7 +77,7 @@ AttributeList::Set (std::string name, const AttributeValue &value) bool AttributeList::SetFailSafe (std::string name, const AttributeValue &value) { - struct TypeId::AttributeInfo info; + struct TypeId::AttributeInformation info; bool ok = TypeId::LookupAttributeByFullName (name, &info); if (!ok) { @@ -89,7 +89,7 @@ AttributeList::SetFailSafe (std::string name, const AttributeValue &value) void AttributeList::SetWithTid (TypeId tid, std::string name, const AttributeValue & value) { - struct TypeId::AttributeInfo info; + struct TypeId::AttributeInformation info; bool ok = tid.LookupAttributeByName (name, &info); if (!ok) { @@ -122,7 +122,7 @@ AttributeList::DoSetOne (Ptr checker, const AttributeVal m_attributes.push_back (attr); } bool -AttributeList::DoSet (struct TypeId::AttributeInfo *info, const AttributeValue &value) +AttributeList::DoSet (struct TypeId::AttributeInformation *info, const AttributeValue &value) { if (info->checker == 0) { @@ -175,7 +175,8 @@ AttributeList::LookupAttributeFullNameByChecker (Ptr che TypeId tid = TypeId::GetRegistered (i); for (uint32_t j = 0; j < tid.GetAttributeN (); j++) { - if (checker == tid.GetAttributeChecker (j)) + struct TypeId::AttributeInformation info = tid.GetAttribute(j); + if (checker == info.checker) { return tid.GetAttributeFullName (j); } @@ -220,7 +221,7 @@ AttributeList::DeserializeFromString (std::string str) else { std::string name = str.substr (cur, equal-cur); - struct TypeId::AttributeInfo info; + struct TypeId::AttributeInformation info; if (!TypeId::LookupAttributeByFullName (name, &info)) { NS_FATAL_ERROR ("Error while parsing serialized attribute: name does not exist: \"" << name << "\""); diff --git a/src/core/model/attribute-list.h b/src/core/model/attribute-list.h index be2583f43..17850adfb 100644 --- a/src/core/model/attribute-list.h +++ b/src/core/model/attribute-list.h @@ -101,7 +101,7 @@ private: - bool DoSet (struct TypeId::AttributeInfo *info, const AttributeValue ¶m); + bool DoSet (struct TypeId::AttributeInformation *info, const AttributeValue ¶m); void DoSetOne (Ptr checker, const AttributeValue ¶m); std::string LookupAttributeFullNameByChecker (Ptr checker) const; diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc index aab4966fe..559aa2f18 100644 --- a/src/core/model/command-line.cc +++ b/src/core/model/command-line.cc @@ -157,10 +157,9 @@ CommandLine::PrintAttributes (std::string type) const for (uint32_t i = 0; i < tid.GetAttributeN (); ++i) { std::cout << " --"< checker = tid.GetAttributeChecker (i); - Ptr initial = tid.GetAttributeInitialValue (i); - std::cout << initial->SerializeToString (checker) << "]: " - << tid.GetAttributeHelp (i) << std::endl; + struct TypeId::AttributeInformation info = tid.GetAttribute (i); + std::cout << info.initialValue->SerializeToString (info.checker) << "]: " + << info.help << std::endl; } } diff --git a/src/core/model/config.cc b/src/core/model/config.cc index 2fd0687cc..a1b3bf158 100644 --- a/src/core/model/config.cc +++ b/src/core/model/config.cc @@ -377,7 +377,7 @@ Resolver::DoResolve (std::string path, Ptr root) { // this is a normal attribute. TypeId tid = root->GetInstanceTypeId (); - struct TypeId::AttributeInfo info; + struct TypeId::AttributeInformation info; if (!tid.LookupAttributeByName (item, &info)) { NS_LOG_DEBUG ("Requested item="<accessor = tid.GetAttributeAccessor (i); - info->flags = tid.GetAttributeFlags (i); - info->initialValue = tid.GetAttributeInitialValue (i); - info->checker = tid.GetAttributeChecker (i); + *info = tmp; return true; } } @@ -643,27 +640,6 @@ TypeId::GetAttributeInitialValue (uint32_t i) const Ptr value = Singleton::Get ()->GetAttributeInitialValue (m_tid, i); return value; } -Ptr -TypeId::GetAttributeAccessor (uint32_t i) const -{ - // Used exclusively by the Object class. - Ptr accessor = Singleton::Get ()->GetAttributeAccessor (m_tid, i); - return accessor; -} -uint32_t -TypeId::GetAttributeFlags (uint32_t i) const -{ - // Used exclusively by the Object class. - uint32_t flags = Singleton::Get ()->GetAttributeFlags (m_tid, i); - return flags; -} -Ptr -TypeId::GetAttributeChecker (uint32_t i) const -{ - // Used exclusively by the Object class. - Ptr checker = Singleton::Get ()->GetAttributeChecker (m_tid, i); - return checker; -} uint32_t TypeId::GetTraceSourceN (void) const diff --git a/src/core/model/type-id.h b/src/core/model/type-id.h index ef2bf1af5..ed752be77 100644 --- a/src/core/model/type-id.h +++ b/src/core/model/type-id.h @@ -176,21 +176,6 @@ public: * is initialized. */ Ptr GetAttributeInitialValue (uint32_t i) const; - /** - * \param i index into attribute array. - * \returns the flags associated to the requested attribute. - */ - uint32_t GetAttributeFlags (uint32_t i) const; - /** - * \param i index into attribute array. - * \returns the checker associated to the requested attribute. - */ - Ptr GetAttributeChecker (uint32_t i) const; - /** - * \param i index into attribute array. - * \returns the accessor associated to the requested attribute. - */ - Ptr GetAttributeAccessor (uint32_t i) const; /** * \returns a callback which can be used to instanciate an object @@ -318,26 +303,13 @@ public: TypeId HideFromDocumentation (void); - /** - * \brief store together a set of attribute properties. - */ - struct AttributeInfo { - // The accessor associated to the attribute. - Ptr accessor; - // The initial value associated to the attribute. - Ptr initialValue; - // The set of access control flags associated to the attribute. - uint32_t flags; - // The checker associated to the attribute. - Ptr checker; - }; /** * \param name the name of the requested attribute - * \param info a pointer to the TypeId::AttributeInfo data structure + * \param info a pointer to the TypeId::AttributeInformation data structure * where the result value of this method will be stored. * \returns true if the requested attribute could be found, false otherwise. */ - bool LookupAttributeByName (std::string name, struct AttributeInfo *info) const; + bool LookupAttributeByName (std::string name, struct AttributeInformation *info) const; /** * \param name the name of the requested trace source * \returns the trace source accessor which can be used to connect and disconnect @@ -350,11 +322,11 @@ public: /** * \param fullName the full name of the requested attribute - * \param info a pointer to the TypeId::AttributeInfo data structure + * \param info a pointer to the TypeId::AttributeInformation data structure * where the result value of this method will be stored. * \returns the Accessor associated to the requested attribute */ - static bool LookupAttributeByFullName (std::string fullName, struct AttributeInfo *info); + static bool LookupAttributeByFullName (std::string fullName, struct AttributeInformation *info); /** * \returns the internal integer which uniquely identifies this diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index be89b7574..dc71f2c1f 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -19,32 +19,29 @@ PrintAttributes (TypeId tid, std::ostream &os) os << "