A new round of fixes

simulations/LTE/d2d/omnetpp.ini

@@ -517,7 +517,7 @@ output-vector-file = ${resultdir}/${configname}/pos2=${pos2}-${repetition}.vec
 # Transmitter
 *.ueD2DTx[0].app[*].typename = "VoIPSender"
 *.ueD2DTx[0].app[*].silences = false
-*.ueD2DTx[0].app[*].PacketSize = 2500B
+*.ueD2DTx[0].app[*].packetSize = 2500B
 *.ueD2DTx[0].app[*].sampling_time = 0.001s
 *.ueD2DTx[0].app[*].localPort = 3088+ancestorIndex(0)
 *.ueD2DTx[0].app[*].startTime = uniform(0s,0.02s)

simulations/LTE/demo/omnetpp.ini

@@ -79,7 +79,7 @@ description = 4 Ues downloading a video from a server while 2 of them having a v
 **.ue2*.macCellId = 2
 
 # VoIP source config
-**.ue11.app[1].PacketSize = 40B
+**.ue11.app[1].packetSize = 40B
 **.ue11.app[1].destAddress = "ue22"
 **.ue11.app[1].destPort = 1000
 **.ue11.app[1].localPort = 3088
@@ -139,7 +139,7 @@ network = simu5g.simulations.LTE.networks.SingleCell
 *.ue[*].app[*].typename = "VoIPReceiver"
 *.ue[*].app[0].localPort = 3000
 
-*.server.app[*].PacketSize = 40B
+*.server.app[*].packetSize = 40B
 *.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of udp Apps
 *.server.app[*].destPort = 3000
 *.server.app[*].localPort = 3088+ancestorIndex(0)
@@ -189,7 +189,7 @@ network = simu5g.simulations.LTE.networks.SingleCell
 *.server.app[0..24].typename = "VoIPReceiver"
 *.server.app[0..24].localPort = 4000+ancestorIndex(0)
 
-*.ue[*].app[1].PacketSize = 40B
+*.ue[*].app[1].packetSize = 40B
 *.ue[*].app[1].destAddress = "server"
 *.ue[*].app[1].destPort = 4000+ancestorIndex(1)
 *.ue[*].app[1].localPort = 4088
@@ -202,7 +202,7 @@ network = simu5g.simulations.LTE.networks.SingleCell
 *.ue[*].app[0].localPort = 3000
 
 *.server.app[25..].typename = "VoIPSender"
-*.server.app[25..].PacketSize = 40B
+*.server.app[25..].packetSize = 40B
 *.server.app[25..].destAddress = "ue["+string(ancestorIndex(0)-25)+"]"
 *.server.app[25..].destPort = 3000
 *.server.app[25..].localPort = 3088+ancestorIndex(0)
@@ -256,7 +256,7 @@ sim-time-limit=20s
 *.ue[*].app[0].localPort = 3000
 
 *.server.app[*].typename = "VoIPSender"
-*.server.app[*].PacketSize = 40B
+*.server.app[*].packetSize = 40B
 *.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of udp Apps
 *.server.app[*].destPort = 3000
 *.server.app[*].localPort = 3088+ancestorIndex(0)
@@ -296,7 +296,7 @@ sim-time-limit=20s
 *.server.app[*].typename = "VoIPReceiver"
 *.server.app[*].localPort = 3000+ancestorIndex(0)
 
-*.ue[*].app[*].PacketSize = 40B
+*.ue[*].app[*].packetSize = 40B
 # obtain the address of the client by reading its index in the array of udp Apps
 *.ue[*].app[*].destAddress = "server"
 *.ue[*].app[*].destPort = 3000+ancestorIndex(1)
@@ -331,7 +331,7 @@ description = Constant BitRate (CBR) uplink scenario
 **.ue[*].app[*].startTime = uniform(0s, 0.02s)
 **.ue[*].app[*].finishTime = ${cbrEnd}
 **.ue[*].app[*].sampling_time = 0.02s
-**.ue[*].app[*].PacketSize = 100B
+**.ue[*].app[*].packetSize = 100B
 
 **.server.app[*].typename = "CbrReceiver"
 **.server.app[*].localPort = 3000+ancestorIndex(0)
@@ -364,7 +364,7 @@ description = Constant BitRate (CBR) downlink scenario
 **.server.app[*].startTime = uniform(0s, 0.02s)
 **.server.app[*].finishTime = ${cbrEnd}
 **.server.app[*].sampling_time = 0.02s
-**.server.app[*].PacketSize = 100B
+**.server.app[*].packetSize = 100B
 
 
 
