fix: take into account used IPs (#75)

Author: MegaRedHand

src/context.ts

@@ -6,7 +6,7 @@ import {
   saveToLocalStorage,
 } from "./types/viewportManager";
 import { Layer } from "./types/devices/device";
-import { IpAddressGenerator } from "./packets/ip";
+import { IpAddress, IpAddressGenerator } from "./packets/ip";
 import { layerFromName } from "./types/devices/utils";
 
 export class GlobalContext {
@@ -19,10 +19,10 @@ export class GlobalContext {
   initialize(viewport: Viewport) {
     this.viewport = viewport;
 
-    const baseIp = "10.0.0.0";
-    const mask = "255.255.255.255";
-    this.ipGenerator = new IpAddressGenerator(baseIp, mask);
+    // Sets the initial datagraph and viewgraph
     loadFromLocalStorage(this);
+
+    this.setIpGenerator();
   }
 
   getNextIp(): { ip: string; mask: string } {
@@ -33,6 +33,7 @@ export class GlobalContext {
     this.datagraph = datagraph;
     this.viewport.clear();
     this.viewgraph = new ViewGraph(this.datagraph, this.viewport, layer);
+    this.setIpGenerator();
   }
 
   load(datagraph: DataGraph, layer: Layer = Layer.Link) {
@@ -79,4 +80,18 @@ export class GlobalContext {
       this.saveIntervalId = null;
     }
   }
+
+  private setIpGenerator() {
+    let maxIp = IpAddress.parse("10.0.0.0");
+    this.datagraph.getDevices().forEach((device) => {
+      const ip = IpAddress.parse(device.ip);
+      if (maxIp.octets < ip.octets) {
+        maxIp = ip;
+      }
+    });
+    // TODO: we should use IpAddress instead of string here and in Datagraph
+    const baseIp = maxIp.toString();
+    const mask = "255.255.255.255";
+    this.ipGenerator = new IpAddressGenerator(baseIp, mask);
+  }
 }

src/types/graphs/datagraph.ts

@@ -155,28 +155,6 @@ export class DataGraph {
     device1.connections.add(n2Id);
     device2.connections.add(n1Id);
 
-    if (isRouter(device1)) {
-      if (!device1.routingTable) {
-        device1.routingTable = [];
-      }
-      device1.routingTable.push({
-        ip: device2.ip.toString(),
-        mask: device2.mask,
-        iface: n2Id,
-      });
-    }
-
-    if (isRouter(device2)) {
-      if (!device2.routingTable) {
-        device2.routingTable = [];
-      }
-      device2.routingTable.push({
-        ip: device1.ip.toString(),
-        mask: device1.mask,
-        iface: n1Id,
-      });
-    }
-
     console.log(
       `Connection created between devices ID: ${n1Id} and ID: ${n2Id}`,
     );