Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

uses MACRelayUnit instead of MACRelayUnitNP/MACRelayUnitPP

  • Loading branch information...
commit 429133960291cb9fa32e645595e0b7a6cdd63a05 1 parent 3a09740
@ZoltanBojthe ZoltanBojthe authored
View
2  examples/ethernet/arptest/omnetpp.ini
@@ -40,7 +40,7 @@ tkenv-plugin-path = ../../../etc/plugins
**.eth[*].queue.dataQueue.frameCapacity = 10
# Ethernet switch
-**.switch*.relayUnitType = "MACRelayUnitNP"
+**.switch*.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1MiB
View
2  examples/ethernet/lans/defaults.ini
@@ -10,7 +10,7 @@
**.mac.txrate = 0 # autoconfig
**.mac[*].txrate = 0 # autoconfig
-**.switch*.relayUnitType = "MACRelayUnitNP"
+**.switch*.relayUnitType = "MACRelayUnit"
**.relayUnit.numCPUs = 2
**.relayUnit.processingTime = 2us
View
2  examples/inet/ipv4largenet/omnetpp.ini
@@ -43,7 +43,7 @@ IPv4LargeNet.switch*.relayUnit.numCPUs = 2
**.relayUnit.highWatermark = 512KiB
**.relayUnit.pauseUnits = 300 # pause for 300*512 bit (19200 byte) time
**.relayUnit.addressTableFile = ""
-**.switch*.relayUnitType = "MACRelayUnitNP"
+**.switch*.relayUnitType = "MACRelayUnit"
**.host[*].numPingApps = 1
**.host[*].pingApp[*].typename = "PingTestApp"
View
2  examples/mobileipv6/omnetpp.ini
@@ -232,7 +232,7 @@ tkenv-plugin-path = ../../etc/plugins
**.radio.snirThreshold = 4dB
# relay unit configuration
-**.relayUnitType = "MACRelayUnitNP"
+**.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1MiB
View
2  examples/voipstream/VoIPStreamLargeNet/omnetpp.ini
@@ -100,7 +100,7 @@ cmdenv-express-mode = true
**.namid = -1 # auto
# Ethernet switch
-**.switch*.relayUnitType = "MACRelayUnitNP"
+**.switch*.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1048576B # 1Mb
View
2  examples/voipstream/VoIPStreamTest/omnetpp.ini
@@ -143,7 +143,7 @@ cmdenv-express-mode = true
**.namid = -1 # auto
# Ethernet switch
-**.switch*.relayUnitType = "MACRelayUnitNP"
+**.switch*.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1048576B # 1Mb
View
2  examples/voipstream/VoIPStreamTrafficTest/omnetpp.ini
@@ -106,7 +106,7 @@ cmdenv-express-mode = true
**.namid = -1 # auto
# Ethernet switch
-**.switch*.relayUnitType = "MACRelayUnitNP"
+**.switch*.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1048576B # 1Mb
View
2  examples/wireless/lan80211/omnetpp-ftp.ini
@@ -74,7 +74,7 @@ tkenv-plugin-path = ../../../etc/plugins
**.radio.snirThreshold = 4dB
# relay unit configuration
-**.relayUnitType = "MACRelayUnitNP"
+**.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1MiB
View
2  examples/wireless/lan80211/omnetpp-streaming.ini
@@ -70,7 +70,7 @@ tkenv-plugin-path = ../../../etc/plugins
**.radio.snirThreshold = 4dB
# relay unit configuration
-**.relayUnitType = "MACRelayUnitNP"
+**.relayUnitType = "MACRelayUnit"
**.relayUnit.addressTableSize = 100
**.relayUnit.agingTime = 120s
**.relayUnit.bufferSize = 1MiB
View
6 src/linklayer/IEtherMAC.ned
@@ -29,7 +29,7 @@ package inet.linklayer;
// Expected environment:
// - phys$i and phys$o should be connected to the "network"
// - upperLayerIn and upperLayerOut are usually connected to ~EtherLLC (in hosts)
-// or ~MACRelayUnitPP (in a switch)
+// or ~MACRelayUnit (in a switch)
//
// The module does not perform encapsulation or decapsulation of frames --
// this is done by higher layers (~EtherLLC or ~EtherEncap).
@@ -61,8 +61,8 @@ moduleinterface IEtherMAC
int mtu @unit("B");
@display("i=block/rxtx");
gates:
- input upperLayerIn @labels(EtherFrame); // to ~EtherLLC or ~MACRelayUnitPP
- output upperLayerOut @labels(EtherFrame); // to ~EtherLLC or ~MACRelayUnitPP
+ input upperLayerIn @labels(EtherFrame); // to ~EtherLLC or ~MACRelayUnit
+ output upperLayerOut @labels(EtherFrame); // to ~EtherLLC or ~MACRelayUnit
inout phys @labels(EtherFrame); // to physical layer or the network
}
View
2  src/linklayer/IMACRelayUnit.ned
@@ -42,7 +42,7 @@ package inet.linklayer;
// per second, amount of memory available in the switch, etc.)
// C++ implementations can subclass from the class <tt>MACRelayUnitBase</tt>.
//
-// Known implementations are ~MACRelayUnitNP and ~MACRelayUnitPP.
+// Known implementations are ~MACRelayUnit and ~Ieee8021DRelay.
//
moduleinterface IMACRelayUnit
{
View
6 src/linklayer/ethernet/EtherMAC.ned
@@ -43,7 +43,7 @@ import inet.linklayer.IEtherMAC;
// Expected environment:
// - phys$i and phys$o should be connected to the "network"
// - upperLayerIn and upperLayerOut are usually connected to ~EtherLLC (in hosts)
-// or ~MACRelayUnitPP (in a switch)
+// or ~MACRelayUnit (in a switch)
//
// <b>Operation</b>
//
@@ -152,8 +152,8 @@ simple EtherMAC like IEtherMAC
@statistic[backoff](title="backoff"; record=count,vector; interpolationmode=none);
gates:
- input upperLayerIn @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnitPP
- output upperLayerOut @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnitPP
+ input upperLayerIn @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnit
+ output upperLayerOut @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnit
inout phys @labels(EtherFrame); // to physical layer or the network
}
View
4 src/linklayer/ethernet/EtherMACFullDuplex.ned
@@ -158,8 +158,8 @@ simple EtherMACFullDuplex like IEtherMAC
@statistic[droppedPkNotForUs](title="packets dropped/not for us"; source=dropPkNotForUs; record=count,"sum(packetBytes)","vector(packetBytes)"; interpolationmode=none);
gates:
- input upperLayerIn @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnitPP
- output upperLayerOut @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnitPP
+ input upperLayerIn @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnit
+ output upperLayerOut @labels(EtherFrame); // to ~EtherLLC or ~EtherEncap or ~MACRelayUnit
inout phys @labels(EtherFrame); // to physical layer or the network
}
View
2  src/linklayer/ethernet/eth-index.ned
@@ -24,7 +24,7 @@
// encapsulation/decapsulation models (~EtherEncap, ~EtherLLC);
// bus and hub models ((~EtherBus for modelling coaxial cable, and ~EtherHub);
// a switch model (~EtherSwitch) with various relay units (~IMACRelayUnit,
-// ~MACRelayUnitNP and ~MACRelayUnitPP); some traffic generators
+// ~MACRelayUnit and ~Ieee8021DRelay); some traffic generators
// (~EtherTrafGen, ~EtherAppCli/~EtherAppSrv); and example host models
// (~EtherHost, ~EtherHost2). In INET hosts, an Ethernet interface is
// represented by ~EthernetInterface.
View
2  src/nodes/wireless/AccessPoint.ned
@@ -46,7 +46,7 @@ module AccessPoint
@labels(node,ethernet-node,wireless-node);
@display("i=device/accesspoint");
string mobilityType = default("StationaryMobility"); // how the node moves around. see: inet.mobility
- string relayUnitType = default(haveClass("MACRelayUnitNP")?"MACRelayUnitNP":"MACRelayUnit_None"); // type of the IMACRelayUnit (MACRelayUnitNP, MACRelayUnitPP, etc)
+ string relayUnitType = default(haveClass("MACRelayUnit")?"MACRelayUnit":"MACRelayUnit_None"); // type of the IMACRelayUnit (MACRelayUnit, Ieee8021DRelay, etc)
int numRadios = default(1); // the number of radios in the access point
bool hasStatus = default(false);
wlan[*].mgmtType = default("Ieee80211MgmtAP");
Please sign in to comment.
Something went wrong with that request. Please try again.