From 68c7d75a1baad3258084b1251451e50ae45ffdf5 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 10 Feb 2021 01:18:28 +0100
Subject: [PATCH] treewide: exploit label MAC address from OpenWrt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the latest release, OpenWrt provides the label MAC address for
many devices. All of our devices should be covered.

In can be retrieved by the function

  get_mac_label

from /lib/functions/system.sh

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
---
 src/packages/fff/fff-network/Makefile                         | 2 +-
 src/packages/fff/fff-network/arm/network.tplink,c2600         | 2 --
 src/packages/fff/fff-network/files/usr/sbin/configurenetwork  | 2 ++
 src/packages/fff/fff-network/mips/network.glinet,gl-ar150     | 3 +--
 .../fff/fff-network/mips/network.tplink,archer-c25-v1         | 1 -
 .../fff/fff-network/mips/network.tplink,archer-c60-v1         | 1 -
 .../fff/fff-network/mips/network.tplink,archer-c60-v2         | 1 -
 src/packages/fff/fff-network/mips/network.tplink,archer-c7-v2 | 1 -
 src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5 | 1 -
 src/packages/fff/fff-network/mips/network.tplink,cpe210-v1    | 1 -
 src/packages/fff/fff-network/mips/network.tplink,cpe210-v2    | 2 --
 src/packages/fff/fff-network/mips/network.tplink,cpe210-v3    | 2 --
 src/packages/fff/fff-network/mips/network.tplink,cpe510-v1    | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-mr3020-v1 | 1 -
 .../fff/fff-network/mips/network.tplink,tl-wa850re-v1         | 2 --
 .../fff/fff-network/mips/network.tplink,tl-wa860re-v1         | 2 --
 .../fff/fff-network/mips/network.tplink,tl-wa901nd-v2         | 2 --
 .../fff/fff-network/mips/network.tplink,tl-wdr3500-v1         | 2 --
 .../fff/fff-network/mips/network.tplink,tl-wdr3600-v1         | 3 +--
 .../fff/fff-network/mips/network.tplink,tl-wdr4300-v1         | 3 +--
 .../fff/fff-network/mips/network.tplink,tl-wdr4310-v1         | 3 +--
 .../fff/fff-network/mips/network.tplink,tl-wr1043n-v5         | 1 -
 .../fff/fff-network/mips/network.tplink,tl-wr1043nd-v1        | 1 -
 .../fff/fff-network/mips/network.tplink,tl-wr1043nd-v2        | 2 --
 .../fff/fff-network/mips/network.tplink,tl-wr1043nd-v3        | 2 --
 .../fff/fff-network/mips/network.tplink,tl-wr1043nd-v4        | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr710n-v1 | 2 --
 src/packages/fff/fff-network/mips/network.tplink,tl-wr740n-v4 | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr741-v1  | 1 -
 .../fff/fff-network/mips/network.tplink,tl-wr741nd-v4         | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v10 | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v11 | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v12 | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v7  | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v8  | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v9  | 1 -
 src/packages/fff/fff-network/mips/network.tplink,tl-wr842n-v2 | 1 -
 src/packages/fff/fff-network/mips/network.ubnt,bullet-m       | 2 --
 .../fff/fff-network/mips/network.ubnt,nanostation-loco-m      | 2 --
 .../fff/fff-network/mips/network.ubnt,nanostation-loco-m-xw   | 2 --
 src/packages/fff/fff-network/mips/network.ubnt,nanostation-m  | 2 --
 src/packages/fff/fff-network/mips/network.ubnt,picostation-m  | 2 --
 src/packages/fff/fff-network/mips/network.ubnt,unifi          | 2 --
 src/packages/fff/fff-network/mips/network.ubnt,unifiac-mesh   | 4 ----
 src/packages/fff/fff-network/mipsel/network.netgear,r6220     | 1 -
 .../fff/fff-network/mipsel/network.tplink,archer-c50-v3       | 1 -
 .../fff/fff-network/mipsel/network.tplink,archer-c50-v4       | 1 -
 .../fff/fff-network/mipsel/network.tplink,tl-wr841n-v13       | 3 +--
 src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x | 4 ----
 .../fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp      | 4 ----
 .../fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1      | 1 -
 src/packages/fff/fff-wireguard/Makefile                       | 2 +-
 .../fff/fff-wireguard/files/etc/layer3.d/50-wireguard         | 1 +
 53 files changed, 10 insertions(+), 81 deletions(-)

diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index 3f226cb2..c3eb61bb 100644
--- a/src/packages/fff/fff-network/Makefile
+++ b/src/packages/fff/fff-network/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_RELEASE:=38
+PKG_RELEASE:=39
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-network/arm/network.tplink,c2600 b/src/packages/fff/fff-network/arm/network.tplink,c2600
index 8c3fc205..3821617f 100644
--- a/src/packages/fff/fff-network/arm/network.tplink,c2600
+++ b/src/packages/fff/fff-network/arm/network.tplink,c2600
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 CLIENT_PORTS="0t 1 2"
 WAN_PORTS="0t 5"
 BATMAN_PORTS="0t 3 4"
-
-ROUTERMAC=$(cat /sys/class/net/eth1/address)
diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index 8faedfc2..42dee1e2 100755
--- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -1,6 +1,7 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+. /lib/functions/system.sh
 . /lib/functions/fff/network
 
 setupPorts() {
@@ -22,6 +23,7 @@ setupPorts() {
 
 BOARD="$(uci get board.model.name)"
 . /etc/network.$BOARD
+[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
 
 if [ -s /etc/network.config ] ; then
     . /etc/network.config
diff --git a/src/packages/fff/fff-network/mips/network.glinet,gl-ar150 b/src/packages/fff/fff-network/mips/network.glinet,gl-ar150
index cb1ce84c..1782d4ea 100644
--- a/src/packages/fff/fff-network/mips/network.glinet,gl-ar150
+++ b/src/packages/fff/fff-network/mips/network.glinet,gl-ar150
@@ -6,8 +6,7 @@ WAN_PORTS=
 BATMAN_PORTS="0t"
 CLIENT_PORTS="0t"
 
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
-ETHMESHMAC="$(macFlipLocalBit "$ROUTERMAC")"
+ETHMESHMAC="$(macFlipLocalBit $(cat /sys/class/net/eth0/address))"
 
 . /etc/network.mode
 
diff --git a/src/packages/fff/fff-network/mips/network.tplink,archer-c25-v1 b/src/packages/fff/fff-network/mips/network.tplink,archer-c25-v1
index 13355d53..3946b9b1 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,archer-c25-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,archer-c25-v1
@@ -5,4 +5,3 @@ WAN_PORTS=""
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth0/address)
-ROUTERMAC=$(cat /sys/class/net/eth1/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v1 b/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v1
index aafc5af3..a0718396 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v1
@@ -4,4 +4,3 @@ CLIENT_PORTS="1 2 0t"
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v2 b/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v2
index aafc5af3..a0718396 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v2
+++ b/src/packages/fff/fff-network/mips/network.tplink,archer-c60-v2
@@ -4,4 +4,3 @@ CLIENT_PORTS="1 2 0t"
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v2 b/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v2
index 9a8f8614..640e015c 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v2
+++ b/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v2
@@ -4,5 +4,4 @@ CLIENT_PORTS="4 5 0t"
 WAN_PORTS="1 0t"
 BATMAN_PORTS="2 3 0t"
 
-ROUTERMAC=$(cat /sys/class/net/eth1/address)
 ETHMESHMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5 b/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5
index 1a217e8b..eb9f53a1 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5
+++ b/src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5
@@ -10,4 +10,3 @@ BATMAN_PORTS="2 3 0t"
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,cpe210-v1 b/src/packages/fff/fff-network/mips/network.tplink,cpe210-v1
index a690d54a..3c0a422b 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,cpe210-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,cpe210-v1
@@ -10,7 +10,6 @@ BATMAN_PORTS="0t"
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
 
 . /etc/network.mode
 
diff --git a/src/packages/fff/fff-network/mips/network.tplink,cpe210-v2 b/src/packages/fff/fff-network/mips/network.tplink,cpe210-v2
index 245aa6e3..12a5677e 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,cpe210-v2
+++ b/src/packages/fff/fff-network/mips/network.tplink,cpe210-v2
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,cpe210-v3 b/src/packages/fff/fff-network/mips/network.tplink,cpe210-v3
index 245aa6e3..12a5677e 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,cpe210-v3
+++ b/src/packages/fff/fff-network/mips/network.tplink,cpe210-v3
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,cpe510-v1 b/src/packages/fff/fff-network/mips/network.tplink,cpe510-v1
index a690d54a..3c0a422b 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,cpe510-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,cpe510-v1
@@ -10,7 +10,6 @@ BATMAN_PORTS="0t"
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
 
 . /etc/network.mode
 
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-mr3020-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-mr3020-v1
index facaf91b..28d46b58 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-mr3020-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-mr3020-v1
@@ -8,4 +8,3 @@ ONE_PORT="YES"
 . /etc/network.mode
 
 ETHMESHMAC=$(cat /sys/class/net/eth0/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wa850re-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wa850re-v1
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wa850re-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wa850re-v1
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wa860re-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wa860re-v1
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wa860re-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wa860re-v1
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wa901nd-v2 b/src/packages/fff/fff-network/mips/network.tplink,tl-wa901nd-v2
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wa901nd-v2
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wa901nd-v2
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3500-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3500-v1
index 59b96dfa..3387eb6e 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3500-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3500-v1
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 CLIENT_PORTS="0t 1 2"
 WAN_PORTS=
 BATMAN_PORTS="0t 3 4"
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3600-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3600-v1
index 0ac2c732..c75c7e12 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3600-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr3600-v1
@@ -6,5 +6,4 @@ BATMAN_PORTS="0t 2 3"
 
 . /lib/functions/system.sh
 
-ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress)
-ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)
+ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4300-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4300-v1
index 0ac2c732..c75c7e12 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4300-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4300-v1
@@ -6,5 +6,4 @@ BATMAN_PORTS="0t 2 3"
 
 . /lib/functions/system.sh
 
-ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress)
-ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)
+ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4310-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4310-v1
index 0ac2c732..c75c7e12 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4310-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wdr4310-v1
@@ -6,5 +6,4 @@ BATMAN_PORTS="0t 2 3"
 
 . /lib/functions/system.sh
 
-ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress)
-ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)
+ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043n-v5 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043n-v5
index 734922ae..99c26fca 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043n-v5
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043n-v5
@@ -11,4 +11,3 @@ BATMAN_PORTS="3 4 0t"
 # address where we can copy it from
 
 ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v1
index 7caeaa1e..ff35556f 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v1
@@ -10,4 +10,3 @@ BATMAN_PORTS="1 2 5t"
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v2 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v2
index 2ce83e63..90fea417 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v2
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v2
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 CLIENT_PORTS="1 2 6t"
 WAN_PORTS="5 6t"
 BATMAN_PORTS="3 4 6t"
-
-ROUTERMAC=$(cat /sys/class/net/eth1/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v3 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v3
index 2ce83e63..90fea417 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v3
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v3
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 CLIENT_PORTS="1 2 6t"
 WAN_PORTS="5 6t"
 BATMAN_PORTS="3 4 6t"
-
-ROUTERMAC=$(cat /sys/class/net/eth1/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v4 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v4
index 734922ae..99c26fca 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v4
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v4
@@ -11,4 +11,3 @@ BATMAN_PORTS="3 4 0t"
 # address where we can copy it from
 
 ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr710n-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr710n-v1
index 66ab834e..76c851e6 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr710n-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr710n-v1
@@ -3,5 +3,3 @@ SWITCHDEV=eth0
 CLIENT_PORTS="3 0t"
 WAN_PORTS=
 BATMAN_PORTS="0t"
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr740n-v4 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr740n-v4
index ed1a46d1..d58fe8a4 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr740n-v4
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr740n-v4
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="2 3 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr741-v1 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr741-v1
index 346712bb..a0291385 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr741-v1
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr741-v1
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth0/address)
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr741nd-v4 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr741nd-v4
index ed1a46d1..d58fe8a4 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr741nd-v4
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr741nd-v4
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="2 3 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v10 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v10
index 498708b0..259e7106 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v10
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v10
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v11 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v11
index 498708b0..259e7106 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v11
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v11
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v12 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v12
index 498708b0..259e7106 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v12
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v12
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v7 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v7
index 46fd57b7..259e7106 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v7
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v7
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v8 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v8
index 541fb3d3..bb7a3795 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v8
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v8
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 2 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v9 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v9
index 498708b0..259e7106 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v9
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr841-v9
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 4 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.tplink,tl-wr842n-v2 b/src/packages/fff/fff-network/mips/network.tplink,tl-wr842n-v2
index 541fb3d3..bb7a3795 100644
--- a/src/packages/fff/fff-network/mips/network.tplink,tl-wr842n-v2
+++ b/src/packages/fff/fff-network/mips/network.tplink,tl-wr842n-v2
@@ -5,4 +5,3 @@ WAN_PORTS=
 BATMAN_PORTS="3 2 0t"
 
 ETHMESHMAC=$(cat /sys/class/net/eth1/address)
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,bullet-m b/src/packages/fff/fff-network/mips/network.ubnt,bullet-m
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,bullet-m
+++ b/src/packages/fff/fff-network/mips/network.ubnt,bullet-m
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m
+++ b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m-xw b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m-xw
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m-xw
+++ b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-loco-m-xw
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m
index 6c28394b..aaeeba07 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m
+++ b/src/packages/fff/fff-network/mips/network.ubnt,nanostation-m
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,picostation-m b/src/packages/fff/fff-network/mips/network.ubnt,picostation-m
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,picostation-m
+++ b/src/packages/fff/fff-network/mips/network.ubnt,picostation-m
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,unifi b/src/packages/fff/fff-network/mips/network.ubnt,unifi
index 372750c3..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,unifi
+++ b/src/packages/fff/fff-network/mips/network.ubnt,unifi
@@ -6,5 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-
-ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
diff --git a/src/packages/fff/fff-network/mips/network.ubnt,unifiac-mesh b/src/packages/fff/fff-network/mips/network.ubnt,unifiac-mesh
index 2d14e939..57cbf33f 100644
--- a/src/packages/fff/fff-network/mips/network.ubnt,unifiac-mesh
+++ b/src/packages/fff/fff-network/mips/network.ubnt,unifiac-mesh
@@ -6,7 +6,3 @@ BATMAN_PORTS=""
 ONE_PORT="YES"
 
 . /etc/network.mode
-. /lib/functions.sh
-. /lib/functions/system.sh
-
-ROUTERMAC=$(mtd_get_mac_binary EEPROM 0x0)
diff --git a/src/packages/fff/fff-network/mipsel/network.netgear,r6220 b/src/packages/fff/fff-network/mipsel/network.netgear,r6220
index f1f77bfe..0ec9f379 100644
--- a/src/packages/fff/fff-network/mipsel/network.netgear,r6220
+++ b/src/packages/fff/fff-network/mipsel/network.netgear,r6220
@@ -6,5 +6,4 @@ CLIENT_PORTS="6t 0 1"
 WAN_PORTS="6t 4"
 BATMAN_PORTS="6t 2 3"
 
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
diff --git a/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v3 b/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v3
index a779a717..0fc2d8af 100644
--- a/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v3
+++ b/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v3
@@ -6,5 +6,4 @@ CLIENT_PORTS="6t 3 4"
 WAN_PORTS="6t 0"
 BATMAN_PORTS="6t 1 2"
 
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
diff --git a/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v4 b/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v4
index a779a717..0fc2d8af 100644
--- a/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v4
+++ b/src/packages/fff/fff-network/mipsel/network.tplink,archer-c50-v4
@@ -6,5 +6,4 @@ CLIENT_PORTS="6t 3 4"
 WAN_PORTS="6t 0"
 BATMAN_PORTS="6t 1 2"
 
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
diff --git a/src/packages/fff/fff-network/mipsel/network.tplink,tl-wr841n-v13 b/src/packages/fff/fff-network/mipsel/network.tplink,tl-wr841n-v13
index 273381a9..a0be533c 100644
--- a/src/packages/fff/fff-network/mipsel/network.tplink,tl-wr841n-v13
+++ b/src/packages/fff/fff-network/mipsel/network.tplink,tl-wr841n-v13
@@ -6,5 +6,4 @@ CLIENT_PORTS="6t 3 4"
 WAN_PORTS="6t 0"
 BATMAN_PORTS="6t 1 2"
 
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
-ETHMESHMAC=$(macaddr_setbit_la "$ROUTERMAC")
+ETHMESHMAC=$(macaddr_setbit_la $(cat /sys/class/net/eth0/address))
diff --git a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x
index 9dbc9f87..95bc073c 100644
--- a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x
+++ b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x
@@ -1,9 +1,5 @@
-. /lib/functions/fff/network
-
 WANDEV=eth0
 SWITCHDEV=eth0
 CLIENT_PORTS="6t 3 4"
 WAN_PORTS="6t 0"
 BATMAN_PORTS="6t 1 2"
-
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp
index 9dbc9f87..95bc073c 100644
--- a/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp
+++ b/src/packages/fff/fff-network/mipsel/network.ubnt,edgerouter-x-sfp
@@ -1,9 +1,5 @@
-. /lib/functions/fff/network
-
 WANDEV=eth0
 SWITCHDEV=eth0
 CLIENT_PORTS="6t 3 4"
 WAN_PORTS="6t 0"
 BATMAN_PORTS="6t 1 2"
-
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1 b/src/packages/fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1
index 9caa6af4..97085959 100644
--- a/src/packages/fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1
+++ b/src/packages/fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1
@@ -10,4 +10,3 @@ BATMAN_PORTS="0t 2 3"
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
 ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
-ROUTERMAC=$(cat /sys/class/net/eth0/address)
diff --git a/src/packages/fff/fff-wireguard/Makefile b/src/packages/fff/fff-wireguard/Makefile
index c39e68ef..73f65a2c 100644
--- a/src/packages/fff/fff-wireguard/Makefile
+++ b/src/packages/fff/fff-wireguard/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-wireguard
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
index 7f7d38c8..3faa9e2d 100644
--- a/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
+++ b/src/packages/fff/fff-wireguard/files/etc/layer3.d/50-wireguard
@@ -5,6 +5,7 @@
 #load board specific properties
 BOARD="$(uci get board.model.name)"
 . /etc/network.$BOARD
+[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
 
 configure() {
 	# remove peers missing in gateway config