From 54b111bf0dd49fcd1b6dedb5418d82d7d5a0b489 Mon Sep 17 00:00:00 2001
From: PioDer <piotrek@pioder.pl>
Date: Thu, 19 Jan 2017 13:26:43 +0100
Subject: [PATCH] poprawka liczenia dstPortu (odwrotnie zakres)

---
 NATRouter.cpp  | 3 +--
 Node.cpp       | 2 +-
 Simulation.cpp | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/NATRouter.cpp b/NATRouter.cpp
index 199371e..a719dfd 100644
--- a/NATRouter.cpp
+++ b/NATRouter.cpp
@@ -158,7 +158,6 @@ void NATRouter::sNAT(Packet *packet)
 	stringstream ss;
 
 	// mozliwe, ze juz port zostal zaalokowany, to trzeba wykorzystac
-	// TO
 	port = this->getAllocatedPort(packet->getSrcIp(), packet->getSrcPort());
 	if (port == -1)
 		while ((port = this->getFreePort()) == -1)
@@ -283,7 +282,7 @@ void NATRouter::freePorts()
 		if (ports < peak)
 			peak = ports;
 
-		ss << "Free/Reserved:\t" << ports << " (" << peak << ")/" << (NAT_TABLE_LEN-ports-1); // poprawka na nieuzywany port 0
+		ss << "Free/Reserved:\t" << ports << " (" << peak << ")/" << (NAT_TABLE_LEN-ports-1) << " (" << (NAT_TABLE_LEN-peak-1) << ")"; // poprawka na nieuzywany port 0
 
 		portsLog.print(ss.str());
 		portsLog.printProgressBar(4, 4, "Utilization", (float)(NAT_TABLE_LEN-ports-1)/(NAT_TABLE_LEN-1));
diff --git a/Node.cpp b/Node.cpp
index 29cc13b..d44e519 100644
--- a/Node.cpp
+++ b/Node.cpp
@@ -173,7 +173,7 @@ int Node::send(Packet packet, bool isRouter)
 		if (packet.getSrcPort() == 0)
 		{
 			// ustaw port zrodlowy na port losowy z zakresu [32768,61000] - zob. empheral port (port emferyczny)
-			packet.setSrcPort(rand() % 32768 + 28233);
+			packet.setSrcPort(rand() % 28233 + 32768);
 		}
 	}
 	node->putPacket(packet);
diff --git a/Simulation.cpp b/Simulation.cpp
index 6924b41..e711c49 100644
--- a/Simulation.cpp
+++ b/Simulation.cpp
@@ -325,7 +325,7 @@ void Simulation::natOverflowSimulation(int nNodes)
 			currentSrcPort[i] = 1;
 
 		//p.setSrcPort(currentSrcPort[i]++);
-		//p.setSrcPort(0);
+		p.setSrcPort(0);
 		client[i].send(p);
 
 		this->delay(150);