merge
authorNicola Baldo <nbaldo@cttc.es>
Fri, 09 Dec 2011 18:58:21 +0100
changeset 8481 da04dab4021a
parent 8480 3f5d01862563 (current diff)
parent 8478 07123c6eec91 (diff)
child 8482 c9285305f15a
child 8484 41691cd57fca
merge
--- a/src/lte/examples/lena-simple-epc.cc	Fri Dec 09 18:57:10 2011 +0100
+++ b/src/lte/examples/lena-simple-epc.cc	Fri Dec 09 18:58:21 2011 +0100
@@ -44,10 +44,11 @@
 {
 
   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 @@
   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));
--- a/src/lte/helper/lte-helper.cc	Fri Dec 09 18:57:10 2011 +0100
+++ b/src/lte/helper/lte-helper.cc	Fri Dec 09 18:58:21 2011 +0100
@@ -690,7 +690,7 @@
 DlTxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
                  uint16_t rnti, uint8_t lcid, uint32_t packetSize)
 {
-  NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize);
+  NS_LOG_FUNCTION (rlcStats << path << rnti << (uint16_t)lcid << packetSize);
   uint64_t imsi = 0;
   if (rlcStats->ExistsImsiPath(path) == true)
     {
@@ -718,7 +718,7 @@
 DlRxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
                  uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
 {
-  NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize << delay);
+  NS_LOG_FUNCTION (rlcStats << path << rnti << (uint16_t)lcid << packetSize << delay);
   uint64_t imsi = 0;
   if (rlcStats->ExistsImsiPath(path) == true)
     {
@@ -746,7 +746,7 @@
 UlTxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
                  uint16_t rnti, uint8_t lcid, uint32_t packetSize)
 {
-  NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize);
+  NS_LOG_FUNCTION (rlcStats << path << rnti << (uint16_t)lcid << packetSize);
   uint64_t imsi = 0;
     if (rlcStats->ExistsImsiPath(path) == true)
       {
@@ -764,7 +764,7 @@
 UlRxPduCallback (Ptr<RadioBearerStatsCalculator> rlcStats, std::string path,
                  uint16_t rnti, uint8_t lcid, uint32_t packetSize, uint64_t delay)
 {
-  NS_LOG_FUNCTION (rlcStats << path << rnti << lcid << packetSize << delay);
+  NS_LOG_FUNCTION (rlcStats << path << rnti << (uint16_t)lcid << packetSize << delay);
   uint64_t imsi = 0;
   if (rlcStats->ExistsImsiPath(path) == true)
     {