Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed Bug 1649 - bindings scanning for fd-net-device
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Sat, 04 May 2013 22:38:49 +0200
changeset 9739 211496d6d5d6
parent 9738 972234cd8646
child 9740 e6777ccef033
fixed Bug 1649 - bindings scanning for fd-net-device
src/fd-net-device/bindings/modulegen__gcc_ILP32.py file | annotate | diff | comparison | revisions
src/fd-net-device/bindings/modulegen__gcc_LP64.py file | annotate | diff | comparison | revisions
src/fd-net-device/bindings/modulegen_customizations.py file | annotate | diff | comparison | revisions 
--- a/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	Fri May 03 00:40:28 2013 -0400
+++ b/src/fd-net-device/bindings/modulegen__gcc_ILP32.py	Sat May 04 22:38:49 2013 +0200
@@ -234,8 +234,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper [class]
-    module.add_class('PlanetLabFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper [class]
     module.add_class('TapFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
     ## nstime.h (module 'core'): ns3::TimeChecker [class]
@@ -365,7 +363,6 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, root_module['ns3::PlanetLabFdNetDeviceHelper'])
     register_Ns3TapFdNetDeviceHelper_methods(root_module, root_module['ns3::TapFdNetDeviceHelper'])
     register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
@@ -4175,36 +4172,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, cls):
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper(ns3::PlanetLabFdNetDeviceHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PlanetLabFdNetDeviceHelper const &', 'arg0')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper() [constructor]
-    cls.add_constructor([])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapIpAddress(ns3::Ipv4Address address) [member function]
-    cls.add_method('SetTapIpAddress', 
-                   'void', 
-                   [param('ns3::Ipv4Address', 'address')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapMask(ns3::Ipv4Mask mask) [member function]
-    cls.add_method('SetTapMask', 
-                   'void', 
-                   [param('ns3::Ipv4Mask', 'mask')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): int ns3::PlanetLabFdNetDeviceHelper::CreateFileDescriptor() const [member function]
-    cls.add_method('CreateFileDescriptor', 
-                   'int', 
-                   [], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::Ptr<ns3::NetDevice> ns3::PlanetLabFdNetDeviceHelper::InstallPriv(ns3::Ptr<ns3::Node> node) const [member function]
-    cls.add_method('InstallPriv', 
-                   'ns3::Ptr< ns3::NetDevice >', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetFileDescriptor(ns3::Ptr<ns3::FdNetDevice> device) const [member function]
-    cls.add_method('SetFileDescriptor', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::FdNetDevice >', 'device')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3TapFdNetDeviceHelper_methods(root_module, cls):
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper::TapFdNetDeviceHelper(ns3::TapFdNetDeviceHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TapFdNetDeviceHelper const &', 'arg0')])
--- a/src/fd-net-device/bindings/modulegen__gcc_LP64.py	Fri May 03 00:40:28 2013 -0400
+++ b/src/fd-net-device/bindings/modulegen__gcc_LP64.py	Sat May 04 22:38:49 2013 +0200
@@ -234,8 +234,6 @@
     module.add_class('OutputStreamWrapper', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::OutputStreamWrapper, ns3::empty, ns3::DefaultDeleter<ns3::OutputStreamWrapper> >'])
     ## packet.h (module 'network'): ns3::Packet [class]
     module.add_class('Packet', import_from_module='ns.network', parent=root_module['ns3::SimpleRefCount< ns3::Packet, ns3::empty, ns3::DefaultDeleter<ns3::Packet> >'])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper [class]
-    module.add_class('PlanetLabFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper [class]
     module.add_class('TapFdNetDeviceHelper', parent=root_module['ns3::EmuFdNetDeviceHelper'])
     ## nstime.h (module 'core'): ns3::TimeChecker [class]
@@ -365,7 +363,6 @@
     register_Ns3ObjectFactoryValue_methods(root_module, root_module['ns3::ObjectFactoryValue'])
     register_Ns3OutputStreamWrapper_methods(root_module, root_module['ns3::OutputStreamWrapper'])
     register_Ns3Packet_methods(root_module, root_module['ns3::Packet'])
-    register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, root_module['ns3::PlanetLabFdNetDeviceHelper'])
     register_Ns3TapFdNetDeviceHelper_methods(root_module, root_module['ns3::TapFdNetDeviceHelper'])
     register_Ns3TimeChecker_methods(root_module, root_module['ns3::TimeChecker'])
     register_Ns3TimeValue_methods(root_module, root_module['ns3::TimeValue'])
@@ -4175,36 +4172,6 @@
                    [param('ns3::Ptr< ns3::NixVector >', 'arg0')])
     return
 
-def register_Ns3PlanetLabFdNetDeviceHelper_methods(root_module, cls):
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper(ns3::PlanetLabFdNetDeviceHelper const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::PlanetLabFdNetDeviceHelper const &', 'arg0')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::PlanetLabFdNetDeviceHelper::PlanetLabFdNetDeviceHelper() [constructor]
-    cls.add_constructor([])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapIpAddress(ns3::Ipv4Address address) [member function]
-    cls.add_method('SetTapIpAddress', 
-                   'void', 
-                   [param('ns3::Ipv4Address', 'address')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetTapMask(ns3::Ipv4Mask mask) [member function]
-    cls.add_method('SetTapMask', 
-                   'void', 
-                   [param('ns3::Ipv4Mask', 'mask')])
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): int ns3::PlanetLabFdNetDeviceHelper::CreateFileDescriptor() const [member function]
-    cls.add_method('CreateFileDescriptor', 
-                   'int', 
-                   [], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): ns3::Ptr<ns3::NetDevice> ns3::PlanetLabFdNetDeviceHelper::InstallPriv(ns3::Ptr<ns3::Node> node) const [member function]
-    cls.add_method('InstallPriv', 
-                   'ns3::Ptr< ns3::NetDevice >', 
-                   [param('ns3::Ptr< ns3::Node >', 'node')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    ## planetlab-fd-net-device-helper.h (module 'fd-net-device'): void ns3::PlanetLabFdNetDeviceHelper::SetFileDescriptor(ns3::Ptr<ns3::FdNetDevice> device) const [member function]
-    cls.add_method('SetFileDescriptor', 
-                   'void', 
-                   [param('ns3::Ptr< ns3::FdNetDevice >', 'device')], 
-                   is_const=True, visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3TapFdNetDeviceHelper_methods(root_module, cls):
     ## tap-fd-net-device-helper.h (module 'fd-net-device'): ns3::TapFdNetDeviceHelper::TapFdNetDeviceHelper(ns3::TapFdNetDeviceHelper const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::TapFdNetDeviceHelper const &', 'arg0')])
--- a/src/fd-net-device/bindings/modulegen_customizations.py	Fri May 03 00:40:28 2013 -0400
+++ b/src/fd-net-device/bindings/modulegen_customizations.py	Sat May 04 22:38:49 2013 +0200
@@ -4,16 +4,21 @@
     enabled_features = os.environ['NS3_ENABLED_FEATURES'].split(',')
 
     if 'EmuFdNetDevice' not in enabled_features:
-        root_module.classes.remove(root_module['ns3::EmuFdNetDeviceHelper'])
+        if 'ns3::EmuFdNetDeviceHelper'in root_module:
+	    root_module.classes.remove(root_module['ns3::EmuFdNetDeviceHelper'])
 
     if 'TapFdNetDevice' not in enabled_features:
-        root_module.classes.remove(root_module['ns3::TapFdNetDeviceHelper'])
+        if 'ns3::TapFdNetDeviceHelper'in root_module:
+            root_module.classes.remove(root_module['ns3::TapFdNetDeviceHelper'])
 
     if 'PlanetLabFdNetDevice' not in enabled_features:
-        root_module.classes.remove(root_module['ns3::PlanetLabFdNetDeviceHelper'])
+        if 'ns3::PlanetLabFdNetDeviceHelper'in root_module:
+            root_module.classes.remove(root_module['ns3::PlanetLabFdNetDeviceHelper'])
 
     if 'FdNetDevice' not in enabled_features:
         for clsname in ['FdNetDevice', 'FdNetDeviceHelper', 'FdNetDeviceFdReader']: 
-            root_module.classes.remove(root_module['ns3::%s' % clsname])
-        root_module.enums.remove(root_module['ns3::FdNetDeviceHelper::EncapsulationMode'])
+            if 'ns3::%s' % clsname in root_module:
+                root_module.classes.remove(root_module['ns3::%s' % clsname])
+        if 'ns3::FdNetDeviceHelper::EncapsulationMode' in root_module:
+            root_module.enums.remove(root_module['ns3::FdNetDeviceHelper::EncapsulationMode'])
ns-3.24