mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
a6fbdd3a78
If set, label MAC address is available from one of two sources, device tree or board.json. So far, the function get_mac_label was meant for retrieving the address, while an option in uci system config was specified only for case 2 (board.json). The uci config option has several drawbacks: - it is only used for a fraction of devices (those not in DT) - label MAC address is a device property, while config implies user interaction - label_macaddr option will only be set if /etc/config/system does not exist (i.e. only for new installations) Thus, this patch changes the behavior of get_mac_label: Instead of writing the value in board.json to uci system config and reading from this location afterwards, get_mac_label now extracts data from board.json directly. The uci config option won't be used anymore. In addition, two utility functions for extraction only from DT or from board.json are introduced. Since this is only changing the access to the label MAC address, it won't interfere with the addresses stored in the code base so far. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
191 lines
3.5 KiB
Bash
191 lines
3.5 KiB
Bash
# Copyright (C) 2006-2013 OpenWrt.org
|
|
|
|
. /usr/share/libubox/jshn.sh
|
|
|
|
get_mac_binary() {
|
|
local path="$1"
|
|
local offset="$2"
|
|
|
|
if ! [ -e "$path" ]; then
|
|
echo "get_mac_binary: file $path not found!" >&2
|
|
return
|
|
fi
|
|
|
|
hexdump -v -n 6 -s $offset -e '5/1 "%02x:" 1/1 "%02x"' $path 2>/dev/null
|
|
}
|
|
|
|
get_mac_label_dt() {
|
|
local basepath="/proc/device-tree"
|
|
local macdevice="$(cat "$basepath/aliases/label-mac-device" 2>/dev/null)"
|
|
local macaddr
|
|
|
|
[ -n "$macdevice" ] || return
|
|
|
|
macaddr=$(get_mac_binary "$basepath/$macdevice/mac-address" 0 2>/dev/null)
|
|
[ -n "$macaddr" ] || macaddr=$(get_mac_binary "$basepath/$macdevice/local-mac-address" 0 2>/dev/null)
|
|
|
|
echo $macaddr
|
|
}
|
|
|
|
get_mac_label_json() {
|
|
local cfg="/etc/board.json"
|
|
local macaddr
|
|
|
|
[ -s "$cfg" ] || return
|
|
|
|
json_init
|
|
json_load "$(cat $cfg)"
|
|
if json_is_a system object; then
|
|
json_select system
|
|
json_get_var macaddr label_macaddr
|
|
json_select ..
|
|
fi
|
|
|
|
echo $macaddr
|
|
}
|
|
|
|
get_mac_label() {
|
|
local macaddr=$(get_mac_label_dt)
|
|
|
|
[ -n "$macaddr" ] || macaddr=$(get_mac_label_json)
|
|
|
|
echo $macaddr
|
|
}
|
|
|
|
find_mtd_chardev() {
|
|
local INDEX=$(find_mtd_index "$1")
|
|
local PREFIX=/dev/mtd
|
|
|
|
[ -d /dev/mtd ] && PREFIX=/dev/mtd/
|
|
echo "${INDEX:+$PREFIX$INDEX}"
|
|
}
|
|
|
|
mtd_get_mac_ascii() {
|
|
local mtdname="$1"
|
|
local key="$2"
|
|
local part
|
|
local mac_dirty
|
|
|
|
part=$(find_mtd_part "$mtdname")
|
|
if [ -z "$part" ]; then
|
|
echo "mtd_get_mac_ascii: partition $mtdname not found!" >&2
|
|
return
|
|
fi
|
|
|
|
mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p')
|
|
|
|
# "canonicalize" mac
|
|
[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
|
|
}
|
|
|
|
mtd_get_mac_text() {
|
|
local mtdname=$1
|
|
local offset=$(($2))
|
|
local part
|
|
local mac_dirty
|
|
|
|
part=$(find_mtd_part "$mtdname")
|
|
if [ -z "$part" ]; then
|
|
echo "mtd_get_mac_text: partition $mtdname not found!" >&2
|
|
return
|
|
fi
|
|
|
|
if [ -z "$offset" ]; then
|
|
echo "mtd_get_mac_text: offset missing!" >&2
|
|
return
|
|
fi
|
|
|
|
mac_dirty=$(dd if="$part" bs=1 skip="$offset" count=17 2>/dev/null)
|
|
|
|
# "canonicalize" mac
|
|
[ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
|
|
}
|
|
|
|
mtd_get_mac_binary() {
|
|
local mtdname="$1"
|
|
local offset="$2"
|
|
local part
|
|
|
|
part=$(find_mtd_part "$mtdname")
|
|
get_mac_binary "$part" "$offset"
|
|
}
|
|
|
|
mtd_get_mac_binary_ubi() {
|
|
local mtdname="$1"
|
|
local offset="$2"
|
|
|
|
. /lib/upgrade/nand.sh
|
|
|
|
local ubidev=$(nand_find_ubi $CI_UBIPART)
|
|
local part=$(nand_find_volume $ubidev $1)
|
|
|
|
get_mac_binary "/dev/$part" "$offset"
|
|
}
|
|
|
|
mtd_get_part_size() {
|
|
local part_name=$1
|
|
local first dev size erasesize name
|
|
while read dev size erasesize name; do
|
|
name=${name#'"'}; name=${name%'"'}
|
|
if [ "$name" = "$part_name" ]; then
|
|
echo $((0x$size))
|
|
break
|
|
fi
|
|
done < /proc/mtd
|
|
}
|
|
|
|
macaddr_add() {
|
|
local mac=$1
|
|
local val=$2
|
|
local oui=${mac%:*:*:*}
|
|
local nic=${mac#*:*:*:}
|
|
|
|
nic=$(printf "%06x" $((0x${nic//:/} + $val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/')
|
|
echo $oui:$nic
|
|
}
|
|
|
|
macaddr_setbit_la() {
|
|
local mac=$1
|
|
|
|
printf "%02x:%s" $((0x${mac%%:*} | 0x02)) ${mac#*:}
|
|
}
|
|
|
|
macaddr_2bin() {
|
|
local mac=$1
|
|
|
|
echo -ne \\x${mac//:/\\x}
|
|
}
|
|
|
|
macaddr_canonicalize() {
|
|
local mac="$1"
|
|
local canon=""
|
|
|
|
mac=$(echo -n $mac | tr -d \")
|
|
[ ${#mac} -gt 17 ] && return
|
|
[ -n "${mac//[a-fA-F0-9\.: -]/}" ] && return
|
|
|
|
for octet in ${mac//[\.:-]/ }; do
|
|
case "${#octet}" in
|
|
1)
|
|
octet="0${octet}"
|
|
;;
|
|
2)
|
|
;;
|
|
4)
|
|
octet="${octet:0:2} ${octet:2:2}"
|
|
;;
|
|
12)
|
|
octet="${octet:0:2} ${octet:2:2} ${octet:4:2} ${octet:6:2} ${octet:8:2} ${octet:10:2}"
|
|
;;
|
|
*)
|
|
return
|
|
;;
|
|
esac
|
|
canon=${canon}${canon:+ }${octet}
|
|
done
|
|
|
|
[ ${#canon} -ne 17 ] && return
|
|
|
|
printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${canon// / 0x} 2>/dev/null
|
|
}
|