From ab46a5306085a8deb0402dc2d07b6f7869b2cfc7 Mon Sep 17 00:00:00 2001
From: Michael Frey <frey@inf.fu-berlin.de>
Date: Mon, 3 Dec 2012 16:33:40 +0100
Subject: [PATCH 1/2] fixed compiler error (double declaration of variable i)

---
 .../autorouting/HostAutoConfigurator2.cc             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/networklayer/autorouting/HostAutoConfigurator2.cc b/src/networklayer/autorouting/HostAutoConfigurator2.cc
index a9a47b18660..622c8fcaea2 100644
--- a/src/networklayer/autorouting/HostAutoConfigurator2.cc
+++ b/src/networklayer/autorouting/HostAutoConfigurator2.cc
@@ -324,16 +324,16 @@ void HostAutoConfigurator2::setupRoutingTable()
         if (!ie)
             continue;
         IPAddress add(ie->ipv4Data()->getIPAddress().getInt() & ie->ipv4Data()->getNetmask().getInt());
-        int i=0;
-        while (i<routingTable->getNumRoutes())
+        int j=0;
+        while (j<routingTable->getNumRoutes())
         {
-            if (routingTable->getRoute(i)->getInterface()==ie)
+            if (routingTable->getRoute(j)->getInterface()==ie)
         	{
-            	routingTable->deleteRoute(routingTable->getRoute(i));
-                i=0;
+            	routingTable->deleteRoute(routingTable->getRoute(j));
+                j=0;
         	}
         	else
-        	    i++;
+        	    j++;
         }
         addRoute(ie,routingTable,add,ie->ipv4Data()->getNetmask());
     }

From fee5ae06adbd182c3139b1c3617ee14ae0e86702 Mon Sep 17 00:00:00 2001
From: Michael Frey <frey@informatik.hu-berlin.de>
Date: Thu, 6 Dec 2012 18:14:47 +0100
Subject: [PATCH 2/2] fixed issue regarding IEC binary prefixes in omnetpp.ini
 files for the ethernet examples

---
 examples/ethernet/arptest/omnetpp.ini  | 8 ++++----
 examples/ethernet/arptest2/omnetpp.ini | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/ethernet/arptest/omnetpp.ini b/examples/ethernet/arptest/omnetpp.ini
index 976365dde25..56033c21580 100644
--- a/examples/ethernet/arptest/omnetpp.ini
+++ b/examples/ethernet/arptest/omnetpp.ini
@@ -2,7 +2,7 @@
 network = ARPTest
 sim-time-limit = 500s
 cpu-time-limit = 600s
-total-stack = 2MB
+total-stack = 2MiB
 tkenv-plugin-path = ../../../etc/plugins
 #record-eventlog = true
 #debug-on-errors = true
@@ -18,7 +18,7 @@ tkenv-plugin-path = ../../../etc/plugins
 **.client.tcpApp[*].connectPort = 1000
 **.client.tcpApp[*].tOpen = 1.0s
 **.client.tcpApp[*].tSend = 1.1s
-**.client.tcpApp[*].sendBytes = 1MB
+**.client.tcpApp[*].sendBytes = 1MiB
 **.client.tcpApp[*].sendScript = ""
 **.client.tcpApp[*].tClose = 0
 
@@ -48,8 +48,8 @@ tkenv-plugin-path = ../../../etc/plugins
 **.switch*.relayUnitType = "MACRelayUnitNP"
 **.relayUnit.addressTableSize = 100
 **.relayUnit.agingTime = 120s
-**.relayUnit.bufferSize = 1MB
-**.relayUnit.highWatermark = 512KB
+**.relayUnit.bufferSize = 1MiB
+**.relayUnit.highWatermark = 512KiB
 **.relayUnit.pauseUnits = 300  # pause for 300*512 bit (19200 byte) time
 **.relayUnit.addressTableFile = ""
 **.relayUnit.numCPUs = 2
diff --git a/examples/ethernet/arptest2/omnetpp.ini b/examples/ethernet/arptest2/omnetpp.ini
index 3db2e36feb4..2db8a4a654a 100644
--- a/examples/ethernet/arptest2/omnetpp.ini
+++ b/examples/ethernet/arptest2/omnetpp.ini
@@ -2,7 +2,7 @@
 network = ARPTest
 sim-time-limit = 500s
 cpu-time-limit = 600s
-total-stack = 2MB
+total-stack = 2MiB
 tkenv-plugin-path = ../../../etc/plugins
 
 [Config ARPTest]
@@ -16,7 +16,7 @@ tkenv-plugin-path = ../../../etc/plugins
 **.client*.tcpApp[0].connectPort = 1000
 **.client*.tcpApp[0].tOpen = 1s
 **.client*.tcpApp[0].tSend = 1.1s
-**.client*.tcpApp[0].sendBytes = 1MB
+**.client*.tcpApp[0].sendBytes = 1MiB
 **.client*.tcpApp[0].sendScript = ""
 **.client*.tcpApp[0].tClose = 0