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.
Rescan old python bindings
authorGustavo J. A. M. Carneiro <gjc@inescporto.pt>
Fri, 01 Apr 2011 17:45:26 +0100
changeset 6991 3c76393dba66
parent 6990 c9069308a70e
child 6992 5b28d168b9e6
Rescan old python bindings
bindings/python/apidefs/gcc-ILP32/callbacks_list.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_core.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_core_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_internet.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_network_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_ns3tcp_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_ns3wifi_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3_module_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/callbacks_list.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_core.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_core_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_internet.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_network_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_ns3tcp_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_ns3wifi_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3_module_test.py file | annotate | diff | comparison | revisions
bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py file | annotate | diff | comparison | revisions 
--- a/bindings/python/apidefs/gcc-ILP32/callbacks_list.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/callbacks_list.py	Fri Apr 01 17:45:26 2011 +0100
@@ -1,7 +1,5 @@
 callback_classes = [
     ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -9,7 +7,6 @@
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::UanAddress const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'unsigned char*', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::PacketBurst const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Mac48Address', 'ns3::Mac48Address', 'unsigned int', 'bool', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'unsigned int', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::dot11s::PeerLink::PeerState', 'ns3::dot11s::PeerLink::PeerState', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::WifiMacHeader const*', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -19,6 +16,8 @@
     ['std::vector<ns3::Mac48Address, std::allocator<ns3::Mac48Address> >', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'bool', 'ns3::Ptr<ns3::Packet>', 'ns3::Mac48Address', 'ns3::Mac48Address', 'unsigned short', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['unsigned int', 'ns3::Mac48Address', 'ns3::Ptr<ns3::MeshWifiInterfaceMac>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'std::string', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'bool', 'unsigned long long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::Ipv4Header const&', 'ns3::Socket::SocketErrno', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -30,6 +29,7 @@
     ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::ArpCache const>', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', '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::Address const&', 'ns3::NetDevice::PacketType', '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::Packet>', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_core.py	Fri Apr 01 17:45:26 2011 +0100
@@ -73,14 +73,6 @@
     module.add_class('SystemMutex')
     ## system-wall-clock-ms.h: ns3::SystemWallClockMs [class]
     module.add_class('SystemWallClockMs')
-    ## test.h: ns3::TestCase [class]
-    module.add_class('TestCase', allow_subclassing=True)
-    ## test.h: ns3::TestRunner [class]
-    module.add_class('TestRunner')
-    ## test.h: ns3::TestSuite [class]
-    module.add_class('TestSuite', allow_subclassing=True)
-    ## test.h: ns3::TestSuite::TestType [enumeration]
-    module.add_enum('TestType', ['BVT', 'UNIT', 'SYSTEM', 'EXAMPLE', 'PERFORMANCE'], outer_class=root_module['ns3::TestSuite'])
     ## nstime.h: ns3::Time [class]
     module.add_class('Time')
     ## nstime.h: ns3::Time::Unit [enumeration]
@@ -439,9 +431,6 @@
     register_Ns3SystemCondition_methods(root_module, root_module['ns3::SystemCondition'])
     register_Ns3SystemMutex_methods(root_module, root_module['ns3::SystemMutex'])
     register_Ns3SystemWallClockMs_methods(root_module, root_module['ns3::SystemWallClockMs'])
-    register_Ns3TestCase_methods(root_module, root_module['ns3::TestCase'])
-    register_Ns3TestRunner_methods(root_module, root_module['ns3::TestRunner'])
-    register_Ns3TestSuite_methods(root_module, root_module['ns3::TestSuite'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TimeBase_methods(root_module, root_module['ns3::TimeBase'])
     register_Ns3Timer_methods(root_module, root_module['ns3::Timer'])
@@ -1350,285 +1339,6 @@
                    [])
     return
 
-def register_Ns3TestCase_methods(root_module, cls):
-    ## test.h: ns3::TestCase::TestCase(std::string name) [constructor]
-    cls.add_constructor([param('std::string', 'name')])
-    ## test.h: void ns3::TestCase::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::SetVerbose(bool verbose) [member function]
-    cls.add_method('SetVerbose', 
-                   'void', 
-                   [param('bool', 'verbose')])
-    ## test.h: void ns3::TestCase::SetContinueOnFailure(bool continueOnFailure) [member function]
-    cls.add_method('SetContinueOnFailure', 
-                   'void', 
-                   [param('bool', 'continueOnFailure')])
-    ## test.h: void ns3::TestCase::SetName(std::string name) [member function]
-    cls.add_method('SetName', 
-                   'void', 
-                   [param('std::string', 'name')])
-    ## test.h: std::string ns3::TestCase::GetName() [member function]
-    cls.add_method('GetName', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestCase::SetBaseDir(std::string dir) [member function]
-    cls.add_method('SetBaseDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h: std::string ns3::TestCase::GetBaseDir() [member function]
-    cls.add_method('GetBaseDir', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestCase::SetTempDir(std::string dir) [member function]
-    cls.add_method('SetTempDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h: std::string ns3::TestCase::GetTempDir() [member function]
-    cls.add_method('GetTempDir', 
-                   'std::string', 
-                   [])
-    ## test.h: std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
-    cls.add_method('GetSourceDir', 
-                   'std::string', 
-                   [param('std::string', 'file')])
-    ## test.h: void ns3::TestCase::SetStream(std::ofstream * ofs) [member function]
-    cls.add_method('SetStream', 
-                   'void', 
-                   [param('std::ofstream *', 'ofs')])
-    ## test.h: std::ofstream * ns3::TestCase::GetStream() [member function]
-    cls.add_method('GetStream', 
-                   'std::ofstream *', 
-                   [])
-    ## test.h: void ns3::TestCase::UpdateErrorStatus(bool error) [member function]
-    cls.add_method('UpdateErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: void ns3::TestCase::SetErrorStatus(bool error) [member function]
-    cls.add_method('SetErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: bool ns3::TestCase::GetErrorStatus() [member function]
-    cls.add_method('GetErrorStatus', 
-                   'bool', 
-                   [])
-    ## test.h: bool ns3::TestCase::ContinueOnFailure() [member function]
-    cls.add_method('ContinueOnFailure', 
-                   'bool', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportStart() [member function]
-    cls.add_method('ReportStart', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportCaseSuccess() [member function]
-    cls.add_method('ReportCaseSuccess', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportCaseFailure() [member function]
-    cls.add_method('ReportCaseFailure', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportTestFailure(std::string cond, std::string actual, std::string limit, std::string message, std::string file, int32_t line) [member function]
-    cls.add_method('ReportTestFailure', 
-                   'void', 
-                   [param('std::string', 'cond'), param('std::string', 'actual'), param('std::string', 'limit'), param('std::string', 'message'), param('std::string', 'file'), param('int32_t', 'line')])
-    ## test.h: void ns3::TestCase::ReportEnd() [member function]
-    cls.add_method('ReportEnd', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::DoReportStart() [member function]
-    cls.add_method('DoReportStart', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportCaseSuccess() [member function]
-    cls.add_method('DoReportCaseSuccess', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportCaseFailure() [member function]
-    cls.add_method('DoReportCaseFailure', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportTestFailure(std::string cond, std::string actual, std::string limit, std::string message, std::string file, int32_t line) [member function]
-    cls.add_method('DoReportTestFailure', 
-                   'void', 
-                   [param('std::string', 'cond'), param('std::string', 'actual'), param('std::string', 'limit'), param('std::string', 'message'), param('std::string', 'file'), param('int32_t', 'line')], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportEnd() [member function]
-    cls.add_method('DoReportEnd', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoSetup() [member function]
-    cls.add_method('DoSetup', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoTeardown() [member function]
-    cls.add_method('DoTeardown', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    return
-
-def register_Ns3TestRunner_methods(root_module, cls):
-    ## test.h: ns3::TestRunner::TestRunner() [constructor]
-    cls.add_constructor([])
-    ## test.h: ns3::TestRunner::TestRunner(ns3::TestRunner const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TestRunner const &', 'arg0')])
-    ## test.h: static uint32_t ns3::TestRunner::AddTestSuite(ns3::TestSuite * testSuite) [member function]
-    cls.add_method('AddTestSuite', 
-                   'uint32_t', 
-                   [param('ns3::TestSuite *', 'testSuite')], 
-                   is_static=True)
-    ## test.h: static uint32_t ns3::TestRunner::GetNTestSuites() [member function]
-    cls.add_method('GetNTestSuites', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
-    ## test.h: static ns3::TestSuite * ns3::TestRunner::GetTestSuite(uint32_t n) [member function]
-    cls.add_method('GetTestSuite', 
-                   'ns3::TestSuite *', 
-                   [param('uint32_t', 'n')], 
-                   is_static=True)
-    return
-
-def register_Ns3TestSuite_methods(root_module, cls):
-    ## test.h: ns3::TestSuite::TestSuite(std::string name, ns3::TestSuite::TestType type=::ns3::TestSuite::UNIT) [constructor]
-    cls.add_constructor([param('std::string', 'name'), param('ns3::TestSuite::TestType', 'type', default_value='::ns3::TestSuite::UNIT')])
-    ## test.h: bool ns3::TestSuite::Run() [member function]
-    cls.add_method('Run', 
-                   'bool', 
-                   [])
-    ## test.h: uint32_t ns3::TestSuite::AddTestCase(ns3::TestCase * testCase) [member function]
-    cls.add_method('AddTestCase', 
-                   'uint32_t', 
-                   [param('ns3::TestCase *', 'testCase')])
-    ## test.h: uint32_t ns3::TestSuite::GetNTestCases() [member function]
-    cls.add_method('GetNTestCases', 
-                   'uint32_t', 
-                   [])
-    ## test.h: ns3::TestCase * ns3::TestSuite::GetTestCase(uint32_t i) [member function]
-    cls.add_method('GetTestCase', 
-                   'ns3::TestCase *', 
-                   [param('uint32_t', 'i')])
-    ## test.h: ns3::TestSuite::TestType ns3::TestSuite::GetTestType() [member function]
-    cls.add_method('GetTestType', 
-                   'ns3::TestSuite::TestType', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetVerbose(bool verbose) [member function]
-    cls.add_method('SetVerbose', 
-                   'void', 
-                   [param('bool', 'verbose')])
-    ## test.h: void ns3::TestSuite::SetContinueOnFailure(bool continueOnFailure) [member function]
-    cls.add_method('SetContinueOnFailure', 
-                   'void', 
-                   [param('bool', 'continueOnFailure')])
-    ## test.h: void ns3::TestSuite::SetName(std::string name) [member function]
-    cls.add_method('SetName', 
-                   'void', 
-                   [param('std::string', 'name')])
-    ## test.h: std::string ns3::TestSuite::GetName() [member function]
-    cls.add_method('GetName', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetBaseDir(std::string basedir) [member function]
-    cls.add_method('SetBaseDir', 
-                   'void', 
-                   [param('std::string', 'basedir')])
-    ## test.h: std::string ns3::TestSuite::GetBaseDir() [member function]
-    cls.add_method('GetBaseDir', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetTempDir(std::string dir) [member function]
-    cls.add_method('SetTempDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h: std::string ns3::TestSuite::GetTempDir() [member function]
-    cls.add_method('GetTempDir', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
-    cls.add_method('SetStream', 
-                   'void', 
-                   [param('std::ofstream *', 'ofs')])
-    ## test.h: void ns3::TestSuite::UpdateErrorStatus(bool error) [member function]
-    cls.add_method('UpdateErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: void ns3::TestSuite::SetErrorStatus(bool error) [member function]
-    cls.add_method('SetErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: bool ns3::TestSuite::GetErrorStatus() [member function]
-    cls.add_method('GetErrorStatus', 
-                   'bool', 
-                   [])
-    ## test.h: bool ns3::TestSuite::ContinueOnFailure() [member function]
-    cls.add_method('ContinueOnFailure', 
-                   'bool', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportStart() [member function]
-    cls.add_method('ReportStart', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportSuccess() [member function]
-    cls.add_method('ReportSuccess', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportFailure() [member function]
-    cls.add_method('ReportFailure', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportEnd() [member function]
-    cls.add_method('ReportEnd', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::DoReportStart() [member function]
-    cls.add_method('DoReportStart', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoReportSuccess() [member function]
-    cls.add_method('DoReportSuccess', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoReportFailure() [member function]
-    cls.add_method('DoReportFailure', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoReportEnd() [member function]
-    cls.add_method('DoReportEnd', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoSetup() [member function]
-    cls.add_method('DoSetup', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoTeardown() [member function]
-    cls.add_method('DoTeardown', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right'))
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_core_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_internet.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_internet.py	Fri Apr 01 17:45:26 2011 +0100
@@ -9,8 +9,14 @@
     module.add_class('AsciiTraceHelperForIpv4', allow_subclassing=True)
     ## internet-trace-helper.h: ns3::AsciiTraceHelperForIpv6 [class]
     module.add_class('AsciiTraceHelperForIpv6', allow_subclassing=True)
+    ## candidate-queue.h: ns3::CandidateQueue [class]
+    module.add_class('CandidateQueue')
     ## global-route-manager.h: ns3::GlobalRouteManager [class]
     module.add_class('GlobalRouteManager')
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerImpl [class]
+    module.add_class('GlobalRouteManagerImpl', allow_subclassing=True)
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerLSDB [class]
+    module.add_class('GlobalRouteManagerLSDB')
     ## global-router-interface.h: ns3::GlobalRoutingLSA [class]
     module.add_class('GlobalRoutingLSA')
     ## global-router-interface.h: ns3::GlobalRoutingLSA::LSType [enumeration]
@@ -65,6 +71,10 @@
     module.add_class('PcapHelperForIpv4', allow_subclassing=True)
     ## internet-trace-helper.h: ns3::PcapHelperForIpv6 [class]
     module.add_class('PcapHelperForIpv6', allow_subclassing=True)
+    ## global-route-manager-impl.h: ns3::SPFVertex [class]
+    module.add_class('SPFVertex')
+    ## global-route-manager-impl.h: ns3::SPFVertex::VertexType [enumeration]
+    module.add_enum('VertexType', ['VertexUnknown', 'VertexRouter', 'VertexNetwork'], outer_class=root_module['ns3::SPFVertex'])
     ## icmpv4.h: ns3::Icmpv4DestinationUnreachable [class]
     module.add_class('Icmpv4DestinationUnreachable', parent=root_module['ns3::Header'])
     ## icmpv4.h: ns3::Icmpv4DestinationUnreachable [enumeration]
@@ -361,7 +371,10 @@
 def register_methods(root_module):
     register_Ns3AsciiTraceHelperForIpv4_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv4'])
     register_Ns3AsciiTraceHelperForIpv6_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv6'])
+    register_Ns3CandidateQueue_methods(root_module, root_module['ns3::CandidateQueue'])
     register_Ns3GlobalRouteManager_methods(root_module, root_module['ns3::GlobalRouteManager'])
+    register_Ns3GlobalRouteManagerImpl_methods(root_module, root_module['ns3::GlobalRouteManagerImpl'])
+    register_Ns3GlobalRouteManagerLSDB_methods(root_module, root_module['ns3::GlobalRouteManagerLSDB'])
     register_Ns3GlobalRoutingLSA_methods(root_module, root_module['ns3::GlobalRoutingLSA'])
     register_Ns3GlobalRoutingLinkRecord_methods(root_module, root_module['ns3::GlobalRoutingLinkRecord'])
     register_Ns3Ipv4AddressGenerator_methods(root_module, root_module['ns3::Ipv4AddressGenerator'])
@@ -383,6 +396,7 @@
     register_Ns3OptionField_methods(root_module, root_module['ns3::OptionField'])
     register_Ns3PcapHelperForIpv4_methods(root_module, root_module['ns3::PcapHelperForIpv4'])
     register_Ns3PcapHelperForIpv6_methods(root_module, root_module['ns3::PcapHelperForIpv6'])
+    register_Ns3SPFVertex_methods(root_module, root_module['ns3::SPFVertex'])
     register_Ns3Icmpv4DestinationUnreachable_methods(root_module, root_module['ns3::Icmpv4DestinationUnreachable'])
     register_Ns3Icmpv4Echo_methods(root_module, root_module['ns3::Icmpv4Echo'])
     register_Ns3Icmpv4Header_methods(root_module, root_module['ns3::Icmpv4Header'])
@@ -587,6 +601,48 @@
                    is_pure_virtual=True, is_virtual=True)
     return
 
+def register_Ns3CandidateQueue_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## candidate-queue.h: ns3::CandidateQueue::CandidateQueue() [constructor]
+    cls.add_constructor([])
+    ## candidate-queue.h: void ns3::CandidateQueue::Clear() [member function]
+    cls.add_method('Clear', 
+                   'void', 
+                   [])
+    ## candidate-queue.h: bool ns3::CandidateQueue::Empty() const [member function]
+    cls.add_method('Empty', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## candidate-queue.h: ns3::SPFVertex * ns3::CandidateQueue::Find(ns3::Ipv4Address const addr) const [member function]
+    cls.add_method('Find', 
+                   'ns3::SPFVertex *', 
+                   [param('ns3::Ipv4Address const', 'addr')], 
+                   is_const=True)
+    ## candidate-queue.h: ns3::SPFVertex * ns3::CandidateQueue::Pop() [member function]
+    cls.add_method('Pop', 
+                   'ns3::SPFVertex *', 
+                   [])
+    ## candidate-queue.h: void ns3::CandidateQueue::Push(ns3::SPFVertex * vNew) [member function]
+    cls.add_method('Push', 
+                   'void', 
+                   [param('ns3::SPFVertex *', 'vNew')])
+    ## candidate-queue.h: void ns3::CandidateQueue::Reorder() [member function]
+    cls.add_method('Reorder', 
+                   'void', 
+                   [])
+    ## candidate-queue.h: uint32_t ns3::CandidateQueue::Size() const [member function]
+    cls.add_method('Size', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## candidate-queue.h: ns3::SPFVertex * ns3::CandidateQueue::Top() const [member function]
+    cls.add_method('Top', 
+                   'ns3::SPFVertex *', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3GlobalRouteManager_methods(root_module, cls):
     ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function]
     cls.add_method('AllocateRouterId', 
@@ -610,6 +666,67 @@
                    is_static=True)
     return
 
+def register_Ns3GlobalRouteManagerImpl_methods(root_module, cls):
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerImpl::GlobalRouteManagerImpl() [constructor]
+    cls.add_constructor([])
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::DeleteGlobalRoutes() [member function]
+    cls.add_method('DeleteGlobalRoutes', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::BuildGlobalRoutingDatabase() [member function]
+    cls.add_method('BuildGlobalRoutingDatabase', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::InitializeRoutes() [member function]
+    cls.add_method('InitializeRoutes', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::DebugUseLsdb(ns3::GlobalRouteManagerLSDB * arg0) [member function]
+    cls.add_method('DebugUseLsdb', 
+                   'void', 
+                   [param('ns3::GlobalRouteManagerLSDB *', 'arg0')])
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::DebugSPFCalculate(ns3::Ipv4Address root) [member function]
+    cls.add_method('DebugSPFCalculate', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'root')])
+    return
+
+def register_Ns3GlobalRouteManagerLSDB_methods(root_module, cls):
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerLSDB::GlobalRouteManagerLSDB() [constructor]
+    cls.add_constructor([])
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerLSDB::Insert(ns3::Ipv4Address addr, ns3::GlobalRoutingLSA * lsa) [member function]
+    cls.add_method('Insert', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'addr'), param('ns3::GlobalRoutingLSA *', 'lsa')])
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::GlobalRouteManagerLSDB::GetLSA(ns3::Ipv4Address addr) const [member function]
+    cls.add_method('GetLSA', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::GlobalRouteManagerLSDB::GetLSAByLinkData(ns3::Ipv4Address addr) const [member function]
+    cls.add_method('GetLSAByLinkData', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerLSDB::Initialize() [member function]
+    cls.add_method('Initialize', 
+                   'void', 
+                   [])
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::GlobalRouteManagerLSDB::GetExtLSA(uint32_t index) const [member function]
+    cls.add_method('GetExtLSA', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [param('uint32_t', 'index')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: uint32_t ns3::GlobalRouteManagerLSDB::GetNumExtLSAs() const [member function]
+    cls.add_method('GetNumExtLSAs', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3GlobalRoutingLSA_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## global-router-interface.h: ns3::GlobalRoutingLSA::GlobalRoutingLSA() [constructor]
@@ -1663,6 +1780,120 @@
                    is_pure_virtual=True, is_virtual=True)
     return
 
+def register_Ns3SPFVertex_methods(root_module, cls):
+    ## global-route-manager-impl.h: ns3::SPFVertex::SPFVertex() [constructor]
+    cls.add_constructor([])
+    ## global-route-manager-impl.h: ns3::SPFVertex::SPFVertex(ns3::GlobalRoutingLSA * lsa) [constructor]
+    cls.add_constructor([param('ns3::GlobalRoutingLSA *', 'lsa')])
+    ## global-route-manager-impl.h: ns3::SPFVertex::VertexType ns3::SPFVertex::GetVertexType() const [member function]
+    cls.add_method('GetVertexType', 
+                   'ns3::SPFVertex::VertexType', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetVertexType(ns3::SPFVertex::VertexType type) [member function]
+    cls.add_method('SetVertexType', 
+                   'void', 
+                   [param('ns3::SPFVertex::VertexType', 'type')])
+    ## global-route-manager-impl.h: ns3::Ipv4Address ns3::SPFVertex::GetVertexId() const [member function]
+    cls.add_method('GetVertexId', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetVertexId(ns3::Ipv4Address id) [member function]
+    cls.add_method('SetVertexId', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'id')])
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::SPFVertex::GetLSA() const [member function]
+    cls.add_method('GetLSA', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetLSA(ns3::GlobalRoutingLSA * lsa) [member function]
+    cls.add_method('SetLSA', 
+                   'void', 
+                   [param('ns3::GlobalRoutingLSA *', 'lsa')])
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::GetDistanceFromRoot() const [member function]
+    cls.add_method('GetDistanceFromRoot', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetDistanceFromRoot(uint32_t distance) [member function]
+    cls.add_method('SetDistanceFromRoot', 
+                   'void', 
+                   [param('uint32_t', 'distance')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetRootExitDirection(ns3::Ipv4Address nextHop, int32_t id=ns3::SPF_INFINITY) [member function]
+    cls.add_method('SetRootExitDirection', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'nextHop'), param('int32_t', 'id', default_value='ns3::SPF_INFINITY')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetRootExitDirection(std::pair<ns3::Ipv4Address,int> exit) [member function]
+    cls.add_method('SetRootExitDirection', 
+                   'void', 
+                   [param('std::pair< ns3::Ipv4Address, int >', 'exit')])
+    ## global-route-manager-impl.h: std::pair<ns3::Ipv4Address,int> ns3::SPFVertex::GetRootExitDirection(uint32_t i) const [member function]
+    cls.add_method('GetRootExitDirection', 
+                   'std::pair< ns3::Ipv4Address, int >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: std::pair<ns3::Ipv4Address,int> ns3::SPFVertex::GetRootExitDirection() const [member function]
+    cls.add_method('GetRootExitDirection', 
+                   'std::pair< ns3::Ipv4Address, int >', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::MergeRootExitDirections(ns3::SPFVertex const * vertex) [member function]
+    cls.add_method('MergeRootExitDirections', 
+                   'void', 
+                   [param('ns3::SPFVertex const *', 'vertex')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::InheritAllRootExitDirections(ns3::SPFVertex const * vertex) [member function]
+    cls.add_method('InheritAllRootExitDirections', 
+                   'void', 
+                   [param('ns3::SPFVertex const *', 'vertex')])
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::GetNRootExitDirections() const [member function]
+    cls.add_method('GetNRootExitDirections', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: ns3::SPFVertex * ns3::SPFVertex::GetParent(uint32_t i=0) const [member function]
+    cls.add_method('GetParent', 
+                   'ns3::SPFVertex *', 
+                   [param('uint32_t', 'i', default_value='0')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetParent(ns3::SPFVertex * parent) [member function]
+    cls.add_method('SetParent', 
+                   'void', 
+                   [param('ns3::SPFVertex *', 'parent')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::MergeParent(ns3::SPFVertex const * v) [member function]
+    cls.add_method('MergeParent', 
+                   'void', 
+                   [param('ns3::SPFVertex const *', 'v')])
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::GetNChildren() const [member function]
+    cls.add_method('GetNChildren', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: ns3::SPFVertex * ns3::SPFVertex::GetChild(uint32_t n) const [member function]
+    cls.add_method('GetChild', 
+                   'ns3::SPFVertex *', 
+                   [param('uint32_t', 'n')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::AddChild(ns3::SPFVertex * child) [member function]
+    cls.add_method('AddChild', 
+                   'uint32_t', 
+                   [param('ns3::SPFVertex *', 'child')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetVertexProcessed(bool value) [member function]
+    cls.add_method('SetVertexProcessed', 
+                   'void', 
+                   [param('bool', 'value')])
+    ## global-route-manager-impl.h: bool ns3::SPFVertex::IsVertexProcessed() const [member function]
+    cls.add_method('IsVertexProcessed', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::ClearVertexProcessed() [member function]
+    cls.add_method('ClearVertexProcessed', 
+                   'void', 
+                   [])
+    return
+
 def register_Ns3Icmpv4DestinationUnreachable_methods(root_module, cls):
     ## icmpv4.h: ns3::Icmpv4DestinationUnreachable::Icmpv4DestinationUnreachable(ns3::Icmpv4DestinationUnreachable const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Icmpv4DestinationUnreachable const &', 'arg0')])
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_network_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_ns3tcp_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_ns3wifi_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3_module_olsr.py	Fri Apr 01 17:45:26 2011 +0100
@@ -137,8 +137,6 @@
     module.add_class('NeighborTuple')
     ## olsr-repositories.h: ns3::olsr::NeighborTuple::Status [enumeration]
     module.add_enum('Status', ['STATUS_NOT_SYM', 'STATUS_SYM'], outer_class=root_module['ns3::olsr::NeighborTuple'])
-    ## olsr-routing-protocol.h: ns3::olsr::OlsrMprTestCase [class]
-    module.add_class('OlsrMprTestCase', parent=root_module['ns3::TestCase'])
     ## olsr-header.h: ns3::olsr::PacketHeader [class]
     module.add_class('PacketHeader', parent=root_module['ns3::Header'])
     ## olsr-routing-protocol.h: ns3::olsr::RoutingProtocol [class]
@@ -203,7 +201,6 @@
     register_Ns3OlsrMessageHeaderTc_methods(root_module, root_module['ns3::olsr::MessageHeader::Tc'])
     register_Ns3OlsrMprSelectorTuple_methods(root_module, root_module['ns3::olsr::MprSelectorTuple'])
     register_Ns3OlsrNeighborTuple_methods(root_module, root_module['ns3::olsr::NeighborTuple'])
-    register_Ns3OlsrOlsrMprTestCase_methods(root_module, root_module['ns3::olsr::OlsrMprTestCase'])
     register_Ns3OlsrPacketHeader_methods(root_module, root_module['ns3::olsr::PacketHeader'])
     register_Ns3OlsrRoutingProtocol_methods(root_module, root_module['ns3::olsr::RoutingProtocol'])
     register_Ns3OlsrRoutingTableEntry_methods(root_module, root_module['ns3::olsr::RoutingTableEntry'])
@@ -850,16 +847,6 @@
     cls.add_instance_attribute('willingness', 'uint8_t', is_const=False)
     return
 
-def register_Ns3OlsrOlsrMprTestCase_methods(root_module, cls):
-    ## olsr-routing-protocol.h: ns3::olsr::OlsrMprTestCase::OlsrMprTestCase() [constructor]
-    cls.add_constructor([])
-    ## olsr-routing-protocol.h: void ns3::olsr::OlsrMprTestCase::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    return
-
 def register_Ns3OlsrPacketHeader_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## olsr-header.h: ns3::olsr::PacketHeader::PacketHeader(ns3::olsr::PacketHeader const & arg0) [copy constructor]
--- a/bindings/python/apidefs/gcc-ILP32/ns3_module_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-ILP32/ns3modulegen_generated.py	Fri Apr 01 17:45:26 2011 +0100
@@ -459,21 +459,6 @@
     module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list')
     module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type='list')
     module.add_container('std::vector< std::pair< ns3::Ptr< ns3::UanNetDevice >, ns3::Ptr< ns3::UanTransducer > > >', 'std::pair< ns3::Ptr< ns3::UanNetDevice >, ns3::Ptr< ns3::UanTransducer > >', container_type='vector')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndErrorCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndErrorCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndErrorCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndOkCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndOkCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndOkCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxStartCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxStartCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxStartCallback&')
-    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback')
-    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*')
-    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&')
     
     ## Register a nested module for the namespace Config
     
--- a/bindings/python/apidefs/gcc-LP64/callbacks_list.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-LP64/callbacks_list.py	Fri Apr 01 17:45:26 2011 +0100
@@ -1,7 +1,5 @@
 callback_classes = [
     ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::Address const&', 'ns3::Address const&', 'unsigned short', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -9,7 +7,6 @@
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::UanAddress const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'unsigned char*', 'long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::PacketBurst const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
-    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Mac48Address', 'ns3::Mac48Address', 'unsigned int', 'bool', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'unsigned int', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::dot11s::PeerLink::PeerState', 'ns3::dot11s::PeerLink::PeerState', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::WifiMacHeader const*', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -19,6 +16,8 @@
     ['std::vector<ns3::Mac48Address, std::allocator<ns3::Mac48Address> >', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'bool', 'ns3::Ptr<ns3::Packet>', 'ns3::Mac48Address', 'ns3::Mac48Address', 'unsigned short', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['unsigned int', 'ns3::Mac48Address', 'ns3::Ptr<ns3::MeshWifiInterfaceMac>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['bool', 'std::string', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'bool', 'unsigned long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::Packet const>', 'ns3::Ipv4Header const&', 'ns3::Socket::SocketErrno', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
@@ -30,6 +29,7 @@
     ['void', 'ns3::WifiMacHeader const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
     ['void', 'ns3::Ptr<ns3::ArpCache const>', 'ns3::Ipv4Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
+    ['bool', 'ns3::Ptr<ns3::Packet>', 'ns3::empty', '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::Address const&', 'ns3::NetDevice::PacketType', '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::Packet>', 'ns3::Mac48Address', 'ns3::Mac48Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_core.py	Fri Apr 01 17:45:26 2011 +0100
@@ -73,14 +73,6 @@
     module.add_class('SystemMutex')
     ## system-wall-clock-ms.h: ns3::SystemWallClockMs [class]
     module.add_class('SystemWallClockMs')
-    ## test.h: ns3::TestCase [class]
-    module.add_class('TestCase', allow_subclassing=True)
-    ## test.h: ns3::TestRunner [class]
-    module.add_class('TestRunner')
-    ## test.h: ns3::TestSuite [class]
-    module.add_class('TestSuite', allow_subclassing=True)
-    ## test.h: ns3::TestSuite::TestType [enumeration]
-    module.add_enum('TestType', ['BVT', 'UNIT', 'SYSTEM', 'EXAMPLE', 'PERFORMANCE'], outer_class=root_module['ns3::TestSuite'])
     ## nstime.h: ns3::Time [class]
     module.add_class('Time')
     ## nstime.h: ns3::Time::Unit [enumeration]
@@ -439,9 +431,6 @@
     register_Ns3SystemCondition_methods(root_module, root_module['ns3::SystemCondition'])
     register_Ns3SystemMutex_methods(root_module, root_module['ns3::SystemMutex'])
     register_Ns3SystemWallClockMs_methods(root_module, root_module['ns3::SystemWallClockMs'])
-    register_Ns3TestCase_methods(root_module, root_module['ns3::TestCase'])
-    register_Ns3TestRunner_methods(root_module, root_module['ns3::TestRunner'])
-    register_Ns3TestSuite_methods(root_module, root_module['ns3::TestSuite'])
     register_Ns3Time_methods(root_module, root_module['ns3::Time'])
     register_Ns3TimeBase_methods(root_module, root_module['ns3::TimeBase'])
     register_Ns3Timer_methods(root_module, root_module['ns3::Timer'])
@@ -1350,285 +1339,6 @@
                    [])
     return
 
-def register_Ns3TestCase_methods(root_module, cls):
-    ## test.h: ns3::TestCase::TestCase(std::string name) [constructor]
-    cls.add_constructor([param('std::string', 'name')])
-    ## test.h: void ns3::TestCase::Run() [member function]
-    cls.add_method('Run', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::SetVerbose(bool verbose) [member function]
-    cls.add_method('SetVerbose', 
-                   'void', 
-                   [param('bool', 'verbose')])
-    ## test.h: void ns3::TestCase::SetContinueOnFailure(bool continueOnFailure) [member function]
-    cls.add_method('SetContinueOnFailure', 
-                   'void', 
-                   [param('bool', 'continueOnFailure')])
-    ## test.h: void ns3::TestCase::SetName(std::string name) [member function]
-    cls.add_method('SetName', 
-                   'void', 
-                   [param('std::string', 'name')])
-    ## test.h: std::string ns3::TestCase::GetName() [member function]
-    cls.add_method('GetName', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestCase::SetBaseDir(std::string dir) [member function]
-    cls.add_method('SetBaseDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h: std::string ns3::TestCase::GetBaseDir() [member function]
-    cls.add_method('GetBaseDir', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestCase::SetTempDir(std::string dir) [member function]
-    cls.add_method('SetTempDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h: std::string ns3::TestCase::GetTempDir() [member function]
-    cls.add_method('GetTempDir', 
-                   'std::string', 
-                   [])
-    ## test.h: std::string ns3::TestCase::GetSourceDir(std::string file) [member function]
-    cls.add_method('GetSourceDir', 
-                   'std::string', 
-                   [param('std::string', 'file')])
-    ## test.h: void ns3::TestCase::SetStream(std::ofstream * ofs) [member function]
-    cls.add_method('SetStream', 
-                   'void', 
-                   [param('std::ofstream *', 'ofs')])
-    ## test.h: std::ofstream * ns3::TestCase::GetStream() [member function]
-    cls.add_method('GetStream', 
-                   'std::ofstream *', 
-                   [])
-    ## test.h: void ns3::TestCase::UpdateErrorStatus(bool error) [member function]
-    cls.add_method('UpdateErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: void ns3::TestCase::SetErrorStatus(bool error) [member function]
-    cls.add_method('SetErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: bool ns3::TestCase::GetErrorStatus() [member function]
-    cls.add_method('GetErrorStatus', 
-                   'bool', 
-                   [])
-    ## test.h: bool ns3::TestCase::ContinueOnFailure() [member function]
-    cls.add_method('ContinueOnFailure', 
-                   'bool', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportStart() [member function]
-    cls.add_method('ReportStart', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportCaseSuccess() [member function]
-    cls.add_method('ReportCaseSuccess', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportCaseFailure() [member function]
-    cls.add_method('ReportCaseFailure', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::ReportTestFailure(std::string cond, std::string actual, std::string limit, std::string message, std::string file, int32_t line) [member function]
-    cls.add_method('ReportTestFailure', 
-                   'void', 
-                   [param('std::string', 'cond'), param('std::string', 'actual'), param('std::string', 'limit'), param('std::string', 'message'), param('std::string', 'file'), param('int32_t', 'line')])
-    ## test.h: void ns3::TestCase::ReportEnd() [member function]
-    cls.add_method('ReportEnd', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestCase::DoReportStart() [member function]
-    cls.add_method('DoReportStart', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportCaseSuccess() [member function]
-    cls.add_method('DoReportCaseSuccess', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportCaseFailure() [member function]
-    cls.add_method('DoReportCaseFailure', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportTestFailure(std::string cond, std::string actual, std::string limit, std::string message, std::string file, int32_t line) [member function]
-    cls.add_method('DoReportTestFailure', 
-                   'void', 
-                   [param('std::string', 'cond'), param('std::string', 'actual'), param('std::string', 'limit'), param('std::string', 'message'), param('std::string', 'file'), param('int32_t', 'line')], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoReportEnd() [member function]
-    cls.add_method('DoReportEnd', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoSetup() [member function]
-    cls.add_method('DoSetup', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   is_pure_virtual=True, visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestCase::DoTeardown() [member function]
-    cls.add_method('DoTeardown', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    return
-
-def register_Ns3TestRunner_methods(root_module, cls):
-    ## test.h: ns3::TestRunner::TestRunner() [constructor]
-    cls.add_constructor([])
-    ## test.h: ns3::TestRunner::TestRunner(ns3::TestRunner const & arg0) [copy constructor]
-    cls.add_constructor([param('ns3::TestRunner const &', 'arg0')])
-    ## test.h: static uint32_t ns3::TestRunner::AddTestSuite(ns3::TestSuite * testSuite) [member function]
-    cls.add_method('AddTestSuite', 
-                   'uint32_t', 
-                   [param('ns3::TestSuite *', 'testSuite')], 
-                   is_static=True)
-    ## test.h: static uint32_t ns3::TestRunner::GetNTestSuites() [member function]
-    cls.add_method('GetNTestSuites', 
-                   'uint32_t', 
-                   [], 
-                   is_static=True)
-    ## test.h: static ns3::TestSuite * ns3::TestRunner::GetTestSuite(uint32_t n) [member function]
-    cls.add_method('GetTestSuite', 
-                   'ns3::TestSuite *', 
-                   [param('uint32_t', 'n')], 
-                   is_static=True)
-    return
-
-def register_Ns3TestSuite_methods(root_module, cls):
-    ## test.h: ns3::TestSuite::TestSuite(std::string name, ns3::TestSuite::TestType type=::ns3::TestSuite::UNIT) [constructor]
-    cls.add_constructor([param('std::string', 'name'), param('ns3::TestSuite::TestType', 'type', default_value='::ns3::TestSuite::UNIT')])
-    ## test.h: bool ns3::TestSuite::Run() [member function]
-    cls.add_method('Run', 
-                   'bool', 
-                   [])
-    ## test.h: uint32_t ns3::TestSuite::AddTestCase(ns3::TestCase * testCase) [member function]
-    cls.add_method('AddTestCase', 
-                   'uint32_t', 
-                   [param('ns3::TestCase *', 'testCase')])
-    ## test.h: uint32_t ns3::TestSuite::GetNTestCases() [member function]
-    cls.add_method('GetNTestCases', 
-                   'uint32_t', 
-                   [])
-    ## test.h: ns3::TestCase * ns3::TestSuite::GetTestCase(uint32_t i) [member function]
-    cls.add_method('GetTestCase', 
-                   'ns3::TestCase *', 
-                   [param('uint32_t', 'i')])
-    ## test.h: ns3::TestSuite::TestType ns3::TestSuite::GetTestType() [member function]
-    cls.add_method('GetTestType', 
-                   'ns3::TestSuite::TestType', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetVerbose(bool verbose) [member function]
-    cls.add_method('SetVerbose', 
-                   'void', 
-                   [param('bool', 'verbose')])
-    ## test.h: void ns3::TestSuite::SetContinueOnFailure(bool continueOnFailure) [member function]
-    cls.add_method('SetContinueOnFailure', 
-                   'void', 
-                   [param('bool', 'continueOnFailure')])
-    ## test.h: void ns3::TestSuite::SetName(std::string name) [member function]
-    cls.add_method('SetName', 
-                   'void', 
-                   [param('std::string', 'name')])
-    ## test.h: std::string ns3::TestSuite::GetName() [member function]
-    cls.add_method('GetName', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetBaseDir(std::string basedir) [member function]
-    cls.add_method('SetBaseDir', 
-                   'void', 
-                   [param('std::string', 'basedir')])
-    ## test.h: std::string ns3::TestSuite::GetBaseDir() [member function]
-    cls.add_method('GetBaseDir', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetTempDir(std::string dir) [member function]
-    cls.add_method('SetTempDir', 
-                   'void', 
-                   [param('std::string', 'dir')])
-    ## test.h: std::string ns3::TestSuite::GetTempDir() [member function]
-    cls.add_method('GetTempDir', 
-                   'std::string', 
-                   [])
-    ## test.h: void ns3::TestSuite::SetStream(std::ofstream * ofs) [member function]
-    cls.add_method('SetStream', 
-                   'void', 
-                   [param('std::ofstream *', 'ofs')])
-    ## test.h: void ns3::TestSuite::UpdateErrorStatus(bool error) [member function]
-    cls.add_method('UpdateErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: void ns3::TestSuite::SetErrorStatus(bool error) [member function]
-    cls.add_method('SetErrorStatus', 
-                   'void', 
-                   [param('bool', 'error')])
-    ## test.h: bool ns3::TestSuite::GetErrorStatus() [member function]
-    cls.add_method('GetErrorStatus', 
-                   'bool', 
-                   [])
-    ## test.h: bool ns3::TestSuite::ContinueOnFailure() [member function]
-    cls.add_method('ContinueOnFailure', 
-                   'bool', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportStart() [member function]
-    cls.add_method('ReportStart', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportSuccess() [member function]
-    cls.add_method('ReportSuccess', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportFailure() [member function]
-    cls.add_method('ReportFailure', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::ReportEnd() [member function]
-    cls.add_method('ReportEnd', 
-                   'void', 
-                   [])
-    ## test.h: void ns3::TestSuite::DoReportStart() [member function]
-    cls.add_method('DoReportStart', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoReportSuccess() [member function]
-    cls.add_method('DoReportSuccess', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoReportFailure() [member function]
-    cls.add_method('DoReportFailure', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoReportEnd() [member function]
-    cls.add_method('DoReportEnd', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoSetup() [member function]
-    cls.add_method('DoSetup', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    ## test.h: void ns3::TestSuite::DoTeardown() [member function]
-    cls.add_method('DoTeardown', 
-                   'void', 
-                   [], 
-                   visibility='protected', is_virtual=True)
-    return
-
 def register_Ns3Time_methods(root_module, cls):
     cls.add_binary_comparison_operator('!=')
     cls.add_inplace_numeric_operator('*=', param('ns3::Time const &', 'right'))
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_core_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_internet.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_internet.py	Fri Apr 01 17:45:26 2011 +0100
@@ -9,8 +9,14 @@
     module.add_class('AsciiTraceHelperForIpv4', allow_subclassing=True)
     ## internet-trace-helper.h: ns3::AsciiTraceHelperForIpv6 [class]
     module.add_class('AsciiTraceHelperForIpv6', allow_subclassing=True)
+    ## candidate-queue.h: ns3::CandidateQueue [class]
+    module.add_class('CandidateQueue')
     ## global-route-manager.h: ns3::GlobalRouteManager [class]
     module.add_class('GlobalRouteManager')
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerImpl [class]
+    module.add_class('GlobalRouteManagerImpl', allow_subclassing=True)
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerLSDB [class]
+    module.add_class('GlobalRouteManagerLSDB')
     ## global-router-interface.h: ns3::GlobalRoutingLSA [class]
     module.add_class('GlobalRoutingLSA')
     ## global-router-interface.h: ns3::GlobalRoutingLSA::LSType [enumeration]
@@ -65,6 +71,10 @@
     module.add_class('PcapHelperForIpv4', allow_subclassing=True)
     ## internet-trace-helper.h: ns3::PcapHelperForIpv6 [class]
     module.add_class('PcapHelperForIpv6', allow_subclassing=True)
+    ## global-route-manager-impl.h: ns3::SPFVertex [class]
+    module.add_class('SPFVertex')
+    ## global-route-manager-impl.h: ns3::SPFVertex::VertexType [enumeration]
+    module.add_enum('VertexType', ['VertexUnknown', 'VertexRouter', 'VertexNetwork'], outer_class=root_module['ns3::SPFVertex'])
     ## icmpv4.h: ns3::Icmpv4DestinationUnreachable [class]
     module.add_class('Icmpv4DestinationUnreachable', parent=root_module['ns3::Header'])
     ## icmpv4.h: ns3::Icmpv4DestinationUnreachable [enumeration]
@@ -361,7 +371,10 @@
 def register_methods(root_module):
     register_Ns3AsciiTraceHelperForIpv4_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv4'])
     register_Ns3AsciiTraceHelperForIpv6_methods(root_module, root_module['ns3::AsciiTraceHelperForIpv6'])
+    register_Ns3CandidateQueue_methods(root_module, root_module['ns3::CandidateQueue'])
     register_Ns3GlobalRouteManager_methods(root_module, root_module['ns3::GlobalRouteManager'])
+    register_Ns3GlobalRouteManagerImpl_methods(root_module, root_module['ns3::GlobalRouteManagerImpl'])
+    register_Ns3GlobalRouteManagerLSDB_methods(root_module, root_module['ns3::GlobalRouteManagerLSDB'])
     register_Ns3GlobalRoutingLSA_methods(root_module, root_module['ns3::GlobalRoutingLSA'])
     register_Ns3GlobalRoutingLinkRecord_methods(root_module, root_module['ns3::GlobalRoutingLinkRecord'])
     register_Ns3Ipv4AddressGenerator_methods(root_module, root_module['ns3::Ipv4AddressGenerator'])
@@ -383,6 +396,7 @@
     register_Ns3OptionField_methods(root_module, root_module['ns3::OptionField'])
     register_Ns3PcapHelperForIpv4_methods(root_module, root_module['ns3::PcapHelperForIpv4'])
     register_Ns3PcapHelperForIpv6_methods(root_module, root_module['ns3::PcapHelperForIpv6'])
+    register_Ns3SPFVertex_methods(root_module, root_module['ns3::SPFVertex'])
     register_Ns3Icmpv4DestinationUnreachable_methods(root_module, root_module['ns3::Icmpv4DestinationUnreachable'])
     register_Ns3Icmpv4Echo_methods(root_module, root_module['ns3::Icmpv4Echo'])
     register_Ns3Icmpv4Header_methods(root_module, root_module['ns3::Icmpv4Header'])
@@ -587,6 +601,48 @@
                    is_pure_virtual=True, is_virtual=True)
     return
 
+def register_Ns3CandidateQueue_methods(root_module, cls):
+    cls.add_output_stream_operator()
+    ## candidate-queue.h: ns3::CandidateQueue::CandidateQueue() [constructor]
+    cls.add_constructor([])
+    ## candidate-queue.h: void ns3::CandidateQueue::Clear() [member function]
+    cls.add_method('Clear', 
+                   'void', 
+                   [])
+    ## candidate-queue.h: bool ns3::CandidateQueue::Empty() const [member function]
+    cls.add_method('Empty', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## candidate-queue.h: ns3::SPFVertex * ns3::CandidateQueue::Find(ns3::Ipv4Address const addr) const [member function]
+    cls.add_method('Find', 
+                   'ns3::SPFVertex *', 
+                   [param('ns3::Ipv4Address const', 'addr')], 
+                   is_const=True)
+    ## candidate-queue.h: ns3::SPFVertex * ns3::CandidateQueue::Pop() [member function]
+    cls.add_method('Pop', 
+                   'ns3::SPFVertex *', 
+                   [])
+    ## candidate-queue.h: void ns3::CandidateQueue::Push(ns3::SPFVertex * vNew) [member function]
+    cls.add_method('Push', 
+                   'void', 
+                   [param('ns3::SPFVertex *', 'vNew')])
+    ## candidate-queue.h: void ns3::CandidateQueue::Reorder() [member function]
+    cls.add_method('Reorder', 
+                   'void', 
+                   [])
+    ## candidate-queue.h: uint32_t ns3::CandidateQueue::Size() const [member function]
+    cls.add_method('Size', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## candidate-queue.h: ns3::SPFVertex * ns3::CandidateQueue::Top() const [member function]
+    cls.add_method('Top', 
+                   'ns3::SPFVertex *', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3GlobalRouteManager_methods(root_module, cls):
     ## global-route-manager.h: static uint32_t ns3::GlobalRouteManager::AllocateRouterId() [member function]
     cls.add_method('AllocateRouterId', 
@@ -610,6 +666,67 @@
                    is_static=True)
     return
 
+def register_Ns3GlobalRouteManagerImpl_methods(root_module, cls):
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerImpl::GlobalRouteManagerImpl() [constructor]
+    cls.add_constructor([])
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::DeleteGlobalRoutes() [member function]
+    cls.add_method('DeleteGlobalRoutes', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::BuildGlobalRoutingDatabase() [member function]
+    cls.add_method('BuildGlobalRoutingDatabase', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::InitializeRoutes() [member function]
+    cls.add_method('InitializeRoutes', 
+                   'void', 
+                   [], 
+                   is_virtual=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::DebugUseLsdb(ns3::GlobalRouteManagerLSDB * arg0) [member function]
+    cls.add_method('DebugUseLsdb', 
+                   'void', 
+                   [param('ns3::GlobalRouteManagerLSDB *', 'arg0')])
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerImpl::DebugSPFCalculate(ns3::Ipv4Address root) [member function]
+    cls.add_method('DebugSPFCalculate', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'root')])
+    return
+
+def register_Ns3GlobalRouteManagerLSDB_methods(root_module, cls):
+    ## global-route-manager-impl.h: ns3::GlobalRouteManagerLSDB::GlobalRouteManagerLSDB() [constructor]
+    cls.add_constructor([])
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerLSDB::Insert(ns3::Ipv4Address addr, ns3::GlobalRoutingLSA * lsa) [member function]
+    cls.add_method('Insert', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'addr'), param('ns3::GlobalRoutingLSA *', 'lsa')])
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::GlobalRouteManagerLSDB::GetLSA(ns3::Ipv4Address addr) const [member function]
+    cls.add_method('GetLSA', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::GlobalRouteManagerLSDB::GetLSAByLinkData(ns3::Ipv4Address addr) const [member function]
+    cls.add_method('GetLSAByLinkData', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [param('ns3::Ipv4Address', 'addr')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::GlobalRouteManagerLSDB::Initialize() [member function]
+    cls.add_method('Initialize', 
+                   'void', 
+                   [])
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::GlobalRouteManagerLSDB::GetExtLSA(uint32_t index) const [member function]
+    cls.add_method('GetExtLSA', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [param('uint32_t', 'index')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: uint32_t ns3::GlobalRouteManagerLSDB::GetNumExtLSAs() const [member function]
+    cls.add_method('GetNumExtLSAs', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    return
+
 def register_Ns3GlobalRoutingLSA_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## global-router-interface.h: ns3::GlobalRoutingLSA::GlobalRoutingLSA() [constructor]
@@ -1663,6 +1780,120 @@
                    is_pure_virtual=True, is_virtual=True)
     return
 
+def register_Ns3SPFVertex_methods(root_module, cls):
+    ## global-route-manager-impl.h: ns3::SPFVertex::SPFVertex() [constructor]
+    cls.add_constructor([])
+    ## global-route-manager-impl.h: ns3::SPFVertex::SPFVertex(ns3::GlobalRoutingLSA * lsa) [constructor]
+    cls.add_constructor([param('ns3::GlobalRoutingLSA *', 'lsa')])
+    ## global-route-manager-impl.h: ns3::SPFVertex::VertexType ns3::SPFVertex::GetVertexType() const [member function]
+    cls.add_method('GetVertexType', 
+                   'ns3::SPFVertex::VertexType', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetVertexType(ns3::SPFVertex::VertexType type) [member function]
+    cls.add_method('SetVertexType', 
+                   'void', 
+                   [param('ns3::SPFVertex::VertexType', 'type')])
+    ## global-route-manager-impl.h: ns3::Ipv4Address ns3::SPFVertex::GetVertexId() const [member function]
+    cls.add_method('GetVertexId', 
+                   'ns3::Ipv4Address', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetVertexId(ns3::Ipv4Address id) [member function]
+    cls.add_method('SetVertexId', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'id')])
+    ## global-route-manager-impl.h: ns3::GlobalRoutingLSA * ns3::SPFVertex::GetLSA() const [member function]
+    cls.add_method('GetLSA', 
+                   'ns3::GlobalRoutingLSA *', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetLSA(ns3::GlobalRoutingLSA * lsa) [member function]
+    cls.add_method('SetLSA', 
+                   'void', 
+                   [param('ns3::GlobalRoutingLSA *', 'lsa')])
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::GetDistanceFromRoot() const [member function]
+    cls.add_method('GetDistanceFromRoot', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetDistanceFromRoot(uint32_t distance) [member function]
+    cls.add_method('SetDistanceFromRoot', 
+                   'void', 
+                   [param('uint32_t', 'distance')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetRootExitDirection(ns3::Ipv4Address nextHop, int32_t id=ns3::SPF_INFINITY) [member function]
+    cls.add_method('SetRootExitDirection', 
+                   'void', 
+                   [param('ns3::Ipv4Address', 'nextHop'), param('int32_t', 'id', default_value='ns3::SPF_INFINITY')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetRootExitDirection(std::pair<ns3::Ipv4Address,int> exit) [member function]
+    cls.add_method('SetRootExitDirection', 
+                   'void', 
+                   [param('std::pair< ns3::Ipv4Address, int >', 'exit')])
+    ## global-route-manager-impl.h: std::pair<ns3::Ipv4Address,int> ns3::SPFVertex::GetRootExitDirection(uint32_t i) const [member function]
+    cls.add_method('GetRootExitDirection', 
+                   'std::pair< ns3::Ipv4Address, int >', 
+                   [param('uint32_t', 'i')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: std::pair<ns3::Ipv4Address,int> ns3::SPFVertex::GetRootExitDirection() const [member function]
+    cls.add_method('GetRootExitDirection', 
+                   'std::pair< ns3::Ipv4Address, int >', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::MergeRootExitDirections(ns3::SPFVertex const * vertex) [member function]
+    cls.add_method('MergeRootExitDirections', 
+                   'void', 
+                   [param('ns3::SPFVertex const *', 'vertex')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::InheritAllRootExitDirections(ns3::SPFVertex const * vertex) [member function]
+    cls.add_method('InheritAllRootExitDirections', 
+                   'void', 
+                   [param('ns3::SPFVertex const *', 'vertex')])
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::GetNRootExitDirections() const [member function]
+    cls.add_method('GetNRootExitDirections', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: ns3::SPFVertex * ns3::SPFVertex::GetParent(uint32_t i=0) const [member function]
+    cls.add_method('GetParent', 
+                   'ns3::SPFVertex *', 
+                   [param('uint32_t', 'i', default_value='0')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetParent(ns3::SPFVertex * parent) [member function]
+    cls.add_method('SetParent', 
+                   'void', 
+                   [param('ns3::SPFVertex *', 'parent')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::MergeParent(ns3::SPFVertex const * v) [member function]
+    cls.add_method('MergeParent', 
+                   'void', 
+                   [param('ns3::SPFVertex const *', 'v')])
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::GetNChildren() const [member function]
+    cls.add_method('GetNChildren', 
+                   'uint32_t', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: ns3::SPFVertex * ns3::SPFVertex::GetChild(uint32_t n) const [member function]
+    cls.add_method('GetChild', 
+                   'ns3::SPFVertex *', 
+                   [param('uint32_t', 'n')], 
+                   is_const=True)
+    ## global-route-manager-impl.h: uint32_t ns3::SPFVertex::AddChild(ns3::SPFVertex * child) [member function]
+    cls.add_method('AddChild', 
+                   'uint32_t', 
+                   [param('ns3::SPFVertex *', 'child')])
+    ## global-route-manager-impl.h: void ns3::SPFVertex::SetVertexProcessed(bool value) [member function]
+    cls.add_method('SetVertexProcessed', 
+                   'void', 
+                   [param('bool', 'value')])
+    ## global-route-manager-impl.h: bool ns3::SPFVertex::IsVertexProcessed() const [member function]
+    cls.add_method('IsVertexProcessed', 
+                   'bool', 
+                   [], 
+                   is_const=True)
+    ## global-route-manager-impl.h: void ns3::SPFVertex::ClearVertexProcessed() [member function]
+    cls.add_method('ClearVertexProcessed', 
+                   'void', 
+                   [])
+    return
+
 def register_Ns3Icmpv4DestinationUnreachable_methods(root_module, cls):
     ## icmpv4.h: ns3::Icmpv4DestinationUnreachable::Icmpv4DestinationUnreachable(ns3::Icmpv4DestinationUnreachable const & arg0) [copy constructor]
     cls.add_constructor([param('ns3::Icmpv4DestinationUnreachable const &', 'arg0')])
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_network_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_ns3tcp_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_ns3wifi_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3_module_olsr.py	Fri Apr 01 17:45:26 2011 +0100
@@ -137,8 +137,6 @@
     module.add_class('NeighborTuple')
     ## olsr-repositories.h: ns3::olsr::NeighborTuple::Status [enumeration]
     module.add_enum('Status', ['STATUS_NOT_SYM', 'STATUS_SYM'], outer_class=root_module['ns3::olsr::NeighborTuple'])
-    ## olsr-routing-protocol.h: ns3::olsr::OlsrMprTestCase [class]
-    module.add_class('OlsrMprTestCase', parent=root_module['ns3::TestCase'])
     ## olsr-header.h: ns3::olsr::PacketHeader [class]
     module.add_class('PacketHeader', parent=root_module['ns3::Header'])
     ## olsr-routing-protocol.h: ns3::olsr::RoutingProtocol [class]
@@ -203,7 +201,6 @@
     register_Ns3OlsrMessageHeaderTc_methods(root_module, root_module['ns3::olsr::MessageHeader::Tc'])
     register_Ns3OlsrMprSelectorTuple_methods(root_module, root_module['ns3::olsr::MprSelectorTuple'])
     register_Ns3OlsrNeighborTuple_methods(root_module, root_module['ns3::olsr::NeighborTuple'])
-    register_Ns3OlsrOlsrMprTestCase_methods(root_module, root_module['ns3::olsr::OlsrMprTestCase'])
     register_Ns3OlsrPacketHeader_methods(root_module, root_module['ns3::olsr::PacketHeader'])
     register_Ns3OlsrRoutingProtocol_methods(root_module, root_module['ns3::olsr::RoutingProtocol'])
     register_Ns3OlsrRoutingTableEntry_methods(root_module, root_module['ns3::olsr::RoutingTableEntry'])
@@ -850,16 +847,6 @@
     cls.add_instance_attribute('willingness', 'uint8_t', is_const=False)
     return
 
-def register_Ns3OlsrOlsrMprTestCase_methods(root_module, cls):
-    ## olsr-routing-protocol.h: ns3::olsr::OlsrMprTestCase::OlsrMprTestCase() [constructor]
-    cls.add_constructor([])
-    ## olsr-routing-protocol.h: void ns3::olsr::OlsrMprTestCase::DoRun() [member function]
-    cls.add_method('DoRun', 
-                   'void', 
-                   [], 
-                   is_virtual=True)
-    return
-
 def register_Ns3OlsrPacketHeader_methods(root_module, cls):
     cls.add_output_stream_operator()
     ## olsr-header.h: ns3::olsr::PacketHeader::PacketHeader(ns3::olsr::PacketHeader const & arg0) [copy constructor]
--- a/bindings/python/apidefs/gcc-LP64/ns3_module_test.py	Fri Apr 01 11:51:51 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
-
-def register_types(module):
-    root_module = module.get_root()
-    
-    
-    ## Register a nested module for the namespace Config
-    
-    nested_module = module.add_cpp_namespace('Config')
-    register_types_ns3_Config(nested_module)
-    
-    
-    ## Register a nested module for the namespace FatalImpl
-    
-    nested_module = module.add_cpp_namespace('FatalImpl')
-    register_types_ns3_FatalImpl(nested_module)
-    
-    
-    ## Register a nested module for the namespace addressUtils
-    
-    nested_module = module.add_cpp_namespace('addressUtils')
-    register_types_ns3_addressUtils(nested_module)
-    
-    
-    ## Register a nested module for the namespace aodv
-    
-    nested_module = module.add_cpp_namespace('aodv')
-    register_types_ns3_aodv(nested_module)
-    
-    
-    ## Register a nested module for the namespace dot11s
-    
-    nested_module = module.add_cpp_namespace('dot11s')
-    register_types_ns3_dot11s(nested_module)
-    
-    
-    ## Register a nested module for the namespace dsdv
-    
-    nested_module = module.add_cpp_namespace('dsdv')
-    register_types_ns3_dsdv(nested_module)
-    
-    
-    ## Register a nested module for the namespace flame
-    
-    nested_module = module.add_cpp_namespace('flame')
-    register_types_ns3_flame(nested_module)
-    
-    
-    ## Register a nested module for the namespace internal
-    
-    nested_module = module.add_cpp_namespace('internal')
-    register_types_ns3_internal(nested_module)
-    
-    
-    ## Register a nested module for the namespace olsr
-    
-    nested_module = module.add_cpp_namespace('olsr')
-    register_types_ns3_olsr(nested_module)
-    
-
-def register_types_ns3_Config(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_FatalImpl(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_addressUtils(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_aodv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dot11s(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_dsdv(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_flame(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_internal(module):
-    root_module = module.get_root()
-    
-
-def register_types_ns3_olsr(module):
-    root_module = module.get_root()
-    
-
-def register_methods(root_module):
-    return
-
-def register_functions(root_module):
-    module = root_module
-    register_functions_ns3_Config(module.get_submodule('Config'), root_module)
-    register_functions_ns3_FatalImpl(module.get_submodule('FatalImpl'), root_module)
-    register_functions_ns3_addressUtils(module.get_submodule('addressUtils'), root_module)
-    register_functions_ns3_aodv(module.get_submodule('aodv'), root_module)
-    register_functions_ns3_dot11s(module.get_submodule('dot11s'), root_module)
-    register_functions_ns3_dsdv(module.get_submodule('dsdv'), root_module)
-    register_functions_ns3_flame(module.get_submodule('flame'), root_module)
-    register_functions_ns3_internal(module.get_submodule('internal'), root_module)
-    register_functions_ns3_olsr(module.get_submodule('olsr'), root_module)
-    return
-
-def register_functions_ns3_Config(module, root_module):
-    return
-
-def register_functions_ns3_FatalImpl(module, root_module):
-    return
-
-def register_functions_ns3_addressUtils(module, root_module):
-    return
-
-def register_functions_ns3_aodv(module, root_module):
-    return
-
-def register_functions_ns3_dot11s(module, root_module):
-    return
-
-def register_functions_ns3_dsdv(module, root_module):
-    return
-
-def register_functions_ns3_flame(module, root_module):
-    return
-
-def register_functions_ns3_internal(module, root_module):
-    return
-
-def register_functions_ns3_olsr(module, root_module):
-    return
-
--- a/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Fri Apr 01 11:51:51 2011 +0100
+++ b/bindings/python/apidefs/gcc-LP64/ns3modulegen_generated.py	Fri Apr 01 17:45:26 2011 +0100
@@ -459,21 +459,6 @@
     module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list')
     module.add_container('std::list< std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader > >', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type='list')
     module.add_container('std::vector< std::pair< ns3::Ptr< ns3::UanNetDevice >, ns3::Ptr< ns3::UanTransducer > > >', 'std::pair< ns3::Ptr< ns3::UanNetDevice >, ns3::Ptr< ns3::UanTransducer > >', container_type='vector')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndErrorCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndErrorCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndErrorCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxEndCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxEndCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxEndCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxEndOkCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxEndOkCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxEndOkCallback&')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacRxStartCallback')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacRxStartCallback*')
-    typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacRxStartCallback&')
-    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::PhyMacTxStartCallback')
-    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::PhyMacTxStartCallback*')
-    typehandlers.add_type_alias('ns3::Callback< bool, ns3::Ptr< ns3::Packet >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::PhyMacTxStartCallback&')
     
     ## Register a nested module for the namespace Config
ns-3.24