remove wan-interface and get primary-mac/node-id from batman-if

README.md

@@ -22,7 +22,6 @@ Copy `config.json.example` to `config.json` and change it to match your server c
  * `bridge` (string) (Needed: typical br-client)
  * `mesh-wlan` (array of string) (Optional: Ad-Hoc batman-Mesh)
  * `mesh-vpn` (array of string) (Optional: fastd, GRE, L2TP batman-Mesh)
- * `wan` (string) (Needed: for primary MAC-Address and node-id)
  * `fastd_socket` (string) (Optional: needed for uplink-flag)
 
 

config.json.example

@@ -1,7 +1,6 @@
 {
     "batman": "bat0",
     "bridge": "br-client",
-    "wan": "eth0",
     "mesh-vpn": [ "mesh-vpn" ],
     "mesh-wlan": [ "ibss0", "mesh0" ],
     "fastd_socket": "/var/run/fastd.mesh_vpn.socket"

ext-respondd.py

@@ -206,7 +206,7 @@ def getNode_ID():
     if 'node_id' in aliases["nodeinfo"]:
         return aliases["nodeinfo"]["node_id"]
     else:
-        return getDevice_MAC(config["wan"]).replace(':','')
+        return getDevice_MAC(config["batman"]).replace(':','')
 
 def getStationDump(dev_list):
     j = {}
@@ -301,7 +301,7 @@ def createNodeinfo():
                     "interfaces": getBat0_Interfaces(),
                 },
             },
-            "mac": getDevice_MAC(config["wan"]),
+            "mac": getDevice_MAC(config["batman"]),
             "mesh_interfaces": list(getMesh_Interfaces().values()),
         },
         "software": {