--- a/src/lr-wpan/bindings/callbacks_list.py Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/bindings/callbacks_list.py Mon Aug 25 19:15:36 2014 +0200
@@ -1,12 +1,12 @@
callback_classes = [
- ['void', 'ns3::LrWpanPhyEnumeration', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::LrWpanPhyEnumeration', 'unsigned char', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'unsigned int', 'ns3::Ptr<ns3::Packet>', 'unsigned char', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
- ['void', 'ns3::LrWpanMacState', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
- ['void', 'ns3::LrWpanPhyEnumeration', 'ns3::LrWpanPibAttributeIdentifier', 'ns3::LrWpanPhyPibAttributes*', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
- ['void', 'ns3::McpsDataIndicationParams', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
- ['void', 'ns3::McpsDataConfirmParams', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
- ['void', 'ns3::LrWpanPhyEnumeration', 'ns3::LrWpanPibAttributeIdentifier', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['bool', 'ns3::Ptr<ns3::NetDevice>', 'ns3::Ptr<ns3::Packet const>', 'unsigned short', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['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'],
+ ['void', 'ns3::LrWpanMacState', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['void', 'ns3::McpsDataConfirmParams', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['void', 'ns3::McpsDataIndicationParams', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['void', 'ns3::LrWpanPhyEnumeration', 'ns3::LrWpanPibAttributeIdentifier', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['void', 'ns3::LrWpanPhyEnumeration', 'ns3::LrWpanPibAttributeIdentifier', 'ns3::LrWpanPhyPibAttributes*', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+ ['void', 'ns3::LrWpanPhyEnumeration', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
]
--- a/src/lr-wpan/bindings/modulegen__gcc_ILP32.py Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/bindings/modulegen__gcc_ILP32.py Mon Aug 25 19:15:36 2014 +0200
@@ -22,10 +22,12 @@
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPhyOption [enumeration]
module.add_enum('LrWpanPhyOption', ['IEEE_802_15_4_868MHZ_BPSK', 'IEEE_802_15_4_915MHZ_BPSK', 'IEEE_802_15_4_868MHZ_ASK', 'IEEE_802_15_4_915MHZ_ASK', 'IEEE_802_15_4_868MHZ_OQPSK', 'IEEE_802_15_4_915MHZ_OQPSK', 'IEEE_802_15_4_2_4GHZ_OQPSK', 'IEEE_802_15_4_INVALID_PHY_OPTION'])
+ ## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanAddressMode [enumeration]
+ module.add_enum('LrWpanAddressMode', ['NO_PANID_ADDR', 'ADDR_MODE_RESERVED', 'SHORT_ADDR', 'EXT_ADDR'])
+ ## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanMcpsDataConfirmStatus [enumeration]
+ module.add_enum('LrWpanMcpsDataConfirmStatus', ['IEEE_802_15_4_SUCCESS', 'IEEE_802_15_4_TRANSACTION_OVERFLOW', 'IEEE_802_15_4_TRANSACTION_EXPIRED', 'IEEE_802_15_4_CHANNEL_ACCESS_FAILURE', 'IEEE_802_15_4_INVALID_ADDRESS', 'IEEE_802_15_4_INVALID_GTS', 'IEEE_802_15_4_NO_ACK', 'IEEE_802_15_4_COUNTER_ERROR', 'IEEE_802_15_4_FRAME_TOO_LONG', 'IEEE_802_15_4_UNAVAILABLE_KEY', 'IEEE_802_15_4_UNSUPPORTED_SECURITY', 'IEEE_802_15_4_INVALID_PARAMETER'])
## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanTxOption [enumeration]
module.add_enum('LrWpanTxOption', ['TX_OPTION_NONE', 'TX_OPTION_ACK', 'TX_OPTION_GTS', 'TX_OPTION_INDIRECT'])
- ## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanMcpsDataConfirmStatus [enumeration]
- module.add_enum('LrWpanMcpsDataConfirmStatus', ['IEEE_802_15_4_SUCCESS', 'IEEE_802_15_4_TRANSACTION_OVERFLOW', 'IEEE_802_15_4_TRANSACTION_EXPIRED', 'IEEE_802_15_4_CHANNEL_ACCESS_FAILURE', 'IEEE_802_15_4_INVALID_ADDRESS', 'IEEE_802_15_4_INVALID_GTS', 'IEEE_802_15_4_NO_ACK', 'IEEE_802_15_4_COUNTER_ERROR', 'IEEE_802_15_4_FRAME_TOO_LONG', 'IEEE_802_15_4_UNAVAILABLE_KEY', 'IEEE_802_15_4_UNSUPPORTED_SECURITY', 'IEEE_802_15_4_INVALID_PARAMETER'])
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPhyEnumeration [enumeration]
module.add_enum('LrWpanPhyEnumeration', ['IEEE_802_15_4_PHY_BUSY', 'IEEE_802_15_4_PHY_BUSY_RX', 'IEEE_802_15_4_PHY_BUSY_TX', 'IEEE_802_15_4_PHY_FORCE_TRX_OFF', 'IEEE_802_15_4_PHY_IDLE', 'IEEE_802_15_4_PHY_INVALID_PARAMETER', 'IEEE_802_15_4_PHY_RX_ON', 'IEEE_802_15_4_PHY_SUCCESS', 'IEEE_802_15_4_PHY_TRX_OFF', 'IEEE_802_15_4_PHY_TX_ON', 'IEEE_802_15_4_PHY_UNSUPPORTED_ATTRIBUTE', 'IEEE_802_15_4_PHY_READ_ONLY', 'IEEE_802_15_4_PHY_UNSPECIFIED'])
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPibAttributeIdentifier [enumeration]
@@ -34,8 +36,6 @@
module.add_enum('LrWpanAssociationStatus', ['ASSOCIATED', 'PAN_AT_CAPACITY', 'PAN_ACCESS_DENIED', 'ASSOCIATED_WITHOUT_ADDRESS', 'DISASSOCIATED'])
## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanMacState [enumeration]
module.add_enum('LrWpanMacState', ['MAC_IDLE', 'MAC_CSMA', 'MAC_SENDING', 'MAC_ACK_PENDING', 'CHANNEL_ACCESS_FAILURE', 'CHANNEL_IDLE', 'SET_PHY_TX_ON'])
- ## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanAddressMode [enumeration]
- module.add_enum('LrWpanAddressMode', ['NO_PANID_ADDR', 'ADDR_MODE_RESERVED', 'SHORT_ADDR', 'EXT_ADDR'])
## 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]
@@ -308,9 +308,6 @@
module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
## lr-wpan-net-device.h (module 'lr-wpan'): ns3::LrWpanNetDevice [class]
module.add_class('LrWpanNetDevice', parent=root_module['ns3::NetDevice'])
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeCcaConfirmCallback')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeCcaConfirmCallback*')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeCcaConfirmCallback&')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeEdConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeEdConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeEdConfirmCallback&')
@@ -329,6 +326,9 @@
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::LrWpanPhyPibAttributes *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeGetAttributeConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::LrWpanPhyPibAttributes *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeGetAttributeConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::LrWpanPhyPibAttributes *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeGetAttributeConfirmCallback&')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeSetTRXStateConfirmCallback')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeSetTRXStateConfirmCallback*')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeSetTRXStateConfirmCallback&')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PdDataConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PdDataConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PdDataConfirmCallback&')
@@ -344,9 +344,9 @@
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeSetAttributeConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeSetAttributeConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeSetAttributeConfirmCallback&')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeSetTRXStateConfirmCallback')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeSetTRXStateConfirmCallback*')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeSetTRXStateConfirmCallback&')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeCcaConfirmCallback')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeCcaConfirmCallback*')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeCcaConfirmCallback&')
## Register a nested module for the namespace FatalImpl
@@ -2945,10 +2945,10 @@
cls.add_method('EnableLogComponents',
'void',
[])
- ## lr-wpan-helper.h (module 'lr-wpan'): static std::string ns3::LrWpanHelper::LrWpanPhyEnumerationPrinter(ns3::LrWpanPhyEnumeration arg0) [member function]
+ ## lr-wpan-helper.h (module 'lr-wpan'): static std::string ns3::LrWpanHelper::LrWpanPhyEnumerationPrinter(ns3::LrWpanPhyEnumeration e) [member function]
cls.add_method('LrWpanPhyEnumerationPrinter',
'std::string',
- [param('ns3::LrWpanPhyEnumeration', 'arg0')],
+ [param('ns3::LrWpanPhyEnumeration', 'e')],
is_static=True)
## lr-wpan-helper.h (module 'lr-wpan'): static std::string ns3::LrWpanHelper::LrWpanMacStatePrinter(ns3::LrWpanMacState e) [member function]
cls.add_method('LrWpanMacStatePrinter',
@@ -3096,16 +3096,16 @@
'uint64_t',
[],
is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): std::string ns3::LrWpanMacHeader::GetName() const [member function]
- cls.add_method('GetName',
- 'std::string',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetSecControl() const [member function]
cls.add_method('GetSecControl',
'uint8_t',
[],
is_const=True)
+ ## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetSecCtrlReserved() const [member function]
+ cls.add_method('GetSecCtrlReserved',
+ 'uint8_t',
+ [],
+ is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetSecLevel() const [member function]
cls.add_method('GetSecLevel',
'uint8_t',
@@ -3151,11 +3151,6 @@
'ns3::TypeId',
[],
is_static=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetsecctrlReserved() const [member function]
- cls.add_method('GetsecctrlReserved',
- 'uint8_t',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsAckReq() const [member function]
cls.add_method('IsAckReq',
'bool',
@@ -3186,31 +3181,11 @@
'bool',
[],
is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsNoAckReq() const [member function]
- cls.add_method('IsNoAckReq',
- 'bool',
- [],
- is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsNoFrmPend() const [member function]
- cls.add_method('IsNoFrmPend',
- 'bool',
- [],
- is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsNoPanIdComp() const [member function]
- cls.add_method('IsNoPanIdComp',
- 'bool',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsPanIdComp() const [member function]
cls.add_method('IsPanIdComp',
'bool',
[],
is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsSecDisable() const [member function]
- cls.add_method('IsSecDisable',
- 'bool',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsSecEnable() const [member function]
cls.add_method('IsSecEnable',
'bool',
@@ -3221,11 +3196,6 @@
'void',
[param('std::ostream &', 'os')],
is_const=True, is_virtual=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::PrintFrameControl(std::ostream & os) const [member function]
- cls.add_method('PrintFrameControl',
- 'void',
- [param('std::ostream &', 'os')],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
cls.add_method('Serialize',
'void',
@@ -3303,6 +3273,10 @@
cls.add_method('SetSecControl',
'void',
[param('uint8_t', 'secLevel')])
+ ## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::SetSecCtrlReserved(uint8_t res) [member function]
+ cls.add_method('SetSecCtrlReserved',
+ 'void',
+ [param('uint8_t', 'res')])
## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::SetSecDisable() [member function]
cls.add_method('SetSecDisable',
'void',
@@ -3335,10 +3309,6 @@
cls.add_method('SetType',
'void',
[param('ns3::LrWpanMacHeader::LrWpanMacType', 'wpanMacType')])
- ## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::SetsecctrlReserved(uint8_t res) [member function]
- cls.add_method('SetsecctrlReserved',
- 'void',
- [param('uint8_t', 'res')])
return
def register_Ns3Object_methods(root_module, cls):
@@ -3729,10 +3699,10 @@
cls.add_constructor([param('long unsigned int', 'v')])
## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor]
cls.add_constructor([param('long long unsigned int', 'v')])
+ ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & v) [constructor]
+ cls.add_constructor([param('ns3::int64x64_t const &', 'v')])
## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor]
cls.add_constructor([param('std::string const &', 's')])
- ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & value) [constructor]
- cls.add_constructor([param('ns3::int64x64_t const &', 'value')])
## nstime.h (module 'core'): ns3::TimeWithUnit ns3::Time::As(ns3::Time::Unit const unit) const [member function]
cls.add_method('As',
'ns3::TimeWithUnit',
@@ -3743,25 +3713,25 @@
'int',
[param('ns3::Time const &', 'o')],
is_const=True)
- ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & from, ns3::Time::Unit timeUnit) [member function]
- cls.add_method('From',
- 'ns3::Time',
- [param('ns3::int64x64_t const &', 'from'), param('ns3::Time::Unit', 'timeUnit')],
- is_static=True)
## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function]
cls.add_method('From',
'ns3::Time',
[param('ns3::int64x64_t const &', 'value')],
is_static=True)
- ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit timeUnit) [member function]
+ ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value, ns3::Time::Unit unit) [member function]
+ cls.add_method('From',
+ 'ns3::Time',
+ [param('ns3::int64x64_t const &', 'value'), param('ns3::Time::Unit', 'unit')],
+ is_static=True)
+ ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit unit) [member function]
cls.add_method('FromDouble',
'ns3::Time',
- [param('double', 'value'), param('ns3::Time::Unit', 'timeUnit')],
+ [param('double', 'value'), param('ns3::Time::Unit', 'unit')],
is_static=True)
- ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit timeUnit) [member function]
+ ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit unit) [member function]
cls.add_method('FromInteger',
'ns3::Time',
- [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')],
+ [param('uint64_t', 'value'), param('ns3::Time::Unit', 'unit')],
is_static=True)
## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
cls.add_method('GetDays',
@@ -3878,20 +3848,20 @@
'bool',
[],
is_static=True)
- ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
+ ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit unit) const [member function]
cls.add_method('To',
'ns3::int64x64_t',
- [param('ns3::Time::Unit', 'timeUnit')],
- is_const=True)
- ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit timeUnit) const [member function]
+ [param('ns3::Time::Unit', 'unit')],
+ is_const=True)
+ ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit unit) const [member function]
cls.add_method('ToDouble',
'double',
- [param('ns3::Time::Unit', 'timeUnit')],
- is_const=True)
- ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit timeUnit) const [member function]
+ [param('ns3::Time::Unit', 'unit')],
+ is_const=True)
+ ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit unit) const [member function]
cls.add_method('ToInteger',
'int64_t',
- [param('ns3::Time::Unit', 'timeUnit')],
+ [param('ns3::Time::Unit', 'unit')],
is_const=True)
return
--- a/src/lr-wpan/bindings/modulegen__gcc_LP64.py Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/bindings/modulegen__gcc_LP64.py Mon Aug 25 19:15:36 2014 +0200
@@ -22,18 +22,18 @@
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPhyEnumeration [enumeration]
module.add_enum('LrWpanPhyEnumeration', ['IEEE_802_15_4_PHY_BUSY', 'IEEE_802_15_4_PHY_BUSY_RX', 'IEEE_802_15_4_PHY_BUSY_TX', 'IEEE_802_15_4_PHY_FORCE_TRX_OFF', 'IEEE_802_15_4_PHY_IDLE', 'IEEE_802_15_4_PHY_INVALID_PARAMETER', 'IEEE_802_15_4_PHY_RX_ON', 'IEEE_802_15_4_PHY_SUCCESS', 'IEEE_802_15_4_PHY_TRX_OFF', 'IEEE_802_15_4_PHY_TX_ON', 'IEEE_802_15_4_PHY_UNSUPPORTED_ATTRIBUTE', 'IEEE_802_15_4_PHY_READ_ONLY', 'IEEE_802_15_4_PHY_UNSPECIFIED'])
+ ## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanAssociationStatus [enumeration]
+ module.add_enum('LrWpanAssociationStatus', ['ASSOCIATED', 'PAN_AT_CAPACITY', 'PAN_ACCESS_DENIED', 'ASSOCIATED_WITHOUT_ADDRESS', 'DISASSOCIATED'])
## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanTxOption [enumeration]
module.add_enum('LrWpanTxOption', ['TX_OPTION_NONE', 'TX_OPTION_ACK', 'TX_OPTION_GTS', 'TX_OPTION_INDIRECT'])
## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanMcpsDataConfirmStatus [enumeration]
module.add_enum('LrWpanMcpsDataConfirmStatus', ['IEEE_802_15_4_SUCCESS', 'IEEE_802_15_4_TRANSACTION_OVERFLOW', 'IEEE_802_15_4_TRANSACTION_EXPIRED', 'IEEE_802_15_4_CHANNEL_ACCESS_FAILURE', 'IEEE_802_15_4_INVALID_ADDRESS', 'IEEE_802_15_4_INVALID_GTS', 'IEEE_802_15_4_NO_ACK', 'IEEE_802_15_4_COUNTER_ERROR', 'IEEE_802_15_4_FRAME_TOO_LONG', 'IEEE_802_15_4_UNAVAILABLE_KEY', 'IEEE_802_15_4_UNSUPPORTED_SECURITY', 'IEEE_802_15_4_INVALID_PARAMETER'])
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPibAttributeIdentifier [enumeration]
module.add_enum('LrWpanPibAttributeIdentifier', ['phyCurrentChannel', 'phyChannelsSupported', 'phyTransmitPower', 'phyCCAMode', 'phyCurrentPage', 'phyMaxFrameDuration', 'phySHRDuration', 'phySymbolsPerOctet'])
+ ## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPhyOption [enumeration]
+ module.add_enum('LrWpanPhyOption', ['IEEE_802_15_4_868MHZ_BPSK', 'IEEE_802_15_4_915MHZ_BPSK', 'IEEE_802_15_4_868MHZ_ASK', 'IEEE_802_15_4_915MHZ_ASK', 'IEEE_802_15_4_868MHZ_OQPSK', 'IEEE_802_15_4_915MHZ_OQPSK', 'IEEE_802_15_4_2_4GHZ_OQPSK', 'IEEE_802_15_4_INVALID_PHY_OPTION'])
## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanMacState [enumeration]
module.add_enum('LrWpanMacState', ['MAC_IDLE', 'MAC_CSMA', 'MAC_SENDING', 'MAC_ACK_PENDING', 'CHANNEL_ACCESS_FAILURE', 'CHANNEL_IDLE', 'SET_PHY_TX_ON'])
- ## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanAssociationStatus [enumeration]
- module.add_enum('LrWpanAssociationStatus', ['ASSOCIATED', 'PAN_AT_CAPACITY', 'PAN_ACCESS_DENIED', 'ASSOCIATED_WITHOUT_ADDRESS', 'DISASSOCIATED'])
- ## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanPhyOption [enumeration]
- module.add_enum('LrWpanPhyOption', ['IEEE_802_15_4_868MHZ_BPSK', 'IEEE_802_15_4_915MHZ_BPSK', 'IEEE_802_15_4_868MHZ_ASK', 'IEEE_802_15_4_915MHZ_ASK', 'IEEE_802_15_4_868MHZ_OQPSK', 'IEEE_802_15_4_915MHZ_OQPSK', 'IEEE_802_15_4_2_4GHZ_OQPSK', 'IEEE_802_15_4_INVALID_PHY_OPTION'])
## lr-wpan-mac.h (module 'lr-wpan'): ns3::LrWpanAddressMode [enumeration]
module.add_enum('LrWpanAddressMode', ['NO_PANID_ADDR', 'ADDR_MODE_RESERVED', 'SHORT_ADDR', 'EXT_ADDR'])
## address.h (module 'network'): ns3::Address [class]
@@ -308,9 +308,6 @@
module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue'])
## lr-wpan-net-device.h (module 'lr-wpan'): ns3::LrWpanNetDevice [class]
module.add_class('LrWpanNetDevice', parent=root_module['ns3::NetDevice'])
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeCcaConfirmCallback')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeCcaConfirmCallback*')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeCcaConfirmCallback&')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeEdConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeEdConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeEdConfirmCallback&')
@@ -329,6 +326,9 @@
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::LrWpanPhyPibAttributes *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeGetAttributeConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::LrWpanPhyPibAttributes *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeGetAttributeConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::LrWpanPhyPibAttributes *, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeGetAttributeConfirmCallback&')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeSetTRXStateConfirmCallback')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeSetTRXStateConfirmCallback*')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeSetTRXStateConfirmCallback&')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PdDataConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PdDataConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PdDataConfirmCallback&')
@@ -344,9 +344,9 @@
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeSetAttributeConfirmCallback')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeSetAttributeConfirmCallback*')
typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::LrWpanPibAttributeIdentifier, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeSetAttributeConfirmCallback&')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeSetTRXStateConfirmCallback')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeSetTRXStateConfirmCallback*')
- typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeSetTRXStateConfirmCallback&')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::PlmeCcaConfirmCallback')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::PlmeCcaConfirmCallback*')
+ typehandlers.add_type_alias(u'ns3::Callback< void, ns3::LrWpanPhyEnumeration, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::PlmeCcaConfirmCallback&')
## Register a nested module for the namespace FatalImpl
@@ -1630,10 +1630,10 @@
return
def register_Ns3LrWpanEdPower_methods(root_module, cls):
+ ## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanEdPower::LrWpanEdPower() [constructor]
+ cls.add_constructor([])
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanEdPower::LrWpanEdPower(ns3::LrWpanEdPower const & arg0) [copy constructor]
cls.add_constructor([param('ns3::LrWpanEdPower const &', 'arg0')])
- ## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanEdPower::LrWpanEdPower() [constructor]
- cls.add_constructor([])
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanEdPower::averagePower [variable]
cls.add_instance_attribute('averagePower', 'double', is_const=False)
## lr-wpan-phy.h (module 'lr-wpan'): ns3::LrWpanEdPower::lastUpdate [variable]
@@ -2945,10 +2945,10 @@
cls.add_method('EnableLogComponents',
'void',
[])
- ## lr-wpan-helper.h (module 'lr-wpan'): static std::string ns3::LrWpanHelper::LrWpanPhyEnumerationPrinter(ns3::LrWpanPhyEnumeration arg0) [member function]
+ ## lr-wpan-helper.h (module 'lr-wpan'): static std::string ns3::LrWpanHelper::LrWpanPhyEnumerationPrinter(ns3::LrWpanPhyEnumeration e) [member function]
cls.add_method('LrWpanPhyEnumerationPrinter',
'std::string',
- [param('ns3::LrWpanPhyEnumeration', 'arg0')],
+ [param('ns3::LrWpanPhyEnumeration', 'e')],
is_static=True)
## lr-wpan-helper.h (module 'lr-wpan'): static std::string ns3::LrWpanHelper::LrWpanMacStatePrinter(ns3::LrWpanMacState e) [member function]
cls.add_method('LrWpanMacStatePrinter',
@@ -3096,16 +3096,16 @@
'uint64_t',
[],
is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): std::string ns3::LrWpanMacHeader::GetName() const [member function]
- cls.add_method('GetName',
- 'std::string',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetSecControl() const [member function]
cls.add_method('GetSecControl',
'uint8_t',
[],
is_const=True)
+ ## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetSecCtrlReserved() const [member function]
+ cls.add_method('GetSecCtrlReserved',
+ 'uint8_t',
+ [],
+ is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetSecLevel() const [member function]
cls.add_method('GetSecLevel',
'uint8_t',
@@ -3151,11 +3151,6 @@
'ns3::TypeId',
[],
is_static=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): uint8_t ns3::LrWpanMacHeader::GetsecctrlReserved() const [member function]
- cls.add_method('GetsecctrlReserved',
- 'uint8_t',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsAckReq() const [member function]
cls.add_method('IsAckReq',
'bool',
@@ -3186,31 +3181,11 @@
'bool',
[],
is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsNoAckReq() const [member function]
- cls.add_method('IsNoAckReq',
- 'bool',
- [],
- is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsNoFrmPend() const [member function]
- cls.add_method('IsNoFrmPend',
- 'bool',
- [],
- is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsNoPanIdComp() const [member function]
- cls.add_method('IsNoPanIdComp',
- 'bool',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsPanIdComp() const [member function]
cls.add_method('IsPanIdComp',
'bool',
[],
is_const=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsSecDisable() const [member function]
- cls.add_method('IsSecDisable',
- 'bool',
- [],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): bool ns3::LrWpanMacHeader::IsSecEnable() const [member function]
cls.add_method('IsSecEnable',
'bool',
@@ -3221,11 +3196,6 @@
'void',
[param('std::ostream &', 'os')],
is_const=True, is_virtual=True)
- ## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::PrintFrameControl(std::ostream & os) const [member function]
- cls.add_method('PrintFrameControl',
- 'void',
- [param('std::ostream &', 'os')],
- is_const=True)
## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::Serialize(ns3::Buffer::Iterator start) const [member function]
cls.add_method('Serialize',
'void',
@@ -3303,6 +3273,10 @@
cls.add_method('SetSecControl',
'void',
[param('uint8_t', 'secLevel')])
+ ## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::SetSecCtrlReserved(uint8_t res) [member function]
+ cls.add_method('SetSecCtrlReserved',
+ 'void',
+ [param('uint8_t', 'res')])
## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::SetSecDisable() [member function]
cls.add_method('SetSecDisable',
'void',
@@ -3335,10 +3309,6 @@
cls.add_method('SetType',
'void',
[param('ns3::LrWpanMacHeader::LrWpanMacType', 'wpanMacType')])
- ## lr-wpan-mac-header.h (module 'lr-wpan'): void ns3::LrWpanMacHeader::SetsecctrlReserved(uint8_t res) [member function]
- cls.add_method('SetsecctrlReserved',
- 'void',
- [param('uint8_t', 'res')])
return
def register_Ns3Object_methods(root_module, cls):
@@ -3729,10 +3699,10 @@
cls.add_constructor([param('long unsigned int', 'v')])
## nstime.h (module 'core'): ns3::Time::Time(long long unsigned int v) [constructor]
cls.add_constructor([param('long long unsigned int', 'v')])
+ ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & v) [constructor]
+ cls.add_constructor([param('ns3::int64x64_t const &', 'v')])
## nstime.h (module 'core'): ns3::Time::Time(std::string const & s) [constructor]
cls.add_constructor([param('std::string const &', 's')])
- ## nstime.h (module 'core'): ns3::Time::Time(ns3::int64x64_t const & value) [constructor]
- cls.add_constructor([param('ns3::int64x64_t const &', 'value')])
## nstime.h (module 'core'): ns3::TimeWithUnit ns3::Time::As(ns3::Time::Unit const unit) const [member function]
cls.add_method('As',
'ns3::TimeWithUnit',
@@ -3743,25 +3713,25 @@
'int',
[param('ns3::Time const &', 'o')],
is_const=True)
- ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & from, ns3::Time::Unit timeUnit) [member function]
- cls.add_method('From',
- 'ns3::Time',
- [param('ns3::int64x64_t const &', 'from'), param('ns3::Time::Unit', 'timeUnit')],
- is_static=True)
## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value) [member function]
cls.add_method('From',
'ns3::Time',
[param('ns3::int64x64_t const &', 'value')],
is_static=True)
- ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit timeUnit) [member function]
+ ## nstime.h (module 'core'): static ns3::Time ns3::Time::From(ns3::int64x64_t const & value, ns3::Time::Unit unit) [member function]
+ cls.add_method('From',
+ 'ns3::Time',
+ [param('ns3::int64x64_t const &', 'value'), param('ns3::Time::Unit', 'unit')],
+ is_static=True)
+ ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromDouble(double value, ns3::Time::Unit unit) [member function]
cls.add_method('FromDouble',
'ns3::Time',
- [param('double', 'value'), param('ns3::Time::Unit', 'timeUnit')],
+ [param('double', 'value'), param('ns3::Time::Unit', 'unit')],
is_static=True)
- ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit timeUnit) [member function]
+ ## nstime.h (module 'core'): static ns3::Time ns3::Time::FromInteger(uint64_t value, ns3::Time::Unit unit) [member function]
cls.add_method('FromInteger',
'ns3::Time',
- [param('uint64_t', 'value'), param('ns3::Time::Unit', 'timeUnit')],
+ [param('uint64_t', 'value'), param('ns3::Time::Unit', 'unit')],
is_static=True)
## nstime.h (module 'core'): double ns3::Time::GetDays() const [member function]
cls.add_method('GetDays',
@@ -3878,20 +3848,20 @@
'bool',
[],
is_static=True)
- ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit timeUnit) const [member function]
+ ## nstime.h (module 'core'): ns3::int64x64_t ns3::Time::To(ns3::Time::Unit unit) const [member function]
cls.add_method('To',
'ns3::int64x64_t',
- [param('ns3::Time::Unit', 'timeUnit')],
- is_const=True)
- ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit timeUnit) const [member function]
+ [param('ns3::Time::Unit', 'unit')],
+ is_const=True)
+ ## nstime.h (module 'core'): double ns3::Time::ToDouble(ns3::Time::Unit unit) const [member function]
cls.add_method('ToDouble',
'double',
- [param('ns3::Time::Unit', 'timeUnit')],
- is_const=True)
- ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit timeUnit) const [member function]
+ [param('ns3::Time::Unit', 'unit')],
+ is_const=True)
+ ## nstime.h (module 'core'): int64_t ns3::Time::ToInteger(ns3::Time::Unit unit) const [member function]
cls.add_method('ToInteger',
'int64_t',
- [param('ns3::Time::Unit', 'timeUnit')],
+ [param('ns3::Time::Unit', 'unit')],
is_const=True)
return
--- a/src/lr-wpan/helper/lr-wpan-helper.cc Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/helper/lr-wpan-helper.cc Mon Aug 25 19:15:36 2014 +0200
@@ -32,6 +32,12 @@
namespace ns3 {
+/**
+ * @brief Output an ascii line representing the Transmit event (with context)
+ * @param stream the output stream
+ * @param context the context
+ * @param p the packet
+ */
static void
AsciiLrWpanMacTransmitSinkWithContext (
Ptr<OutputStreamWrapper> stream,
@@ -41,6 +47,11 @@
*stream->GetStream () << "t " << Simulator::Now ().GetSeconds () << " " << context << " " << *p << std::endl;
}
+/**
+ * @brief Output an ascii line representing the Transmit event (without context)
+ * @param stream the output stream
+ * @param p the packet
+ */
static void
AsciiLrWpanMacTransmitSinkWithoutContext (
Ptr<OutputStreamWrapper> stream,
@@ -198,6 +209,11 @@
return;
}
+/**
+ * @brief Write a packet in a PCAP file
+ * @param file the output file
+ * @param packet the packet
+ */
static void
PcapSniffLrWpan (Ptr<PcapFileWrapper> file, Ptr<const Packet> packet)
{
--- a/src/lr-wpan/helper/lr-wpan-helper.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/helper/lr-wpan-helper.h Mon Aug 25 19:15:36 2014 +0200
@@ -60,7 +60,9 @@
void AddMobility (Ptr<LrWpanPhy> phy, Ptr<MobilityModel> m);
/**
+ * \brief Install a LrWpanNetDevice and the associated structures (e.g., channel) in the nodes.
* \param c a set of nodes
+ * \returns A container holding the added net devices.
*/
NetDeviceContainer Install (NodeContainer c);
@@ -77,7 +79,18 @@
*/
void EnableLogComponents (void);
- static std::string LrWpanPhyEnumerationPrinter (LrWpanPhyEnumeration);
+ /**
+ * \brief Transform the LrWpanPhyEnumeration enumeration into a printable string.
+ * \param e the LrWpanPhyEnumeration
+ * \return a string
+ */
+ static std::string LrWpanPhyEnumerationPrinter (LrWpanPhyEnumeration e);
+
+ /**
+ * \brief Transform the LrWpanMacState enumeration into a printable string.
+ * \param e the LrWpanMacState
+ * \return a string
+ */
static std::string LrWpanMacStatePrinter (LrWpanMacState e);
/**
@@ -95,7 +108,14 @@
private:
// Disable implicit constructors
+ /**
+ * \brief Copy constructor - defined and not implemented.
+ */
LrWpanHelper (LrWpanHelper const &);
+ /**
+ * \brief Copy constructor - defined and not implemented.
+ * \returns
+ */
LrWpanHelper& operator= (LrWpanHelper const &);
/**
* \internal
@@ -123,6 +143,7 @@
* \param stream The output stream object to use when logging ascii traces.
* \param prefix Filename prefix to use for ascii trace files.
* \param nd Net device for which you want to enable tracing.
+ * \param explicitFilename Treat the prefix as an explicit filename if true
*/
virtual void EnableAsciiInternal (Ptr<OutputStreamWrapper> stream,
std::string prefix,
@@ -130,7 +151,7 @@
bool explicitFilename);
private:
- Ptr<SingleModelSpectrumChannel> m_channel;
+ Ptr<SingleModelSpectrumChannel> m_channel; //!< channel to be used for the devices
};
--- a/src/lr-wpan/model/lr-wpan-csmaca.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-csmaca.h Mon Aug 25 19:15:36 2014 +0200
@@ -240,7 +240,14 @@
private:
// Disable implicit copy constructors
+ /**
+ * \brief Copy constructor - defined and not implemented.
+ */
LrWpanCsmaCa (LrWpanCsmaCa const &);
+ /**
+ * \brief Copy constructor - defined and not implemented.
+ * \returns
+ */
LrWpanCsmaCa& operator= (LrWpanCsmaCa const &);
virtual void DoDispose (void);
--- a/src/lr-wpan/model/lr-wpan-interference-helper.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-interference-helper.h Mon Aug 25 19:15:36 2014 +0200
@@ -87,7 +87,14 @@
Ptr<const SpectrumModel> GetSpectrumModel (void) const;
private:
// Disable implicit copy constructors
+ /**
+ * \brief Copy constructor - defined and not implemented.
+ */
LrWpanInterferenceHelper (LrWpanInterferenceHelper const &);
+ /**
+ * \brief Copy constructor - defined and not implemented.
+ * \returns
+ */
LrWpanInterferenceHelper& operator= (LrWpanInterferenceHelper const &);
/**
* The helpers SpectrumModel.
--- a/src/lr-wpan/model/lr-wpan-mac-header.cc Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-mac-header.cc Mon Aug 25 19:15:36 2014 +0200
@@ -110,47 +110,23 @@
}
bool
-LrWpanMacHeader::IsSecDisable (void) const
-{
- return (m_fctrlSecU == 0);
-}
-
-bool
LrWpanMacHeader::IsFrmPend (void) const
{
return (m_fctrlFrmPending == 1);
}
bool
-LrWpanMacHeader::IsNoFrmPend (void) const
-{
- return (m_fctrlFrmPending == 0);
-}
-
-bool
LrWpanMacHeader::IsAckReq (void) const
{
return (m_fctrlAckReq == 1);
}
bool
-LrWpanMacHeader::IsNoAckReq (void) const
-{
- return (m_fctrlAckReq == 0);
-}
-
-bool
LrWpanMacHeader::IsPanIdComp (void) const
{
return (m_fctrlPanIdComp == 1);
}
-bool
-LrWpanMacHeader::IsNoPanIdComp (void) const
-{
- return (m_fctrlPanIdComp == 0);
-}
-
uint8_t
LrWpanMacHeader::GetFrmCtrlRes (void) const
{
@@ -252,7 +228,7 @@
}
uint8_t
-LrWpanMacHeader::GetsecctrlReserved (void) const
+LrWpanMacHeader::GetSecCtrlReserved (void) const
{
return (m_secctrlReserved);
}
@@ -475,7 +451,7 @@
}
void
-LrWpanMacHeader::SetsecctrlReserved (uint8_t res)
+LrWpanMacHeader::SetSecCtrlReserved (uint8_t res)
{
m_secctrlReserved = res;
}
@@ -504,13 +480,6 @@
m_auxKeyIdKeySrc64 = keySrc;
}
-
-std::string
-LrWpanMacHeader::GetName (void) const
-{
- return "LrWpan MAC Header";
-}
-
TypeId
LrWpanMacHeader::GetTypeId (void)
{
@@ -520,7 +489,6 @@
return tid;
}
-
TypeId
LrWpanMacHeader::GetInstanceTypeId (void) const
{
@@ -528,18 +496,13 @@
}
void
-LrWpanMacHeader::PrintFrameControl (std::ostream &os) const
+LrWpanMacHeader::Print (std::ostream &os) const
{
os << " Frame Type = " << (uint32_t) m_fctrlFrmType << ", Sec Enable = " << (uint32_t) m_fctrlSecU
<< ", Frame Pending = " << (uint32_t) m_fctrlFrmPending << ", Ack Request = " << (uint32_t) m_fctrlAckReq
<< ", PAN ID Compress = " << (uint32_t) m_fctrlPanIdComp << ", Frame Vers = " << (uint32_t) m_fctrlFrmVer
<< ", Dst Addrs Mode = " << (uint32_t) m_fctrlDstAddrMode << ", Src Addr Mode = " << (uint32_t) m_fctrlSrcAddrMode;
-}
-void
-LrWpanMacHeader::Print (std::ostream &os) const
-{
- PrintFrameControl (os);
os << ", Sequence Num = " << static_cast<uint16_t> (m_SeqNum);
switch (m_fctrlDstAddrMode)
@@ -629,7 +592,7 @@
break;
case SHORTADDR:
// check if PAN Id compression is enabled
- if (IsNoPanIdComp ())
+ if (!IsPanIdComp ())
{
size += 4;
}
@@ -640,7 +603,7 @@
break;
case EXTADDR:
// check if PAN Id compression is enabled
- if (IsNoPanIdComp ())
+ if (!IsPanIdComp ())
{
size += 10;
}
@@ -703,14 +666,14 @@
case NOADDR:
break;
case SHORTADDR:
- if (IsNoPanIdComp ())
+ if (!IsPanIdComp ())
{
i.WriteHtolsbU16 (GetSrcPanId ());
}
WriteTo (i, m_addrShortSrcAddr);
break;
case EXTADDR:
- if (IsNoPanIdComp ())
+ if (!IsPanIdComp ())
{
i.WriteHtolsbU16 (GetSrcPanId ());
}
@@ -771,7 +734,7 @@
case NOADDR:
break;
case SHORTADDR:
- if (IsNoPanIdComp ())
+ if (!IsPanIdComp ())
{
m_addrSrcPanId = i.ReadLsbtohU16 ();
}
@@ -785,7 +748,7 @@
ReadFrom (i, m_addrShortSrcAddr);
break;
case EXTADDR:
- if (IsNoPanIdComp ())
+ if (!IsPanIdComp ())
{
m_addrSrcPanId = i.ReadLsbtohU16 ();
}
--- a/src/lr-wpan/model/lr-wpan-mac-header.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-mac-header.h Mon Aug 25 19:15:36 2014 +0200
@@ -18,7 +18,7 @@
* Author: kwong yin <kwong-sang.yin@boeing.com>
*/
-/**
+/*
* the following classes implements the 802.15.4 Mac Header
* There are 4 types of 802.15.4 Mac Headers Frames, and they have these fields
*
@@ -46,7 +46,7 @@
namespace ns3 {
-/*
+/**
* \ingroup lr-wpan
* Represent the Mac Header with the Frame Control and Sequence Number fields
*/
@@ -54,15 +54,22 @@
{
public:
+
+ /**
+ * The possible MAC types, see IEEE 802.15.4-2006, Table 79.
+ */
enum LrWpanMacType
{
- LRWPAN_MAC_BEACON = 0,
- LRWPAN_MAC_DATA = 1,
- LRWPAN_MAC_ACKNOWLEDGMENT = 2,
- LRWPAN_MAC_COMMAND = 3,
- LRWPAN_MAC_RESERVED
+ LRWPAN_MAC_BEACON = 0, //!< LRWPAN_MAC_BEACON
+ LRWPAN_MAC_DATA = 1, //!< LRWPAN_MAC_DATA
+ LRWPAN_MAC_ACKNOWLEDGMENT = 2,//!< LRWPAN_MAC_ACKNOWLEDGMENT
+ LRWPAN_MAC_COMMAND = 3, //!< LRWPAN_MAC_COMMAND
+ LRWPAN_MAC_RESERVED //!< LRWPAN_MAC_RESERVED
};
+ /**
+ * The addressing mode types, see IEEE 802.15.4-2006, Table 80.
+ */
enum AddrModeType
{
NOADDR = 0,
@@ -71,6 +78,9 @@
EXTADDR = 3
};
+ /**
+ * The addressing mode types, see IEEE 802.15.4-2006, Table 80.
+ */
enum KeyIdModeType
{
IMPLICIT = 0,
@@ -81,6 +91,11 @@
LrWpanMacHeader (void);
+ /**
+ * Constructor
+ * \param wpanMacType the header MAC type
+ * \param seqNum the sequence number
+ */
LrWpanMacHeader (enum LrWpanMacType wpanMacType, // Data, ACK, Control MAC Header must have
uint8_t seqNum); // frame control and sequence number.
// Beacon MAC Header must have frame control,
@@ -88,96 +103,324 @@
~LrWpanMacHeader (void);
-
+ /**
+ * Get the header type
+ * \return the header type
+ */
enum LrWpanMacType GetType (void) const;
+ /**
+ * Get the Frame control field
+ * \return the Frame control field
+ */
uint16_t GetFrameControl (void) const;
+
+ /**
+ * Check if Security Enabled bit of Frame Control is enabled
+ * \return true if Security Enabled bit is enabled
+ */
bool IsSecEnable (void) const;
- bool IsSecDisable (void) const;
+
+ /**
+ * Check if Frame Pending bit of Frame Control is enabled
+ * \return true if Frame Pending bit is enabled
+ */
bool IsFrmPend (void) const;
- bool IsNoFrmPend (void) const;
+
+ /**
+ * Check if Ack. Request bit of Frame Control is enabled
+ * \return true if Ack. Request bit is enabled
+ */
bool IsAckReq (void) const;
- bool IsNoAckReq (void) const;
+
+ /**
+ * Check if PAN ID Compression bit of Frame Control is enabled
+ * \return true if PAN ID Compression bit is enabled
+ */
bool IsPanIdComp (void) const;
- bool IsNoPanIdComp (void) const;
+
+ /**
+ * Get the Reserved bits of Frame control field
+ * \return the Reserved bits
+ */
uint8_t GetFrmCtrlRes (void) const;
+
+ /**
+ * Get the Dest. Addressing Mode of Frame control field
+ * \return the Dest. Addressing Mode bits
+ */
uint8_t GetDstAddrMode (void) const;
+ /**
+ * Get the Frame Version of Frame control field
+ * \return the Frame Version bits
+ */
uint8_t GetFrameVer (void) const;
+ /**
+ * Get the Source Addressing Mode of Frame control field
+ * \return the Source Addressing Mode bits
+ */
uint8_t GetSrcAddrMode (void) const;
+ /**
+ * Get the frame Sequence number
+ * \return the sequence number
+ */
uint8_t GetSeqNum (void) const;
+ /**
+ * Get the Destination PAN ID
+ * \return the Destination PAN ID
+ */
uint16_t GetDstPanId (void) const;
+ /**
+ * Get the Destination Short address
+ * \return the Destination Short address
+ */
Mac16Address GetShortDstAddr (void) const;
+ /**
+ * Get the Destination Extended address
+ * \return the Destination Extended address
+ */
Mac64Address GetExtDstAddr (void) const;
+ /**
+ * Get the Source PAN ID
+ * \return the Source PAN ID
+ */
uint16_t GetSrcPanId (void) const;
+ /**
+ * Get the Source Short address
+ * \return the Source Short address
+ */
Mac16Address GetShortSrcAddr (void) const;
+ /**
+ * Get the Source Extended address
+ * \return the Source Extended address
+ */
Mac64Address GetExtSrcAddr (void) const;
+ /**
+ * Get the Auxiliary Security Header - Security Control Octect
+ * \return the Auxiliary Security Header - Security Control Octect
+ */
uint8_t GetSecControl (void) const;
+ /**
+ * Get the Auxiliary Security Header - Frame Counter Octects
+ * \return the Auxiliary Security Header - Frame Counter Octects
+ */
uint32_t GetFrmCounter (void) const;
+ /**
+ * Get the Auxiliary Security Header - Security Control - Security Level bits
+ * \return the Auxiliary Security Header - Security Control - Security Level bits
+ */
uint8_t GetSecLevel (void) const;
+ /**
+ * Get the Auxiliary Security Header - Security Control - Key Identifier Mode bits
+ * \return the Auxiliary Security Header - Security Control - Key Identifier Mode bits
+ */
uint8_t GetKeyIdMode (void) const;
- uint8_t GetsecctrlReserved (void) const;
+ /**
+ * Get the Auxiliary Security Header - Security Control - Reserved bits
+ * \return the Auxiliary Security Header - Security Control - Reserved bits
+ */
+ uint8_t GetSecCtrlReserved (void) const;
+ /**
+ * Get the Auxiliary Security Header - Key Identifier - Key Source (2 Octects)
+ * \return the Auxiliary Security Header - Key Identifier - Key Source (2 Octects)
+ */
uint32_t GetKeyIdSrc32 (void) const;
+ /**
+ * Get the Auxiliary Security Header - Key Identifier - Key Source (4 Octects)
+ * \return the Auxiliary Security Header - Key Identifier - Key Source (4 Octects)
+ */
uint64_t GetKeyIdSrc64 (void) const;
+ /**
+ * Get the Auxiliary Security Header - Key Identifier - Key Index
+ * \return the Auxiliary Security Header - Key Identifier - Key Index
+ */
uint8_t GetKeyIdIndex (void) const;
-
+ /**
+ * Returns true if the header is a beacon
+ * \return true if the header is a beacon
+ */
bool IsBeacon (void) const;
+ /**
+ * Returns true if the header is a data
+ * \return true if the header is a data
+ */
bool IsData (void) const;
+ /**
+ * Returns true if the header is an ack
+ * \return true if the header is an ack
+ */
bool IsAcknowledgment (void) const;
+ /**
+ * Returns true if the header is a command
+ * \return true if the header is a command
+ */
bool IsCommand (void) const;
+ /**
+ * Set the Frame Control field "Frame Type" bits
+ * \param wpanMacType the frame type
+ */
+ void SetType (enum LrWpanMacType wpanMacType);
- void SetType (enum LrWpanMacType wpanMacType);
+ /**
+ * Set the whole Frame Control field
+ * \param frameControl the Frame Control field
+ */
void SetFrameControl (uint16_t frameControl);
+
+ /**
+ * Set the Frame Control field "Security Enabled" bit to true
+ */
void SetSecEnable (void);
+
+ /**
+ * Set the Frame Control field "Security Enabled" bit to false
+ */
void SetSecDisable (void);
+
+ /**
+ * Set the Frame Control field "Frame Pending" bit to true
+ */
void SetFrmPend (void);
+
+ /**
+ * Set the Frame Control field "Frame Pending" bit to false
+ */
void SetNoFrmPend (void);
+
+ /**
+ * Set the Frame Control field "Ack. Request" bit to true
+ */
void SetAckReq (void);
+
+ /**
+ * Set the Frame Control field "Ack. Request" bit to false
+ */
void SetNoAckReq (void);
+
+ /**
+ * Set the Frame Control field "PAN ID Compression" bit to true
+ */
void SetPanIdComp (void);
+
+ /**
+ * Set the Frame Control field "PAN ID Compression" bit to false
+ */
void SetNoPanIdComp (void);
+
+ /**
+ * Set the Frame Control field "Reserved" bits
+ * \param res reserved bits
+ */
void SetFrmCtrlRes (uint8_t res);
+ /**
+ * Set the Destination address mode
+ * \param addrMode Destination address mode
+ */
void SetDstAddrMode (uint8_t addrMode);
+ /**
+ * Set the Frame version
+ * \param ver frame version
+ */
void SetFrameVer (uint8_t ver);
+ /**
+ * Set the Source address mode
+ * \param addrMode Source address mode
+ */
void SetSrcAddrMode (uint8_t addrMode);
+ /**
+ * Set the Sequence number
+ * \param seqNum sequence number
+ */
void SetSeqNum (uint8_t seqNum);
/* The Source/Destination Addressing fields are only set if SrcAddrMode/DstAddrMode are set */
- void SetSrcAddrFields (uint16_t panId,
- Mac16Address addr);
- void SetSrcAddrFields (uint16_t panId,
- Mac64Address addr);
- void SetDstAddrFields (uint16_t panId,
- Mac16Address addr);
- void SetDstAddrFields (uint16_t panId,
- Mac64Address addr);
+ /**
+ * Set Source address fields
+ * \param panId source PAN ID
+ * \param addr source address (16 bit)
+ */
+ void SetSrcAddrFields (uint16_t panId, Mac16Address addr);
+ /**
+ * Set Source address fields
+ * \param panId source PAN ID
+ * \param addr source address (64 bit)
+ */
+ void SetSrcAddrFields (uint16_t panId, Mac64Address addr);
+ /**
+ * Set Destination address fields
+ * \param panId destination PAN ID
+ * \param addr destination address (16 bit)
+ */
+ void SetDstAddrFields (uint16_t panId, Mac16Address addr);
+ /**
+ * Set Destination address fields
+ * \param panId destination PAN ID
+ * \param addr destination address (64 bit)
+ */
+ void SetDstAddrFields (uint16_t panId, Mac64Address addr);
/* Auxiliary Security Header is only set if Sec Enable (SecU) field is set to 1 */
+ /**
+ * Set the auxiliary security header "Security Control" octet
+ * \param secLevel the "Security Control" octect
+ */
void SetSecControl (uint8_t secLevel);
+ /**
+ * Set the auxiliary security header "Frame Counter" octet
+ * \param frmCntr the "Frame Counter" octect
+ */
void SetFrmCounter (uint32_t frmCntr);
+ /**
+ * Set the Security Control field "Security Level" bits (3 bits)
+ * \param secLevel the "Security Level" bits
+ */
void SetSecLevel (uint8_t secLevel);
+ /**
+ * Set the Security Control field "Key Identifier Mode" bits (2 bits)
+ * \param keyIdMode the "Key Identifier Mode" bits
+ */
void SetKeyIdMode (uint8_t keyIdMode);
- void SetsecctrlReserved (uint8_t res);
+
+ /**
+ * Set the Security Control field "Reserved" bits (3 bits)
+ * \param res the "Reserved" bits
+ */
+ void SetSecCtrlReserved (uint8_t res);
/* Variable length will be dependent on Key Id Mode*/
+ /**
+ * Set the Key Index
+ * \param keyIndex the Key index
+ */
void SetKeyId (uint8_t keyIndex);
- void SetKeyId (uint32_t keySrc,
- uint8_t keyIndex);
- void SetKeyId (uint64_t keySrc,
- uint8_t keyIndex);
+ /**
+ * Set the Key Index and originator
+ * \param keySrc the originator of a group key
+ * \param keyIndex the Key index
+ */
+ void SetKeyId (uint32_t keySrc, uint8_t keyIndex);
+ /**
+ * Set the Key Index and originator
+ * \param keySrc the originator of a group key
+ * \param keyIndex the Key index
+ */
+ void SetKeyId (uint64_t keySrc, uint8_t keyIndex);
-
- std::string GetName (void) const;
+ /**
+ * \brief Get the type ID.
+ * \return the object TypeId
+ */
static TypeId GetTypeId (void);
virtual TypeId GetInstanceTypeId (void) const;
- void PrintFrameControl (std::ostream &os) const;
+
void Print (std::ostream &os) const;
uint32_t GetSerializedSize (void) const;
void Serialize (Buffer::Iterator start) const;
@@ -186,50 +429,50 @@
private:
/* Frame Control 2 Octets */
- /* Frame Control fields */
- uint8_t m_fctrlFrmType; // Bit 0-2 = 0 - Beacon, 1 - Data, 2 - Ack, 3 - Command
- uint8_t m_fctrlSecU; // Bit 3 = 0 - no AuxSecHdr , 1 - security enabled AuxSecHdr present
- uint8_t m_fctrlFrmPending; // Bit 4
- uint8_t m_fctrlAckReq; // Bit 5
- uint8_t m_fctrlPanIdComp; // Bit 6 = 0 - no compression, 1 - using only DstPanId for both Src and DstPanId
- uint8_t m_fctrlReserved; // Bit 7-9
- uint8_t m_fctrlDstAddrMode; // Bit 10-11 = 0 - No DstAddr, 2 - ShtDstAddr, 3 - ExtDstAddr
- uint8_t m_fctrlFrmVer; // Bit 12-13
- uint8_t m_fctrlSrcAddrMode; // Bit 14-15 = 0 - No DstAddr, 2 - ShtDstAddr, 3 - ExtDstAddr
+ /* Frame Control field - see 7.2.1.1 */
+ uint8_t m_fctrlFrmType; //!< Frame Control field Bit 0-2 = 0 - Beacon, 1 - Data, 2 - Ack, 3 - Command
+ uint8_t m_fctrlSecU; //!< Frame Control field Bit 3 = 0 - no AuxSecHdr , 1 - security enabled AuxSecHdr present
+ uint8_t m_fctrlFrmPending; //!< Frame Control field Bit 4
+ uint8_t m_fctrlAckReq; //!< Frame Control field Bit 5
+ uint8_t m_fctrlPanIdComp; //!< Frame Control field Bit 6 = 0 - no compression, 1 - using only DstPanId for both Src and DstPanId
+ uint8_t m_fctrlReserved; //!< Frame Control field Bit 7-9
+ uint8_t m_fctrlDstAddrMode; //!< Frame Control field Bit 10-11 = 0 - No DstAddr, 2 - ShtDstAddr, 3 - ExtDstAddr
+ uint8_t m_fctrlFrmVer; //!< Frame Control field Bit 12-13
+ uint8_t m_fctrlSrcAddrMode; //!< Frame Control field Bit 14-15 = 0 - No SrcAddr, 2 - ShtSrcAddr, 3 - ExtSrcAddr
/* Sequence Number */
- uint8_t m_SeqNum; // 1 Octet
+ uint8_t m_SeqNum; //!< Sequence Number (1 Octet)
/* Addressing fields */
- uint16_t m_addrDstPanId; // 0 or 2 Octet
- Mac16Address m_addrShortDstAddr; // 0 or 8 Octet
- Mac64Address m_addrExtDstAddr; // 0 or 8 Octet
- uint16_t m_addrSrcPanId; // 0 or 2 Octet
- Mac16Address m_addrShortSrcAddr; // 0 or 8 Octet
- Mac64Address m_addrExtSrcAddr; // 0 or 8 Octet
+ uint16_t m_addrDstPanId; //!< Dst PAN id (0 or 2 Octets)
+ Mac16Address m_addrShortDstAddr; //!< Dst Short addr (0 or 2 Octets)
+ Mac64Address m_addrExtDstAddr; //!< Dst Ext addr (0 or 8 Octets)
+ uint16_t m_addrSrcPanId; //!< Src PAN id (0 or 2 Octets)
+ Mac16Address m_addrShortSrcAddr; //!< Src Short addr (0 or 2 Octets)
+ Mac64Address m_addrExtSrcAddr; //!< Src Ext addr (0 or 8 Octets)
- /* Auxiliary Security Header // 0, 5, 6, 10 or 14 Octets */
- // uint8_t m_auxSecCtrl; // 1 Octet see below
- uint32_t m_auxFrmCntr; // 4 Octet
+ /* Auxiliary Security Header - See 7.6.2 - 0, 5, 6, 10 or 14 Octets */
+ // uint8_t m_auxSecCtrl; // 1 Octet see below
+ uint32_t m_auxFrmCntr; //!< Auxiliary security header - Frame Counter (4 Octets)
- /* Security Control fields */
- uint8_t m_secctrlSecLevel; // Bit 0-2
- uint8_t m_secctrlKeyIdMode; // Bit 3-4 will indicate size of Key Id
+ /* Security Control fields - See 7.6.2.2 */
+ uint8_t m_secctrlSecLevel; //!< Auxiliary security header - Security Control field - Bit 0-2
+ uint8_t m_secctrlKeyIdMode; //!< Auxiliary security header - Security Control field - Bit 3-4 will indicate size of Key Id
// = 0 - Key is determined implicitly
- // from originator and receipient
+ // from originator and recipient
// = 1 - 1 Octet Key Index
- // = 2 - 1 octet Key Index and 4 oct Key src
- // = 3 - 1 octet Key Index and 8 oct Key src
+ // = 2 - 1 Octet Key Index and 4 oct Key src
+ // = 3 - 1 Octet Key Index and 8 oct Key src
- uint8_t m_secctrlReserved; // Bit 5-7
+ uint8_t m_secctrlReserved; //!< Auxiliary security header - Security Control field - Bit 5-7
union
{
- uint32_t m_auxKeyIdKeySrc32; // 4 octets
- uint64_t m_auxKeyIdKeySrc64; // 8 octets
+ uint32_t m_auxKeyIdKeySrc32; //!< Auxiliary security header - Key Source (4 Octets)
+ uint64_t m_auxKeyIdKeySrc64; //!< Auxiliary security header - Key Source (8 Octets)
};
- uint8_t m_auxKeyIdKeyIndex; // 1 octet
+ uint8_t m_auxKeyIdKeyIndex; //!< Auxiliary security header - Key Index (1 Octet)
}; //LrWpanMacHeader
--- a/src/lr-wpan/model/lr-wpan-mac-trailer.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-mac-trailer.h Mon Aug 25 19:15:36 2014 +0200
@@ -82,7 +82,7 @@
* trailer. The packet itself should contain no trailer. If FCS calculation is
* disabled for this trailer, CheckFcs() will always return true.
*
- * \param the packet to be checked
+ * \param p the packet to be checked
* \return false, if the FCS values do not match, true otherwise
*/
bool CheckFcs (Ptr<const Packet> p);
--- a/src/lr-wpan/model/lr-wpan-mac.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-mac.h Mon Aug 25 19:15:36 2014 +0200
@@ -44,23 +44,30 @@
*
* This section documents the API of the IEEE 802.15.4-related models. For a generic functional description, please refer to the ns-3 manual.
*/
+
+/**
+ * Tx options
+ */
typedef enum
{
- TX_OPTION_NONE = 0,
- TX_OPTION_ACK = 1,
- TX_OPTION_GTS = 2,
- TX_OPTION_INDIRECT = 4
+ TX_OPTION_NONE = 0, //!< TX_OPTION_NONE
+ TX_OPTION_ACK = 1, //!< TX_OPTION_ACK
+ TX_OPTION_GTS = 2, //!< TX_OPTION_GTS
+ TX_OPTION_INDIRECT = 4 //!< TX_OPTION_INDIRECT
} LrWpanTxOption;
+/**
+ * MAC states
+ */
typedef enum
{
- MAC_IDLE,
- MAC_CSMA,
- MAC_SENDING,
- MAC_ACK_PENDING,
- CHANNEL_ACCESS_FAILURE,
- CHANNEL_IDLE,
- SET_PHY_TX_ON
+ MAC_IDLE, //!< MAC_IDLE
+ MAC_CSMA, //!< MAC_CSMA
+ MAC_SENDING, //!< MAC_SENDING
+ MAC_ACK_PENDING, //!< MAC_ACK_PENDING
+ CHANNEL_ACCESS_FAILURE,//!< CHANNEL_ACCESS_FAILURE
+ CHANNEL_IDLE, //!< CHANNEL_IDLE
+ SET_PHY_TX_ON //!< SET_PHY_TX_ON
} LrWpanMacState;
/**
@@ -86,7 +93,7 @@
DISASSOCIATED = 0xff
} LrWpanAssociationStatus;
-/*
+/**
* Table 42 of 802.15.4-2006
*/
typedef enum
@@ -105,6 +112,10 @@
IEEE_802_15_4_INVALID_PARAMETER = 11
} LrWpanMcpsDataConfirmStatus;
+
+/**
+ * MCPS-DATA.request params. See 7.1.1.1
+ */
struct McpsDataRequestParams
{
McpsDataRequestParams ()
@@ -116,42 +127,52 @@
m_txOptions (0)
{
}
- LrWpanAddressMode m_srcAddrMode;
- LrWpanAddressMode m_dstAddrMode;
- uint16_t m_dstPanId;
- Mac16Address m_dstAddr;
- uint8_t m_msduHandle;
- uint8_t m_txOptions; // bitmap
+ LrWpanAddressMode m_srcAddrMode; //!< Source address mode
+ LrWpanAddressMode m_dstAddrMode; //!< Destination address mode
+ uint16_t m_dstPanId; //!< Destination PAN identifier
+ Mac16Address m_dstAddr; //!< Destination address
+ uint8_t m_msduHandle; //!< MSDU handle
+ uint8_t m_txOptions; //!< Tx Options (bitfield)
};
+/**
+ * MCPS-DATA.confirm params. See 7.1.1.2
+ */
struct McpsDataConfirmParams
{
- uint8_t m_msduHandle;
- LrWpanMcpsDataConfirmStatus m_status;
+ uint8_t m_msduHandle; //!< MSDU handle
+ LrWpanMcpsDataConfirmStatus m_status; //!< The status of the last MSDU transmission
};
+/**
+ * MCPS-DATA.indication params. See 7.1.1.3
+ */
struct McpsDataIndicationParams
{
- uint8_t m_srcAddrMode;
- uint16_t m_srcPanId;
- Mac16Address m_srcAddr;
- uint8_t m_dstAddrMode;
- uint16_t m_dstPanId;
- Mac16Address m_dstAddr;
- uint8_t m_mpduLinkQuality;
- uint8_t m_dsn;
+ uint8_t m_srcAddrMode; //!< Source address mode
+ uint16_t m_srcPanId; //!< Source PAN identifier
+ Mac16Address m_srcAddr; //!< Source address
+ uint8_t m_dstAddrMode; //!< Destination address mode
+ uint16_t m_dstPanId; //!< Destination PAN identifier
+ Mac16Address m_dstAddr; //!< Destination address
+ uint8_t m_mpduLinkQuality; //!< LQI value measured during reception of the MPDU
+ uint8_t m_dsn; //!< The DSN of the received data frame
};
-// This callback is called after a McpsDataRequest has been called from
-// the higher layer. It returns a status of the outcome of the
-// transmission request
+/**
+ * This callback is called after a McpsDataRequest has been called from
+ * the higher layer. It returns a status of the outcome of the
+ * transmission request
+ */
typedef Callback<void, McpsDataConfirmParams> McpsDataConfirmCallback;
-// This callback is called after a Mcps has successfully received a
-// frame and wants to deliver it to the higher layer.
-//
-// XXX for now, we do not deliver all of the parameters in section
-// 7.1.1.3.1 but just send up the packet.
+/**
+ * This callback is called after a Mcps has successfully received a
+ * frame and wants to deliver it to the higher layer.
+ *
+ * \todo for now, we do not deliver all of the parameters in section
+ * 7.1.1.3.1 but just send up the packet.
+ */
typedef Callback<void, McpsDataIndicationParams, Ptr<Packet> > McpsDataIndicationCallback;
@@ -488,8 +509,8 @@
*/
struct TxQueueElement
{
- uint8_t txQMsduHandle;
- Ptr<Packet> txQPkt;
+ uint8_t txQMsduHandle; //!< MSDU Handle
+ Ptr<Packet> txQPkt; //!< Queued packet
};
/**
@@ -652,7 +673,7 @@
*/
TracedCallback<Ptr<const Packet> > m_promiscSnifferTrace;
- /*
+ /**
* A trace source that fires when the LrWpanMac changes states.
* Parameters are the old mac state and the new mac state.
*/
--- a/src/lr-wpan/model/lr-wpan-net-device.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-net-device.h Mon Aug 25 19:15:36 2014 +0200
@@ -138,7 +138,7 @@
virtual void SetNode (Ptr<Node> node);
virtual bool NeedsArp (void) const;
- virtual void SetReceiveCallback (ReceiveCallback cb);
+ virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb);
virtual void SetPromiscReceiveCallback (PromiscReceiveCallback cb);
virtual bool SupportsSendFrom (void) const;
@@ -215,7 +215,7 @@
bool m_configComplete;
/**
- * Configure the NetDevice to request MAC layer acknowledgements when sending
+ * Configure the NetDevice to request MAC layer acknowledgments when sending
* packets using the Send() API.
*/
bool m_useAcks;
--- a/src/lr-wpan/model/lr-wpan-phy.h Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-phy.h Mon Aug 25 19:15:36 2014 +0200
@@ -46,29 +46,30 @@
*/
typedef struct
{
- double averagePower;
- Time lastUpdate;
- Time measurementLength;
+ double averagePower; //!< Average measured power
+ Time lastUpdate; //!< Last update time
+ Time measurementLength; //!< Total measuremement period
} LrWpanEdPower;
/**
- * IEEE802.15.4-2006 Table 1 and 2 in section 6.1.1 and 6.1.2
+ * This data structure provides the Bit rate and Symbol rate for a given channel
+ * See IEEE802.15.4-2006 Table 1 and 2 in section 6.1.1 and 6.1.2
*/
typedef struct
{
- double bitRate;
- double symbolRate;
+ double bitRate; //!< bit rate
+ double symbolRate; //!< symbol rate
} LrWpanPhyDataAndSymbolRates;
/**
- * IEEE802.15.4-2006 Figure 16, Table 19 and 20 in section 6.3
- * this data structure provides number of symbols for the PPDU headers: SHR and PHR
+ * This data structure provides number of symbols for the PPDU headers: SHR and PHR
+ * See IEEE802.15.4-2006 Figure 16, Table 19 and 20 in section 6.3
*/
typedef struct
{
- double shrPreamble;
- double shrSfd;
- double phr;
+ double shrPreamble; //!< Number of symbols for the SHR preamble
+ double shrSfd; //!< Number of symbols for the SHR SFD
+ double phr; //!< Number of symbols for the PHR
} LrWpanPhyPpduHeaderSymbolNumber;
/**
@@ -127,14 +128,14 @@
*/
typedef struct
{
- uint8_t phyCurrentChannel;
- uint32_t phyChannelsSupported[32];
- uint8_t phyTransmitPower;
- uint8_t phyCCAMode;
- uint32_t phyCurrentPage;
- uint32_t phyMaxFrameDuration;
- uint32_t phySHRDuration;
- double phySymbolsPerOctet;
+ uint8_t phyCurrentChannel; //!< The RF channel to use
+ uint32_t phyChannelsSupported[32]; //!< BitField representing the available channels supported by a channel page.
+ uint8_t phyTransmitPower; //!< Transmit power
+ uint8_t phyCCAMode; //!< CCA mode
+ uint32_t phyCurrentPage; //!< Current channel page
+ uint32_t phyMaxFrameDuration; //!< The maximum number of symbols in a frame
+ uint32_t phySHRDuration; //!< The duration of the synchronization header (SHR) in symbols
+ double phySymbolsPerOctet; //!< The number of symbols per octet
} LrWpanPhyPibAttributes;
/**
@@ -647,6 +648,10 @@
* The error model describing the bit and packet error rates.
*/
Ptr<LrWpanErrorModel> m_errorModel;
+
+ /**
+ * The current PHY PIB attributes.
+ */
LrWpanPhyPibAttributes m_phyPIBAttributes;
// State variables
--- a/src/lr-wpan/model/lr-wpan-spectrum-value-helper.cc Mon Aug 25 09:34:17 2014 +0200
+++ b/src/lr-wpan/model/lr-wpan-spectrum-value-helper.cc Mon Aug 25 19:15:36 2014 +0200
@@ -27,8 +27,12 @@
namespace ns3 {
-Ptr<SpectrumModel> g_LrWpanSpectrumModel;
+Ptr<SpectrumModel> g_LrWpanSpectrumModel; //!< Global object used to initialize the LrWpan Spectrum Model
+/**
+ * \ingroup lr-wpan
+ * \brief Helper class used to automatically initialize the LrWpan Spectrum Model objects
+ */
class LrWpanSpectrumModelInitializer
{
public:
@@ -50,7 +54,7 @@
g_LrWpanSpectrumModel = Create<SpectrumModel> (bands);
}
-} g_LrWpanSpectrumModelInitializerInstance;
+} g_LrWpanSpectrumModelInitializerInstance; //!< Global object used to initialize the LrWpan Spectrum Model
LrWpanSpectrumValueHelper::LrWpanSpectrumValueHelper (void)
{