AckingMacToEthernetPcapRecorderHelper: Followed recent PcapRecorder c…

…hanges.
inet-framework · Jan 6, 2025 · 2d93f15 · 2d93f15
1 parent 4aae98c
commit 2d93f15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/inet/linklayer/acking/AckingMacHeaderSerializer.cc b/src/inet/linklayer/acking/AckingMacHeaderSerializer.cc
@@ -66,11 +66,12 @@ PcapLinkType AckingMacToEthernetPcapRecorderHelper::protocolToLinkType(const Pro
     return LINKTYPE_INVALID;
 }
 
-Packet *AckingMacToEthernetPcapRecorderHelper::tryConvertToLinkType(const Packet *packet, PcapLinkType pcapLinkType, const Protocol *protocol) const
+Packet *AckingMacToEthernetPcapRecorderHelper::tryConvertToLinkType(const Packet *packet, b frontOffset, b backOffset, PcapLinkType pcapLinkType, const Protocol *protocol) const
 {
 #if defined(INET_WITH_ETHERNET)
     if (*protocol == Protocol::ackingMac && pcapLinkType == LINKTYPE_ETHERNET) {
         auto newPacket = packet->dup();
+        const auto& frontPart = frontOffset != b(0) ? newPacket->removeAtFront(frontOffset) : nullptr;
         auto ackingHdr = newPacket->popAtFront<AckingMacHeader>();
         newPacket->trimFront();
         auto ethHeader = makeShared<EthernetMacHeader>();
@@ -79,6 +80,8 @@ Packet *AckingMacToEthernetPcapRecorderHelper::tryConvertToLinkType(const Packet
         ethHeader->setTypeOrLength(ackingHdr->getNetworkProtocol());
         newPacket->insertAtFront(ethHeader);
         newPacket->addTagIfAbsent<PacketProtocolTag>()->setProtocol(&Protocol::ethernetMac);
+        if (frontPart != nullptr)
+            newPacket->insertAtFront(frontPart);
         return newPacket;
     }
 #endif // defined(INET_WITH_ETHERNET)

diff --git a/src/inet/linklayer/acking/AckingMacHeaderSerializer.h b/src/inet/linklayer/acking/AckingMacHeaderSerializer.h
@@ -31,7 +31,7 @@ class INET_API AckingMacToEthernetPcapRecorderHelper : public cObject, public Pc
 {
     virtual PcapLinkType protocolToLinkType(const Protocol *protocol) const;
     virtual bool matchesLinkType(PcapLinkType pcapLinkType, const Protocol *protocol) const;
-    virtual Packet *tryConvertToLinkType(const Packet *packet, PcapLinkType pcapLinkType, const Protocol *protocol) const;
+    virtual Packet *tryConvertToLinkType(const Packet *packet, b frontOffset, b backOffset, PcapLinkType pcapLinkType, const Protocol *protocol) const;
 };
 
 } // namespace inet