From 6af34ad8298ea31377ca3d47467100bb99871590 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Sun, 27 Jul 2014 23:02:38 +0200 Subject: [PATCH] Bug 1941 - [cont.] Remove unnecessary dependency on Application module in other modules --- ...h-information-element-vector-test-suite.cc | 2 +- src/sixlowpan/examples/wscript | 2 +- src/wimax/examples/wscript | 4 +- src/wimax/test/qos-test.cc | 69 +++++++++---------- src/wimax/wscript | 2 +- 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/mesh/test/mesh-information-element-vector-test-suite.cc b/src/mesh/test/mesh-information-element-vector-test-suite.cc index 335b8ec92..3a282ab30 100644 --- a/src/mesh/test/mesh-information-element-vector-test-suite.cc +++ b/src/mesh/test/mesh-information-element-vector-test-suite.cc @@ -40,7 +40,7 @@ using namespace ns3; struct MeshInformationElementVectorBist : public TestCase { MeshInformationElementVectorBist () : - TestCase ("Serializarion test for all mesh information elements") + TestCase ("Serialization test for all mesh information elements") { }; void DoRun (); diff --git a/src/sixlowpan/examples/wscript b/src/sixlowpan/examples/wscript index e30632927..8591f062f 100644 --- a/src/sixlowpan/examples/wscript +++ b/src/sixlowpan/examples/wscript @@ -9,5 +9,5 @@ def build(bld): obj.source = 'example-sixlowpan.cc' obj = bld.create_ns3_program('example-ping-lr-wpan', - ['network', 'sixlowpan', 'internet', 'lr-wpan']) + ['network', 'sixlowpan', 'internet', 'lr-wpan', 'applications']) obj.source = 'example-ping-lr-wpan.cc' diff --git a/src/wimax/examples/wscript b/src/wimax/examples/wscript index b51415323..f9f6b9358 100644 --- a/src/wimax/examples/wscript +++ b/src/wimax/examples/wscript @@ -1,10 +1,10 @@ 7## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program( 'wimax-ipv4', ['wimax', 'internet', 'mobility', 'csma']) + obj = bld.create_ns3_program( 'wimax-ipv4', ['wimax', 'internet', 'mobility', 'csma', 'applications']) obj.source = 'wimax-ipv4.cc' - obj = bld.create_ns3_program( 'wimax-multicast', ['wimax', 'internet', 'csma']) + obj = bld.create_ns3_program( 'wimax-multicast', ['wimax', 'internet', 'csma', 'applications']) obj.source = 'wimax-multicast.cc' obj = bld.create_ns3_program( 'wimax-simple', ['wimax', 'internet', 'mobility', 'applications']) diff --git a/src/wimax/test/qos-test.cc b/src/wimax/test/qos-test.cc index 5fa116fd9..fc0116e23 100644 --- a/src/wimax/test/qos-test.cc +++ b/src/wimax/test/qos-test.cc @@ -30,7 +30,6 @@ #include "ns3/ipv4-address-helper.h" #include "ns3/ipv4-header.h" #include "ns3/packet-sink-helper.h" -#include "ns3/udp-client-server-helper.h" #include "ns3/simulator.h" #include "ns3/wimax-helper.h" #include "ns3/mobility-helper.h" @@ -88,23 +87,23 @@ Ns3WimaxSchedulingTestCase::DoRunOnce (WimaxHelper::SchedulerType scheduler) Ipv4InterfaceContainer BSinterface = address.Assign (bsDevs); /*------------------------------*/ - UdpServerHelper udpServer; - ApplicationContainer serverApps; - UdpClientHelper udpClient; - ApplicationContainer clientApps; - - udpServer = UdpServerHelper (100); - serverApps = udpServer.Install (ssNodes.Get (0)); - serverApps.Start (Seconds (1)); - serverApps.Stop (Seconds (2)); - - udpClient = UdpClientHelper (SSinterfaces.GetAddress (0), 100); - udpClient.SetAttribute ("MaxPackets", UintegerValue (1200)); - udpClient.SetAttribute ("Interval", TimeValue (Seconds (0.12))); - udpClient.SetAttribute ("PacketSize", UintegerValue (1024)); - clientApps = udpClient.Install (ssNodes.Get (1)); - clientApps.Start (Seconds (1)); - clientApps.Stop (Seconds (2)); + // UdpServerHelper udpServer; + // ApplicationContainer serverApps; + // UdpClientHelper udpClient; + // ApplicationContainer clientApps; + // + // udpServer = UdpServerHelper (100); + // serverApps = udpServer.Install (ssNodes.Get (0)); + // serverApps.Start (Seconds (1)); + // serverApps.Stop (Seconds (2)); + // + // udpClient = UdpClientHelper (SSinterfaces.GetAddress (0), 100); + // udpClient.SetAttribute ("MaxPackets", UintegerValue (1200)); + // udpClient.SetAttribute ("Interval", TimeValue (Seconds (0.12))); + // udpClient.SetAttribute ("PacketSize", UintegerValue (1024)); + // clientApps = udpClient.Install (ssNodes.Get (1)); + // clientApps.Start (Seconds (1)); + // clientApps.Stop (Seconds (2)); Simulator::Stop (Seconds (2 + 0.1)); @@ -210,23 +209,23 @@ Ns3WimaxSFTypeTestCase::DoRunOnce (ServiceFlow::SchedulingType schedulingType) Ipv4InterfaceContainer BSinterface = address.Assign (bsDevs); /*------------------------------*/ - UdpServerHelper udpServer; - ApplicationContainer serverApps; - UdpClientHelper udpClient; - ApplicationContainer clientApps; - - udpServer = UdpServerHelper (100); - serverApps = udpServer.Install (ssNodes.Get (0)); - serverApps.Start (Seconds (1)); - serverApps.Stop (Seconds (2)); - - udpClient = UdpClientHelper (SSinterfaces.GetAddress (0), 100); - udpClient.SetAttribute ("MaxPackets", UintegerValue (1200)); - udpClient.SetAttribute ("Interval", TimeValue (Seconds (0.12))); - udpClient.SetAttribute ("PacketSize", UintegerValue (1024)); - clientApps = udpClient.Install (ssNodes.Get (1)); - clientApps.Start (Seconds (1)); - clientApps.Stop (Seconds (2)); + // UdpServerHelper udpServer; + // ApplicationContainer serverApps; + // UdpClientHelper udpClient; + // ApplicationContainer clientApps; + // + // udpServer = UdpServerHelper (100); + // serverApps = udpServer.Install (ssNodes.Get (0)); + // serverApps.Start (Seconds (1)); + // serverApps.Stop (Seconds (2)); + // + // udpClient = UdpClientHelper (SSinterfaces.GetAddress (0), 100); + // udpClient.SetAttribute ("MaxPackets", UintegerValue (1200)); + // udpClient.SetAttribute ("Interval", TimeValue (Seconds (0.12))); + // udpClient.SetAttribute ("PacketSize", UintegerValue (1024)); + // clientApps = udpClient.Install (ssNodes.Get (1)); + // clientApps.Start (Seconds (1)); + // clientApps.Stop (Seconds (2)); Simulator::Stop (Seconds (2 + 0.1)); diff --git a/src/wimax/wscript b/src/wimax/wscript index 159803c90..691fb174b 100644 --- a/src/wimax/wscript +++ b/src/wimax/wscript @@ -1,6 +1,6 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_module('wimax', ['network', 'point-to-point', 'internet', 'applications', 'propagation', 'mobility']) + obj = bld.create_ns3_module('wimax', ['network', 'point-to-point', 'internet', 'propagation', 'mobility']) obj.source = [ 'model/cid.cc', 'model/cid-factory.cc',