@@ -389,7 +389,7 @@ seed-set = ${repetition}
 **.schedulingDisciplineDl = ${sched="PF","MAXCI"}
 
 **.numUe = ${numUEs=50,100,150}
-*.server.app[*].PacketSize = ${pktSize=30B,40B,50B,60B}
+*.server.app[*].packetSize = ${pktSize=30B,40B,50B,60B}
 
 *.server.numApps = ${numUEs}
 

simulations/LTE/multicell/omnetpp.ini

@@ -60,7 +60,7 @@ seed-set = ${repetition}
 *.ue*.app[*].typename = "VoIPReceiver"
 *.ue*.app[0].localPort = 3000
 
-*.server.app[*].PacketSize = 40B
+*.server.app[*].packetSize = 40B
 *.server.app[0].destAddress = "ue11"
 *.server.app[1].destAddress = "ue12"
 *.server.app[2].destAddress = "ue21"

simulations/NR/bgTraffic/omnetpp.ini

@@ -154,7 +154,7 @@ description = "CBR Downlink (standalone, with background traffic)"
 *.ue[*].app[0].localPort = 3000
 
 *.server.app[*].typename = "CbrSender"
-*.server.app[*].PacketSize = ${msgLen=1000B}
+*.server.app[*].packetSize = ${msgLen=1000B}
 *.server.app[*].sampling_time = ${sndInt=0.01s}
 *.server.app[*].destAddress = "ue[0]"
 *.server.app[*].startTime = uniform(0s,0.05s)
@@ -200,7 +200,7 @@ description = "CBR Uplink (standalone, with background traffic)"
 
 *.ue[*].app[*].typename = "CbrSender"
 *.ue[*].app[*].destAddress = "server"
-*.ue[*].app[*].PacketSize = ${msgLen=1000B}
+*.ue[*].app[*].packetSize = ${msgLen=1000B}
 *.ue[*].app[*].sampling_time = ${sndInt=0.01s}
 *.ue[*].app[*].startTime = uniform(0s,0.05s)
 *.ue[*].app[*].finishTime = 19s
@@ -246,7 +246,7 @@ description = "CBR Downlink and Uplink (standalone, with background traffic)"
 *.ue[*].app[0].localPort = 3000
 
 *.server.app[0].typename = "CbrSender"
-*.server.app[0].PacketSize = ${msgLen=1000B}
+*.server.app[0].packetSize = ${msgLen=1000B}
 *.server.app[0].sampling_time = ${sndInt=0.01s}
 *.server.app[0].destAddress = "ue[0]"
 *.server.app[0].destPort = 3000
@@ -261,7 +261,7 @@ description = "CBR Downlink and Uplink (standalone, with background traffic)"
 *.ue[*].app[1].typename = "CbrSender"
 *.ue[*].app[1].destAddress = "server"
 *.ue[*].app[1].destPort = 3001
-*.ue[*].app[1].PacketSize = ${msgLen}
+*.ue[*].app[1].packetSize = ${msgLen}
 *.ue[*].app[1].sampling_time = ${sndInt}
 *.ue[*].app[1].startTime = uniform(0s,0.05s)
 *.ue[*].app[1].finishTime = 19s

simulations/NR/d2d/omnetpp.ini

@@ -80,7 +80,7 @@ extends=SinglePair
 # Traffic between UEs (ueD2DTx[0] --> ueD2DRx[0])
 # Transmitter
 *.ueD2DTx[0].app[*].typename = "CbrSender"
-*.ueD2DTx[0].app[*].PacketSize = 1000B
+*.ueD2DTx[0].app[*].packetSize = 1000B
 *.ueD2DTx[0].app[*].sampling_time = 0.01s
 *.ueD2DTx[0].app[*].localPort = 3088+ancestorIndex(0)
 *.ueD2DTx[0].app[*].startTime = uniform(0s,0.02s)
@@ -221,7 +221,7 @@ extends=MultiplePairs
 # Traffic between pairs of UEs (e.g. ueD2DTx[0] --> ueD2DRx[0] )
 # Transmitters
 *.ueD2DTx[*].app[*].typename = "CbrSender"
-*.ueD2DTx[*].app[*].PacketSize = 1000B
+*.ueD2DTx[*].app[*].packetSize = 1000B
 *.ueD2DTx[*].app[*].sampling_time = 0.01s
 *.ueD2DTx[*].app[*].localPort = 3088+ancestorIndex(0)
 *.ueD2DTx[*].app[*].startTime = uniform(0s,0.02s)
