freifunk/hopglass
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use server side resolving only, add proper support for nexthop resolving (#81)

Browse source 
* Revert "Use resolved data if gateway was already resolved (#78)"

This reverts commit 44bb8e9d3d.

* Revert "proportions: lookup gateway name"

This reverts commit 94662cb3dc.

* Revert "infobox/node: change mac used to lookup nodes"

This reverts commit 2ca2604403.

* Revert "infobox/node: resolve nexthop and gateway from data"

This reverts commit 9e7049c9e3.

* Resolve nexthop full chain if possible

requires hopglass/hopglass-server#79

* Correctly handle sidecase when nodes on route report inconsistent gateway
This commit is contained in:
Marvin W 2017-01-07 18:43:04 +01:00 • committed by PetaByteBoy // Milan Pässler
commit 5cb88e8d06
4 changed files with 28 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/proportions.js
View file

@ -23,7 +23,7 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc
var uplinkTable = document.createElement("table")
uplinkTable.classList.add("proportion")
var gwNodesTable = document.createElement("table")
var gwNodesTable = document.createElement("table")
gwNodesTable.classList.add("proportion")
var gwClientsTable = document.createElement("table")
@ -119,8 +119,9 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc
var onlineNodes = data.nodes.all.filter(online)
var nodes = onlineNodes.concat(data.nodes.lost)
var nodeDict = {}
data.graph.nodes.forEach(function (d) {
nodeDict[d.id.substr(0, 8)] = d
data.nodes.all.forEach(function (d) {
nodeDict[d.nodeinfo.node_id] = d
})
var statusDict = count(nodes, ["flags", "online"], function (d) {
@ -161,13 +162,6 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc
if (d.id)
return d.id
var n = nodeDict[d.substr(0, 8)]
if (!n)
return d
var name = dictGet(n, ["node", "nodeinfo", "hostname"])
if (name)
return name
return d
})
@ -181,13 +175,6 @@ define(["chroma-js", "virtual-dom", "numeral-intl", "filters/genericnode", "verc
if (d.id)
return d.id
var n = nodeDict[d.substr(0, 8)]
if (!n)
return d
var name = dictGet(n, ["node", "nodeinfo", "hostname"])
if (name)
return name
return d
})