X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Ffunctions%2Fnetwork.sh;h=8b06e8cd41c00bfe70e61c88e2fd6561ee97bf05;hb=ab865f7094aa325f9f0345bc6b76f8bec998dada;hp=159da09a0d61617682663bd2718a52f46df826f2;hpb=7de192f60d4d02f5921f7eb499be348dc3f15948;p=openwrt-working-2016%2F.git diff --git a/package/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh index 159da09a0d..8b06e8cd41 100644 --- a/package/base-files/files/lib/functions/network.sh +++ b/package/base-files/files/lib/functions/network.sh @@ -41,16 +41,40 @@ network_get_subnet() { __network_ipaddr "$1" "$2" 4 1; } network_get_subnet6() { __network_ipaddr "$1" "$2" 6 1; } -network_get_device() +__network_device() { local __var="$1" local __iface="$2" + local __field="$3" local __tmp="$(ubus call network.interface."$__iface" status 2>/dev/null)" [ -n "$__tmp" ] || return 1 json_load "$__tmp" - json_get_var "$__var" device + json_get_var "$__var" "$__field" +} + +network_is_up() +{ + local __up + __network_device __up "$1" up && [ $__up -eq 1 ] +} + +network_get_device() { __network_device "$1" "$2" l3_device; } +network_get_physdev() { __network_device "$1" "$2" device; } - return 0 + +__network_defer() +{ + local __device="$1" + local __defer="$2" + + json_init + json_add_string name "$__device" + json_add_boolean defer "$__defer" + + ubus call network.device set_state "$(json_dump)" 2>/dev/null } + +network_defer_device() { __network_defer "$1" 1; } +network_ready_device() { __network_defer "$1" 0; }