From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 Jun 2010 22:22:54 +0000 (+0200)
Subject: network: New function zone_is_up, zone_is_down, zone_is_nonlocal.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f482a1905725205a4819b9d2d86d92fe79defc2;p=ipfire-3.x.git

network: New function zone_is_up, zone_is_down, zone_is_nonlocal.

These are only shortcut functions that make life easier.
---

diff --git a/pkgs/core/network/src/functions.zone b/pkgs/core/network/src/functions.zone
index 41b60aa02..e1b6ea54e 100644
--- a/pkgs/core/network/src/functions.zone
+++ b/pkgs/core/network/src/functions.zone
@@ -51,10 +51,13 @@ function zone_name_is_valid() {
 function zone_is_local() {
 	local zone=${1}
 
-	if [[ ${zone} =~ ^red[0-9]{1,5} ]]; then
-		return ${EXIT_ERROR}
-	fi
-	return ${EXIT_OK}
+	! zone_is_nonlocal ${zone}
+}
+
+function zone_is_nonlocal() {
+	local zone=${1}
+
+	[[ ${zone} =~ ^red[0-9]{1,5} ]]
 }
 
 function zone_get_hook() {
@@ -297,7 +300,7 @@ function zones_get_local() {
 function zones_get_nonlocal() {
 	local zone
 	for zone in $(zones_get_all); do
-		zone_is_local ${zone} || echo "${zone}"
+		zone_is_nonlocal ${zone} && echo "${zone}"
 	done
 }
 
@@ -434,3 +437,13 @@ function zone_db() {
 			;;
 	esac
 }
+
+function zone_is_up() {
+	local zone=${1}
+
+	device_is_up ${zone}
+}
+
+function zone_is_down() {
+	! zone_is_up $@
+}