KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: implement network_get_gateway(), network_get_gateway6(), network_find_wan() and network_find_wan6() in /lib/functions/network.sh

Browse source 
SVN-Revision: 32397
This commit is contained in:
Jo-Philipp Wich 2012-06-17 11:50:50 +00:00
parent 70d9295138
commit 57a7257569
2 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/base-files/Makefile
View file

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files
PKG_RELEASE:=109
PKG_RELEASE:=110
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host

59
package/base-files/files/lib/functions/network.sh
View file

@ -41,6 +41,65 @@ network_get_subnet() { __network_ipaddr "$1" "$2" 4 1; }
network_get_subnet6() { __network_ipaddr "$1" "$2" 6 1; }
__network_gateway()
{
local __var="$1"
local __iface="$2"
local __family="$3"
local __tmp="$(ubus call network.interface."$__iface" status 2>/dev/null)"
local __idx=1
json_load "${__tmp:-{}}"
if json_get_type __tmp route && [ "$__tmp" = array ]; then
json_select route
while json_get_type __tmp "$__idx" && [ "$__tmp" = object ]; do
json_select "$((__idx++))"
json_get_var __tmp target
case "${__family}/${__tmp}" in
4/0.0.0.0|6/::)
json_get_var "$__var" nexthop
return $?
;;
esac
json_select ".."
done
fi
return 1
}
network_get_gateway() { __network_gateway "$1" "$2" 4; }
network_get_gateway6() { __network_gateway "$1" "$2" 6; }
__network_wan() {
local __var="$1"
local __family="$2"
local __iface
for __iface in $(ubus list | sed -ne 's/^network\.interface\.//p'); do
if __network_gateway "$__var" "$__iface" "$__family"; then
eval "export -- \"$__var=$__iface\""
return 0
fi
done
eval "export -- \"$__var=\""
return 1
}
network_find_wan() { __network_wan "$1" 4; }
network_find_wan6() { __network_wan "$1" 6; }
__network_device()
{
local __var="$1"