From c253bc7fb010a79b6cfd9bc38f440ab207f50f48 Mon Sep 17 00:00:00 2001 From: Levente Meszaros Date: Fri, 12 Apr 2024 11:47:04 +0200 Subject: [PATCH] DirectionReverserLayer: Replaced the MessageDispatcher module with LocalDelivery whcih checks the ethernet destination MAC address. --- .../ethernet/common/DirectionReverserLayer.ned | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/inet/linklayer/ethernet/common/DirectionReverserLayer.ned b/src/inet/linklayer/ethernet/common/DirectionReverserLayer.ned index 3f853adaec3..c2568f68d72 100644 --- a/src/inet/linklayer/ethernet/common/DirectionReverserLayer.ned +++ b/src/inet/linklayer/ethernet/common/DirectionReverserLayer.ned @@ -7,12 +7,13 @@ package inet.linklayer.ethernet.common; -import inet.common.MessageDispatcher; +import inet.linklayer.ieee8021d.relay.Ieee8021dDelivery; import inet.protocolelement.contract.IProtocolLayer; import inet.queueing.common.PacketMultiplexer; import inet.queueing.contract.IPacketDelayer; import inet.queueing.contract.IPacketFlow; + // // This module provides a layer that combines the decision for local delivery // with the service of reversing the direction of an incoming packet to outgoing @@ -33,7 +34,7 @@ module DirectionReverserLayer like IProtocolLayer cutthroughBarrier: like IPacketDelayer { @display("p=100,150"); } - fork: MessageDispatcher { + localDelivery: LocalDelivery { @display("p=100,300;i=-;b=10,10,oval,grey,,1"); } delayer: like IPacketDelayer { @@ -49,11 +50,11 @@ module DirectionReverserLayer like IProtocolLayer upperLayerIn --> { @display("m=n"); } --> join.in++; join.out --> { @display("m=s"); } --> lowerLayerOut; - lowerLayerIn --> { @display("m=s"); } --> fork.in++; - fork.out++ --> cutthroughBarrier.in; + lowerLayerIn --> { @display("m=s"); } --> localDelivery.in; + localDelivery.deliveryOut --> cutthroughBarrier.in; cutthroughBarrier.out --> { @display("m=n"); } --> upperLayerOut; - fork.out++ --> delayer.in; + localDelivery.forwardingOut --> delayer.in; delayer.out --> reverser.in; reverser.out --> join.in++; }