3 files changed, 60 insertions, 10 deletions

diff --git a/web/nms.gathering.org/js/nms-info-box.js b/web/nms.gathering.org/js/nms-info-box.js
index a2d4f86..0b90d49 100644
--- a/web/nms.gathering.org/js/nms-info-box.js
+++ b/web/nms.gathering.org/js/nms-info-box.js
@@ -436,7 +436,7 @@ nmsInfoBox._makeCommentTable = function(content) {
 
 nmsInfoBox._searchSmart = function(id, sw) {
 	try {
-		if (nmsData.smanagement.switches[sw].distro == id) {
+		if (nmsData.switches.switches[sw].distro_name == id) {
 			return true;
 		}
 		if (id.match("active")) {
@@ -461,15 +461,22 @@ nmsInfoBox._searchSmart = function(id, sw) {
 				}
 			}
 		}
-		if (nmsData.smanagement.switches[sw].ip.match(id)) {
-			return true;
-		}
-		if (nmsData.smanagement.switches[sw].subnet4.match(id)) {
-			return true;
-		}
-		if (nmsData.smanagement.switches[sw].subnet6.match(id)) {
-			return true;
-		}
+		try {
+			if (nmsData.smanagement.switches[sw].mgmt_v4_addr.match(id)) {
+				return true;
+			}
+			if (nmsData.smanagement.switches[sw].mgmt_v6_addr.match(id)) {
+				return true;
+			}
+		} catch (e) {}
+		try {
+			if (nmsData.smanagement.switches[sw].subnet4.match(id)) {
+				return true;
+			}
+			if (nmsData.smanagement.switches[sw].subnet6.match(id)) {
+				return true;
+			}
+		} catch (e) {}
 		if (nmsData.snmp.snmp[sw].misc.sysDescr[0].match(id)) {
 			return true;
 		}
diff --git a/web/nms.gathering.org/js/nms-map.js b/web/nms.gathering.org/js/nms-map.js
index 7cbf274..ada6886 100644
--- a/web/nms.gathering.org/js/nms-map.js
+++ b/web/nms.gathering.org/js/nms-map.js
@@ -47,6 +47,7 @@ var nmsMap = nmsMap || {
 	},
 
 	_color: { },
+	_linknets: {} ,
 	_highlight: { },
 	_highlightActive: false,
 	_c: {}
@@ -157,6 +158,7 @@ nmsMap._resizeEvent = function() {
 		nmsMap._blurDrawn = false;
 		nmsMap._drawBG();
 		nmsMap._drawAllSwitches();
+		nmsMap._drawAllLinknets();
 		nmsMap.drawNow();
 		nmsMap.stats.resizeEvents++;
 	}
@@ -330,6 +332,40 @@ nmsMap._drawText = function(ctx, text, box, align) {
 	ctx.restore();
 };
 
+nmsMap._setLinknetColor = function(l, color1, color2)
+{
+	var oldcolor1;
+	var oldcolor2;
+	try {
+		oldcolor1 = nmsMap._linknets[l].sysname1;
+		oldcolor2 = nmsMap._linknets[l].sysname2;
+		if (oldcolor1 == color1 && oldcolor2 == color2) {
+			return ;
+		}
+	} catch (e) {}
+	nmsMap._linknets[l] = {};
+	nmsMap._linknets[l].sysname1 = color1;
+	nmsMap._linknets[l].sysname2 = color2;
+	nmsMap._drawLinknet(l)
+}
+
+nmsMap._drawLinknet = function(l) {
+	try {
+		var color1 = blue;
+		var color2 = blue;
+		try {
+			color1 = nmsMap._linknets[l].sysname1;
+			color2 = nmsMap._linknets[l].sysname2;
+		} catch(e) { }
+		nmsMap._connectSwitches(nmsData.switches.linknets[l].sysname1, nmsData.switches.linknets[l].sysname2, color1, color2);
+	} catch(e) { }
+}
+
+nmsMap._drawAllLinknets = function() {
+	for (var l in nmsData.switches.linknets) {
+		nmsMap._drawLinknet(l);
+	}
+}
 nmsMap._drawAllSwitches = function() {
 	if (nmsData.switches == undefined) {
 		this.stats.earlyDrawAll++;
@@ -386,10 +422,12 @@ nmsMap._connectBoxes = function(box1, box2,color1, color2) {
 	gradient.addColorStop(0, color1);
 	gradient.addColorStop(1, color2);
 	ctx.strokeStyle = gradient;
+	ctx.beginPath();
 	ctx.moveTo(x0,y0);
 	ctx.lineTo(x1,y1); 
 	ctx.lineWidth = 5;
 	ctx.stroke();
+	ctx.closePath();
 	ctx.restore();
 };
 
diff --git a/web/nms.gathering.org/js/nms.js b/web/nms.gathering.org/js/nms.js
index 49cacde..964c73f 100644
--- a/web/nms.gathering.org/js/nms.js
+++ b/web/nms.gathering.org/js/nms.js
@@ -38,6 +38,7 @@ var nms = {
 		'5':setMapModeFromN,
 		'6':setMapModeFromN,
 		'7':setMapModeFromN,
+		'c':toggleConnect,
 		'h':moveTimeFromKey,
 		'j':moveTimeFromKey,
 		'k':moveTimeFromKey,
@@ -345,6 +346,10 @@ function toggleLayer(layer) {
                l.style.display = 'none';
 }
 
+function toggleConnect() {
+	toggleLayer("linkCanvas");
+}
+
 function commentInactive(id)
 {
 	commentChange(id,"inactive");