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

Bug 1941 - [cont.] Remove unnecessary dependency on Application module in other modules

Browse Source
This commit is contained in:
Tommaso Pecorella
2014-07-27 23:02:38 +02:00
parent e3729362c9
commit 6af34ad829
5 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesh/test/mesh-information-element-vector-test-suite.cc
View File

@@ -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 ();

2
src/sixlowpan/examples/wscript
View File

@@ -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'

4
src/wimax/examples/wscript
View File

@@ -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'])

69
src/wimax/test/qos-test.cc
View File

@@ -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));

2
src/wimax/wscript
View File

@@ -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',