Attachment #2594 for bug #2505

View | Details | Raw Unified | Return to bug 2505
Collapse All | Expand All




Icmpv4Echo::Deserialize (Buffer::Iterator start)
{
  NS_LOG_FUNCTION (this << &start);

  uint32_t optionalPayloadSize = start.GetRemainingSize () -4;
  NS_ASSERT (start.GetRemainingSize () >= 4);

  m_identifier = start.ReadNtohU16 ();
  m_sequence = start.ReadNtohU16 ();
  if (optionalPayloadSize != m_dataSize)
  uint32_t size = start.GetSize () - 4;
  if (size != m_dataSize)
    {
      delete [] m_data;
      m_dataSize = optionalPayloadSize;
      m_data = new uint8_t[m_dataSize];
    }
  start.Read (m_data, m_dataSize);
  return m_dataSize+4;
}
void 
Icmpv4Echo::Print (std::ostream &os) const
{
  NS_LOG_FUNCTION (this << &os);
  os << "identifier=" << m_identifier << ", sequence="  << m_sequence << ", data size=" << m_dataSize;
}






uint32_t Icmpv6DestinationUnreachable::Deserialize (Buffer::Iterator start)
{
  NS_LOG_FUNCTION (this << &start);
  uint16_t length = start.GetRemainingSize () - 8;
  uint8_t* data = new uint8_t[length];
  Buffer::Iterator i = start;


uint32_t Icmpv6TooBig::Deserialize (Buffer::Iterator start) 
{
  NS_LOG_FUNCTION (this << &start);
  uint16_t length = start.GetRemainingSize () - 8;
  uint8_t* data = new uint8_t[length];
  Buffer::Iterator i = start;


{
  NS_LOG_FUNCTION (this << &start);
  
  uint16_t length = start.GetRemainingSize () - 8;
  uint8_t* data = new uint8_t[length];
  Buffer::Iterator i = start;


uint32_t Icmpv6ParameterError::Deserialize (Buffer::Iterator start) 
{
  NS_LOG_FUNCTION (this << &start);
  uint16_t length = start.GetRemainingSize () - 8;
  uint8_t* data = new uint8_t[length];
  Buffer::Iterator i = start;


(-)a/src/internet/model/rip-header.cc (-1 / +1 lines)

Lines 225-231	Link Here

225

  uint16_t temp16 = i.ReadU16 ();

225

  uint16_t temp16 = i.ReadU16 ();

226

  NS_ASSERT_MSG (temp16 == 0, "RIP received a message with invalid filled flags, aborting.");

226

  NS_ASSERT_MSG (temp16 == 0, "RIP received a message with invalid filled flags, aborting.");

227

228

  uint8_t rteNumber = (i.GetSize () - 4)/20;

228

  uint8_t rteNumber = i.GetRemainingSize ()/20;

229

  for (uint8_t n=0; n<rteNumber; n++)

229

  for (uint8_t n=0; n<rteNumber; n++)

230

231

      RipRte rte;

231

      RipRte rte;

(-)a/src/internet/model/ripng-header.cc (-1 / +1 lines)

Lines 208-214	Link Here

208

  uint16_t temp16 = i.ReadU16 ();

208

  uint16_t temp16 = i.ReadU16 ();

209

  NS_ASSERT_MSG (temp16 == 0, "RipNG received a message with invalid filled flags, aborting.");

209

  NS_ASSERT_MSG (temp16 == 0, "RipNG received a message with invalid filled flags, aborting.");

210

211

  uint8_t rteNumber = (i.GetSize () - 4)/20;

211

  uint8_t rteNumber = i.GetRemainingSize ()/20;

212

  for (uint8_t n=0; n<rteNumber; n++)

212

  for (uint8_t n=0; n<rteNumber; n++)

213

214

      RipNgRte rte;

214

      RipNgRte rte;

(-)a/src/network/bindings/modulegen__gcc_ILP32.py (-11 / +104 lines)

Lines 178-183	Link Here

178

    module.add_class('TypeId', import_from_module='ns.core')

178

    module.add_class('TypeId', import_from_module='ns.core')

179

    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]

179

    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]

180

    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')

180

    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')

181

    ## type-id.h (module 'core'): ns3::TypeId::SupportLevel [enumeration]

182

    module.add_enum('SupportLevel', ['SUPPORTED', 'DEPRECATED', 'OBSOLETE'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')

181

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]

183

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]

182

    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])

184

    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])

183

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]

185

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]

Lines 356-361	Link Here

356

    module.add_class('DynamicQueueLimits', parent=root_module['ns3::QueueLimits'])

358

    module.add_class('DynamicQueueLimits', parent=root_module['ns3::QueueLimits'])

357

    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]

