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

examples: Remove useless dependencies

Browse Source
This commit is contained in:
Sébastien Deronne
2018-05-09 18:37:34 +02:00
parent b88cf084f0
commit c977c4ad29
2 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/wireless/wifi-simple-interference.cc
View File

@@ -87,7 +87,6 @@
#include "ns3/yans-wifi-helper.h" #include "ns3/yans-wifi-helper.h"
#include "ns3/ssid.h" #include "ns3/ssid.h"
#include "ns3/mobility-helper.h" #include "ns3/mobility-helper.h"
#include "ns3/ipv4-address-helper.h"
#include "ns3/yans-wifi-channel.h" #include "ns3/yans-wifi-channel.h"
#include "ns3/mobility-model.h" #include "ns3/mobility-model.h"
#include "ns3/internet-stack-helper.h" #include "ns3/internet-stack-helper.h"
@@ -225,11 +224,6 @@ int main (int argc, char *argv[])
InternetStackHelper internet; InternetStackHelper internet;
internet.Install (c); internet.Install (c);
Ipv4AddressHelper ipv4;
NS_LOG_INFO ("Assign IP Addresses.");
ipv4.SetBase ("10.1.1.0", "255.255.255.0");
Ipv4InterfaceContainer i = ipv4.Assign (devices);
TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory");
Ptr<Socket> recvSink = Socket::CreateSocket (c.Get (0), tid); Ptr<Socket> recvSink = Socket::CreateSocket (c.Get (0), tid);
InetSocketAddress local = InetSocketAddress (Ipv4Address ("10.1.1.1"), 80); InetSocketAddress local = InetSocketAddress (Ipv4Address ("10.1.1.1"), 80);

78
examples/wireless/wscript
View File

