Bug 1941 - [cont.] Remove unnecessary dependency on Application module in other modules
--- a/src/mesh/test/mesh-information-element-vector-test-suite.cc Sat Jul 26 13:08:33 2014 +0200
+++ b/src/mesh/test/mesh-information-element-vector-test-suite.cc Sun Jul 27 23:02:38 2014 +0200
@@ -40,7 +40,7 @@
struct MeshInformationElementVectorBist : public TestCase
{
MeshInformationElementVectorBist () :
- TestCase ("Serializarion test for all mesh information elements")
+ TestCase ("Serialization test for all mesh information elements")
{
};
void DoRun ();
--- a/src/sixlowpan/examples/wscript Sat Jul 26 13:08:33 2014 +0200
+++ b/src/sixlowpan/examples/wscript Sun Jul 27 23:02:38 2014 +0200
@@ -9,5 +9,5 @@
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'
--- a/src/wimax/examples/wscript Sat Jul 26 13:08:33 2014 +0200
+++ b/src/wimax/examples/wscript Sun Jul 27 23:02:38 2014 +0200
@@ -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'])
--- a/src/wimax/test/qos-test.cc Sat Jul 26 13:08:33 2014 +0200
+++ b/src/wimax/test/qos-test.cc Sun Jul 27 23:02:38 2014 +0200
@@ -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 @@
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 @@
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));
--- a/src/wimax/wscript Sat Jul 26 13:08:33 2014 +0200
+++ b/src/wimax/wscript Sun Jul 27 23:02:38 2014 +0200
@@ -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',