359

    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]

358

    module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])

360

    module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])

361

    ## attribute.h (module 'core'): ns3::EmptyAttributeAccessor [class]

362

    module.add_class('EmptyAttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::AttributeAccessor'])

363

    ## attribute.h (module 'core'): ns3::EmptyAttributeChecker [class]

364

    module.add_class('EmptyAttributeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])

359

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]

365

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]

360

    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])

366

    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])

361

    ## enum.h (module 'core'): ns3::EnumChecker [class]

367

    ## enum.h (module 'core'): ns3::EnumChecker [class]

Lines 503-511	Link Here

503

    module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type=u'list')

509

    module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type=u'list')

504

    module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type=u'vector')

510

    module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type=u'vector')

505

    module.add_container('std::list< unsigned int >', 'unsigned int', container_type=u'list')

511

    module.add_container('std::list< unsigned int >', 'unsigned int', container_type=u'list')

506

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxEndCallback')

507

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxEndCallback*')

508

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxEndCallback&')

509

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >', u'ns3::SequenceNumber16')

512

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >', u'ns3::SequenceNumber16')

510

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >*', u'ns3::SequenceNumber16*')

513

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >*', u'ns3::SequenceNumber16*')

511

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >&', u'ns3::SequenceNumber16&')

514

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >&', u'ns3::SequenceNumber16&')

Lines 524-529	Link Here

524

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxStartCallback')

527

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxStartCallback')

525

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxStartCallback*')

528

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxStartCallback*')

526

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxStartCallback&')

529

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxStartCallback&')

530

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxEndCallback')

531

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxEndCallback*')

532

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxEndCallback&')

527

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyRxEndOkCallback')

533

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyRxEndOkCallback')

528

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyRxEndOkCallback*')

534

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyRxEndOkCallback*')

529

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyRxEndOkCallback&')

535

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyRxEndOkCallback&')

Lines 625-630	Link Here

625

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *', u'ns3::TracedValueCallback::Time')

631

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *', u'ns3::TracedValueCallback::Time')

626

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) **', u'ns3::TracedValueCallback::Time*')

632

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) **', u'ns3::TracedValueCallback::Time*')

627

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *&', u'ns3::TracedValueCallback::Time&')

633

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *&', u'ns3::TracedValueCallback::Time&')

634

    typehandlers.add_type_alias(u'void ( * ) (  ) *', u'ns3::TracedValueCallback::Void')

635

    typehandlers.add_type_alias(u'void ( * ) (  ) **', u'ns3::TracedValueCallback::Void*')

636

    typehandlers.add_type_alias(u'void ( * ) (  ) *&', u'ns3::TracedValueCallback::Void&')

628

637

629

def register_types_ns3_addressUtils(module):

638

def register_types_ns3_addressUtils(module):

630

    root_module = module.get_root()

639

    root_module = module.get_root()

Lines 771-776	Link Here

771

    register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue'])

780

    register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue'])

772

    register_Ns3DynamicQueueLimits_methods(root_module, root_module['ns3::DynamicQueueLimits'])

781

    register_Ns3DynamicQueueLimits_methods(root_module, root_module['ns3::DynamicQueueLimits'])

773

    register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])

782

    register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])

783

    register_Ns3EmptyAttributeAccessor_methods(root_module, root_module['ns3::EmptyAttributeAccessor'])

784

    register_Ns3EmptyAttributeChecker_methods(root_module, root_module['ns3::EmptyAttributeChecker'])

774

    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])

785

    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])

775

    register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])

786

    register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])

776

    register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue'])

787

    register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue'])

Lines 1256-1261	Link Here

1256

                   'uint32_t',

1267

                   'uint32_t',

1257

                   [param('ns3::Buffer::Iterator const &', 'o')],

1268

                   [param('ns3::Buffer::Iterator const &', 'o')],

1258

                   is_const=True)

1269

                   is_const=True)

1270

    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetRemainingSize() const [member function]

1271

    cls.add_method('GetRemainingSize',

1272

                   'uint32_t',

1273

[],

1274

                   is_const=True)

1259

    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]

1275

    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]

1260

    cls.add_method('GetSize',

1276

    cls.add_method('GetSize',

1261

                   'uint32_t',

1277

                   'uint32_t',

Lines 3694-3716	Link Here

3694

    cls.add_constructor([])

3710

    cls.add_constructor([])

3695

    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]

3711

    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]

3696

    cls.add_constructor([param('ns3::TypeId const &', 'o')])

3712

    cls.add_constructor([param('ns3::TypeId const &', 'o')])

3697

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]

3713

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SUPPORTED, std::string const & supportMsg="") [member function]