@@ -1,116 +1,114 @@
## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
def build(bld): def build(bld):
obj = bld.create_ns3_program('mixed-wired-wireless', ['core', 'mobility', 'wifi', 'applications', 'point-to-point', obj = bld.create_ns3_program('mixed-wired-wireless', ['wifi', 'applications', 'olsr', 'netanim'])
'internet', 'csma', 'olsr', 'netanim'])
obj.source = 'mixed-wired-wireless.cc' obj.source = 'mixed-wired-wireless.cc'
bld.register_ns3_script('mixed-wired-wireless.py', ['core', 'mobility', 'wifi', 'applications', 'point-to-point', bld.register_ns3_script('mixed-wired-wireless.py', ['wifi', 'applications', 'olsr'])
'internet', 'csma', 'olsr'])
obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'applications', 'stats']) obj = bld.create_ns3_program('wifi-adhoc', ['wifi', 'applications'])
obj.source = 'wifi-adhoc.cc' obj.source = 'wifi-adhoc.cc'
obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'mobility', 'wifi', 'stats']) obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['internet', 'wifi'])
obj.source = 'wifi-clear-channel-cmu.cc' obj.source = 'wifi-clear-channel-cmu.cc'
obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats']) obj = bld.create_ns3_program('wifi-ap', ['wifi', 'applications'])
obj.source = 'wifi-ap.cc' obj.source = 'wifi-ap.cc'
bld.register_ns3_script('wifi-ap.py', ['core', 'mobility', 'wifi', 'applications', 'config-store', 'stats']) bld.register_ns3_script('wifi-ap.py', ['wifi', 'applications'])
obj = bld.create_ns3_program('wifi-wired-bridging', ['internet', 'mobility', 'wifi', 'csma', 'bridge', 'applications']) obj = bld.create_ns3_program('wifi-wired-bridging', ['wifi', 'csma', 'bridge', 'applications'])
obj.source = 'wifi-wired-bridging.cc' obj.source = 'wifi-wired-bridging.cc'
obj = bld.create_ns3_program('multirate', ['internet', 'mobility', 'wifi', 'stats', 'flow-monitor', 'olsr', 'applications', 'point-to-point']) obj = bld.create_ns3_program('multirate', ['wifi', 'flow-monitor', 'olsr', 'applications'])
obj.source = 'multirate.cc' obj.source = 'multirate.cc'
obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('wifi-simple-adhoc', ['internet', 'wifi'])
obj.source = 'wifi-simple-adhoc.cc' obj.source = 'wifi-simple-adhoc.cc'
obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'mobility', 'wifi', 'olsr', 'config-store', 'stats', 'point-to-point']) obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['internet', 'wifi', 'olsr'])
obj.source = 'wifi-simple-adhoc-grid.cc' obj.source = 'wifi-simple-adhoc-grid.cc'
obj = bld.create_ns3_program('wifi-simple-infra', ['internet', 'mobility', 'wifi','config-store']) obj = bld.create_ns3_program('wifi-simple-infra', ['internet', 'wifi'])
obj.source = 'wifi-simple-infra.cc' obj.source = 'wifi-simple-infra.cc'
obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('wifi-simple-interference', ['internet', 'wifi'])
obj.source = 'wifi-simple-interference.cc' obj.source = 'wifi-simple-interference.cc'
obj = bld.create_ns3_program('wifi-blockack', ['internet', 'mobility', 'wifi', 'applications']) obj = bld.create_ns3_program('wifi-blockack', ['wifi', 'applications'])
obj.source = 'wifi-blockack.cc' obj.source = 'wifi-blockack.cc'
obj = bld.create_ns3_program('dsss-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('dsss-validation', ['wifi'])
obj.source = 'dsss-validation.cc' obj.source = 'dsss-validation.cc'
obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('ofdm-validation', ['wifi'])
obj.source = 'ofdm-validation.cc' obj.source = 'ofdm-validation.cc'
obj = bld.create_ns3_program('ofdm-ht-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('ofdm-ht-validation', ['wifi'])
obj.source = 'ofdm-ht-validation.cc' obj.source = 'ofdm-ht-validation.cc'
obj = bld.create_ns3_program('ofdm-vht-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('ofdm-vht-validation', ['wifi'])
obj.source = 'ofdm-vht-validation.cc' obj.source = 'ofdm-vht-validation.cc'
obj = bld.create_ns3_program('wifi-hidden-terminal', ['internet', 'mobility', 'wifi', 'applications', 'propagation', 'flow-monitor']) obj = bld.create_ns3_program('wifi-hidden-terminal', ['wifi', 'applications', 'flow-monitor'])
obj.source = 'wifi-hidden-terminal.cc' obj.source = 'wifi-hidden-terminal.cc'
obj = bld.create_ns3_program('ht-wifi-network', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('ht-wifi-network', ['wifi', 'applications'])
obj.source = 'ht-wifi-network.cc' obj.source = 'ht-wifi-network.cc'
obj = bld.create_ns3_program('vht-wifi-network', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('vht-wifi-network', ['wifi', 'applications'])
obj.source = 'vht-wifi-network.cc' obj.source = 'vht-wifi-network.cc'
obj = bld.create_ns3_program('wifi-timing-attributes', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('wifi-timing-attributes', ['wifi', 'applications'])
obj.source = 'wifi-timing-attributes.cc' obj.source = 'wifi-timing-attributes.cc'
obj = bld.create_ns3_program('wifi-sleep', ['core', 'network', 'internet', 'mobility', 'wifi', 'applications', 'energy', 'config-store']) obj = bld.create_ns3_program('wifi-sleep', ['wifi', 'applications'])
obj.source = 'wifi-sleep.cc' obj.source = 'wifi-sleep.cc'
obj = bld.create_ns3_program('power-adaptation-distance', ['core', 'mobility', 'wifi', 'applications', 'flow-monitor']) obj = bld.create_ns3_program('power-adaptation-distance', ['wifi', 'applications'])
obj.source = 'power-adaptation-distance.cc' obj.source = 'power-adaptation-distance.cc'
obj = bld.create_ns3_program('power-adaptation-interference', ['core', 'mobility', 'wifi', 'applications', 'flow-monitor']) obj = bld.create_ns3_program('power-adaptation-interference', ['wifi', 'applications', 'flow-monitor'])
obj.source = 'power-adaptation-interference.cc' obj.source = 'power-adaptation-interference.cc'
obj = bld.create_ns3_program('rate-adaptation-distance', ['core', 'mobility', 'wifi', 'applications', 'flow-monitor']) obj = bld.create_ns3_program('rate-adaptation-distance', ['wifi', 'applications'])
obj.source = 'rate-adaptation-distance.cc' obj.source = 'rate-adaptation-distance.cc'
obj = bld.create_ns3_program('wifi-aggregation', ['internet', 'mobility', 'wifi', 'applications']) obj = bld.create_ns3_program('wifi-aggregation', ['wifi', 'applications'])
obj.source = 'wifi-aggregation.cc' obj.source = 'wifi-aggregation.cc'
obj = bld.create_ns3_program('simple-ht-hidden-stations', ['internet', 'mobility', 'wifi', 'applications']) obj = bld.create_ns3_program('simple-ht-hidden-stations', ['wifi', 'applications'])
obj.source = 'simple-ht-hidden-stations.cc' obj.source = 'simple-ht-hidden-stations.cc'
obj = bld.create_ns3_program('80211n-mimo', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('80211n-mimo', ['wifi', 'applications'])
obj.source = '80211n-mimo.cc' obj.source = '80211n-mimo.cc'
obj = bld.create_ns3_program('mixed-network', ['internet', 'mobility', 'wifi', 'applications']) obj = bld.create_ns3_program('mixed-network', ['wifi', 'applications'])
obj.source = 'mixed-network.cc' obj.source = 'mixed-network.cc'
obj = bld.create_ns3_program('wifi-tcp', ['internet', 'mobility', 'wifi', 'applications', 'point-to-point']) obj = bld.create_ns3_program('wifi-tcp', ['wifi', 'applications'])
obj.source = 'wifi-tcp.cc' obj.source = 'wifi-tcp.cc'
obj = bld.create_ns3_program('80211e-txop', ['internet', 'mobility', 'wifi', 'applications']) obj = bld.create_ns3_program('80211e-txop', ['wifi', 'applications'])
obj.source = '80211e-txop.cc' obj.source = '80211e-txop.cc'
obj = bld.create_ns3_program('wifi-spectrum-per-example', ['internet', 'mobility', 'wifi', 'applications', 'spectrum']) obj = bld.create_ns3_program('wifi-spectrum-per-example', ['wifi', 'applications'])
obj.source = 'wifi-spectrum-per-example.cc' obj.source = 'wifi-spectrum-per-example.cc'
obj = bld.create_ns3_program('wifi-spectrum-per-interference', ['internet', 'mobility', 'wifi', 'applications', 'spectrum']) obj = bld.create_ns3_program('wifi-spectrum-per-interference', ['wifi', 'applications'])
obj.source = 'wifi-spectrum-per-interference.cc' obj.source = 'wifi-spectrum-per-interference.cc'
obj = bld.create_ns3_program('wifi-spectrum-saturation-example', ['internet', 'mobility', 'wifi', 'applications', 'spectrum']) obj = bld.create_ns3_program('wifi-spectrum-saturation-example', ['wifi', 'applications'])
obj.source = 'wifi-spectrum-saturation-example.cc' obj.source = 'wifi-spectrum-saturation-example.cc'
obj = bld.create_ns3_program('ofdm-he-validation', ['core', 'mobility', 'wifi', 'config-store', 'stats']) obj = bld.create_ns3_program('ofdm-he-validation', ['wifi'])
obj.source = 'ofdm-he-validation.cc' obj.source = 'ofdm-he-validation.cc'
obj = bld.create_ns3_program('he-wifi-network', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('he-wifi-network', ['wifi', 'applications'])
obj.source = 'he-wifi-network.cc' obj.source = 'he-wifi-network.cc'
obj = bld.create_ns3_program('wifi-multi-tos', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('wifi-multi-tos', ['wifi', 'applications'])
obj.source = 'wifi-multi-tos.cc' obj.source = 'wifi-multi-tos.cc'
obj = bld.create_ns3_program('wifi-backward-compatibility', ['core','internet', 'mobility', 'wifi', 'applications', 'propagation']) obj = bld.create_ns3_program('wifi-backward-compatibility', ['wifi', 'applications'])
obj.source = 'wifi-backward-compatibility.cc' obj.source = 'wifi-backward-compatibility.cc'