Merge branch 'master' into l2tp-quickfix

q&d solution for uplinks
main: quick & dirty fix for l2tp ifaces
2016-03-28 22:59:33 +02:00 · 2016-03-28 22:24:12 +02:00 · 2016-03-28 21:16:36 +02:00
1 changed files with 6 additions and 6 deletions
--- a/lib/main.js
+++ b/lib/main.js
@ -113,13 +113,13 @@ function (moment, Router, L, GUI, numeral) {
      })

      links.forEach( function (d) {
-        if (d.type === "tunnel")
-          d.type = "VPN"
-        else if (d.type === "wireless")
+        if (d.type === "wireless")
          d.type = "Wifi"
-        else if (d.type === "other")
-          d.type = "Kabel"
-        else
+        else if (d.type === "other") {
+          d.type = "VPN"
+          if (d.target.node)
+            d.target.node.flags.uplink = true
+        } else
          d.type = "N/A"
        var unknown = (d.source.node === undefined)
        if (unknown) {
Author	SHA1	Message	Date
Milan Pässler	dc6d3f24ca	Merge branch 'master' into l2tp-quickfix	2016-03-28 22:59:33 +02:00
Milan Pässler	312fa6b8fd	q&d solution for uplinks	2016-03-28 22:24:12 +02:00
Milan Pässler	be01654f08	main: quick & dirty fix for l2tp ifaces	2016-03-28 21:16:36 +02:00