apps: added numbering to VoIP and VoD packet names, to facilitate tracing with Qtenv

Author: avarga

src/simu5g/apps/vod/VodUdpClient.cc

@@ -139,7 +139,7 @@ void VodUdpClient::handleMessage(cMessage *msg)
             socket.setTos(tos);
         delete msg;
     }
-    else if (!strcmp(msg->getName(), "VoDPacket")) {
+    else if (opp_stringbeginswith(msg->getName(), "VoDPacket")) {
         receiveStream(check_and_cast<inet::Packet *>(msg)->peekAtFront<VoDPacket>().get());
         delete msg;
     }

src/simu5g/apps/vod/VodUdpServer.cc

@@ -136,7 +136,7 @@ void VodUdpServer::handleSVCMessage(cMessage *msg)
         int seq_num = numPkSentApp;
         int currentFrame = svcTrace_[numPkSentApp].frameNumber;
 
-        Packet *packet = new Packet("VoDPacket");
+        Packet *packet = new Packet(opp_stringf("VoDPacket-%d-%d", getId(), seq_num).c_str());
         auto frame = makeShared<VoDPacket>();
         frame->setFrameSeqNum(seq_num);
         frame->setPayloadTimestamp(simTime());

src/simu5g/apps/voip/VoipSender.cc

@@ -156,7 +156,7 @@ void VoipSender::sendVoIPPacket()
     if (destAddress_.isUnspecified())
         destAddress_ = L3AddressResolver().resolve(par("destAddress"));
 
-    Packet *packet = new inet::Packet("VoIP");
+    Packet *packet = new inet::Packet(opp_stringf("VoIP-%d-%d", getId(), iDframe_).c_str());
     auto voip = makeShared<VoipPacket>();
     voip->setIDtalk(iDtalk_ - 1);
     voip->setNframes(nframes_);

src/simu5g/stack/pdcp/LtePdcp.cc

@@ -36,25 +36,28 @@ LtePdcpBase::~LtePdcpBase()
 {
 }
 
+
 ApplicationType LtePdcpBase::getApplication(cPacket *pkt)
 {
-    if ((strcmp(pkt->getName(), "VoIP")) == 0)
+    const char *name = pkt->getName();
+    if (opp_stringbeginswith(name, "VoIP"))
         return VOIP;
-    else if ((strcmp(pkt->getName(), "gaming")) == 0)
+    else if (opp_stringbeginswith(name, "gaming"))
         return GAMING;
-    else if ((strcmp(pkt->getName(), "VoDPacket") == 0) || (strcmp(pkt->getName(), "VoDFinishPacket") == 0))
+    else if (opp_stringbeginswith(name, "VoDPacket") || opp_stringbeginswith(name, "VoDFinishPacket"))
         return VOD;
     else
         return CBR;
 }
 
 LteTrafficClass LtePdcpBase::getTrafficCategory(cPacket *pkt)
 {
-    if ((strcmp(pkt->getName(), "VoIP")) == 0)
+    const char *name = pkt->getName();
+    if (opp_stringbeginswith(name, "VoIP"))
         return CONVERSATIONAL;
-    else if ((strcmp(pkt->getName(), "gaming")) == 0)
+    else if (opp_stringbeginswith(name, "gaming"))
         return INTERACTIVE;
-    else if ((strcmp(pkt->getName(), "VoDPacket") == 0) || (strcmp(pkt->getName(), "VoDFinishPacket") == 0))
+    else if (opp_stringbeginswith(name, "VoDPacket") || opp_stringbeginswith(name, "VoDFinishPacket"))
         return STREAMING;
     else
         return BACKGROUND;