Merge pull request #6 from gjaskula99/configfile

Configfile, S&F and flooding

Author: reksio6700

Switch.config

@@ -0,0 +1,48 @@
+# Rx and Tx buffers' size
+Switch.bufferSize=10
+
+# CAM table
+CAM.size=8
+CAM.TTL=100
+# MAC flooding
+CAM.flood=false
+
+# Percentage of broadcast traffic, excluding CAM learning
+Switch.broadcast=5
+# Force pushing broadcast frame to engress even if not all Tx buffers have memory available, some traffic may be lost
+Switch.forcePush=false
+
+# Ethernet interfaces state; true is UP, false is DOWN
+Switch.interface0=true
+Switch.interface1=true
+Switch.interface2=false
+Switch.interface3=false
+Switch.interface4=false
+Switch.interface5=false
+Switch.interface6=false
+Switch.interface7=false
+
+# Interface speed - how much traffic will be handled in each iteration, value is treated as bytes and should be multiplicity of 64
+Switch.speed=6400
+
+# Switching mode; true for Cut-Through, false for Store&Forward
+Switch.modeCF=true
+
+# Frame size
+Switch.fixedFrame=true
+
+# Handling mode; 0 for instant, 1-4 for length percentage, 5 for EXP
+Switch.handling=0
+
+# Minimal delay between frames
+Switch.delay=0
+
+# Number of seconds for simulator to run
+Simulator.iterations=10
+
+# RNG used for traffic generation
+# 0 - UNIFORM(min,max), 1 - EXPONENTIAL(lambda), 2 - NORMAL(mean,deviation)
+# Please note that not all parameters may be used for each RNG
+TrafficRNG.type=1
+TrafficRNG.param1=0.001
+TrafficRNG.param2=0

src/buffer/Buffer.java

@@ -44,9 +44,9 @@ public Frame pop()
 		assert this.currentSize > 0;
 		currentSize--;
 		Frame f = buffer[0];
-		for(int i = currentSize; i >= 1; i--)
+		for(int i = 0; i < currentSize; i++)
 		{
-			buffer[i - 1] = buffer[i];
+			buffer[i] = buffer[i + 1];
 		}
 		return f;
 	}

src/buffer/RxBuffer.java

@@ -40,9 +40,9 @@ public Frame pop()
 		currentSize--;
 		Frame f = buffer[0];
 		this.receiving[0] = 0;
-		for(int i = currentSize; i >= 1; i--)
+		for(int i = 0; i < currentSize; i++)
 		{
-			buffer[i - 1] = buffer[i];
+			buffer[i] = buffer[i + 1];
 		}
 		return f;
 	}

src/buffer/TxBuffer.java

@@ -45,9 +45,9 @@ public Frame pop()
 		currentSize--;
 		Frame f = buffer[0];
 		this.transmitting[0] = 0;
-		for(int i = currentSize; i >= 1; i--)
+		for(int i = 0; i < currentSize; i++)
 		{
-			buffer[i - 1] = buffer[i];
+			buffer[i] = buffer[i + 1];
 		}
 		return f;
 	}

src/l2/MAC.java

@@ -17,6 +17,11 @@ public MAC(int interfaceID, int hostID)
 		this.address = str.toCharArray();
 	}
 
+	public MAC(String address)
+	{
+		this.address = address.toCharArray();
+	}
+	
 	char[] address = new char[12];
 
 	public char[] getMAC()

src/l2/MACTable.java

@@ -15,6 +15,10 @@ public MACTable(int valid, int size)
 	int defaultValidity;
 	int maxSize;
 
+	public int getSize()
+	{
+		return address.size();
+	}
 	public boolean exists(MAC addr)
 	{
 		//if(address.contains(addr)) return true;