3698

    cls.add_method('AddAttribute',

3714

    cls.add_method('AddAttribute',

3699

                   'ns3::TypeId',

3715

                   'ns3::TypeId',

3700

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])

3716

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::TypeId::SupportLevel', 'supportLevel', default_value='::ns3::TypeId::SUPPORTED'), param('std::string const &', 'supportMsg', default_value='""')])

3701

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]

3717

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SUPPORTED, std::string const & supportMsg="") [member function]

3702

    cls.add_method('AddAttribute',

3718

    cls.add_method('AddAttribute',

3703

                   'ns3::TypeId',

3719

                   'ns3::TypeId',

3704

                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])

3720

                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::TypeId::SupportLevel', 'supportLevel', default_value='::ns3::TypeId::SUPPORTED'), param('std::string const &', 'supportMsg', default_value='""')])

3705

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]

3721

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]

3706

    cls.add_method('AddTraceSource',

3722

    cls.add_method('AddTraceSource',

3707

                   'ns3::TypeId',

3723

                   'ns3::TypeId',

3708

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')],

3724

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')],

3709

                   deprecated=True)

3725

                   deprecated=True)

3710

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor, std::string callback) [member function]

3726

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor, std::string callback, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SUPPORTED, std::string const & supportMsg="") [member function]

3711

    cls.add_method('AddTraceSource',

3727

    cls.add_method('AddTraceSource',

3712

                   'ns3::TypeId',

3728

                   'ns3::TypeId',

3713

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor'), param('std::string', 'callback')])

3729

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor'), param('std::string', 'callback'), param('ns3::TypeId::SupportLevel', 'supportLevel', default_value='::ns3::TypeId::SUPPORTED'), param('std::string const &', 'supportMsg', default_value='""')])

3714

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]

3730

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]

3715

    cls.add_method('GetAttribute',

3731

    cls.add_method('GetAttribute',

3716

                   'ns3::TypeId::AttributeInformation',

3732

                   'ns3::TypeId::AttributeInformation',

Lines 3825-3830	Link Here

3825

                   'ns3::Ptr< ns3::TraceSourceAccessor const >',

3841

                   'ns3::Ptr< ns3::TraceSourceAccessor const >',

3826

                   [param('std::string', 'name')],

3842

                   [param('std::string', 'name')],

3827

                   is_const=True)

3843

                   is_const=True)

3844

    ## type-id.h (module 'core'): ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name, ns3::TypeId::TraceSourceInformation * info) const [member function]

3845

    cls.add_method('LookupTraceSourceByName',

3846

                   'ns3::Ptr< ns3::TraceSourceAccessor const >',

3847

                   [param('std::string', 'name'), param('ns3::TypeId::TraceSourceInformation *', 'info')],

3848

                   is_const=True)

3828

    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]

3849

    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]

3829

    cls.add_method('MustHideFromDocumentation',

3850

    cls.add_method('MustHideFromDocumentation',

3830

                   'bool',

3851

                   'bool',

Lines 3851-3860	Link Here

3851

    cls.add_method('SetSize',

3872

    cls.add_method('SetSize',

3852

                   'ns3::TypeId',

3873

                   'ns3::TypeId',

3853

                   [param('std::size_t', 'size')])

3874

                   [param('std::size_t', 'size')])

3854

    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function]

3875

    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t uid) [member function]

3855

    cls.add_method('SetUid',

3876

    cls.add_method('SetUid',

3856

                   'void',

3877

                   'void',

3857

                   [param('uint16_t', 'tid')])

3878

                   [param('uint16_t', 'uid')])

3858

    return

3879

    return

3859

3880

3860

def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):

3881

def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):

Lines 3876-3881	Link Here

3876

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3897

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3877

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]

3898

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]

3878

    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)

3899

    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)

3900

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::supportLevel [variable]

3901

    cls.add_instance_attribute('supportLevel', 'ns3::TypeId::SupportLevel', is_const=False)

3902

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::supportMsg [variable]

3903

    cls.add_instance_attribute('supportMsg', 'std::string', is_const=False)

3879

    return

3904

    return

3880

3905

3881

def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):

3906

def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):

Lines 3891-3896	Link Here

3891

    cls.add_instance_attribute('help', 'std::string', is_const=False)

3916

    cls.add_instance_attribute('help', 'std::string', is_const=False)

3892

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]

3917

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]

3893

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3918

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3919

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::supportLevel [variable]

3920

    cls.add_instance_attribute('supportLevel', 'ns3::TypeId::SupportLevel', is_const=False)

3921

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::supportMsg [variable]

3922

    cls.add_instance_attribute('supportMsg', 'std::string', is_const=False)

3894

    return

3923

    return

3895

3924

3896

def register_Ns3Empty_methods(root_module, cls):

3925