@@ -422,7 +422,7 @@ extends=SinglePair-modeSwitching
 # Traffic between UEs (ueD2DTx[0] --> ueD2DRx[0])
 # Transmitter
 *.ueD2DTx[0].app[*].typename = "CbrSender"
-*.ueD2DTx[0].app[*].PacketSize = 1000B
+*.ueD2DTx[0].app[*].packetSize = 1000B
 *.ueD2DTx[0].app[*].sampling_time = 0.01s
 *.ueD2DTx[0].app[*].localPort = 3088+ancestorIndex(0)
 *.ueD2DTx[0].app[*].startTime = uniform(0s,0.02s)

simulations/NR/dualConnectivity/omnetpp.ini

@@ -109,7 +109,7 @@ description = "Base configuration, do not run this config!"
 *.ue[*].app[*].localPort = 3000+ancestorIndex(0)
 
 *.server.app[*].typename = "VoIPSender"
-*.server.app[*].PacketSize = 40B
+*.server.app[*].packetSize = 40B
 *.server.app[*].destAddress = "ue[0]" # obtain the address of the client by reading its index in the array of udp Apps
 *.server.app[*].localPort = 3088+ancestorIndex(0)
 *.server.app[*].destPort = 3000+ancestorIndex(0)

simulations/NR/dualConnectivity_multicell/omnetpp.ini

@@ -172,7 +172,7 @@ description = "one CBR downlink connection - if gNB out of range, use eNB"
 *.server.app[*].destAddress = "ue[" + string(ancestorIndex(0)) + "]" # obtain the address of the client by reading its index in the array of apps
 *.server.app[*].localPort = 3088+ancestorIndex(0)
 *.server.app[*].destPort = 3000
-*.server.app[*].PacketSize = 1000B
+*.server.app[*].packetSize = 1000B
 *.server.app[*].sampling_time = 0.05s
 *.server.app[*].startTime = uniform(0.02s, 0.05s)
 *.server.app[*].finishTime = 39.9s
@@ -204,7 +204,7 @@ description = "one CBR uplink connection - if gNB out of range, use eNB"
 
 *.ue[*].app[*].typename = "CbrSender"
 *.ue[*].app[*].destAddress = "server"
-*.ue[*].app[*].PacketSize = 1000B
+*.ue[*].app[*].packetSize = 1000B
 *.ue[*].app[*].sampling_time = 0.05s
 *.ue[*].app[*].localPort = 3088
 *.ue[*].app[*].destPort = 3000
@@ -236,7 +236,7 @@ description = "two CBR downlink connections - one via eNodeB, one via gNodeB"
 *.server.app[*].destAddress = "ue[0]" # obtain the address of the client by reading its index in the array of apps
 *.server.app[*].localPort = 3088+ancestorIndex(0)
 *.server.app[*].destPort = 3000+ancestorIndex(0)
-*.server.app[*].PacketSize = 1000B
+*.server.app[*].packetSize = 1000B
 *.server.app[*].sampling_time = 0.05s
 *.server.app[*].startTime = uniform(0.02s, 0.05s)
 *.server.app[*].finishTime = 39.9s
@@ -266,7 +266,7 @@ description = "two CBR uplink connections - one via eNodeB, one via gNodeB"
 
 *.ue[*].app[*].typename = "CbrSender"
 *.ue[*].app[*].destAddress = "server"
-*.ue[*].app[*].PacketSize = 1000B
+*.ue[*].app[*].packetSize = 1000B
 *.ue[*].app[*].sampling_time = 0.05s
 *.ue[*].app[*].localPort = 3088+ancestorIndex(0)
 *.ue[*].app[*].destPort = 3000+ancestorIndex(0)
@@ -300,7 +300,7 @@ description = "one CBR downlink, split bearer"
 *.server.app[*].destAddress = "ue[" + string(ancestorIndex(0)) + "]" # obtain the address of the client by reading its index in the array of apps
 *.server.app[*].localPort = 3088+ancestorIndex(0)
 *.server.app[*].destPort = 3000
-*.server.app[*].PacketSize = 1000B
+*.server.app[*].packetSize = 1000B
 *.server.app[*].sampling_time = 0.05s
 *.server.app[*].startTime = uniform(0.02s, 0.05s)
 *.server.app[*].finishTime = 39.9s

simulations/NR/standalone/omnetpp.ini

@@ -81,7 +81,7 @@ extends=Standalone
 *.ue[*].app[*].typename = "VoIPReceiver"
 *.ue[*].app[0].localPort = 3000
 
