From a8578c96c80ae631d8e7f5f4a94d506c14f06d78 Mon Sep 17 00:00:00 2001 From: jeboog Date: Sun, 14 Mar 2021 19:20:20 -0400 Subject: [PATCH] Fixed receivePacket() logic --- Python/router.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Python/router.py b/Python/router.py index 6486ccb..05e4959 100644 --- a/Python/router.py +++ b/Python/router.py @@ -17,6 +17,7 @@ def __init__(self, queueBufferSize, dddState, bandwidthToNServer, bandwidthToMserver, packetSize, packet_ID_prefix="R-"): self.queueSize = queueBufferSize # MB's + self.receiveBufferLength = 0 self.clientConnection = clientConnection self.natIP = "10.0.0.0" self.remoteServerConnection = remoteServerConnection @@ -76,7 +77,8 @@ def __init__(self, queueBufferSize, dddState, # Receive packets coming from different connections. def receivePacket(self, synPacket): - if(len(self.receiveBuffer) < self.queueSize): + self.receiveBufferLength = self.receiveBufferLength + synPacket.packetSize + if(self.receiveBufferLength < self.queueSize): self.receiveBuffer.append(synPacket) self.packetsReceived += 1 self.fileGen.addToLog(synPacket.packetID, "Received at Router", @@ -84,6 +86,7 @@ def receivePacket(self, synPacket): synPacket.packetType, self.curTime) else: # print("Packet is getting Dropped") + self.receiveBufferLength = self.receiveBufferLength - synPacket.packetSize self.fileGen.animateDrop(self.packetIDPrefix[0], curPacket.packetType, curPacket.sequenceNumber, @@ -98,6 +101,7 @@ def receivePacket(self, synPacket): # Adds the packets in receive buffer to destination queues. def addToQueues(self): for i in self.receiveBuffer: + self.receiveBufferLength = self.receiveBufferLength - i.packetSize # Add to remote servers queue if(i.dstIP == self.remoteServerIP): self.currentQueueLoadNServer += i.packetSize