From 03df3b5b5ab3ab413178e1fe9ba10567a6523c46 Mon Sep 17 00:00:00 2001 From: Manuel Requena Date: Fri, 9 Dec 2011 17:47:01 +0100 Subject: [PATCH] Add client/server applications to ApplicationContainer --- src/lte/examples/lena-simple-epc.cc | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/lte/examples/lena-simple-epc.cc b/src/lte/examples/lena-simple-epc.cc index 1e039b49e..bed18cf9d 100644 --- a/src/lte/examples/lena-simple-epc.cc +++ b/src/lte/examples/lena-simple-epc.cc @@ -44,10 +44,11 @@ main (int argc, char *argv[]) { uint16_t numberOfNodes = 2; - uint32_t simTime = 5; + double simTime = 5.0; double distance = 60.0; // Inter packet interval in ms - double interPacketInterval = 1; +// double interPacketInterval = 1; + double interPacketInterval = 100; // Command line arguments CommandLine cmd; @@ -144,29 +145,32 @@ main (int argc, char *argv[]) ApplicationContainer serverApps; for (uint32_t u = 0; u < ueNodes.GetN (); ++u) { - serverApps = dlPacketSinkHelper.Install (ueNodes.Get(u)); - serverApps = ulPacketSinkHelper.Install (remoteHost); - serverApps = packetSinkHelper.Install (ueNodes.Get(u)); + serverApps.Add (dlPacketSinkHelper.Install (ueNodes.Get(u))); + serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); + serverApps.Add (packetSinkHelper.Install (ueNodes.Get(u))); + UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval))); dlClient.SetAttribute ("MaxPackets", UintegerValue(1000000)); + UdpClientHelper ulClient (remoteHostAddr, ulPort); ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval))); ulClient.SetAttribute ("MaxPackets", UintegerValue(1000000)); + UdpClientHelper client (ueIpIface.GetAddress (u), otherPort); client.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval))); client.SetAttribute ("MaxPackets", UintegerValue(1000000)); - clientApps = dlClient.Install (remoteHost); - clientApps = ulClient.Install (ueNodes.Get(u)); + + clientApps.Add (dlClient.Install (remoteHost)); + clientApps.Add (ulClient.Install (ueNodes.Get(u))); if (u+1 < ueNodes.GetN ()) { - clientApps = client.Install (ueNodes.Get(u+1)); + clientApps.Add (client.Install (ueNodes.Get(u+1))); } else { - clientApps = client.Install (ueNodes.Get(0)); + clientApps.Add (client.Install (ueNodes.Get(0))); } - } serverApps.Start (Seconds (0.01)); clientApps.Start (Seconds (0.01));