-*.server.app[*].PacketSize = 40B
+*.server.app[*].packetSize = 40B
 *.server.app[*].destAddress = "ue[0]" # obtain the address of the client by reading its index in the array of udp Apps
 *.server.app[*].localPort = 3088+ancestorIndex(0)
 *.server.app[*].typename = "VoIPSender"
@@ -108,7 +108,7 @@ extends=Standalone
 *.server.app[*].typename = "VoIPReceiver"
 *.server.app[*].localPort = 3000+ancestorIndex(0)
 
-*.ue[*].app[*].PacketSize = 40B
+*.ue[*].app[*].packetSize = 40B
 # obtain the address of the client by reading its index in the array of udp Apps
 *.ue[*].app[*].destAddress = "server"
 *.ue[*].app[*].localPort = 3088+ancestorIndex(0)

simulations/NR/standalone_multicell/omnetpp.ini

@@ -110,7 +110,7 @@ description = "CBR DL traffic from remote server to UEs"
 *.ue[*].app[*].localPort = 3000
 
 *.server.app[*].typename = "CbrSender"
-*.server.app[*].PacketSize = 100B
+*.server.app[*].packetSize = 100B
 *.server.app[*].sampling_time = 0.02s
 *.server.app[*].destAddress = "ue[" + string(ancestorIndex(0)) + "]"
 *.server.app[*].destPort = 3000
@@ -142,7 +142,7 @@ description = "CBR UL traffic from UEs to remote server"
 *.server.app[*].localPort = 3000 + ancestorIndex(0)
 
 *.ue[*].app[*].typename = "CbrSender"
-*.ue[*].app[*].PacketSize = 100B
+*.ue[*].app[*].packetSize = 100B
 *.ue[*].app[*].sampling_time = 0.02s
 *.ue[*].app[*].destAddress = "server"
 *.ue[*].app[*].destPort = 3000 + ancestorIndex(1)

simulations/NR/test_multiCarrier/omnetpp.ini

@@ -89,7 +89,7 @@ output-vector-file = ${resultdir}/${configname}/${iterationvars}-${repetition}.v
 *.server.app[*].localPort = 3088+ancestorIndex(0)
 *.server.app[*].typename = "CbrSender"
 *.server.app[*].startTime = uniform(0.01s,0.02s)
-*.server.app[*].PacketSize = 2000B
+*.server.app[*].packetSize = 2000B
 #------------------------------------#
 
 
@@ -110,7 +110,7 @@ output-vector-file = ${resultdir}/${configname}/${iterationvars}-${repetition}.v
 *.ue[*].app[*].destPort = 1000+ancestorIndex(1)
 *.ue[*].app[*].typename = "CbrSender"
 *.ue[*].app[*].startTime = uniform(0s,0.02s)
-*.ue[*].app[*].PacketSize = 2000B
+*.ue[*].app[*].packetSize = 2000B
 #------------------------------------#
 
 #------------------------------------#

simulations/NR/test_tdd/omnetpp.ini

@@ -103,7 +103,7 @@ network = simu5g.simulations.NR.networks.SingleCell_withSecondaryGnb
 *.ue[*].app[*].typename = "CbrReceiver"
 *.ue[*].app[0].localPort = 10000
 
-*.server.app[*].PacketSize = 3000B
+*.server.app[*].packetSize = 3000B
 *.server.app[*].sampling_time = 0.001s
 *.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of udp Apps
 *.server.app[*].destPort = 10000

simulations/NR/tutorial/omnetpp.ini

@@ -63,7 +63,7 @@ output-vector-file = ${resultdir}/${configname}/${repetition}.vec
 *.ue[*].app[*].localPort = 1000
 
 *.server.app[*].typename = "CbrSender"
-*.server.app[*].PacketSize = 1000B      # send 800 Kb/s
+*.server.app[*].packetSize = 1000B      # send 800 Kb/s
 *.server.app[*].sampling_time = 0.01s
 *.server.app[*].destAddress = "ue["+string(ancestorIndex(0))+"]" # obtain the address of the client by reading its index in the array of Apps
 *.server.app[*].destPort = 1000

src/apps/cbr/CbrSender.cc

@@ -50,7 +50,7 @@ void CbrSender::initialize(int stage)
         nframesTmp_ = 0;
         iDframe_ = 0;
         timestamp_ = 0;
-        size_ = par("PacketSize");
+        size_ = par("packetSize");
         sampling_time = par("sampling_time");
         localPort_ = par("localPort");
         destPort_ = par("destPort");

src/apps/cbr/CbrSender.ned

@@ -20,7 +20,7 @@ simple CbrSender like IApp
         int localPort = default(-1);
         int destPort = default(3000);
         string destAddress;