def register_Ns3Empty_methods(root_module, cls):

Lines 6828-6833	Link Here

6828

                   visibility='private', is_virtual=True)

6857

                   visibility='private', is_virtual=True)

6829

    return

6858

    return

6830

6859

6860

def register_Ns3EmptyAttributeAccessor_methods(root_module, cls):

6861

    ## attribute.h (module 'core'): ns3::EmptyAttributeAccessor::EmptyAttributeAccessor(ns3::EmptyAttributeAccessor const & arg0) [copy constructor]

6862

    cls.add_constructor([param('ns3::EmptyAttributeAccessor const &', 'arg0')])

6863

    ## attribute.h (module 'core'): ns3::EmptyAttributeAccessor::EmptyAttributeAccessor() [constructor]

6864

    cls.add_constructor([])

6865

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]

6866

    cls.add_method('Get',

6867

                   'bool',

6868

                   [param('ns3::ObjectBase const *', 'object'), param('ns3::AttributeValue &', 'attribute')],

6869

                   is_const=True, is_virtual=True)

6870

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::HasGetter() const [member function]

6871

    cls.add_method('HasGetter',

6872

                   'bool',

6873

[],

6874

                   is_const=True, is_virtual=True)

6875

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::HasSetter() const [member function]

6876

    cls.add_method('HasSetter',

6877

                   'bool',

6878

[],

6879

                   is_const=True, is_virtual=True)

6880

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]

6881

    cls.add_method('Set',

6882

                   'bool',

6883

                   [param('ns3::ObjectBase *', 'object'), param('ns3::AttributeValue const &', 'value')],

6884

                   is_const=True, is_virtual=True)

6885

    return

6886

6887

def register_Ns3EmptyAttributeChecker_methods(root_module, cls):

6888

    ## attribute.h (module 'core'): ns3::EmptyAttributeChecker::EmptyAttributeChecker(ns3::EmptyAttributeChecker const & arg0) [copy constructor]

6889

    cls.add_constructor([param('ns3::EmptyAttributeChecker const &', 'arg0')])

6890

    ## attribute.h (module 'core'): ns3::EmptyAttributeChecker::EmptyAttributeChecker() [constructor]

6891

    cls.add_constructor([])

6892

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeChecker::Check(ns3::AttributeValue const & value) const [member function]

6893

    cls.add_method('Check',

6894

                   'bool',

6895

                   [param('ns3::AttributeValue const &', 'value')],

6896

                   is_const=True, is_virtual=True)

6897

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]

6898

    cls.add_method('Copy',

6899

                   'bool',

6900

                   [param('ns3::AttributeValue const &', 'source'), param('ns3::AttributeValue &', 'destination')],

6901

                   is_const=True, is_virtual=True)

6902

    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeChecker::Create() const [member function]

6903

    cls.add_method('Create',

6904

                   'ns3::Ptr< ns3::AttributeValue >',

6905

[],

6906

                   is_const=True, is_virtual=True)

6907

    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeChecker::GetUnderlyingTypeInformation() const [member function]

6908

    cls.add_method('GetUnderlyingTypeInformation',

6909

                   'std::string',

6910

[],

6911

                   is_const=True, is_virtual=True)

6912

    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeChecker::GetValueTypeName() const [member function]

6913

    cls.add_method('GetValueTypeName',

6914

                   'std::string',

6915

[],

6916

                   is_const=True, is_virtual=True)

6917

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeChecker::HasUnderlyingTypeInformation() const [member function]

6918

    cls.add_method('HasUnderlyingTypeInformation',

6919

                   'bool',

6920

[],

6921

                   is_const=True, is_virtual=True)

6922

    return

6923

6831

def register_Ns3EmptyAttributeValue_methods(root_module, cls):

6924

def register_Ns3EmptyAttributeValue_methods(root_module, cls):

6832

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]

6925

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]

6833

    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])

6926

    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])

(-)a/src/network/bindings/modulegen__gcc_LP64.py (-11 / +104 lines)

Lines 178-183	Link Here

178

    module.add_class('TypeId', import_from_module='ns.core')

178

    module.add_class('TypeId', import_from_module='ns.core')

179

    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]

179

    ## type-id.h (module 'core'): ns3::TypeId::AttributeFlag [enumeration]

180

    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')

180

    module.add_enum('AttributeFlag', ['ATTR_GET', 'ATTR_SET', 'ATTR_CONSTRUCT', 'ATTR_SGC'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')

181

    ## type-id.h (module 'core'): ns3::TypeId::SupportLevel [enumeration]

182

    module.add_enum('SupportLevel', ['SUPPORTED', 'DEPRECATED', 'OBSOLETE'], outer_class=root_module['ns3::TypeId'], import_from_module='ns.core')

181

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]

183

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation [struct]

182

    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])

