Improve fetching data for respondd

config-respondd_example.toml

@@ -1,15 +1,26 @@
 # how ofter the cache respond of a respondd request is calculated
 data_interval = "3m"
 
-# if set true, respond will contain data from batman interface
+interfaces = [ "wlp4s0" ]
-multi_instance = false
 
 [[listen]]
 address   = "ff02::2:1001"
 interface = ""
 port      = 1001
 
-# manuelle data for respond
+[defaults]
-[data.nodeinfo.location]
+node_id  = ""
+hostname = ""
+site_code = "ffhb"
+domain_code = ""
+vpn = false
+
+[defaults.location]
 latitude  = 53.112446246
 longitude = 8.734087944
+
+
+# if divergent configuration of defaults are wanted by respond on interface/zones example with bat0
+[zones.bat0]
+node_id  = ""
+hostname = ""

respond/daemon/config.go

@@ -0,0 +1,53 @@
+package respondd
+
+import (
+	"io/ioutil"
+	"strings"
+
+	"github.com/FreifunkBremen/yanic/data"
+	"github.com/FreifunkBremen/yanic/lib/duration"
+)
+
+func trim(s string) string {
+	return strings.TrimSpace(strings.Trim(s, "\n"))
+}
+
+type Daemon struct {
+	DataInterval duration.Duration `toml:"data_interval"`
+	Listen       []struct {
+		Address   string `toml:"address"`
+		Interface string `toml:"interface"`
+		Port      int    `toml:"port"`
+	} `toml:"listen"`
+	InterfacesBatman []string `toml:"interfaces_batman"`
+	Interfaces       []string `toml:"interfaces"`
+
+	dataByInterface map[string]*data.ResponseData
+
+	Answer        *AnswerConfig            `toml:"defaults"`
+	AnswerByZones map[string]*AnswerConfig `toml:"zones"`
+}
+
+type AnswerConfig struct {
+	NodeID     string `toml:"node_id"`
+	Hostname   string `toml:"hostname"`
+	SiteCode   string `toml:"site_code"`
+	DomainCode string `toml:"domain_code"`
+	Location *data.Location `json:"location,omitempty"`
+	VPN bool `toml:"vpn"`
+}
+
+func (d *Daemon) getAnswer(iface string) (*AnswerConfig, string) {
+	config := d.Answer
+	if v, ok := d.AnswerByZones[iface]; iface == "" && ok {
+		config = v
+	}
+
+	nodeID := config.NodeID
+	if nodeID == "" {
+		if v, err := ioutil.ReadFile("/etc/machine-id"); err == nil {
+			nodeID = trim(string(v))[:12]
+		}
+	}
+	return config, nodeID
+}

respond/daemon/data.go

@@ -1,63 +1,29 @@
 package respondd
 
 import (
-	"io/ioutil"
-	"os"
-	"strings"
-
 	"github.com/FreifunkBremen/yanic/data"
 )
 
