pioder/sk-nat
1
0
Fork 0
Code Releases Activity

poprawka liczenia dstPortu (odwrotnie zakres)

Browse Source
This commit is contained in:
Piotr Dergun
2017-01-19 13:26:43 +01:00
parent 4f7736de3b
commit 54b111bf0d
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NATRouter.cpp
View File

@@ -158,7 +158,6 @@ void NATRouter::sNAT(Packet *packet)
stringstream ss; stringstream ss;
// mozliwe, ze juz port zostal zaalokowany, to trzeba wykorzystac // mozliwe, ze juz port zostal zaalokowany, to trzeba wykorzystac
// TO
port = this->getAllocatedPort(packet->getSrcIp(), packet->getSrcPort()); port = this->getAllocatedPort(packet->getSrcIp(), packet->getSrcPort());
if (port == -1) if (port == -1)
while ((port = this->getFreePort()) == -1) while ((port = this->getFreePort()) == -1)
@@ -283,7 +282,7 @@ void NATRouter::freePorts()
if (ports < peak) if (ports < peak)
peak = ports; 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.print(ss.str());
portsLog.printProgressBar(4, 4, "Utilization", (float)(NAT_TABLE_LEN-ports-1)/(NAT_TABLE_LEN-1)); portsLog.printProgressBar(4, 4, "Utilization", (float)(NAT_TABLE_LEN-ports-1)/(NAT_TABLE_LEN-1));

2
Node.cpp
View File

@@ -173,7 +173,7 @@ int Node::send(Packet packet, bool isRouter)
if (packet.getSrcPort() == 0) if (packet.getSrcPort() == 0)
{ {
// ustaw port zrodlowy na port losowy z zakresu [32768,61000] - zob. empheral port (port emferyczny) // 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); node->putPacket(packet);

2
Simulation.cpp
View File

@@ -325,7 +325,7 @@ void Simulation::natOverflowSimulation(int nNodes)
currentSrcPort[i] = 1; currentSrcPort[i] = 1;
//p.setSrcPort(currentSrcPort[i]++); //p.setSrcPort(currentSrcPort[i]++);
//p.setSrcPort(0); p.setSrcPort(0);
client[i].send(p); client[i].send(p);
this->delay(150); this->delay(150);