184

    module.add_class('AttributeInformation', import_from_module='ns.core', outer_class=root_module['ns3::TypeId'])

183

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]

185

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation [struct]

Lines 356-361	Link Here

356

    module.add_class('DynamicQueueLimits', parent=root_module['ns3::QueueLimits'])

358

    module.add_class('DynamicQueueLimits', parent=root_module['ns3::QueueLimits'])

357

    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]

359

    ## random-variable-stream.h (module 'core'): ns3::EmpiricalRandomVariable [class]

358

    module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])

360

    module.add_class('EmpiricalRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream'])

361

    ## attribute.h (module 'core'): ns3::EmptyAttributeAccessor [class]

362

    module.add_class('EmptyAttributeAccessor', import_from_module='ns.core', parent=root_module['ns3::AttributeAccessor'])

363

    ## attribute.h (module 'core'): ns3::EmptyAttributeChecker [class]

364

    module.add_class('EmptyAttributeChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])

359

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]

365

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue [class]

360

    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])

366

    module.add_class('EmptyAttributeValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])

361

    ## enum.h (module 'core'): ns3::EnumChecker [class]

367

    ## enum.h (module 'core'): ns3::EnumChecker [class]

Lines 503-511	Link Here

503

    module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type=u'list')

509

    module.add_container('std::list< ns3::Ptr< ns3::Packet > >', 'ns3::Ptr< ns3::Packet >', container_type=u'list')

504

    module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type=u'vector')

510

    module.add_container('std::vector< ns3::Ipv6Address >', 'ns3::Ipv6Address', container_type=u'vector')

505

    module.add_container('std::list< unsigned int >', 'unsigned int', container_type=u'list')

511

    module.add_container('std::list< unsigned int >', 'unsigned int', container_type=u'list')

506

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxEndCallback')

507

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxEndCallback*')

508

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxEndCallback&')

509

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >', u'ns3::SequenceNumber16')

512

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >', u'ns3::SequenceNumber16')

510

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >*', u'ns3::SequenceNumber16*')

513

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >*', u'ns3::SequenceNumber16*')

511

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >&', u'ns3::SequenceNumber16&')

514

    typehandlers.add_type_alias(u'ns3::SequenceNumber< unsigned short, short >&', u'ns3::SequenceNumber16&')

Lines 524-529	Link Here

524

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxStartCallback')

527

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxStartCallback')

525

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxStartCallback*')

528

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxStartCallback*')

526

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxStartCallback&')

529

    typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxStartCallback&')

530

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyTxEndCallback')

531

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyTxEndCallback*')

532

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyTxEndCallback&')

527

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyRxEndOkCallback')

533

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::GenericPhyRxEndOkCallback')

528

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyRxEndOkCallback*')

534

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::GenericPhyRxEndOkCallback*')

529

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyRxEndOkCallback&')

535

    typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::GenericPhyRxEndOkCallback&')

Lines 625-630	Link Here

625

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *', u'ns3::TracedValueCallback::Time')

631

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *', u'ns3::TracedValueCallback::Time')

626

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) **', u'ns3::TracedValueCallback::Time*')

632

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) **', u'ns3::TracedValueCallback::Time*')

627

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *&', u'ns3::TracedValueCallback::Time&')

633

    typehandlers.add_type_alias(u'void ( * ) ( ns3::Time, ns3::Time ) *&', u'ns3::TracedValueCallback::Time&')

634

    typehandlers.add_type_alias(u'void ( * ) (  ) *', u'ns3::TracedValueCallback::Void')

635

    typehandlers.add_type_alias(u'void ( * ) (  ) **', u'ns3::TracedValueCallback::Void*')

636

    typehandlers.add_type_alias(u'void ( * ) (  ) *&', u'ns3::TracedValueCallback::Void&')

628

637

629

def register_types_ns3_addressUtils(module):

638

def register_types_ns3_addressUtils(module):

630

    root_module = module.get_root()

639

    root_module = module.get_root()

Lines 771-776	Link Here

771

    register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue'])

780

    register_Ns3DropTailQueue_methods(root_module, root_module['ns3::DropTailQueue'])

772

    register_Ns3DynamicQueueLimits_methods(root_module, root_module['ns3::DynamicQueueLimits'])

781

    register_Ns3DynamicQueueLimits_methods(root_module, root_module['ns3::DynamicQueueLimits'])

773

    register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])

782

    register_Ns3EmpiricalRandomVariable_methods(root_module, root_module['ns3::EmpiricalRandomVariable'])

783

    register_Ns3EmptyAttributeAccessor_methods(root_module, root_module['ns3::EmptyAttributeAccessor'])

