forked from freifunk-franken/firmware
treewide: exploit label MAC address from OpenWrt
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>
This commit is contained in:
parent
e850e221db
commit
68c7d75a1b
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-network
|
PKG_NAME:=fff-network
|
||||||
PKG_RELEASE:=38
|
PKG_RELEASE:=39
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="0t 1 2"
|
CLIENT_PORTS="0t 1 2"
|
||||||
WAN_PORTS="0t 5"
|
WAN_PORTS="0t 5"
|
||||||
BATMAN_PORTS="0t 3 4"
|
BATMAN_PORTS="0t 3 4"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
. /lib/functions/system.sh
|
||||||
. /lib/functions/fff/network
|
. /lib/functions/fff/network
|
||||||
|
|
||||||
setupPorts() {
|
setupPorts() {
|
||||||
|
@ -22,6 +23,7 @@ setupPorts() {
|
||||||
|
|
||||||
BOARD="$(uci get board.model.name)"
|
BOARD="$(uci get board.model.name)"
|
||||||
. /etc/network.$BOARD
|
. /etc/network.$BOARD
|
||||||
|
[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
|
||||||
|
|
||||||
if [ -s /etc/network.config ] ; then
|
if [ -s /etc/network.config ] ; then
|
||||||
. /etc/network.config
|
. /etc/network.config
|
||||||
|
|
|
@ -6,8 +6,7 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="0t"
|
BATMAN_PORTS="0t"
|
||||||
CLIENT_PORTS="0t"
|
CLIENT_PORTS="0t"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC="$(macFlipLocalBit $(cat /sys/class/net/eth0/address))"
|
||||||
ETHMESHMAC="$(macFlipLocalBit "$ROUTERMAC")"
|
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=""
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
|
||||||
|
|
|
@ -4,4 +4,3 @@ CLIENT_PORTS="1 2 0t"
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -4,4 +4,3 @@ CLIENT_PORTS="1 2 0t"
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -4,5 +4,4 @@ CLIENT_PORTS="4 5 0t"
|
||||||
WAN_PORTS="1 0t"
|
WAN_PORTS="1 0t"
|
||||||
BATMAN_PORTS="2 3 0t"
|
BATMAN_PORTS="2 3 0t"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
||||||
|
|
|
@ -10,4 +10,3 @@ BATMAN_PORTS="2 3 0t"
|
||||||
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ BATMAN_PORTS="0t"
|
||||||
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -10,7 +10,6 @@ BATMAN_PORTS="0t"
|
||||||
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
|
|
|
@ -8,4 +8,3 @@ ONE_PORT="YES"
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="0t 1 2"
|
CLIENT_PORTS="0t 1 2"
|
||||||
WAN_PORTS=
|
WAN_PORTS=
|
||||||
BATMAN_PORTS="0t 3 4"
|
BATMAN_PORTS="0t 3 4"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,4 @@ BATMAN_PORTS="0t 2 3"
|
||||||
|
|
||||||
. /lib/functions/system.sh
|
. /lib/functions/system.sh
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress)
|
ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
|
||||||
ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)
|
|
||||||
|
|
|
@ -6,5 +6,4 @@ BATMAN_PORTS="0t 2 3"
|
||||||
|
|
||||||
. /lib/functions/system.sh
|
. /lib/functions/system.sh
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress)
|
ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
|
||||||
ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)
|
|
||||||
|
|
|
@ -6,5 +6,4 @@ BATMAN_PORTS="0t 2 3"
|
||||||
|
|
||||||
. /lib/functions/system.sh
|
. /lib/functions/system.sh
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy1/macaddress)
|
ETHMESHMAC=$(macaddr_add $(cat /sys/class/ieee80211/phy1/macaddress) 1)
|
||||||
ETHMESHMAC=$(macaddr_add $ROUTERMAC 1)
|
|
||||||
|
|
|
@ -11,4 +11,3 @@ BATMAN_PORTS="3 4 0t"
|
||||||
# address where we can copy it from
|
# address where we can copy it from
|
||||||
|
|
||||||
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
|
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -10,4 +10,3 @@ BATMAN_PORTS="1 2 5t"
|
||||||
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="1 2 6t"
|
CLIENT_PORTS="1 2 6t"
|
||||||
WAN_PORTS="5 6t"
|
WAN_PORTS="5 6t"
|
||||||
BATMAN_PORTS="3 4 6t"
|
BATMAN_PORTS="3 4 6t"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="1 2 6t"
|
CLIENT_PORTS="1 2 6t"
|
||||||
WAN_PORTS="5 6t"
|
WAN_PORTS="5 6t"
|
||||||
BATMAN_PORTS="3 4 6t"
|
BATMAN_PORTS="3 4 6t"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth1/address)
|
|
||||||
|
|
|
@ -11,4 +11,3 @@ BATMAN_PORTS="3 4 0t"
|
||||||
# address where we can copy it from
|
# address where we can copy it from
|
||||||
|
|
||||||
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
|
ETHMESHMAC=$(macaddr_add $(mtd_get_mac_binary info 8) 1)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -3,5 +3,3 @@ SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="3 0t"
|
CLIENT_PORTS="3 0t"
|
||||||
WAN_PORTS=
|
WAN_PORTS=
|
||||||
BATMAN_PORTS="0t"
|
BATMAN_PORTS="0t"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="2 3 0t"
|
BATMAN_PORTS="2 3 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="2 3 0t"
|
BATMAN_PORTS="2 3 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 2 0t"
|
BATMAN_PORTS="3 2 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 4 0t"
|
BATMAN_PORTS="3 4 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -5,4 +5,3 @@ WAN_PORTS=
|
||||||
BATMAN_PORTS="3 2 0t"
|
BATMAN_PORTS="3 2 0t"
|
||||||
|
|
||||||
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
ETHMESHMAC=$(cat /sys/class/net/eth1/address)
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,5 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
|
|
||||||
|
|
|
@ -6,7 +6,3 @@ BATMAN_PORTS=""
|
||||||
ONE_PORT="YES"
|
ONE_PORT="YES"
|
||||||
|
|
||||||
. /etc/network.mode
|
. /etc/network.mode
|
||||||
. /lib/functions.sh
|
|
||||||
. /lib/functions/system.sh
|
|
||||||
|
|
||||||
ROUTERMAC=$(mtd_get_mac_binary EEPROM 0x0)
|
|
||||||
|
|
|
@ -6,5 +6,4 @@ CLIENT_PORTS="6t 0 1"
|
||||||
WAN_PORTS="6t 4"
|
WAN_PORTS="6t 4"
|
||||||
BATMAN_PORTS="6t 2 3"
|
BATMAN_PORTS="6t 2 3"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
|
||||||
|
|
|
@ -6,5 +6,4 @@ CLIENT_PORTS="6t 3 4"
|
||||||
WAN_PORTS="6t 0"
|
WAN_PORTS="6t 0"
|
||||||
BATMAN_PORTS="6t 1 2"
|
BATMAN_PORTS="6t 1 2"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
|
||||||
|
|
|
@ -6,5 +6,4 @@ CLIENT_PORTS="6t 3 4"
|
||||||
WAN_PORTS="6t 0"
|
WAN_PORTS="6t 0"
|
||||||
BATMAN_PORTS="6t 1 2"
|
BATMAN_PORTS="6t 1 2"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/net/eth0/address)")
|
||||||
|
|
|
@ -6,5 +6,4 @@ CLIENT_PORTS="6t 3 4"
|
||||||
WAN_PORTS="6t 0"
|
WAN_PORTS="6t 0"
|
||||||
BATMAN_PORTS="6t 1 2"
|
BATMAN_PORTS="6t 1 2"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
ETHMESHMAC=$(macaddr_setbit_la $(cat /sys/class/net/eth0/address))
|
||||||
ETHMESHMAC=$(macaddr_setbit_la "$ROUTERMAC")
|
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
. /lib/functions/fff/network
|
|
||||||
|
|
||||||
WANDEV=eth0
|
WANDEV=eth0
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="6t 3 4"
|
CLIENT_PORTS="6t 3 4"
|
||||||
WAN_PORTS="6t 0"
|
WAN_PORTS="6t 0"
|
||||||
BATMAN_PORTS="6t 1 2"
|
BATMAN_PORTS="6t 1 2"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
. /lib/functions/fff/network
|
|
||||||
|
|
||||||
WANDEV=eth0
|
WANDEV=eth0
|
||||||
SWITCHDEV=eth0
|
SWITCHDEV=eth0
|
||||||
CLIENT_PORTS="6t 3 4"
|
CLIENT_PORTS="6t 3 4"
|
||||||
WAN_PORTS="6t 0"
|
WAN_PORTS="6t 0"
|
||||||
BATMAN_PORTS="6t 1 2"
|
BATMAN_PORTS="6t 1 2"
|
||||||
|
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -10,4 +10,3 @@ BATMAN_PORTS="0t 2 3"
|
||||||
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
# only possible, because wXmesh is created first and therefore gets the 'universally administered address'
|
||||||
|
|
||||||
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
|
ETHMESHMAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy1/macaddress)")
|
||||||
ROUTERMAC=$(cat /sys/class/net/eth0/address)
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=fff-wireguard
|
PKG_NAME:=fff-wireguard
|
||||||
PKG_RELEASE:=5
|
PKG_RELEASE:=6
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
#load board specific properties
|
#load board specific properties
|
||||||
BOARD="$(uci get board.model.name)"
|
BOARD="$(uci get board.model.name)"
|
||||||
. /etc/network.$BOARD
|
. /etc/network.$BOARD
|
||||||
|
[ -n "$ROUTERMAC" ] || ROUTERMAC=$(get_mac_label)
|
||||||
|
|
||||||
configure() {
|
configure() {
|
||||||
# remove peers missing in gateway config
|
# remove peers missing in gateway config
|
||||||
|
|
Loading…
Reference in New Issue
Block a user