common: fixed copy-paste error in ProtocolUtils.cc when checking EcapsulationProtocolReq

rhornig · rhornig · commit 172752df1f84 · 2025-09-01T16:43:45.000+02:00
diff --git a/src/inet/common/ProtocolUtils.cc b/src/inet/common/ProtocolUtils.cc
@@ -42,9 +42,9 @@ const Protocol *popEncapsulationProtocolReq(Packet *packet)
         return nullptr;
 }
 
-INET_API bool hasEncapsulationProtocolReq(Packet *packet, const Protocol *protocol)
+bool hasEncapsulationProtocolReq(Packet *packet, const Protocol *protocol)
 {
-    if (auto encapsulationProtocolReq = packet->addTagIfAbsent<EncapsulationProtocolReq>()) {
+    if (auto encapsulationProtocolReq = packet->findTag<EncapsulationProtocolReq>()) {
         for (size_t i = 0; i < encapsulationProtocolReq->getProtocolArraySize(); i++)
             if (encapsulationProtocolReq->getProtocol(i) == protocol)
                 return true;
@@ -54,7 +54,7 @@ INET_API bool hasEncapsulationProtocolReq(Packet *packet, const Protocol *protoc
 
 void removeEncapsulationProtocolReq(Packet *packet, const Protocol *protocol)
 {
-    if (auto encapsulationProtocolReq = packet->addTagIfAbsent<EncapsulationProtocolReq>()) {
+    if (auto encapsulationProtocolReq = packet->findTagForUpdate<EncapsulationProtocolReq>()) {
         for (size_t i = 0; i < encapsulationProtocolReq->getProtocolArraySize(); i++) {
             if (encapsulationProtocolReq->getProtocol(i) == protocol) {
                 encapsulationProtocolReq->eraseProtocol(i);

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ const Protocol popEncapsulationProtocolReq(Packet packet)`
`42`	`42`	`return nullptr;`
`43`	`43`	`}`
`44`	`44`
`45`		`-INET_API bool hasEncapsulationProtocolReq(Packet packet, const Protocol protocol)`
	`45`	`+bool hasEncapsulationProtocolReq(Packet packet, const Protocol protocol)`
`46`	`46`	`{`
`47`		`- if (auto encapsulationProtocolReq = packet->addTagIfAbsent<EncapsulationProtocolReq>()) {`
	`47`	`+ if (auto encapsulationProtocolReq = packet->findTag<EncapsulationProtocolReq>()) {`
`48`	`48`	`for (size_t i = 0; i < encapsulationProtocolReq->getProtocolArraySize(); i++)`
`49`	`49`	`if (encapsulationProtocolReq->getProtocol(i) == protocol)`
`50`	`50`	`return true;`
`@@ -54,7 +54,7 @@ INET_API bool hasEncapsulationProtocolReq(Packet packet, const Protocol protoc`
`54`	`54`
`55`	`55`	`void removeEncapsulationProtocolReq(Packet packet, const Protocol protocol)`
`56`	`56`	`{`
`57`		`- if (auto encapsulationProtocolReq = packet->addTagIfAbsent<EncapsulationProtocolReq>()) {`
	`57`	`+ if (auto encapsulationProtocolReq = packet->findTagForUpdate<EncapsulationProtocolReq>()) {`
`58`	`58`	`for (size_t i = 0; i < encapsulationProtocolReq->getProtocolArraySize(); i++) {`
`59`	`59`	`if (encapsulationProtocolReq->getProtocol(i) == protocol) {`
`60`	`60`	`encapsulationProtocolReq->eraseProtocol(i);`