784

    register_Ns3EmptyAttributeChecker_methods(root_module, root_module['ns3::EmptyAttributeChecker'])

774

    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])

785

    register_Ns3EmptyAttributeValue_methods(root_module, root_module['ns3::EmptyAttributeValue'])

775

    register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])

786

    register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker'])

776

    register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue'])

787

    register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue'])

Lines 1256-1261	Link Here

1256

                   'uint32_t',

1267

                   'uint32_t',

1257

                   [param('ns3::Buffer::Iterator const &', 'o')],

1268

                   [param('ns3::Buffer::Iterator const &', 'o')],

1258

                   is_const=True)

1269

                   is_const=True)

1270

    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetRemainingSize() const [member function]

1271

    cls.add_method('GetRemainingSize',

1272

                   'uint32_t',

1273

[],

1274

                   is_const=True)

1259

    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]

1275

    ## buffer.h (module 'network'): uint32_t ns3::Buffer::Iterator::GetSize() const [member function]

1260

    cls.add_method('GetSize',

1276

    cls.add_method('GetSize',

1261

                   'uint32_t',

1277

                   'uint32_t',

Lines 3694-3716	Link Here

3694

    cls.add_constructor([])

3710

    cls.add_constructor([])

3695

    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]

3711

    ## type-id.h (module 'core'): ns3::TypeId::TypeId(ns3::TypeId const & o) [copy constructor]

3696

    cls.add_constructor([param('ns3::TypeId const &', 'o')])

3712

    cls.add_constructor([param('ns3::TypeId const &', 'o')])

3697

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]

3713

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SUPPORTED, std::string const & supportMsg="") [member function]

3698

    cls.add_method('AddAttribute',

3714

    cls.add_method('AddAttribute',

3699

                   'ns3::TypeId',

3715

                   'ns3::TypeId',

3700

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])

3716

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::TypeId::SupportLevel', 'supportLevel', default_value='::ns3::TypeId::SUPPORTED'), param('std::string const &', 'supportMsg', default_value='""')])

3701

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker) [member function]

3717

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddAttribute(std::string name, std::string help, uint32_t flags, ns3::AttributeValue const & initialValue, ns3::Ptr<ns3::AttributeAccessor const> accessor, ns3::Ptr<ns3::AttributeChecker const> checker, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SUPPORTED, std::string const & supportMsg="") [member function]

3702

    cls.add_method('AddAttribute',

3718

    cls.add_method('AddAttribute',

3703

                   'ns3::TypeId',

3719

                   'ns3::TypeId',

3704

                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker')])

3720

                   [param('std::string', 'name'), param('std::string', 'help'), param('uint32_t', 'flags'), param('ns3::AttributeValue const &', 'initialValue'), param('ns3::Ptr< ns3::AttributeAccessor const >', 'accessor'), param('ns3::Ptr< ns3::AttributeChecker const >', 'checker'), param('ns3::TypeId::SupportLevel', 'supportLevel', default_value='::ns3::TypeId::SUPPORTED'), param('std::string const &', 'supportMsg', default_value='""')])

3705

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]

3721

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor) [member function]

3706

    cls.add_method('AddTraceSource',

3722

    cls.add_method('AddTraceSource',

3707

                   'ns3::TypeId',

3723

                   'ns3::TypeId',

3708

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')],

3724

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor')],

3709

                   deprecated=True)

3725

                   deprecated=True)

3710

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor, std::string callback) [member function]

3726

    ## type-id.h (module 'core'): ns3::TypeId ns3::TypeId::AddTraceSource(std::string name, std::string help, ns3::Ptr<ns3::TraceSourceAccessor const> accessor, std::string callback, ns3::TypeId::SupportLevel supportLevel=::ns3::TypeId::SUPPORTED, std::string const & supportMsg="") [member function]

3711

    cls.add_method('AddTraceSource',

3727

    cls.add_method('AddTraceSource',

3712

                   'ns3::TypeId',

3728

                   'ns3::TypeId',

3713

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor'), param('std::string', 'callback')])

3729

                   [param('std::string', 'name'), param('std::string', 'help'), param('ns3::Ptr< ns3::TraceSourceAccessor const >', 'accessor'), param('std::string', 'callback'), param('ns3::TypeId::SupportLevel', 'supportLevel', default_value='::ns3::TypeId::SUPPORTED'), param('std::string const &', 'supportMsg', default_value='""')])

3714

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]

3730

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation ns3::TypeId::GetAttribute(uint32_t i) const [member function]

