From cbc4859a04717a79c434a604e4953a0ccd409e87 Mon Sep 17 00:00:00 2001
From: Abhinna Adhikari <adhikari.abhinna@gmail.com>
Date: Sun, 6 Dec 2020 16:52:10 -0500
Subject: [PATCH] Add port filter functionality to router

---
 index.html   |  1 -
 js/ddd.js    |  6 +++---
 js/router.js | 27 ++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index b7a93ed..db2eea8 100644
--- a/index.html
+++ b/index.html
@@ -74,7 +74,6 @@ <h2 class="text-white mb-4">DDD Filter applications in the Network</h2>
 
                   <!--THIS IS THE SIDEBAR. I ALSO ADDED THE BUTTONS TO IT AS WELL-->
                   <div id="mySidebar" class="sidebar">
-                    <a href="javascript:void(0)" class="closebtn" onclick="closeNav()">×</a>
                 <form style="float:left; padding-top: 30px; padding-left: 30px;"">
                       <label>Number of Packets:</label><br>
                       <input type="number" id="npackets" name="npackets" value=3><br>
diff --git a/js/ddd.js b/js/ddd.js
index 0034cbb..01e29fd 100644
--- a/js/ddd.js
+++ b/js/ddd.js
@@ -10,7 +10,7 @@ export class DDD extends Entity {
 
         // Bind methods
         this.sendPackets = this.sendPackets.bind(this);
-        this.passFilter = this.passFilter.bind(this);
+        this.passPortFilter = this.passPortFilter.bind(this);
         this.openNewPorts = this.openNewPorts.bind(this);
 
     }
@@ -41,7 +41,7 @@ export class DDD extends Entity {
         return newOpenPorts;
     }
 
-    passFilter(packet) {
+    passPortFilter(packet) {
         return this.openPorts.includes(packet.dstPort);
     }
 
@@ -56,7 +56,7 @@ export class DDD extends Entity {
         for (let i = 0; i < this.packetsPerTimeUnit; ++i) {
             let packet = this.dequeue();
             if (packet) {
-                if (!this.passFilter(packet)) {
+                if (!this.passPortFilter(packet)) {
                     packet.dropped = true;
                     this.garbage.enqueue(packet);
                 }
diff --git a/js/router.js b/js/router.js
index a80d974..7f96c6c 100644
--- a/js/router.js
+++ b/js/router.js
@@ -1,11 +1,36 @@
 import { Entity } from './entity.js';
+import { DDD } from './ddd.js';
 
 export class Router extends Entity{
     constructor(x, y, nextEntity, packetsPerTimeUnit, queue=[]) {
         super('images/router.png', 'Router', x, y, 100, 100, nextEntity, packetsPerTimeUnit, queue);
-        this.openPorts = []
 
         // Bind methods
     }
+
+    sendPackets(dstEntity = undefined) {
+        // Send packet from srcEntity to dstEntity. If dstEntity undefined, then send to nextEntity
+        if (!dstEntity) {
+            dstEntity = this.nextEntity;
+        }
+
+        // Send packetsPerTimeUnit packets from current entity to dstEntity
+        let sentPackets = [];
+        for (let i = 0; i < this.packetsPerTimeUnit; ++i) {
+            let packet = this.dequeue();
+            if (packet) {
+                if (this.nextEntity instanceof DDD && !this.nextEntity.passPortFilter(packet)) {
+                    packet.dropped = true;
+                    this.nextEntity.garbage.enqueue(packet);
+                }
+                else {
+                    packet.nextEntity = dstEntity;  // Used for packet animation
+                    dstEntity.enqueue(packet);
+                }
+                sentPackets.push(packet);
+            }
+        }
+        return sentPackets;
+    }
 }