From 4f20392af067fa106012f2bcba791c40467e8a43 Mon Sep 17 00:00:00 2001 From: Mitch Watrous Date: Sun, 2 Jun 2013 09:27:51 -0700 Subject: [PATCH] rescan DSR bindings --- src/dsr/bindings/modulegen__gcc_ILP32.py | 45 ++++++------------------ src/dsr/bindings/modulegen__gcc_LP64.py | 45 ++++++------------------ 2 files changed, 20 insertions(+), 70 deletions(-) diff --git a/src/dsr/bindings/modulegen__gcc_ILP32.py b/src/dsr/bindings/modulegen__gcc_ILP32.py index 333e55305..4ebfc55f0 100644 --- a/src/dsr/bindings/modulegen__gcc_ILP32.py +++ b/src/dsr/bindings/modulegen__gcc_ILP32.py @@ -150,6 +150,8 @@ def register_types(module): module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -2451,6 +2453,10 @@ def register_Ns3PacketTagList_methods(root_module, cls): cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -8641,6 +8647,10 @@ def register_Ns3Packet_methods(root_module, cls): cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -10009,10 +10019,6 @@ def register_Ns3DsrDsrOptionRrepHeader_methods(root_module, cls): 'void', [param('std::ostream &', 'os')], is_const=True, is_virtual=True) - ## dsr-option-header.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::DsrOptionRrepHeader::SearchNextHop(ns3::Ipv4Address ipv4Address) [member function] - cls.add_method('SearchNextHop', - 'ns3::Ipv4Address', - [param('ns3::Ipv4Address', 'ipv4Address')]) ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRrepHeader::Serialize(ns3::Buffer::Iterator start) const [member function] cls.add_method('Serialize', 'void', @@ -10051,11 +10057,6 @@ def register_Ns3DsrDsrOptionRreqHeader_methods(root_module, cls): 'ns3::dsr::DsrOptionHeader::Alignment', [], is_const=True, is_virtual=True) - ## dsr-option-header.h (module 'dsr'): uint32_t ns3::dsr::DsrOptionRreqHeader::GetDataLength() const [member function] - cls.add_method('GetDataLength', - 'uint32_t', - [], - is_const=True) ## dsr-option-header.h (module 'dsr'): uint16_t ns3::dsr::DsrOptionRreqHeader::GetId() const [member function] cls.add_method('GetId', 'uint16_t', @@ -10105,10 +10106,6 @@ def register_Ns3DsrDsrOptionRreqHeader_methods(root_module, cls): 'void', [param('ns3::Buffer::Iterator', 'start')], is_const=True, is_virtual=True) - ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetDataLength(uint32_t dataLength) [member function] - cls.add_method('SetDataLength', - 'void', - [param('uint32_t', 'dataLength')]) ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetId(uint16_t identification) [member function] cls.add_method('SetId', 'void', @@ -10394,11 +10391,6 @@ def register_Ns3DsrDsrRouting_methods(root_module, cls): cls.add_method('GetElementsFromContext', 'std::vector< std::string >', [param('std::string', 'context')]) - ## dsr-routing.h (module 'dsr'): uint8_t ns3::dsr::DsrRouting::GetExtensionNumber() const [member function] - cls.add_method('GetExtensionNumber', - 'uint8_t', - [], - is_const=True) ## dsr-routing.h (module 'dsr'): uint16_t ns3::dsr::DsrRouting::GetIDfromIP(ns3::Ipv4Address address) [member function] cls.add_method('GetIDfromIP', 'uint16_t', @@ -10603,10 +10595,6 @@ def register_Ns3DsrDsrRouting_methods(root_module, cls): cls.add_method('SendRequest', 'void', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source')]) - ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendRequestAndIncrement(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination) [member function] - cls.add_method('SendRequestAndIncrement', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination')]) ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendUnreachError(ns3::Ipv4Address errorHop, ns3::Ipv4Address destination, ns3::Ipv4Address originalDst, uint8_t salvage, uint8_t protocol) [member function] cls.add_method('SendUnreachError', 'void', @@ -11334,10 +11322,6 @@ def register_Ns3DsrRouteCache_methods(root_module, cls): cls.add_method('DeleteRoute', 'bool', [param('ns3::Ipv4Address', 'dst')]) - ## dsr-rcache.h (module 'dsr'): void ns3::dsr::RouteCache::DropPathWithDst(ns3::Ipv4Address dst) [member function] - cls.add_method('DropPathWithDst', - 'void', - [param('ns3::Ipv4Address', 'dst')]) ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::FindSameRoute(ns3::dsr::RouteCacheEntry & rt, std::list > & rtVector) [member function] cls.add_method('FindSameRoute', 'bool', @@ -11361,11 +11345,6 @@ def register_Ns3DsrRouteCache_methods(root_module, cls): 'ns3::Callback< void, ns3::Ipv4Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', [], is_const=True) - ## dsr-rcache.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::RouteCache::GetDestination() const [member function] - cls.add_method('GetDestination', - 'ns3::Ipv4Address', - [], - is_const=True) ## dsr-rcache.h (module 'dsr'): ns3::Time ns3::dsr::RouteCache::GetExpireTime(ns3::Ipv4Address addr) [member function] cls.add_method('GetExpireTime', 'ns3::Time', @@ -11420,10 +11399,6 @@ def register_Ns3DsrRouteCache_methods(root_module, cls): 'ns3::Time', [], is_const=True) - ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsEqual(ns3::dsr::RouteCacheEntry ca) [member function] - cls.add_method('IsEqual', - 'bool', - [param('ns3::dsr::RouteCacheEntry', 'ca')]) ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsLinkCache() [member function] cls.add_method('IsLinkCache', 'bool', diff --git a/src/dsr/bindings/modulegen__gcc_LP64.py b/src/dsr/bindings/modulegen__gcc_LP64.py index 333e55305..4ebfc55f0 100644 --- a/src/dsr/bindings/modulegen__gcc_LP64.py +++ b/src/dsr/bindings/modulegen__gcc_LP64.py @@ -150,6 +150,8 @@ def register_types(module): module.add_class('PacketTagList', import_from_module='ns.network') ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData [struct] module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) + ## packet-tag-list.h (module 'network'): ns3::PacketTagList::TagData::TagData_e [enumeration] + module.add_enum('TagData_e', ['MAX_SIZE'], outer_class=root_module['ns3::PacketTagList::TagData'], import_from_module='ns.network') ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] module.add_class('SimpleRefCount', automatic_type_narrowing=True, import_from_module='ns.core', template_parameters=['ns3::Object', 'ns3::ObjectBase', 'ns3::ObjectDeleter'], parent=root_module['ns3::ObjectBase'], memory_policy=cppclass.ReferenceCountingMethodsPolicy(incref_method='Ref', decref_method='Unref', peekref_method='GetReferenceCount')) ## simulator.h (module 'core'): ns3::Simulator [class] @@ -2451,6 +2453,10 @@ def register_Ns3PacketTagList_methods(root_module, cls): cls.add_method('RemoveAll', 'void', []) + ## packet-tag-list.h (module 'network'): bool ns3::PacketTagList::Replace(ns3::Tag & tag) [member function] + cls.add_method('Replace', + 'bool', + [param('ns3::Tag &', 'tag')]) return def register_Ns3PacketTagListTagData_methods(root_module, cls): @@ -8641,6 +8647,10 @@ def register_Ns3Packet_methods(root_module, cls): cls.add_method('RemoveTrailer', 'uint32_t', [param('ns3::Trailer &', 'trailer')]) + ## packet.h (module 'network'): bool ns3::Packet::ReplacePacketTag(ns3::Tag & tag) [member function] + cls.add_method('ReplacePacketTag', + 'bool', + [param('ns3::Tag &', 'tag')]) ## packet.h (module 'network'): uint32_t ns3::Packet::Serialize(uint8_t * buffer, uint32_t maxSize) const [member function] cls.add_method('Serialize', 'uint32_t', @@ -10009,10 +10019,6 @@ def register_Ns3DsrDsrOptionRrepHeader_methods(root_module, cls): 'void', [param('std::ostream &', 'os')], is_const=True, is_virtual=True) - ## dsr-option-header.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::DsrOptionRrepHeader::SearchNextHop(ns3::Ipv4Address ipv4Address) [member function] - cls.add_method('SearchNextHop', - 'ns3::Ipv4Address', - [param('ns3::Ipv4Address', 'ipv4Address')]) ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRrepHeader::Serialize(ns3::Buffer::Iterator start) const [member function] cls.add_method('Serialize', 'void', @@ -10051,11 +10057,6 @@ def register_Ns3DsrDsrOptionRreqHeader_methods(root_module, cls): 'ns3::dsr::DsrOptionHeader::Alignment', [], is_const=True, is_virtual=True) - ## dsr-option-header.h (module 'dsr'): uint32_t ns3::dsr::DsrOptionRreqHeader::GetDataLength() const [member function] - cls.add_method('GetDataLength', - 'uint32_t', - [], - is_const=True) ## dsr-option-header.h (module 'dsr'): uint16_t ns3::dsr::DsrOptionRreqHeader::GetId() const [member function] cls.add_method('GetId', 'uint16_t', @@ -10105,10 +10106,6 @@ def register_Ns3DsrDsrOptionRreqHeader_methods(root_module, cls): 'void', [param('ns3::Buffer::Iterator', 'start')], is_const=True, is_virtual=True) - ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetDataLength(uint32_t dataLength) [member function] - cls.add_method('SetDataLength', - 'void', - [param('uint32_t', 'dataLength')]) ## dsr-option-header.h (module 'dsr'): void ns3::dsr::DsrOptionRreqHeader::SetId(uint16_t identification) [member function] cls.add_method('SetId', 'void', @@ -10394,11 +10391,6 @@ def register_Ns3DsrDsrRouting_methods(root_module, cls): cls.add_method('GetElementsFromContext', 'std::vector< std::string >', [param('std::string', 'context')]) - ## dsr-routing.h (module 'dsr'): uint8_t ns3::dsr::DsrRouting::GetExtensionNumber() const [member function] - cls.add_method('GetExtensionNumber', - 'uint8_t', - [], - is_const=True) ## dsr-routing.h (module 'dsr'): uint16_t ns3::dsr::DsrRouting::GetIDfromIP(ns3::Ipv4Address address) [member function] cls.add_method('GetIDfromIP', 'uint16_t', @@ -10603,10 +10595,6 @@ def register_Ns3DsrDsrRouting_methods(root_module, cls): cls.add_method('SendRequest', 'void', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source')]) - ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendRequestAndIncrement(ns3::Ptr packet, ns3::Ipv4Address source, ns3::Ipv4Address destination) [member function] - cls.add_method('SendRequestAndIncrement', - 'void', - [param('ns3::Ptr< ns3::Packet >', 'packet'), param('ns3::Ipv4Address', 'source'), param('ns3::Ipv4Address', 'destination')]) ## dsr-routing.h (module 'dsr'): void ns3::dsr::DsrRouting::SendUnreachError(ns3::Ipv4Address errorHop, ns3::Ipv4Address destination, ns3::Ipv4Address originalDst, uint8_t salvage, uint8_t protocol) [member function] cls.add_method('SendUnreachError', 'void', @@ -11334,10 +11322,6 @@ def register_Ns3DsrRouteCache_methods(root_module, cls): cls.add_method('DeleteRoute', 'bool', [param('ns3::Ipv4Address', 'dst')]) - ## dsr-rcache.h (module 'dsr'): void ns3::dsr::RouteCache::DropPathWithDst(ns3::Ipv4Address dst) [member function] - cls.add_method('DropPathWithDst', - 'void', - [param('ns3::Ipv4Address', 'dst')]) ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::FindSameRoute(ns3::dsr::RouteCacheEntry & rt, std::list > & rtVector) [member function] cls.add_method('FindSameRoute', 'bool', @@ -11361,11 +11345,6 @@ def register_Ns3DsrRouteCache_methods(root_module, cls): 'ns3::Callback< void, ns3::Ipv4Address, unsigned char, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', [], is_const=True) - ## dsr-rcache.h (module 'dsr'): ns3::Ipv4Address ns3::dsr::RouteCache::GetDestination() const [member function] - cls.add_method('GetDestination', - 'ns3::Ipv4Address', - [], - is_const=True) ## dsr-rcache.h (module 'dsr'): ns3::Time ns3::dsr::RouteCache::GetExpireTime(ns3::Ipv4Address addr) [member function] cls.add_method('GetExpireTime', 'ns3::Time', @@ -11420,10 +11399,6 @@ def register_Ns3DsrRouteCache_methods(root_module, cls): 'ns3::Time', [], is_const=True) - ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsEqual(ns3::dsr::RouteCacheEntry ca) [member function] - cls.add_method('IsEqual', - 'bool', - [param('ns3::dsr::RouteCacheEntry', 'ca')]) ## dsr-rcache.h (module 'dsr'): bool ns3::dsr::RouteCache::IsLinkCache() [member function] cls.add_method('IsLinkCache', 'bool',