3715

    cls.add_method('GetAttribute',

3731

    cls.add_method('GetAttribute',

3716

                   'ns3::TypeId::AttributeInformation',

3732

                   'ns3::TypeId::AttributeInformation',

Lines 3825-3830	Link Here

3825

                   'ns3::Ptr< ns3::TraceSourceAccessor const >',

3841

                   'ns3::Ptr< ns3::TraceSourceAccessor const >',

3826

                   [param('std::string', 'name')],

3842

                   [param('std::string', 'name')],

3827

                   is_const=True)

3843

                   is_const=True)

3844

    ## type-id.h (module 'core'): ns3::Ptr<ns3::TraceSourceAccessor const> ns3::TypeId::LookupTraceSourceByName(std::string name, ns3::TypeId::TraceSourceInformation * info) const [member function]

3845

    cls.add_method('LookupTraceSourceByName',

3846

                   'ns3::Ptr< ns3::TraceSourceAccessor const >',

3847

                   [param('std::string', 'name'), param('ns3::TypeId::TraceSourceInformation *', 'info')],

3848

                   is_const=True)

3828

    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]

3849

    ## type-id.h (module 'core'): bool ns3::TypeId::MustHideFromDocumentation() const [member function]

3829

    cls.add_method('MustHideFromDocumentation',

3850

    cls.add_method('MustHideFromDocumentation',

3830

                   'bool',

3851

                   'bool',

Lines 3851-3860	Link Here

3851

    cls.add_method('SetSize',

3872

    cls.add_method('SetSize',

3852

                   'ns3::TypeId',

3873

                   'ns3::TypeId',

3853

                   [param('std::size_t', 'size')])

3874

                   [param('std::size_t', 'size')])

3854

    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t tid) [member function]

3875

    ## type-id.h (module 'core'): void ns3::TypeId::SetUid(uint16_t uid) [member function]

3855

    cls.add_method('SetUid',

3876

    cls.add_method('SetUid',

3856

                   'void',

3877

                   'void',

3857

                   [param('uint16_t', 'tid')])

3878

                   [param('uint16_t', 'uid')])

3858

    return

3879

    return

3859

3880

3860

def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):

3881

def register_Ns3TypeIdAttributeInformation_methods(root_module, cls):

Lines 3876-3881	Link Here

3876

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3897

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3877

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]

3898

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::originalInitialValue [variable]

3878

    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)

3899

    cls.add_instance_attribute('originalInitialValue', 'ns3::Ptr< ns3::AttributeValue const >', is_const=False)

3900

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::supportLevel [variable]

3901

    cls.add_instance_attribute('supportLevel', 'ns3::TypeId::SupportLevel', is_const=False)

3902

    ## type-id.h (module 'core'): ns3::TypeId::AttributeInformation::supportMsg [variable]

3903

    cls.add_instance_attribute('supportMsg', 'std::string', is_const=False)

3879

    return

3904

    return

3880

3905

3881

def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):

3906

def register_Ns3TypeIdTraceSourceInformation_methods(root_module, cls):

Lines 3891-3896	Link Here

3891

    cls.add_instance_attribute('help', 'std::string', is_const=False)

3916

    cls.add_instance_attribute('help', 'std::string', is_const=False)

3892

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]

3917

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::name [variable]

3893

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3918

    cls.add_instance_attribute('name', 'std::string', is_const=False)

3919

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::supportLevel [variable]

3920

    cls.add_instance_attribute('supportLevel', 'ns3::TypeId::SupportLevel', is_const=False)

3921

    ## type-id.h (module 'core'): ns3::TypeId::TraceSourceInformation::supportMsg [variable]

3922

    cls.add_instance_attribute('supportMsg', 'std::string', is_const=False)

3894

    return

3923

    return

3895

3924

3896

def register_Ns3Empty_methods(root_module, cls):

3925

def register_Ns3Empty_methods(root_module, cls):

Lines 6828-6833	Link Here

6828

                   visibility='private', is_virtual=True)

6857

                   visibility='private', is_virtual=True)

6829

    return

6858

    return

6830

6859

6860

def register_Ns3EmptyAttributeAccessor_methods(root_module, cls):

6861

    ## attribute.h (module 'core'): ns3::EmptyAttributeAccessor::EmptyAttributeAccessor(ns3::EmptyAttributeAccessor const & arg0) [copy constructor]

6862

    cls.add_constructor([param('ns3::EmptyAttributeAccessor const &', 'arg0')])

6863

    ## attribute.h (module 'core'): ns3::EmptyAttributeAccessor::EmptyAttributeAccessor() [constructor]

6864

    cls.add_constructor([])

6865

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::Get(ns3::ObjectBase const * object, ns3::AttributeValue & attribute) const [member function]

6866

    cls.add_method('Get',

6867

                   'bool',

6868

                   [param('ns3::ObjectBase const *', 'object'), param('ns3::AttributeValue &', 'attribute')],

6869

                   is_const=True, is_virtual=True)

