Topology, SNMP

Author: veniware

Protest/Front/topology.css

@@ -30,6 +30,8 @@
 
 .topology-selected > rect:first-child {
 	fill: color-mix(in srgb, var(--clr-select) 60%, transparent 40%);
+	stroke: var(--clr-select);
+	stroke-width: 2px;
 }
 
 .topology-loading {

Protest/Front/topology.js

@@ -74,6 +74,8 @@ class Topology extends Window {
 
 			this.dragging.element.x = x;
 			this.dragging.element.y = y;
+
+			this.AdjustSvgSize();
 		};
 
 		this.content.onmouseup = ()=> {
@@ -84,6 +86,10 @@ class Topology extends Window {
 		this.stopButton.onclick = ()=> this.Stop();
 	}
 
+	AfterResize() { //override
+		this.AdjustSvgSize();
+	}
+
 	InitializeSvg() {
 		this.svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
 		this.svg.setAttribute("width", 1);
@@ -103,7 +109,7 @@ class Topology extends Window {
 
 		const loadingStop1 = document.createElementNS("http://www.w3.org/2000/svg", "stop");
 		loadingStop1.setAttribute("offset", ".15");
-		loadingStop1.setAttribute("stop-color", "#c0c0c080");
+		loadingStop1.setAttribute("stop-color", "#c0c0c060");
 		loadGradient.appendChild(loadingStop1);
 
 		const loadingStop2 = document.createElementNS("http://www.w3.org/2000/svg", "stop");
@@ -118,7 +124,7 @@ class Topology extends Window {
 
 		const loadingStop4 = document.createElementNS("http://www.w3.org/2000/svg", "stop");
 		loadingStop4.setAttribute("offset", ".85");
-		loadingStop4.setAttribute("stop-color", "#c0c0c080");
+		loadingStop4.setAttribute("stop-color", "#c0c0c060");
 		loadGradient.appendChild(loadingStop4);
 
 		const animateTransform = document.createElementNS("http://www.w3.org/2000/svg", "animateTransform");
@@ -386,7 +392,7 @@ class Topology extends Window {
 
 		const label = document.createElementNS("http://www.w3.org/2000/svg", "text");
 		label.innerHTML = options.name;
-		label.setAttribute("y", 104);
+		label.setAttribute("y", 106);
 		label.setAttribute("x", 48);
 		label.setAttribute("font-size", "11");
 		label.setAttribute("font-weight", "600");
@@ -408,8 +414,7 @@ class Topology extends Window {
 			this.SelectDevice(options.file);
 		});
 
-		this.svg.setAttribute("width", Math.max(this.workspace.offsetWidth, options.x + 150));
-		this.svg.setAttribute("height", Math.max(this.workspace.offsetHeight, options.y + 150));
+		this.AdjustSvgSize();
 
 		return {
 			root: g,
@@ -458,4 +463,15 @@ class Topology extends Window {
 		ipLabel.textContent = initial.ip;
 		grid.appendChild(ipLabel);
 	}
+
+	AdjustSvgSize() {
+		let maxX = this.workspace.offsetWidth, maxY = this.workspace.offsetHeight;
+		for (const file in this.devices) {
+			if (this.devices[file].element.x + 100 > maxX) maxX = this.devices[file].element.x + 100;
+			if (this.devices[file].element.y + 128 > maxY) maxY = this.devices[file].element.y + 128;
+		}
+		
+		this.svg.setAttribute("width", maxX === this.workspace.offsetWidth ? Math.max(maxX - 20, 1) : maxX);
+		this.svg.setAttribute("height", maxY === this.workspace.offsetHeight ? Math.max(maxY - 20, 1) : maxY);
+	}
 }

Protest/Tools/Topology.cs

@@ -166,8 +166,14 @@ private static byte[] ComputeSnmpResponse(string file, Dictionary<string, string
             }
         }
 
-        //TODO:
-        return System.Text.Encoding.UTF8.GetBytes($"{{\"snmp\":\"{file}\"}}");
+        byte[] payload = JsonSerializer.SerializeToUtf8Bytes(new {
+            switchInfo = new {
+                localPortIdSuptype = localPortIdSuptype,
+                localPortId        = localPortId
+            }
+        });
+
+        return payload;
     }
 
 }