LteMac*,etc: eliminate use of getTagsWithInherit()

The C++ types of tag objects in question can be known beforehand, so just use getTag.

Author: avarga

src/simu5g/common/LteCommon.h

@@ -518,26 +518,6 @@ bool checkIfHeaderType(const inet::Packet *pkt, bool checkFirst = false) {
     return false;
 }
 
-template<typename T>
-std::vector<T> getTagsWithInherit(inet::Packet *pkt)
-{
-    std::vector<T> t;
-    auto tags = pkt->getTags();
-    if (tags.getNumTags() == 0)
-        return t;
-
-    // check if a tag that is derived from this exists.
-    //
-    for (int i = 0; i < tags.getNumTags(); i++) {
-        auto tag = tags.getTagForUpdate(i);
-        auto temp = inet::dynamicPtrCast<T>(tag);
-        if (temp != nullptr) {
-            t.push_back(*temp.get());
-        }
-    }
-    return t;
-}
-
 } //namespace
 
 #endif

src/simu5g/stack/mac/LteMacUeD2D.cc

@@ -224,13 +224,9 @@ void LteMacUeD2D::macPduMake(MacCid cid)
                     auto pkt = check_and_cast<Packet *>(connDescOut_[destCid].queue->popFront());
 
                     // multicast support
-                    // this trick gets the group ID from the MAC SDU and sets item in the MAC PDU
-                    auto infoVec = getTagsWithInherit<LteControlInfo>(pkt);
-
-                    if (infoVec.empty())
-                        throw cRuntimeError("No tag of type LteControlInfo found");
-
-                    int32_t groupId = infoVec.front().getMulticastGroupId();
+                    // this trick gets the group ID from the MAC SDU and sets it in the MAC PDU
+                    auto flowInfo = pkt->getTag<FlowControlInfo>();
+                    int32_t groupId = flowInfo->getMulticastGroupId();
                     if (groupId >= 0) // for unicast, group id is -1
                         macPkt->getTagForUpdate<UserControlInfo>()->setMulticastGroupId(groupId);
 

src/simu5g/stack/mac/NrMacUe.cc

@@ -429,11 +429,8 @@ void NrMacUe::macPduMake(MacCid cid)
 
                     // multicast support
                     // this trick gets the group ID from the MAC SDU and sets it in the MAC PDU
-                    auto infoVec = getTagsWithInherit<LteControlInfo>(pkt);
-                    if (infoVec.empty())
-                        throw cRuntimeError("No tag of type LteControlInfo found");
-
-                    int32_t groupId = infoVec.front().getMulticastGroupId();
+                    auto flowInfo = pkt->getTag<FlowControlInfo>();
+                    int32_t groupId = flowInfo->getMulticastGroupId();
                     if (groupId >= 0) // for unicast, group id is -1
                         macPkt->getTagForUpdate<UserControlInfo>()->setMulticastGroupId(groupId);
 

src/simu5g/stack/mac/buffer/harq_d2d/LteHarqProcessTxD2D.cc

@@ -38,13 +38,8 @@ Packet *LteHarqProcessTxD2D::extractPdu(Codeword cw)
 
     numSelected_--;
     Packet *pkt = units_[cw]->extractPdu();
-    auto pdu = pkt->peekAtFront<LteMacPdu>();
-    auto infoVec = getTagsWithInherit<LteControlInfo>(pkt);
-    if (infoVec.empty())
-        throw cRuntimeError("No tag of type LteControlInfo found");
-    auto info = infoVec.front();
-
-    if (info.getDirection() == D2D_MULTI) {
+    auto info = pkt->getTag<UserControlInfo>();
+    if (info->getDirection() == D2D_MULTI) {
         // if the PDU is for a multicast/broadcast connection, the selected unit has been emptied
         numEmptyUnits_++;
     }