6870

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::HasGetter() const [member function]

6871

    cls.add_method('HasGetter',

6872

                   'bool',

6873

[],

6874

                   is_const=True, is_virtual=True)

6875

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::HasSetter() const [member function]

6876

    cls.add_method('HasSetter',

6877

                   'bool',

6878

[],

6879

                   is_const=True, is_virtual=True)

6880

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeAccessor::Set(ns3::ObjectBase * object, ns3::AttributeValue const & value) const [member function]

6881

    cls.add_method('Set',

6882

                   'bool',

6883

                   [param('ns3::ObjectBase *', 'object'), param('ns3::AttributeValue const &', 'value')],

6884

                   is_const=True, is_virtual=True)

6885

    return

6886

6887

def register_Ns3EmptyAttributeChecker_methods(root_module, cls):

6888

    ## attribute.h (module 'core'): ns3::EmptyAttributeChecker::EmptyAttributeChecker(ns3::EmptyAttributeChecker const & arg0) [copy constructor]

6889

    cls.add_constructor([param('ns3::EmptyAttributeChecker const &', 'arg0')])

6890

    ## attribute.h (module 'core'): ns3::EmptyAttributeChecker::EmptyAttributeChecker() [constructor]

6891

    cls.add_constructor([])

6892

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeChecker::Check(ns3::AttributeValue const & value) const [member function]

6893

    cls.add_method('Check',

6894

                   'bool',

6895

                   [param('ns3::AttributeValue const &', 'value')],

6896

                   is_const=True, is_virtual=True)

6897

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeChecker::Copy(ns3::AttributeValue const & source, ns3::AttributeValue & destination) const [member function]

6898

    cls.add_method('Copy',

6899

                   'bool',

6900

                   [param('ns3::AttributeValue const &', 'source'), param('ns3::AttributeValue &', 'destination')],

6901

                   is_const=True, is_virtual=True)

6902

    ## attribute.h (module 'core'): ns3::Ptr<ns3::AttributeValue> ns3::EmptyAttributeChecker::Create() const [member function]

6903

    cls.add_method('Create',

6904

                   'ns3::Ptr< ns3::AttributeValue >',

6905

[],

6906

                   is_const=True, is_virtual=True)

6907

    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeChecker::GetUnderlyingTypeInformation() const [member function]

6908

    cls.add_method('GetUnderlyingTypeInformation',

6909

                   'std::string',

6910

[],

6911

                   is_const=True, is_virtual=True)

6912

    ## attribute.h (module 'core'): std::string ns3::EmptyAttributeChecker::GetValueTypeName() const [member function]

6913

    cls.add_method('GetValueTypeName',

6914

                   'std::string',

6915

[],

6916

                   is_const=True, is_virtual=True)

6917

    ## attribute.h (module 'core'): bool ns3::EmptyAttributeChecker::HasUnderlyingTypeInformation() const [member function]

6918

    cls.add_method('HasUnderlyingTypeInformation',

6919

                   'bool',

6920

[],

6921

                   is_const=True, is_virtual=True)

6922

    return

6923

6831

def register_Ns3EmptyAttributeValue_methods(root_module, cls):

6924

def register_Ns3EmptyAttributeValue_methods(root_module, cls):

6832

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]

6925

    ## attribute.h (module 'core'): ns3::EmptyAttributeValue::EmptyAttributeValue(ns3::EmptyAttributeValue const & arg0) [copy constructor]

6833

    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])

6926

    cls.add_constructor([param('ns3::EmptyAttributeValue const &', 'arg0')])

(-)a/src/network/model/buffer.cc (+7 lines)

Lines 1161-1166	Link Here

1161

  return m_dataEnd - m_dataStart;

1161

  return m_dataEnd - m_dataStart;

1162

1163

1164

uint32_t

1165

Buffer::Iterator::GetRemainingSize (void) const

1166

1167

  NS_LOG_FUNCTION (this);

1168

  return m_dataEnd - m_current;

1169

1170

1164

1171

1165

std::string

1172

std::string

1166

Buffer::Iterator::GetReadErrorMessage (void) const

1173

Buffer::Iterator::GetReadErrorMessage (void) const

(-)a/src/network/model/buffer.h (+5 lines)

Lines 376-381	Link Here

376

*/

376

*/

377

    uint32_t GetSize (void) const;

377

    uint32_t GetSize (void) const;

378

379

/**

380

     * \returns the size left to read of the underlying buffer we are iterating

381

*/

382

    uint32_t GetRemainingSize (void) const;

383

379

private:

384

private:

380

    friend class Buffer;

385

    friend class Buffer;

381

/**

386

/**

Return to bug 2505