hopglass · Jun 28, 2020 · Jun 28, 2020
Showing with 48 additions and 31 deletions.

+21 −18 bat-list-neighbours

+27 −13 respondd
diff --git a/bat-list-neighbours b/bat-list-neighbours
@@ -4,30 +4,33 @@ const fs = require('fs')
 const netIfaces = require('os').networkInterfaces()
 const exec = require('child_process').execSync
 
-var batIface = "bat0"
+var batIfaces = ["bat0"]
 try {
   var c = JSON.parse(fs.readFileSync("./config.json")).bat_iface
-  if (c != null) batIface = c.replace(/[^A-Za-z0-9\-_\.]/g, '')
+  if (typeof c === "string") c = [c]
+  if (c) batIfaces = c.map(b => b.replace(/[^A-Za-z0-9\-_\.]/g, ''))
 } catch (ignored) {
 }
 
 var res = {}
-var origs = exec("batctl meshif " + batIface + " originators").toString().trim()
-if (origs) {
-  origs = origs.split("\n")
-  origs.forEach((orig) => {
-    var mac = orig.substring(3,20)
-    if (orig.substring(39,56) != mac) return
-    var lastSeen = parseFloat(orig.substring(21,29).trim())
-    var tq = parseInt(orig.substring(34,37).trim())
-    var iface = orig.split('[')[1].split(']')[0].trim()
-    var mac2 = netIfaces[iface][0].mac
-    if (!(mac2 in res)) res[mac2] = {"neighbours": {}}
-    res[mac2].neighbours[mac] = {
-      "tq": tq,
-      "lastseen": lastSeen
-    }
-  })
+for(const batIface of batIfaces) {
+  var origs = exec("batctl meshif " + batIface + " originators").toString().trim()
+  if (origs) {
+    origs = origs.split("\n")
+    origs.forEach((orig) => {
+      var mac = orig.substring(3,20)
+      if (orig.substring(39,56) != mac) return
+      var lastSeen = parseFloat(orig.substring(21,29).trim())
+      var tq = parseInt(orig.substring(34,37).trim())
+      var iface = orig.split('[')[1].split(']')[0].trim()
+      var mac2 = netIfaces[iface][0].mac
+      if (!(mac2 in res)) res[mac2] = {"neighbours": {}}
+      res[mac2].neighbours[mac] = {
+        "tq": tq,
+        "lastseen": lastSeen
+      }
+    })
+  }
 }
 
 console.log(JSON.stringify(res))
diff --git a/respondd b/respondd
@@ -9,7 +9,7 @@ const process = require('child_process')
 const myproc = require('process')
 
 const defConfig = {
-  "bat_iface": "bat0",
+  "bat_iface": ["bat0"],
   "mcast_group": "ff02::2:1001",
   "mcast_iface": "bat0",
   "port": "1001",
@@ -74,7 +74,7 @@ function getV6AddrForInterface(iface) {
   try {
     return os.networkInterfaces()[iface].filter((a) => a.family == "IPv6").map((a) => a.address)
   } catch (e) {
-    return undefined
+    return []
   }
 }
 
@@ -105,7 +105,13 @@ function getFileContents(name) {
 function getTrafficStats() {
   try {
     var res = {}
-    var vs = evalExec("/sbin/ethtool -S " + getConfig("bat_iface") + " | head -n 12 | tail -n 11").split("\n")
+    var vs = getConfig("bat_iface").flatMap((b) => {
+      try {
+        return evalExec("/sbin/ethtool -S " + b + " | head -n 12 | tail -n 11").split("\n")
+      } catch (e) {
+        return []
+      }
+    })
     vs.forEach((v) => {
       var x = v.split(": ")
       var group = x[0].trim()
@@ -129,15 +135,18 @@ function getTrafficStats() {
 }
 
 function getMeshAddresses() {
-  var bat = getConfig("bat_iface")
-  var data = {
-    "interfaces": {
-      "tunnel": evalExec("cat /sys/class/net/"+bat+"/lower_*/address").split("\n"),
-      "other": [getPrimaryMac()]
-    }
-  }
   var res = {}
-  res[bat] = data
+  getConfig("bat_iface").forEach((b) => {
+    try {
+      var data = {
+        "interfaces": {
+          "tunnel": evalExec("cat /sys/class/net/"+b+"/lower_*/address").split("\n"),
+          "other": [getPrimaryMac()]
+        }
+      }
+      res[b] = data
+    } catch (ignored) {}
+  })
   return res
 }
 
@@ -180,9 +189,14 @@ try {
 }
 
 function getConfig(opt) {
-  if (opt == "listen")
+  if (opt in config) {
+    const c = config[opt]
+    if (opt === "bat_iface" && typeof c === "string") return [c]
+    return c
+  }
+  if (opt == "listen") {
     return getV6AddrForInterface(getConfig("mcast_iface")).filter((a) => a.startsWith("fe80:"))[0] + "%" + getConfig("mcast_iface")
-  if (opt in config) return config[opt]
+  }
   if (opt == "hostname") return os.hostname()
   else return defConfig[opt]
 }