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

SVN-Revision: 34733

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6452a3ecb095e9509d2a9c3419e2c54f91f8e7b4..ec69e0cb3cd2a71a3d5969631767d05c6b494b21 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=121
+PKG_RELEASE:=122
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh
index d242abbe62db559c8d5482ecef30979fa5995adb..424965acb57785d9bac5493f3a56eb54b25dfb0f 100644 (file)
--- a/package/base-files/files/lib/functions/network.sh
+++ b/package/base-files/files/lib/functions/network.sh
@@ -39,11 +39,11 @@ __network_parse_ifstatus()
                # parse addresses
                local __family
                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"
 
-                               if json_get_type __tmp 1 && [ "$__tmp" = object ]; then
+                               if json_is_a 1 object; then
 
                                        json_select 1
                                        __network_set_cache "${__key}_address${__family}" address
@@ -58,12 +58,12 @@ __network_parse_ifstatus()
                done
 
                # parse routes
-               if json_get_type __tmp route && [ "$__tmp" = array ]; then
+               if json_is_a route array; then
 
                        json_select "route"
 
                        local __idx=1
-                       while json_get_type __tmp "$__idx" && [ "$__tmp" = object ]; do
+                       while json_is_a "$__idx" object; do
 
                                json_select "$((__idx++))"
                                json_get_var __tmp target
@@ -88,14 +88,14 @@ __network_parse_ifstatus()
                # parse dns info
                local __field
                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"
 
                                local __idx=1
                                local __dns=""
 
-                               while json_get_type __tmp "$__idx" && [ "$__tmp" = string ]; do
+                               while json_is_a "$__idx" string; do
 
                                        json_get_var __tmp "$((__idx++))"
                                        __dns="${__dns:+$__dns }$__tmp"
@@ -118,7 +118,7 @@ __network_parse_ifstatus()
                done
 
                # descend into inactive table
-               json_get_type __tmp "inactive" && [ "$__tmp" = object ] && json_select "inactive"
+               json_is_a "inactive" object && json_select "inactive"
 
        done