From 724cd8ba514e015e31fef3a02c88e33a5c5e182e Mon Sep 17 00:00:00 2001
From: Martin Geno <geno+dev@fireorbit.de>
Date: Sat, 21 Jan 2017 04:24:04 +0100
Subject: [PATCH] fix neighbour to influxdb

---
 models/node.go      | 7 +++++--
 models/node_test.go | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/models/node.go b/models/node.go
index 9a49e5f..0e5d4a8 100644
--- a/models/node.go
+++ b/models/node.go
@@ -57,7 +57,7 @@ func (node *Node) ToInflux() (tags imodels.Tags, fields imodels.Fields) {
 		if meshvpn := stats.MeshVPN; meshvpn != nil {
 			for _, group := range meshvpn.Groups {
 				for _, link := range group.Peers {
-					if link.Established > 1 {
+					if link != nil && link.Established > 1 {
 						vpn++
 					}
 				}
@@ -73,7 +73,10 @@ func (node *Node) ToInflux() (tags imodels.Tags, fields imodels.Fields) {
 		fields["neighbours.batadv"] = batadv
 
 		// protocol: LLDP
-		lldp := len(neighbours.LLDP)
+		lldp := 0
+		for _, lldpNeighbours := range neighbours.LLDP {
+			lldp += len(lldpNeighbours)
+		}
 		fields["neighbours.lldp"] = lldp
 
 		// total is the sum of all protocols
diff --git a/models/node_test.go b/models/node_test.go
index 641dec1..4ebefed 100644
--- a/models/node_test.go
+++ b/models/node_test.go
@@ -36,6 +36,7 @@ func TestToInflux(t *testing.T) {
 						Peers: map[string]*data.MeshVPNPeerLink{
 							"vpn01": &data.MeshVPNPeerLink{Established: 3},
 							"vpn02": &data.MeshVPNPeerLink{},
+							"trash": nil,
 							"vpn03": &data.MeshVPNPeerLink{Established: 0},
 						},
 					},
@@ -59,6 +60,7 @@ func TestToInflux(t *testing.T) {
 					},
 				},
 			},
+			LLDP: map[string]data.LLDPNeighbours{},
 		},
 	}