fff-network: use upstream function to set local bit

OpenWrt provides a function to set the local-bit in IP addresses.

This removes our custom function macFlipLocalBit() and switches to
the upstream version.

Note that technically the upstream version _sets_ the local bit,
i.e. only works one way, while our version _toggled_ the status.

Since we always start from addresses without the local bit set,
this is irrelevant for the given cases, though.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

src/packages/fff/fff-network/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_RELEASE:=31
+PKG_RELEASE:=32
 
 include $(INCLUDE_DIR)/package.mk
 

src/packages/fff/fff-network/files/lib/functions/fff/network

@@ -28,14 +28,3 @@ ipEUISuffix() {
 	echo "$mac" | awk -F: '{ printf("%02x%s:%sff:fe%s:%s%s\n", xor(("0x"$1),2), $2, $3, $4, $5, $6) }'
 	return 0
 }
-
-macFlipLocalBit() {
-	# Returns given MAC-address with locally administered bit flipped
-	#
-	# Argument: MAC-address
-
-	local mac=$1
-
-	echo "$mac" | awk -F: '{ printf("%02x:%s:%s:%s:%s:%s\n", xor(("0x"$1),2), $2, $3, $4, $5, $6) }'
-	return 0
-}

src/packages/fff/fff-network/mips/network.cpe210

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -9,7 +9,7 @@ BATMAN_PORTS="0t"
 # use mac address from phy0 with 'locally administered' bit set to '1'
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/ieee80211/phy0/macaddress)")
 ROUTERMAC=$(cat /sys/class/net/eth0/address)
 
 . /etc/network.mode

src/packages/fff/fff-network/mips/network.cpe510

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -9,7 +9,7 @@ BATMAN_PORTS="0t"
 # use mac address from phy0 with 'locally administered' bit set to '1'
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/ieee80211/phy0/macaddress)")
 ROUTERMAC=$(cat /sys/class/net/eth0/address)
 
 . /etc/network.mode

src/packages/fff/fff-network/mips/network.glinet,gl-ar150

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth1
 SWITCHDEV=eth0
@@ -7,7 +7,7 @@ BATMAN_PORTS="0t"
 CLIENT_PORTS="0t"
 
 ROUTERMAC=$(cat /sys/class/net/eth0/address)
-ETHMESHMAC="$(macFlipLocalBit "$ROUTERMAC")"
+ETHMESHMAC="$(macaddr_setbit_la "$ROUTERMAC")"
 
 . /etc/network.mode
 

src/packages/fff/fff-network/mips/network.tplink,archer-c7-v5

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -9,5 +9,5 @@ BATMAN_PORTS="2 3 0t"
 # use mac address from phy1 with 'locally administered' bit set to '1'
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/ieee80211/phy1/macaddress)")
 ROUTERMAC=$(cat /sys/class/net/eth0/address)

src/packages/fff/fff-network/mips/network.tplink,tl-wr1043nd-v1

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -9,5 +9,5 @@ BATMAN_PORTS="1 2 5t"
 # use mac address from phy0 with 'locally administered' bit set to '1'
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/ieee80211/phy0/macaddress)")
 ROUTERMAC=$(cat /sys/class/net/eth0/address)

src/packages/fff/fff-network/mipsel/network.r6220

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -7,4 +7,4 @@ WAN_PORTS="6t 4"
 BATMAN_PORTS="6t 2 3"
 
 ROUTERMAC=$(cat /sys/class/net/eth0/address)
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")

src/packages/fff/fff-network/mipsel/network.tplink,c50-v3

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -7,4 +7,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)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")

src/packages/fff/fff-network/mipsel/network.tplink,c50-v4

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -7,4 +7,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)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")

src/packages/fff/fff-network/powerpc/network.tplink,tl-wdr4900-v1

@@ -1,4 +1,4 @@
-. /lib/functions/fff/network
+. /lib/functions/system.sh
 
 WANDEV=eth0
 SWITCHDEV=eth0
@@ -9,5 +9,5 @@ BATMAN_PORTS="0t 2 3"
 # use mac address from phy1 with 'locally administered' bit set to '1'
 # only possible, because wXmesh is created first and therefore gets the 'universally administered address'
 
-ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
+ETHMESHMAC=$(macaddr_setbit_la "$(cat /sys/class/ieee80211/phy1/macaddress)")
 ROUTERMAC=$(cat /sys/class/net/eth0/address)