[BUGFIX] not crash if batman not exists

FreifunkBremen · May 3, 2019 · ad244a5 · ad244a5
1 parent d7d39fe
commit ad244a5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/respond/daemon/neighbours.go b/respond/daemon/neighbours.go
@@ -8,8 +8,14 @@ func (d *Daemon) updateNeighbours(iface string, resp *data.ResponseData) {
 	_, nodeID := d.getAnswer(iface)
 	resp.Neighbours.NodeID = nodeID
 	resp.Neighbours.Batadv = make(map[string]data.BatadvNeighbours)
+
 	for _, bface := range d.Batman {
+
 		b := NewBatman(bface)
+		if b == nil {
+			continue
+		}
+
 		for bfaceAddr, n := range b.Neighbours() {
 			resp.Neighbours.Batadv[bfaceAddr] = n
 		}

diff --git a/respond/daemon/nodeinfo.go b/respond/daemon/nodeinfo.go
@@ -66,14 +66,22 @@ func (d *Daemon) updateNodeinfo(iface string, resp *data.ResponseData) {
 
 	resp.Nodeinfo.Network.Mesh = make(map[string]*data.NetworkInterface)
 	for _, bface := range d.Batman {
+
 		b := NewBatman(bface)
+
+		if b == nil {
+			continue
+		}
+
 		mesh := data.NetworkInterface{}
+
 		for _, bbface := range b.Interfaces {
 			addr := b.Address(bbface)
 			if addr != "" {
 				mesh.Interfaces.Tunnel = append(mesh.Interfaces.Tunnel, addr)
 			}
 		}
+
 		resp.Nodeinfo.Network.Mesh[bface] = &mesh
 	}
 }