mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
f24e012997
When attempting to use any of the functions in network.sh while netifd is
not started yet, the ubus interface dump query will fail with "Not found",
yielding an empty response.
Subsequently, jsonfilter is invoked with an empty string instead of a valid
JSON document, causing it to emit a second "unexpected end of data" error.
This caused the dnsmasq init script to log the following errors during
early boot on some systems:
procd: /etc/rc.d/S19dnsmasq: Command failed: Not found.
procd: /etc/rc.d/S19dnsmasq: Failed to parse json data: unexpected end of data.
Fix the issue by allowing the ubus query to fail with "Not found" but still
logging other failures, and by passing an empty JSON object to jsonfilter
if the interface status cache is empty.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
302 lines
7.5 KiB
Bash
302 lines
7.5 KiB
Bash
# 1: destination variable
|
|
# 2: interface
|
|
# 3: path
|
|
# 4: separator
|
|
# 5: limit
|
|
__network_ifstatus() {
|
|
local __tmp
|
|
|
|
[ -z "$__NETWORK_CACHE" ] && {
|
|
__tmp="$(ubus call network.interface dump 2>&1)"
|
|
case "$?" in
|
|
4) : ;;
|
|
0) export __NETWORK_CACHE="$__tmp" ;;
|
|
*) echo "$__tmp" >&2 ;;
|
|
esac
|
|
}
|
|
|
|
__tmp="$(jsonfilter ${4:+-F "$4"} ${5:+-l "$5"} -s "${__NETWORK_CACHE:-{}}" -e "$1=@.interface${2:+[@.interface='$2']}$3")"
|
|
|
|
[ -z "$__tmp" ] && \
|
|
unset "$1" && \
|
|
return 1
|
|
|
|
eval "$__tmp"
|
|
}
|
|
|
|
# determine first IPv4 address of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_ipaddr() {
|
|
__network_ifstatus "$1" "$2" "['ipv4-address'][0].address";
|
|
}
|
|
|
|
# determine first IPv6 address of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_ipaddr6() {
|
|
__network_ifstatus "$1" "$2" "['ipv6-address'][0].address" || \
|
|
__network_ifstatus "$1" "$2" "['ipv6-prefix-assignment'][0]['local-address'].address" || \
|
|
return 1
|
|
}
|
|
|
|
# determine first IPv4 subnet of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_subnet() {
|
|
__network_ifstatus "$1" "$2" "['ipv4-address'][0]['address','mask']" "/"
|
|
}
|
|
|
|
# determine first IPv6 subnet of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_subnet6() {
|
|
local __nets __addr
|
|
|
|
if network_get_subnets6 __nets "$2"; then
|
|
# Attempt to return first non-fe80::/10, non-fc::/7 range
|
|
for __addr in $__nets; do
|
|
case "$__addr" in fe[8ab]?:*|f[cd]??:*)
|
|
continue
|
|
esac
|
|
export "$1=$__addr"
|
|
return 0
|
|
done
|
|
|
|
# Attempt to return first non-fe80::/10 range
|
|
for __addr in $__nets; do
|
|
case "$__addr" in fe[8ab]?:*)
|
|
continue
|
|
esac
|
|
export "$1=$__addr"
|
|
return 0
|
|
done
|
|
|
|
# Return first item
|
|
for __addr in $__nets; do
|
|
export "$1=$__addr"
|
|
return 0
|
|
done
|
|
fi
|
|
|
|
unset "$1"
|
|
return 1
|
|
}
|
|
|
|
# determine first IPv6 prefix of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_prefix6() {
|
|
__network_ifstatus "$1" "$2" "['ipv6-prefix'][0]['address','mask']" "/"
|
|
}
|
|
|
|
# determine all IPv4 addresses of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_ipaddrs() {
|
|
__network_ifstatus "$1" "$2" "['ipv4-address'][*].address"
|
|
}
|
|
|
|
# determine all IPv6 addresses of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_ipaddrs6() {
|
|
local __addr
|
|
local __list=""
|
|
|
|
if __network_ifstatus "__addr" "$2" "['ipv6-address'][*].address"; then
|
|
for __addr in $__addr; do
|
|
__list="${__list:+$__list }${__addr}"
|
|
done
|
|
fi
|
|
|
|
if __network_ifstatus "__addr" "$2" "['ipv6-prefix-assignment'][*]['local-address'].address"; then
|
|
for __addr in $__addr; do
|
|
__list="${__list:+$__list }${__addr}"
|
|
done
|
|
fi
|
|
|
|
if [ -n "$__list" ]; then
|
|
export "$1=$__list"
|
|
return 0
|
|
fi
|
|
|
|
unset "$1"
|
|
return 1
|
|
}
|
|
|
|
# determine all IP addresses of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_ipaddrs_all() {
|
|
local __addr __addr6
|
|
|
|
network_get_ipaddrs __addr "$2"
|
|
network_get_ipaddrs6 __addr6 "$2"
|
|
|
|
if [ -n "$__addr" -o -n "$__addr6" ]; then
|
|
export "$1=${__addr:+$__addr }$__addr6"
|
|
return 0
|
|
fi
|
|
|
|
unset "$1"
|
|
return 1
|
|
}
|
|
|
|
# determine all IPv4 subnets of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_subnets() {
|
|
__network_ifstatus "$1" "$2" "['ipv4-address'][*]['address','mask']" "/ "
|
|
}
|
|
|
|
# determine all IPv6 subnets of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_subnets6() {
|
|
local __addr __mask
|
|
local __list=""
|
|
|
|
if __network_ifstatus "__addr" "$2" "['ipv6-address'][*]['address','mask']" "/ "; then
|
|
for __addr in $__addr; do
|
|
__list="${__list:+$__list }${__addr}"
|
|
done
|
|
fi
|
|
|
|
if __network_ifstatus "__addr" "$2" "['ipv6-prefix-assignment'][*]['local-address'].address" && \
|
|
__network_ifstatus "__mask" "$2" "['ipv6-prefix-assignment'][*].mask"; then
|
|
for __addr in $__addr; do
|
|
__list="${__list:+$__list }${__addr}/${__mask%% *}"
|
|
__mask="${__mask#* }"
|
|
done
|
|
fi
|
|
|
|
if [ -n "$__list" ]; then
|
|
export "$1=$__list"
|
|
return 0
|
|
fi
|
|
|
|
unset "$1"
|
|
return 1
|
|
}
|
|
|
|
# determine all IPv6 prefixes of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_prefixes6() {
|
|
__network_ifstatus "$1" "$2" "['ipv6-prefix'][*]['address','mask']" "/ "
|
|
}
|
|
|
|
# determine IPv4 gateway of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
# 3: consider inactive gateway if "true" (optional)
|
|
network_get_gateway() {
|
|
__network_ifstatus "$1" "$2" ".route[@.target='0.0.0.0' && !@.table].nexthop" "" 1 && \
|
|
return 0
|
|
|
|
[ "$3" = 1 -o "$3" = "true" ] && \
|
|
__network_ifstatus "$1" "$2" ".inactive.route[@.target='0.0.0.0' && !@.table].nexthop" "" 1
|
|
}
|
|
|
|
# determine IPv6 gateway of given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
# 3: consider inactive gateway if "true" (optional)
|
|
network_get_gateway6() {
|
|
__network_ifstatus "$1" "$2" ".route[@.target='::' && !@.table].nexthop" "" 1 && \
|
|
return 0
|
|
|
|
[ "$3" = 1 -o "$3" = "true" ] && \
|
|
__network_ifstatus "$1" "$2" ".inactive.route[@.target='::' && !@.table].nexthop" "" 1
|
|
}
|
|
|
|
# determine the DNS servers of the given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
# 3: consider inactive servers if "true" (optional)
|
|
network_get_dnsserver() {
|
|
__network_ifstatus "$1" "$2" "['dns-server'][*]" && return 0
|
|
|
|
[ "$3" = 1 -o "$3" = "true" ] && \
|
|
__network_ifstatus "$1" "$2" ".inactive['dns-server'][*]"
|
|
}
|
|
|
|
# determine the domains of the given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
# 3: consider inactive domains if "true" (optional)
|
|
network_get_dnssearch() {
|
|
__network_ifstatus "$1" "$2" "['dns-search'][*]" && return 0
|
|
|
|
[ "$3" = 1 -o "$3" = "true" ] && \
|
|
__network_ifstatus "$1" "$2" ".inactive['dns-search'][*]"
|
|
}
|
|
|
|
|
|
# 1: destination variable
|
|
# 2: addr
|
|
# 3: inactive
|
|
__network_wan()
|
|
{
|
|
__network_ifstatus "$1" "" \
|
|
"[@.route[@.target='$2' && !@.table]].interface" "" 1 && \
|
|
return 0
|
|
|
|
[ "$3" = 1 -o "$3" = "true" ] && \
|
|
__network_ifstatus "$1" "" \
|
|
"[@.inactive.route[@.target='$2' && !@.table]].interface" "" 1
|
|
}
|
|
|
|
# find the logical interface which holds the current IPv4 default route
|
|
# 1: destination variable
|
|
# 2: consider inactive default routes if "true" (optional)
|
|
network_find_wan() { __network_wan "$1" "0.0.0.0" "$2"; }
|
|
|
|
# find the logical interface which holds the current IPv6 default route
|
|
# 1: destination variable
|
|
# 2: consider inactive dafault routes if "true" (optional)
|
|
network_find_wan6() { __network_wan "$1" "::" "$2"; }
|
|
|
|
# test whether the given logical interface is running
|
|
# 1: interface
|
|
network_is_up()
|
|
{
|
|
local __up
|
|
__network_ifstatus "__up" "$1" ".up" && [ "$__up" = 1 ]
|
|
}
|
|
|
|
# determine the protocol of the given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_protocol() { __network_ifstatus "$1" "$2" ".proto"; }
|
|
|
|
# determine the layer 3 linux network device of the given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_device() { __network_ifstatus "$1" "$2" ".l3_device"; }
|
|
|
|
# determine the layer 2 linux network device of the given logical interface
|
|
# 1: destination variable
|
|
# 2: interface
|
|
network_get_physdev() { __network_ifstatus "$1" "$2" ".device"; }
|
|
|
|
# defer netifd actions on the given linux network device
|
|
# 1: device name
|
|
network_defer_device()
|
|
{
|
|
ubus call network.device set_state \
|
|
"$(printf '{ "name": "%s", "defer": true }' "$1")" 2>/dev/null
|
|
}
|
|
|
|
# continue netifd actions on the given linux network device
|
|
# 1: device name
|
|
network_ready_device()
|
|
{
|
|
ubus call network.device set_state \
|
|
"$(printf '{ "name": "%s", "defer": false }' "$1")" 2>/dev/null
|
|
}
|
|
|
|
# flush the internal value cache to force re-reading values from ubus
|
|
network_flush_cache() { unset __NETWORK_CACHE; }
|