qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:17:32 +02:00
Code

base-files: use json_is_a() in network.sh

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34733 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-12-17 13:07:42 +00:00
parent 9a4a2a481e
commit 0cc78c2020
2 changed files with 8 additions and 8 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 include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=121 PKG_RELEASE:=122
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host PKG_BUILD_DEPENDS:=opkg/host

14
package/base-files/files/lib/functions/network.sh
View File

@ -39,11 +39,11 @@ __network_parse_ifstatus()
# parse addresses # parse addresses
local __family local __family
for __family in 4 6; do for __family in 4 6; do
if json_get_type __tmp "ipv${__family}_address" && [ "$__tmp" = array ]; then if json_is_a "ipv${__family}_address" array; then
json_select "ipv${__family}_address" json_select "ipv${__family}_address"
if json_get_type __tmp 1 && [ "$__tmp" = object ]; then if json_is_a 1 object; then
json_select 1 json_select 1
__network_set_cache "${__key}_address${__family}" address __network_set_cache "${__key}_address${__family}" address
@ -58,12 +58,12 @@ __network_parse_ifstatus()
done done
# parse routes # parse routes
if json_get_type __tmp route && [ "$__tmp" = array ]; then if json_is_a route array; then
json_select "route" json_select "route"
local __idx=1 local __idx=1
while json_get_type __tmp "$__idx" && [ "$__tmp" = object ]; do while json_is_a "$__idx" object; do
json_select "$((__idx++))" json_select "$((__idx++))"
json_get_var __tmp target json_get_var __tmp target
@ -88,14 +88,14 @@ __network_parse_ifstatus()
# parse dns info # parse dns info
local __field local __field
for __field in "dns_server" "dns_search"; do for __field in "dns_server" "dns_search"; do
if json_get_type __tmp "$__field" && [ "$__tmp" = array ]; then if json_is_a "$__field" array; then
json_select "$__field" json_select "$__field"
local __idx=1 local __idx=1
local __dns="" local __dns=""
while json_get_type __tmp "$__idx" && [ "$__tmp" = string ]; do while json_is_a "$__idx" string; do
json_get_var __tmp "$((__idx++))" json_get_var __tmp "$((__idx++))"
__dns="${__dns:+$__dns }$__tmp" __dns="${__dns:+$__dns }$__tmp"
@ -118,7 +118,7 @@ __network_parse_ifstatus()
done done
# descend into inactive table # descend into inactive table
json_get_type __tmp "inactive" && [ "$__tmp" = object ] && json_select "inactive" json_is_a "inactive" object && json_select "inactive"
done done