-func trim(s string) string {
-	return strings.TrimSpace(strings.Trim(s, "\n"))
-}
-
 func (d *Daemon) updateData() {
-	nodeID := ""
+	for iface, iData := range d.dataByInterface {
-	// Nodeinfo
+		if iData.Nodeinfo == nil {
-	if d.Data.Nodeinfo == nil {
+			iData.Nodeinfo = &data.Nodeinfo{}
-		d.Data.Nodeinfo = &data.Nodeinfo{}
-	} else {
-		nodeID = d.Data.Nodeinfo.NodeID
 		}
-	if d.Data.Nodeinfo.Hostname == "" {
+		if iData.Statistics == nil {
-		d.Data.Nodeinfo.Hostname, _ = os.Hostname()
+			iData.Statistics = &data.Statistics{}
 		}
-
+		if iData.Neighbours == nil {
-	// Statistics
+			iData.Neighbours = &data.Neighbours{}
-	if d.Data.Statistics == nil {
-		d.Data.Statistics = &data.Statistics{}
-	} else if nodeID == "" {
-		nodeID = d.Data.Statistics.NodeID
 		}
-
+		d.updateNodeinfo(iface, iData)
-	// Neighbours
+		d.updateStatistics(iface, iData)
-	if d.Data.Neighbours == nil {
+		d.updateNeighbours(iface, iData)
-		d.Data.Neighbours = &data.Neighbours{}
-	} else if nodeID == "" {
-		nodeID = d.Data.Neighbours.NodeID
-	}
-
-	if nodeID == "" && !d.MultiInstance {
-		if v, err := ioutil.ReadFile("/etc/machine-id"); err == nil {
-			nodeID = trim(string(v))[:12]
-		}
-	}
-	d.Data.Nodeinfo.NodeID = nodeID
-	d.Data.Statistics.NodeID = nodeID
-	d.Data.Neighbours.NodeID = nodeID
-
-	for _, data := range d.dataByInterface {
-		data.Nodeinfo = d.Data.Nodeinfo
 	}
 }
 
 func (d *Daemon) getData(iface string) *data.ResponseData {
-	if !d.MultiInstance {
+	if iData, ok := d.dataByInterface[iface]; ok {
-		return d.Data
+		return iData
-	}
-	if data, ok := d.dataByInterface[iface]; ok {
-		return data
 	}
 	d.dataByInterface[iface] = &data.ResponseData{}
 	d.updateData()

respond/daemon/main.go

@@ -7,24 +7,12 @@ import (
 	"github.com/bdlm/log"
 
 	"github.com/FreifunkBremen/yanic/data"
-	"github.com/FreifunkBremen/yanic/lib/duration"
 )
 
-type Daemon struct {
-	MultiInstance bool              `toml:"multi_instance"`
-	DataInterval  duration.Duration `toml:"data_interval"`
-	Listen        []struct {
-		Address   string `toml:"address"`
-		Interface string `toml:"interface"`
-		Port      int    `toml:"port"`
-	} `toml:"listen"`
-	Data            *data.ResponseData `toml:"data"`
-	dataByInterface map[string]*data.ResponseData
-}
-
 func (d *Daemon) Start() {
-	if d.Data == nil {
+	d.dataByInterface = make(map[string]*data.ResponseData)
-		d.Data = &data.ResponseData{}
+	if d.AnswerByZones == nil {
+		d.AnswerByZones = make(map[string]*AnswerConfig)
 	}
 
 	d.updateData()

respond/daemon/neighbours.go

@@ -0,0 +1,10 @@
+package respondd
+
+import (
+	"github.com/FreifunkBremen/yanic/data"
+)
+
+func (d *Daemon) updateNeighbours(iface string, data *data.ResponseData) {
+	_, nodeID := d.getAnswer(iface)
+	data.Neighbours.NodeID = nodeID
+}

respond/daemon/nodeinfo.go

@@ -0,0 +1,69 @@
+package respondd
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"net"
+
+	"github.com/FreifunkBremen/yanic/data"
+)
+
+func (d *Daemon) updateNodeinfo(iface string, data *data.ResponseData) {
+	config, nodeID := d.getAnswer(iface)
+	data.Nodeinfo.NodeID = nodeID
+
+	if config.Hostname == "" {
+		data.Nodeinfo.Hostname, _ = os.Hostname()
+	} else {
+		data.Nodeinfo.Hostname = config.Hostname
+	}
+
+	data.Nodeinfo.VPN = config.VPN
+	data.Nodeinfo.Location = config.Location
+
+	data.Nodeinfo.System.SiteCode = config.SiteCode
+	data.Nodeinfo.System.DomainCode = config.DomainCode
+
+	data.Nodeinfo.Hardware.Nproc = runtime.NumCPU()
+
+	if data.Nodeinfo.Network.Mac == "" {
+		data.Nodeinfo.Network.Mac = fmt.Sprintf("%s:%s:%s:%s:%s:%s", nodeID[0:2], nodeID[2:4], nodeID[4:6], nodeID[6:8], nodeID[8:10], nodeID[10:12])
+	}
+
+	if iface == "" {
+		data.Nodeinfo.Network.Addresses = []string{}
+		for _, i := range d.Interfaces {
+			addrs := getAddresses(i)
+			data.Nodeinfo.Network.Addresses = append(data.Nodeinfo.Network.Addresses, addrs...)
+		}
+	} else {
+		data.Nodeinfo.Network.Addresses = getAddresses(iface)
+	}
+}
+
+func getAddresses(iface string) (addrs []string) {
+	in, err := net.InterfaceByName(iface)
+	if err != nil {
+		return
+	}
+	inAddrs, err := in.Addrs() 
+	if err != nil {
+		return
+	}
+	for _, a := range inAddrs {
+		var ip net.IP
+		switch v := a.(type) {
+			case *net.IPNet:
+				ip = v.IP
+			case *net.IPAddr:
+				ip = v.IP
+			default:
+				continue
+		}
+		if ip4 := ip.To4(); ip4 == nil {
+			addrs = append(addrs, ip.String())
+		}
+	}
+	return
+}

respond/daemon/statistics.go

@@ -0,0 +1,15 @@
+package respondd
+
+import (
+	"github.com/shirou/gopsutil/host"
+
+	"github.com/FreifunkBremen/yanic/data"
+)
+
+func (d *Daemon) updateStatistics(iface string, data *data.ResponseData) {
+	_, nodeID := d.getAnswer(iface)
+	data.Statistics.NodeID = nodeID
+	if uptime, err := host.Uptime(); err == nil {
+		data.Statistics.Uptime = float64(uptime)
+	}
+}