diff --git a/src/inet/linklayer/ieee8021q/Ieee8021qFilter.ned b/src/inet/linklayer/ieee8021q/Ieee8021qFilter.ned index 609bbd910f1..b8bcb6ba116 100644 --- a/src/inet/linklayer/ieee8021q/Ieee8021qFilter.ned +++ b/src/inet/linklayer/ieee8021q/Ieee8021qFilter.ned @@ -49,7 +49,7 @@ module Ieee8021qFilter like IPacketFilter displayStringTextFormat = default(""); @display("p=500,100,column,150"); } - gateClosedFilter[numGates]: like IPacketFilter { + gateFilter[numGates]: like IPacketFilter { @display("p=700,100,column,150"); } gate[numGates]: like IPacketGate { @@ -85,8 +85,8 @@ module Ieee8021qFilter like IPacketFilter streamFilter[i].out --> sm[j].in++ if streamFilterTable.get(i).get("gate") == j; } for i=0..numGates-1 { - sm[i].out --> gateClosedFilter[i].in; - gateClosedFilter[i].out --> gate[i].in; + sm[i].out --> gateFilter[i].in; + gateFilter[i].out --> gate[i].in; gate[i].out --> gc[i].in; } for i=0..numGates-1, for j=0..numMeters-1 { diff --git a/src/inet/linklayer/ieee8021q/SimpleIeee8021qFilter.ned b/src/inet/linklayer/ieee8021q/SimpleIeee8021qFilter.ned index 2376f5c83eb..744c64dd5d2 100644 --- a/src/inet/linklayer/ieee8021q/SimpleIeee8021qFilter.ned +++ b/src/inet/linklayer/ieee8021q/SimpleIeee8021qFilter.ned @@ -35,7 +35,7 @@ module SimpleIeee8021qFilter like IPacketFilter defaultGateIndex = default(parent.hasDefaultPath ? 0 : -1); @display("p=100,100"); } - gateClosedFilter[numStreams]: like IPacketFilter { + gateFilter[numStreams]: like IPacketFilter { @display("p=300,$startY,column,150"); } gate[numStreams]: like IPacketGate { @@ -58,8 +58,8 @@ module SimpleIeee8021qFilter like IPacketFilter in --> { @display("m=w"); } --> classifier.in; classifier.out++ --> multiplexer.in++ if hasDefaultPath; for i=0..numStreams-1 { - classifier.out++ --> gateClosedFilter[i].in; - gateClosedFilter[i].out --> gate[i].in; + classifier.out++ --> gateFilter[i].in; + gateFilter[i].out --> gate[i].in; gate[i].out --> meter[i].in; meter[i].out --> filter[i].in; filter[i].out --> multiplexer.in++;