Bugfixing Meshviewer error
This commit is contained in:
parent
801ac20dfd
commit
88fdc227a3
17
main.go
17
main.go
@ -88,6 +88,7 @@ func processUcAPIs() ([]node, []link) {
|
||||
}
|
||||
|
||||
//build nodes struct
|
||||
//mvJson, err := getMeshviewerJSON()
|
||||
for _, jsonDevice := range d.Devices {
|
||||
var currentDevice ucDevice
|
||||
var currentJSONDevice device
|
||||
@ -98,8 +99,11 @@ func processUcAPIs() ([]node, []link) {
|
||||
}
|
||||
}
|
||||
if isRemoteMACpublished(jsonDevice.MAC, d.Devices) == true {
|
||||
//hier muss gecheckt werden ob der link valide ist
|
||||
if checkMeshviewerLink(jsonDevice.LinkedTo) {
|
||||
links = ucAddLink(jsonDevice, links)
|
||||
}
|
||||
}
|
||||
load, err := strconv.ParseFloat(currentDevice.Sysstats.CPU, 64)
|
||||
if err != nil {
|
||||
fmt.Println("Error: ", currentDevice.Name)
|
||||
@ -507,6 +511,17 @@ func getMeshviewerJSON(url string) (mvDevices, error) {
|
||||
}
|
||||
return n, nil
|
||||
}
|
||||
|
||||
func checkMeshviewerLink(s string) bool {
|
||||
mvNodes, _ := getMeshviewer()
|
||||
for i := range mvNodes {
|
||||
if mvNodes[i].MAC == s {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func findNodeID(NodeID string) bool {
|
||||
for i := range ucDev.Devices {
|
||||
if ucDev.Devices[i].GatewayNexthop == NodeID {
|
||||
@ -521,7 +536,7 @@ func addmvDevices(d mvDevices) ([]node, []link) {
|
||||
|
||||
for i := range d.Nodes {
|
||||
mvNode := d.Nodes[i]
|
||||
if findNodeID(mvNode.NodeID) == true {
|
||||
if findNodeID(mvNode.NodeID) {
|
||||
mvNode.Clients = 0
|
||||
mvNode.ClientsWifi24 = 0
|
||||
mvNode.ClientsWifi5 = 0
|
||||
|
Loading…
Reference in New Issue
Block a user