F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Nicola Baldo
2011-03-31 12:51:49 +02:00
parent a4074c5e23 1c9164b534
commit c790ceb6e7
10 changed files with 7973 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/applications/bindings/callbacks_list.py
View File

@@ -1,4 +1,6 @@
callback_classes = [
['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::Socket>', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::Ptr<ns3::Socket>', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],
['void', 'ns3::Ptr<ns3::Socket>', 'ns3::Address const&', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'],

3962
src/applications/bindings/modulegen__gcc_ILP32.py
View File

File diff suppressed because it is too large Load Diff

3962
src/applications/bindings/modulegen__gcc_LP64.py
View File

File diff suppressed because it is too large Load Diff

4
src/applications/bindings/modulegen_customizations.py Normal file
View File

@@ -0,0 +1,4 @@
import os
def post_register_types(root_module):
root_module.add_include('"ns3/network-module.h"')

8
src/applications/bindings/scan-header.h Normal file
View File

@@ -0,0 +1,8 @@
/* We need to scan the complete network module so that all address
* formats are pulled, otherwise just a few basic ones are seen, and
* that affects implicit conversions detected by pybindgen. */
#include "ns3/network-module.h"
#include "ns3/applications-module.h"

31
src/emu/wscript
View File

@@ -29,23 +29,24 @@ def build(bld):
'doc/emu.h',
]
env = bld.env_of_name('default')
if env['ENABLE_EMU']:
module.source.extend([
'model/emu-net-device.cc',
'model/emu-encode-decode.cc',
'helper/emu-helper.cc',
])
headers.source.extend([
'model/emu-net-device.h',
'helper/emu-helper.h',
])
if not bld.env['ENABLE_EMU']:
return
obj = bld.create_suid_program('emu-sock-creator')
obj.source = [
'model/emu-sock-creator.cc',
module.source.extend([
'model/emu-net-device.cc',
'model/emu-encode-decode.cc',
]
'helper/emu-helper.cc',
])
headers.source.extend([
'model/emu-net-device.h',
'helper/emu-helper.h',
])
obj = bld.create_suid_program('emu-sock-creator')
obj.source = [
'model/emu-sock-creator.cc',
'model/emu-encode-decode.cc',
]
if bld.env['ENABLE_EXAMPLES']:
bld.add_subdirs('examples')

7
src/internet/wscript
View File

@@ -76,13 +76,12 @@ def configure(conf):
found = False
for path in ['.', 'lib', 'lib64']:
if os.path.exists(os.path.join(conf.env['WITH_NSC'], path, lib_to_check)):
# append the NSC kernel dirs to the module path so that these dirs
# append the NSC kernel dir to the module path so that this dir
# will end up in the LD_LIBRARY_PATH, thus allowing the NSC NS-3
# module to find the necessary NSC shared libraries.
found = True
for nsc_module in ['linux-2.6.18', 'linux-2.6.26']:
conf.env.append_value('NS3_MODULE_PATH',
os.path.abspath(os.path.join(conf.env['WITH_NSC'], path, nsc_module)))
conf.env.append_value('NS3_MODULE_PATH',
os.path.abspath(os.path.join(conf.env['WITH_NSC'], path)))
if not found:
conf.env['NSC_ENABLED'] = False
conf.report_optional_feature("nsc", "Network Simulation Cradle", False,

35
src/tap-bridge/wscript
View File

@@ -29,25 +29,26 @@ def build(bld):
'doc/tap.h',
]
env = bld.env_of_name('default')
if env['ENABLE_TAP']:
module.source.extend([
'model/tap-bridge.cc',
'model/tap-encode-decode.cc',
'helper/tap-bridge-helper.cc',
])
headers.source.extend([
'model/tap-bridge.h',
'helper/tap-bridge-helper.h',
])
if not bld.env['ENABLE_TAP']:
return
module.source.extend([
'model/tap-bridge.cc',
'model/tap-encode-decode.cc',
'helper/tap-bridge-helper.cc',
])
headers.source.extend([
'model/tap-bridge.h',
'helper/tap-bridge-helper.h',
])
if not env['PLATFORM'].startswith('freebsd'):
obj = bld.create_suid_program('tap-creator')
obj.source = [
'model/tap-creator.cc',
'model/tap-encode-decode.cc',
]
if not bld.env['PLATFORM'].startswith('freebsd'):
obj = bld.create_suid_program('tap-creator')
obj.source = [
'model/tap-creator.cc',
'model/tap-encode-decode.cc',
]
if bld.env['ENABLE_EXAMPLES']:
bld.add_subdirs('examples')