Rename internet-stack to internet, and organize module
This commit is contained in:
Tom Henderson
@@ -2,13 +2,13 @@
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('dumbbell-animation',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'dumbbell-animation.cc'
|
||||
|
||||
obj = bld.create_ns3_program('grid-animation',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'grid-animation.cc'
|
||||
|
||||
obj = bld.create_ns3_program('star-animation',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'star-animation.cc'
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-one-subnet', ['csma', 'internet'])
|
||||
obj.source = 'csma-one-subnet.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-broadcast', ['csma', 'internet'])
|
||||
obj.source = 'csma-broadcast.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-packet-socket', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-packet-socket', ['csma', 'internet'])
|
||||
obj.source = 'csma-packet-socket.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-multicast', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-multicast', ['csma', 'internet'])
|
||||
obj.source = 'csma-multicast.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-star', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-star', ['csma', 'internet'])
|
||||
obj.source = 'csma-star.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-raw-ip-socket', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-raw-ip-socket', ['csma', 'internet'])
|
||||
obj.source = 'csma-raw-ip-socket.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-ping', ['csma', 'internet-stack', 'v4ping'])
|
||||
obj = bld.create_ns3_program('csma-ping', ['csma', 'internet', 'v4ping'])
|
||||
obj.source = 'csma-ping.cc'
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
def build(bld):
|
||||
env = bld.env_of_name('default')
|
||||
if env['ENABLE_EMU']:
|
||||
obj = bld.create_ns3_program('emu-udp-echo', ['emu', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('emu-udp-echo', ['emu', 'internet'])
|
||||
obj.source = 'emu-udp-echo.cc'
|
||||
|
||||
obj = bld.create_ns3_program('emu-ping', ['emu', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('emu-ping', ['emu', 'internet'])
|
||||
obj.source = 'emu-ping.cc'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('energy-model-example', ['core', 'mobility', 'wifi', 'energy', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('energy-model-example', ['core', 'mobility', 'wifi', 'energy', 'internet'])
|
||||
obj.source = 'energy-model-example.cc'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('simple-error-model', ['point-to-point', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('simple-error-model', ['point-to-point', 'internet'])
|
||||
obj.source = 'simple-error-model.cc'
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/ipv6-static-routing-helper.h"
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/ipv6-static-routing-helper.h"
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/ipv6-header.h"
|
||||
using namespace ns3;
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
|
||||
using namespace ns3;
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
|
||||
#include "ns3/ipv6-routing-table-entry.h"
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
|
||||
#include "ns3/radvd.h"
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('icmpv6-redirect', ['csma', 'internet'])
|
||||
obj.source = 'icmpv6-redirect.cc'
|
||||
|
||||
obj = bld.create_ns3_program('ping6', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('ping6', ['csma', 'internet'])
|
||||
obj.source = 'ping6.cc'
|
||||
|
||||
obj = bld.create_ns3_program('radvd', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('radvd', ['csma', 'internet'])
|
||||
obj.source = 'radvd.cc'
|
||||
|
||||
obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('radvd-two-prefix', ['csma', 'internet'])
|
||||
obj.source = 'radvd-two-prefix.cc'
|
||||
|
||||
obj = bld.create_ns3_program('test-ipv6', ['point-to-point', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('test-ipv6', ['point-to-point', 'internet'])
|
||||
obj.source = 'test-ipv6.cc'
|
||||
|
||||
obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('fragmentation-ipv6', ['csma', 'internet'])
|
||||
obj.source = 'fragmentation-ipv6.cc'
|
||||
|
||||
obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('loose-routing-ipv6', ['csma', 'internet'])
|
||||
obj.source = 'loose-routing-ipv6.cc'
|
||||
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('matrix-topology',
|
||||
['simulator', 'common', 'node', 'internet-stack'])
|
||||
['simulator', 'common', 'node', 'internet'])
|
||||
obj.source = 'matrix-topology.cc'
|
||||
|
||||
@@ -45,10 +45,9 @@
|
||||
|
||||
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/global-routing-module.h"
|
||||
#include "ns3/wifi-module.h"
|
||||
#include "ns3/mesh-module.h"
|
||||
#include "ns3/mobility-module.h"
|
||||
|
||||
@@ -39,10 +39,9 @@
|
||||
#include <fstream>
|
||||
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/global-routing-module.h"
|
||||
#include "ns3/onoff-application.h"
|
||||
#include "ns3/packet-sink.h"
|
||||
#include "ns3/point-to-point-net-device.h"
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('simple-distributed',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'simple-distributed.cc'
|
||||
|
||||
obj = bld.create_ns3_program('third-distributed',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'third-distributed.cc'
|
||||
|
||||
obj = bld.create_ns3_program('nms-p2p-nix-distributed',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'nms-p2p-nix-distributed.cc'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet'])
|
||||
obj.source = 'object-names.cc'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('realtime-udp-echo', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('realtime-udp-echo', ['csma', 'internet'])
|
||||
obj.source = 'realtime-udp-echo.cc'
|
||||
|
||||
@@ -37,10 +37,9 @@
|
||||
#include <fstream>
|
||||
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/global-routing-module.h"
|
||||
#include "ns3/onoff-application.h"
|
||||
#include "ns3/packet-sink.h"
|
||||
#include "ns3/point-to-point-net-device.h"
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/ipv6-static-routing-helper.h"
|
||||
|
||||
|
||||
@@ -2,45 +2,45 @@
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('dynamic-global-routing',
|
||||
['point-to-point', 'csma', 'internet-stack', 'global-routing'])
|
||||
['point-to-point', 'csma', 'internet'])
|
||||
obj.source = 'dynamic-global-routing.cc'
|
||||
|
||||
obj = bld.create_ns3_program('static-routing-slash32',
|
||||
['point-to-point', 'internet-stack', 'global-routing'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'static-routing-slash32.cc'
|
||||
|
||||
obj = bld.create_ns3_program('global-routing-slash32',
|
||||
['point-to-point', 'internet-stack', 'global-routing'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'global-routing-slash32.cc'
|
||||
|
||||
obj = bld.create_ns3_program('global-injection-slash32',
|
||||
['point-to-point', 'internet-stack', 'global-routing'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'global-injection-slash32.cc'
|
||||
|
||||
obj = bld.create_ns3_program('simple-global-routing',
|
||||
['point-to-point', 'internet-stack', 'global-routing'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'simple-global-routing.cc'
|
||||
|
||||
obj = bld.create_ns3_program('simple-alternate-routing',
|
||||
['point-to-point', 'internet-stack', 'global-routing'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'simple-alternate-routing.cc'
|
||||
|
||||
obj = bld.create_ns3_program( 'mixed-global-routing',
|
||||
['point-to-point', 'internet-stack', 'global-routing' , 'csma-cd'])
|
||||
['point-to-point', 'internet', 'csma'])
|
||||
obj.source = 'mixed-global-routing.cc'
|
||||
|
||||
obj = bld.create_ns3_program('nix-simple',
|
||||
['point-to-point', 'internet-stack', 'nix-vector-routing'])
|
||||
['point-to-point', 'internet', 'nix-vector-routing'])
|
||||
obj.source = 'nix-simple.cc'
|
||||
|
||||
obj = bld.create_ns3_program('nms-p2p-nix',
|
||||
['point-to-point', 'internet-stack', 'nix-vector-routing'])
|
||||
['point-to-point', 'internet', 'nix-vector-routing'])
|
||||
obj.source = 'nms-p2p-nix.cc'
|
||||
|
||||
obj = bld.create_ns3_program('simple-routing-ping6',
|
||||
['csma', 'internet-stack'])
|
||||
['csma', 'internet'])
|
||||
obj.source = 'simple-routing-ping6.cc'
|
||||
|
||||
obj = bld.create_ns3_program('aodv',
|
||||
['wifi', 'internet-stack', 'aodv'])
|
||||
['wifi', 'internet', 'aodv'])
|
||||
obj.source = 'aodv.cc'
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('socket-bound-static-routing', ['node', 'csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('socket-bound-static-routing', ['node', 'csma', 'internet'])
|
||||
obj.source = 'socket-bound-static-routing.cc'
|
||||
|
||||
obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['node', 'csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['node', 'csma', 'internet'])
|
||||
obj.source = 'socket-bound-tcp-static-routing.cc'
|
||||
|
||||
@@ -29,8 +29,7 @@
|
||||
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/internet-stack-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
|
||||
#include "ns3/stats-module.h"
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
def build(bld):
|
||||
env = bld.env_of_name('default')
|
||||
if env['ENABLE_TAP']:
|
||||
obj = bld.create_ns3_program('tap-csma', ['csma', 'tap-bridge', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('tap-csma', ['csma', 'tap-bridge', 'internet'])
|
||||
obj.source = 'tap-csma.cc'
|
||||
obj = bld.create_ns3_program('tap-csma-virtual-machine', ['csma', 'tap-bridge', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('tap-csma-virtual-machine', ['csma', 'tap-bridge', 'internet'])
|
||||
obj.source = 'tap-csma-virtual-machine.cc'
|
||||
obj = bld.create_ns3_program('tap-wifi-virtual-machine', ['csma', 'tap-bridge', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('tap-wifi-virtual-machine', ['csma', 'tap-bridge', 'internet'])
|
||||
obj.source = 'tap-wifi-virtual-machine.cc'
|
||||
obj = bld.create_ns3_program('tap-wifi-dumbbell', ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('tap-wifi-dumbbell', ['wifi', 'csma', 'point-to-point', 'tap-bridge', 'internet'])
|
||||
obj.source = 'tap-wifi-dumbbell.cc'
|
||||
|
||||
@@ -39,8 +39,7 @@
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/internet-stack-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/ipv4-global-routing-helper.h"
|
||||
|
||||
using namespace ns3;
|
||||
|
||||
@@ -2,25 +2,25 @@
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('tcp-large-transfer',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'tcp-large-transfer.cc'
|
||||
|
||||
obj = bld.create_ns3_program('tcp-nsc-lfn',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'tcp-nsc-lfn.cc'
|
||||
|
||||
obj = bld.create_ns3_program('tcp-nsc-zoo',
|
||||
['csma', 'internet-stack'])
|
||||
['csma', 'internet'])
|
||||
obj.source = 'tcp-nsc-zoo.cc'
|
||||
|
||||
obj = bld.create_ns3_program('tcp-star-server',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'tcp-star-server.cc'
|
||||
|
||||
obj = bld.create_ns3_program('star',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'star.cc'
|
||||
|
||||
obj = bld.create_ns3_program('tcp-bulk-send',
|
||||
['point-to-point', 'internet-stack'])
|
||||
['point-to-point', 'internet'])
|
||||
obj.source = 'tcp-bulk-send.cc'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('topology-read', ['topology-read', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('topology-read', ['topology-read', 'internet'])
|
||||
obj.source = 'topology-example-sim.cc'
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/internet-stack-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
|
||||
using namespace ns3;
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <fstream>
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/internet-stack-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
|
||||
using namespace ns3;
|
||||
|
||||
@@ -4,20 +4,20 @@ def build(bld):
|
||||
obj = bld.create_ns3_program('hello-simulator', ['core'])
|
||||
obj.source = 'hello-simulator.cc'
|
||||
|
||||
obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet'])
|
||||
obj.source = 'first.cc'
|
||||
|
||||
obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet'])
|
||||
obj.source = 'second.cc'
|
||||
|
||||
obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet'])
|
||||
obj.source = 'third.cc'
|
||||
|
||||
obj = bld.create_ns3_program('fourth', ['core'])
|
||||
obj.source = 'fourth.cc'
|
||||
|
||||
obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet'])
|
||||
obj.source = 'fifth.cc'
|
||||
|
||||
obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet'])
|
||||
obj.source = 'sixth.cc'
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('udp-client-server', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('udp-client-server', ['csma', 'internet'])
|
||||
obj.source = 'udp-client-server.cc'
|
||||
|
||||
obj = bld.create_ns3_program('udp-trace-client-server', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('udp-trace-client-server', ['csma', 'internet'])
|
||||
obj.source = 'udp-trace-client-server.cc'
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('udp-echo', ['csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('udp-echo', ['csma', 'internet'])
|
||||
obj.source = 'udp-echo.cc'
|
||||
|
||||
@@ -40,10 +40,9 @@
|
||||
* - the recipient receives a block ack request or a MPDU with ack policy Block Ack.
|
||||
*/
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/core-module.h"
|
||||
#include "ns3/internet-module.h"
|
||||
#include "ns3/network-module.h"
|
||||
#include "ns3/helper-module.h"
|
||||
#include "ns3/global-routing-module.h"
|
||||
#include "ns3/wifi-module.h"
|
||||
#include "ns3/mobility-module.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_program('mixed-wireless', ['core', 'mobility', 'wifi', 'point-to-point',
|
||||
'internet-stack'])
|
||||
'internet'])
|
||||
obj.source = 'mixed-wireless.cc'
|
||||
|
||||
obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi'])
|
||||
|
||||
@@ -31,11 +31,11 @@ def build(bld):
|
||||
obj.source = 'main-test-sync.cc'
|
||||
|
||||
obj = bld.create_ns3_program('main-simple',
|
||||
['node', 'internet-stack', 'onoff'])
|
||||
['node', 'internet', 'onoff'])
|
||||
obj.source = 'main-simple.cc'
|
||||
|
||||
obj = bld.create_ns3_program('main-grid-topology',
|
||||
['core', 'mobility', 'internet-stack'])
|
||||
['core', 'mobility', 'internet'])
|
||||
obj.source = 'main-grid-topology.cc'
|
||||
|
||||
obj = bld.create_ns3_program('main-random-topology',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
module = bld.create_ns3_module('ping6', ['internet-stack'])
|
||||
module = bld.create_ns3_module('ping6', ['internet'])
|
||||
module.source = [
|
||||
'ping6.cc',
|
||||
]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
module = bld.create_ns3_module('radvd', ['internet-stack'])
|
||||
module = bld.create_ns3_module('radvd', ['internet'])
|
||||
module.source = [
|
||||
'radvd.cc',
|
||||
'radvd-interface.cc',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
module = bld.create_ns3_module('udp-client-server', ['internet-stack'])
|
||||
module = bld.create_ns3_module('udp-client-server', ['internet'])
|
||||
module.source = [
|
||||
'udp-client.cc',
|
||||
'udp-server.cc',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
module = bld.create_ns3_module('udp-echo', ['internet-stack'])
|
||||
module = bld.create_ns3_module('udp-echo', ['internet'])
|
||||
module.source = [
|
||||
'udp-echo-client.cc',
|
||||
'udp-echo-server.cc',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_module('flow-monitor', ['internet-stack'])
|
||||
obj = bld.create_ns3_module('flow-monitor', ['internet'])
|
||||
obj.source = ["model/%s" % s for s in [
|
||||
'flow-monitor.cc',
|
||||
'flow-classifier.cc',
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
def build(bld):
|
||||
|
||||
obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-bridge', ['bridge', 'csma', 'internet'])
|
||||
obj.source = 'csma-bridge.cc'
|
||||
|
||||
obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet-stack'])
|
||||
obj = bld.create_ns3_program('csma-bridge-one-hop', ['bridge', 'csma', 'internet'])
|
||||
obj.source = 'csma-bridge-one-hop.cc'
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
def build(bld):
|
||||
|
||||
obj = bld.create_ns3_program('virtual-net-device', ['point-to-point', 'internet-stack', 'global-routing',
|
||||
obj = bld.create_ns3_program('virtual-net-device', ['point-to-point', 'internet', 'global-routing',
|
||||
'virtual-net-device'])
|
||||
obj.source = 'virtual-net-device.cc'
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "ns3/object-factory.h"
|
||||
#include "ns3/node.h"
|
||||
#include "ns3/node-container.h"
|
||||
#include "ipv4-routing-helper.h"
|
||||
#include "ns3/ipv4-routing-helper.h"
|
||||
|
||||
namespace ns3
|
||||
{
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "ns3/packet.h"
|
||||
#include "ns3/names.h"
|
||||
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
#include "csma-helper.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "ns3/node-container.h"
|
||||
#include "ns3/csma-channel.h"
|
||||
#include "ns3/deprecated.h"
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "ns3/config.h"
|
||||
#include "ns3/packet.h"
|
||||
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
#include "emu-helper.h"
|
||||
|
||||
NS_LOG_COMPONENT_DEFINE ("EmuHelper");
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "ns3/node-container.h"
|
||||
#include "ns3/emu-net-device.h"
|
||||
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "ns3/names.h"
|
||||
#include "ns3/mpi-interface.h"
|
||||
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
#include "point-to-point-helper.h"
|
||||
|
||||
NS_LOG_COMPONENT_DEFINE ("PointToPointHelper");
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "ns3/node-container.h"
|
||||
#include "ns3/deprecated.h"
|
||||
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "ns3/node-container.h"
|
||||
#include "ns3/net-device-container.h"
|
||||
#include "ns3/wifi-phy-standard.h"
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "ns3/bs-scheduler.h"
|
||||
#include "ns3/bs-scheduler-simple.h"
|
||||
#include "ns3/bs-scheduler-rtps.h"
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
|
||||
namespace ns3 {
|
||||
|
||||
|
||||
@@ -1,33 +1,26 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
|
||||
def build(bld):
|
||||
helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet-stack', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
|
||||
helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'csma', 'onoff', 'packet-sink', 'udp-echo', 'spectrum'])
|
||||
helper.source = [
|
||||
'wifi-helper.cc',
|
||||
'point-to-point-helper.cc',
|
||||
'csma-helper.cc',
|
||||
'mobility-helper.cc',
|
||||
'ns2-mobility-helper.cc',
|
||||
'ipv4-address-helper.cc',
|
||||
'internet-stack-helper.cc',
|
||||
'on-off-helper.cc',
|
||||
'packet-sink-helper.cc',
|
||||
'ipv4-interface-container.cc',
|
||||
'udp-echo-helper.cc',
|
||||
'yans-wifi-helper.cc',
|
||||
'v4ping-helper.cc',
|
||||
'nqos-wifi-mac-helper.cc',
|
||||
'qos-wifi-mac-helper.cc',
|
||||
'ipv4-nix-vector-helper.cc',
|
||||
'ipv4-routing-helper.cc',
|
||||
'aodv-helper.cc',
|
||||
'mesh-helper.cc',
|
||||
'dot11s-installer.cc',
|
||||
'flame-installer.cc',
|
||||
'athstats-helper.cc',
|
||||
'ipv6-address-helper.cc',
|
||||
'ipv6-interface-container.cc',
|
||||
'ipv6-routing-helper.cc',
|
||||
'ping6-helper.cc',
|
||||
'animation-interface.cc',
|
||||
'canvas-location.cc',
|
||||
@@ -36,7 +29,6 @@ def build(bld):
|
||||
'point-to-point-star-helper.cc',
|
||||
'csma-star-helper.cc',
|
||||
'udp-client-server-helper.cc',
|
||||
'trace-helper.cc',
|
||||
'wimax-helper.cc',
|
||||
'topology-reader-helper.cc',
|
||||
'bulk-send-helper.cc',
|
||||
@@ -50,27 +42,20 @@ def build(bld):
|
||||
'csma-helper.h',
|
||||
'mobility-helper.h',
|
||||
'ns2-mobility-helper.h',
|
||||
'ipv4-address-helper.h',
|
||||
'internet-stack-helper.h',
|
||||
'on-off-helper.h',
|
||||
'packet-sink-helper.h',
|
||||
'ipv4-interface-container.h',
|
||||
'udp-echo-helper.h',
|
||||
'yans-wifi-helper.h',
|
||||
'v4ping-helper.h',
|
||||
'nqos-wifi-mac-helper.h',
|
||||
'qos-wifi-mac-helper.h',
|
||||
'ipv4-nix-vector-helper.h',
|
||||
'ipv4-routing-helper.h',
|
||||
'aodv-helper.h',
|
||||
'mesh-helper.h',
|
||||
'mesh-stack-installer.h',
|
||||
'dot11s-installer.h',
|
||||
'flame-installer.h',
|
||||
'athstats-helper.h',
|
||||
'ipv6-address-helper.h',
|
||||
'ipv6-interface-container.h',
|
||||
'ipv6-routing-helper.h',
|
||||
'ping6-helper.h',
|
||||
'animation-interface.h',
|
||||
'canvas-location.h',
|
||||
@@ -79,7 +64,6 @@ def build(bld):
|
||||
'point-to-point-star-helper.h',
|
||||
'csma-star-helper.h',
|
||||
'udp-client-server-helper.h',
|
||||
'trace-helper.h',
|
||||
'wimax-helper.h',
|
||||
'topology-reader-helper.h',
|
||||
'bulk-send-helper.h',
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
|
||||
*/
|
||||
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
#include "yans-wifi-helper.h"
|
||||
#include "ns3/error-rate-model.h"
|
||||
#include "ns3/propagation-loss-model.h"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#define YANS_WIFI_HELPER_H
|
||||
|
||||
#include "wifi-helper.h"
|
||||
#include "trace-helper.h"
|
||||
#include "ns3/trace-helper.h"
|
||||
#include "ns3/yans-wifi-channel.h"
|
||||
#include "ns3/deprecated.h"
|
||||
|
||||
|
||||
@@ -1,222 +0,0 @@
|
||||
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
|
||||
import os
|
||||
import sys
|
||||
|
||||
import Options
|
||||
import Logs
|
||||
import Utils
|
||||
import Task
|
||||
|
||||
# Required NSC version
|
||||
NSC_RELEASE_NAME = "nsc-0.5.2"
|
||||
|
||||
|
||||
def set_options(opt):
|
||||
opt.add_option('--with-nsc',
|
||||
help=('Use Network Simulation Cradle, given by the indicated path,'
|
||||
' to allow the use of real-world network stacks'),
|
||||
default='', dest='with_nsc')
|
||||
|
||||
|
||||
def configure(conf):
|
||||
conf.env['ENABLE_NSC'] = False
|
||||
|
||||
# checks for flex and bison, which is needed to build NSCs globaliser
|
||||
# TODO: how to move these checks into the allinone scripts?
|
||||
#def check_nsc_buildutils():
|
||||
# import flex
|
||||
# import bison
|
||||
# conf.check_tool('flex bison')
|
||||
# conf.check(lib='fl', mandatory=True)
|
||||
|
||||
# Check for the location of NSC
|
||||
if Options.options.with_nsc:
|
||||
if os.path.isdir(Options.options.with_nsc):
|
||||
conf.check_message("NSC location", '', True, ("%s (given)" % Options.options.with_nsc))
|
||||
conf.env['WITH_NSC'] = os.path.abspath(Options.options.with_nsc)
|
||||
else:
|
||||
# ns-3-dev uses ../nsc, while ns-3 releases use ../NSC_RELEASE_NAME
|
||||
nsc_dir = os.path.join('..', "nsc")
|
||||
nsc_release_dir = os.path.join('..', NSC_RELEASE_NAME)
|
||||
if os.path.isdir(nsc_dir):
|
||||
conf.check_message("NSC location", '', True, ("%s (guessed)" % nsc_dir))
|
||||
conf.env['WITH_NSC'] = os.path.abspath(nsc_dir)
|
||||
elif os.path.isdir(nsc_release_dir):
|
||||
conf.check_message("NSC location", '', True, ("%s (guessed)" % nsc_release_dir))
|
||||
conf.env['WITH_NSC'] = os.path.abspath(nsc_release_dir)
|
||||
del nsc_dir
|
||||
del nsc_release_dir
|
||||
|
||||
if not conf.env['WITH_NSC']:
|
||||
conf.check_message("NSC location", '', False)
|
||||
conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
|
||||
"NSC not found (see option --with-nsc)")
|
||||
return
|
||||
|
||||
if sys.platform in ['linux2']:
|
||||
arch = os.uname()[4]
|
||||
else:
|
||||
arch = None
|
||||
ok = False
|
||||
if arch in ('x86_64', 'i686', 'i586', 'i486', 'i386'):
|
||||
conf.env['NSC_ENABLED'] = True
|
||||
conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE')
|
||||
conf.check(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
|
||||
ok = True
|
||||
conf.check_message('NSC supported architecture', arch, ok)
|
||||
|
||||
if not ok:
|
||||
conf.env['NSC_ENABLED'] = False
|
||||
conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
|
||||
"architecture %r not supported" % arch)
|
||||
return
|
||||
|
||||
lib_to_check = 'liblinux2.6.26.so'
|
||||
|
||||
if not os.path.exists(os.path.join(conf.env['WITH_NSC'], lib_to_check)):
|
||||
conf.env['NSC_ENABLED'] = False
|
||||
conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
|
||||
"NSC library %s is missing: NSC has not been built?" % lib_to_check)
|
||||
return
|
||||
|
||||
# append the NSC kernel dirs to the module path so that these dirs
|
||||
# will end up in the LD_LIBRARY_PATH, thus allowing the NSC NS-3
|
||||
# module to find the necessary NSC shared libraries.
|
||||
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'], nsc_module)))
|
||||
|
||||
conf.report_optional_feature("nsc", "Network Simulation Cradle", True, "")
|
||||
|
||||
|
||||
|
||||
def build(bld):
|
||||
obj = bld.create_ns3_module('internet-stack', ['network'])
|
||||
obj.source = [
|
||||
'tcp-test.cc',
|
||||
'udp-test.cc',
|
||||
'ipv4-test.cc',
|
||||
'ipv4-raw-test.cc',
|
||||
'ipv4-l4-protocol.cc',
|
||||
'udp-header.cc',
|
||||
'tcp-header.cc',
|
||||
'ipv4-interface.cc',
|
||||
'ipv4-l3-protocol.cc',
|
||||
'ipv4-end-point.cc',
|
||||
'udp-l4-protocol.cc',
|
||||
'tcp-l4-protocol.cc',
|
||||
'arp-header.cc',
|
||||
'arp-cache.cc',
|
||||
'arp-l3-protocol.cc',
|
||||
'udp-socket-impl.cc',
|
||||
'ipv4-end-point-demux.cc',
|
||||
'udp-socket-factory-impl.cc',
|
||||
'tcp-socket-factory-impl.cc',
|
||||
'pending-data.cc',
|
||||
'rtt-estimator.cc',
|
||||
'ipv4-raw-socket-factory-impl.cc',
|
||||
'ipv4-raw-socket-impl.cc',
|
||||
'icmpv4.cc',
|
||||
'icmpv4-l4-protocol.cc',
|
||||
'loopback-net-device.cc',
|
||||
'ndisc-cache.cc',
|
||||
'ipv6-interface.cc',
|
||||
'icmpv6-header.cc',
|
||||
'ipv6-l3-protocol.cc',
|
||||
'ipv6-end-point.cc',
|
||||
'ipv6-end-point-demux.cc',
|
||||
'ipv6-l4-protocol.cc',
|
||||
'ipv6-raw-socket-factory-impl.cc',
|
||||
'ipv6-raw-socket-impl.cc',
|
||||
'ipv6-autoconfigured-prefix.cc',
|
||||
'ipv6-extension.cc',
|
||||
'ipv6-extension-header.cc',
|
||||
'ipv6-extension-demux.cc',
|
||||
'ipv6-option.cc',
|
||||
'ipv6-option-header.cc',
|
||||
'ipv6-option-demux.cc',
|
||||
'icmpv6-l4-protocol.cc',
|
||||
'ipv6-test.cc',
|
||||
'ipv6-extension-header-test-suite.cc',
|
||||
'tcp-socket-base.cc',
|
||||
'tcp-rfc793.cc',
|
||||
'tcp-tahoe.cc',
|
||||
'tcp-reno.cc',
|
||||
'tcp-newreno.cc',
|
||||
'tcp-rx-buffer.cc',
|
||||
'tcp-tx-buffer.cc',
|
||||
'ipv4-packet-info-tag.cc',
|
||||
'ipv6-packet-info-tag.cc',
|
||||
'ipv4-interface-address.cc',
|
||||
'ipv4-address-generator.cc',
|
||||
'ipv4-header.cc',
|
||||
'ipv4-route.cc',
|
||||
'ipv4-routing-protocol.cc',
|
||||
'udp-socket.cc',
|
||||
'udp-socket-factory.cc',
|
||||
'tcp-socket.cc',
|
||||
'tcp-socket-factory.cc',
|
||||
'ipv4.cc',
|
||||
'ipv4-raw-socket-factory.cc',
|
||||
'ipv6-header.cc',
|
||||
'ipv6-interface-address.cc',
|
||||
'ipv6-route.cc',
|
||||
'ipv6.cc',
|
||||
'ipv6-raw-socket-factory.cc',
|
||||
'ipv6-routing-protocol.cc',
|
||||
]
|
||||
|
||||
headers = bld.new_task_gen('ns3header')
|
||||
headers.module = 'internet-stack'
|
||||
headers.source = [
|
||||
'udp-header.h',
|
||||
'tcp-header.h',
|
||||
'icmpv4.h',
|
||||
'icmpv6-header.h',
|
||||
# used by routing
|
||||
'ipv4-interface.h',
|
||||
'ipv4-l3-protocol.h',
|
||||
'ipv6-l3-protocol.h',
|
||||
'ipv6-extension-header.h',
|
||||
'ipv6-option-header.h',
|
||||
'arp-l3-protocol.h',
|
||||
'udp-l4-protocol.h',
|
||||
'tcp-l4-protocol.h',
|
||||
'icmpv4-l4-protocol.h',
|
||||
'ipv4-l4-protocol.h',
|
||||
'ipv4-raw-socket-impl.h',
|
||||
'arp-header.h',
|
||||
'arp-cache.h',
|
||||
'icmpv6-l4-protocol.h',
|
||||
'ipv6-l4-protocol.h',
|
||||
'ipv6-interface.h',
|
||||
'ndisc-cache.h',
|
||||
'loopback-net-device.h',
|
||||
'ipv4-packet-info-tag.h',
|
||||
'ipv6-packet-info-tag.h',
|
||||
'ipv4-interface-address.h',
|
||||
'ipv4-address-generator.h',
|
||||
'ipv4-header.h',
|
||||
'ipv4-route.h',
|
||||
'ipv4-routing-protocol.h',
|
||||
'udp-socket.h',
|
||||
'udp-socket-factory.h',
|
||||
'tcp-socket.h',
|
||||
'tcp-socket-factory.h',
|
||||
'ipv4.h',
|
||||
'ipv4-raw-socket-factory.h',
|
||||
'ipv6-header.h',
|
||||
'ipv6-interface-address.h',
|
||||
'ipv6-route.h',
|
||||
'ipv6.h',
|
||||
'ipv6-raw-socket-factory.h',
|
||||
'ipv6-routing-protocol.h',
|
||||
]
|
||||
|
||||
if bld.env['NSC_ENABLED']:
|
||||
obj.source.append ('nsc-tcp-socket-impl.cc')
|
||||
obj.source.append ('nsc-tcp-l4-protocol.cc')
|
||||
obj.source.append ('nsc-tcp-socket-factory-impl.cc')
|
||||
obj.source.append ('nsc-sysctl.cc')
|
||||
headers.source.append('nsc-tcp-l4-protocol.h')
|
||||
obj.uselib = 'DL'
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user