-        int PacketSize @unit(B) = default(40B);
+        int packetSize @unit(B) = default(40B);
         double sampling_time @unit("s") = default(0.02s);
         double startTime @unit("s") = default(0s);
         double finishTime @unit("s") = default(0s);

src/apps/d2dMultihop/MultihopD2D.cc

@@ -210,12 +210,6 @@ void MultihopD2D::handleRcvdPacket(cMessage* msg)
     EV << "MultihopD2D::handleRcvdPacket - Received packet from lower layer" << endl;
 
     Packet* pPacket = check_and_cast<Packet*>(msg);
-
-    if (pPacket == nullptr)
-    {
-        throw cRuntimeError("MultihopD2D::handleMessage - FATAL! Error when casting to inet packet");
-    }
-
     auto mhop = pPacket->peekAtFront<MultihopD2DPacket>();
     pPacket->removeControlInfo();
 

src/apps/mec/MecApps/MecAppBase.cc

@@ -38,13 +38,7 @@ MecAppBase::MecAppBase()
 MecAppBase::~MecAppBase()
 {
     std::cout << "MecAppBase::~MecAppBase()" << std::endl;
-    if(sendTimer != nullptr)
-    {
-        if(sendTimer->isSelfMessage())
-            cancelAndDelete(sendTimer);
-        else
-            delete sendTimer;
-    }
+    cancelAndDelete(sendTimer);
 
     sockets_.deleteSockets();
 

src/apps/mec/MecApps/MecAppBase.h

@@ -49,7 +49,7 @@ struct HttpMessageStatus
     HttpBaseMessage *currentMessage = nullptr;
     std::string bufferedData;
     cQueue httpMessageQueue;
-    ProcessingTimeMessage* processMsgTimer;
+    ProcessingTimeMessage* processMsgTimer = nullptr;
 };
 
 class  MecAppBase : public omnetpp::cSimpleModule, public inet::TcpSocket::ICallback

src/apps/mec/MecApps/MecRequestBackgroundApp/MecRequestBackgroundApp.ned

@@ -22,7 +22,6 @@ simple MecRequestBackgroundApp like IMECApp, IApp
         bool allocateHostResources = default(false);
 
         int packetSize @unit(B) = default(10B);
-        string interfaceTableModule = default("");
 
         int mecAppIndex = default(0);
         int mecAppId = default(0); // it will be override by getId() in initialize

src/apps/mec/MecApps/MecRequestBackgroundGeneratorApp/MecRequestBackgroundGeneratorApp.ned

@@ -26,7 +26,6 @@ simple MecRequestBackgroundGeneratorApp like IMECApp, IApp
         bool allocateHostResources = default(false);
 
         int packetSize @unit(B) = default(10B);
-        string interfaceTableModule = default("");
 
         int mecAppIndex = default(0);
         int mecAppId = default(0); // it will be override by getId() in initialize

src/apps/mec/MecApps/MecRequestForegroundApp/MecRequestForegroundApp.ned

@@ -28,7 +28,6 @@ simple MecRequestForegroundApp like IMECApp, IApp
         bool allocateHostResources = default(false);
 
         int packetSize @unit(B) = default(10B);
-        string interfaceTableModule = default("");
         int mecAppIndex = default(0);
         int mecAppId = default(0); // it will be override by getId() in initialize
         int localUePort = default(0); // not used in MecRequestBackgroundGeneratorApp

src/apps/mec/MecRequestResponseApp/MECResponseApp.ned

@@ -23,7 +23,6 @@ simple MECResponseApp like IMECApp, IApp
         @display("i=block/app;is=s");
 
         int responsePacketSize @unit(B) = default(50B);
-        string interfaceTableModule = default("");
         int mecAppIndex;
         int mecAppId;
         int localUePort;

src/apps/mec/MecRequestResponseApp/UERequestApp.ned

@@ -25,8 +25,8 @@ simple UERequestApp like IApp
 
         //connection infos
         int localPort = default(4000);
-        int deviceAppPort = default(4000); // ipAddress of the DeviceApp
-        string deviceAppAddress; // port of the DeviceApp
+        int deviceAppPort = default(4000); // port of the DeviceApp
+        string deviceAppAddress; // ipAddress of the DeviceApp
 
         int requestPacketSize @unit(B) = default(10B);
 
@@ -39,8 +39,6 @@ simple UERequestApp like IApp
 
         string mecAppName = default("MecResponseApp");
 
-        string interfaceTableModule;
-
         // stats
 
         @signal[responseTime];