From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 1/8] zone: add config hid functions
Date: Tue, 25 Jul 2017 18:07:06 +0200
Message-ID: <1500998833-10543-2-git-send-email-jonatan.schlag@ipfire.org>
In-Reply-To: <1500998833-10543-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1397113276228325812=="
List-Id: <network.lists.ipfire.org>

--===============1397113276228325812==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

The following patch adds the basic functions which are we need to work with h=
ids.

Fixes: #11406 (partially)

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/functions/functions.zone | 86 ++++++++++++++++++++++++++++++++++++++++++=
++
 1 file changed, 86 insertions(+)

diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index bba1705..28a22fe 100644
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -656,6 +656,75 @@ zone_config_list_ids() {
 	echo ${ids}
 }
=20
+# List all hids of a zone
+zone_config_list_hids() {
+	assert [ $# -eq 1 ]
+	local zone=3D${1}
+
+	local config
+	local hids
+
+	for config in $(zone_configs_list ${zone}); do
+		# Get hook from config
+		hook=3D"$(zone_config_get_hook "${zone}" "${config}")"
+		# Append hids to the list
+		list_append hids "$(zone_config_get_hid "${zone}" "${config}")"
+	done
+
+	echo ${hids}
+}
+
+# get the hid from a given config
+zone_config_get_hid() {
+	assert [ $# -eq 2 ]
+	local zone=3D${1}
+	local config=3D${2}
+
+	local hook
+
+	hook=3D"$(zone_config_get_hook "${zone}" "${config}")"
+	echo "$(hook_exec "config" "${hook}" "hid" "${zone}" "${config}")"
+}
+
+# Checks if a hid is valid for a given zone
+zone_config_hid_is_valid() {
+	assert [ $# -eq 2]
+	local zone=3D${1}
+	local hid=3D${2}
+
+	local _hid
+	for _hid in $(zone_config_list_hids "${zone}"); do
+		if [[ ${_hid} =3D=3D ${hid} ]]; then
+			return ${EXIT_TRUE}
+		fi
+	done
+
+	return ${EXIT_FALSE}
+
+}
+
+# This function converts a hid to a id
+zone_config_convert_hid_to_id() {
+	assert [ $# -eq 2 ]
+	local zone=3D${1}
+	local hid=3D${2}
+
+	local hook
+	local config
+	local id
+
+	for config in $(zone_configs_list ${zone}); do
+		# Get hook from config
+		hook=3D"$(zone_config_get_hook "${zone}" "${config}")"
+		if [[ "$(hook_exec "config" "${hook}" "hid" "${zone}" "${config}")" =3D=3D=
 "${hid}" ]]; then
+			id=3D$(config_get_id_from_config "${config}")
+			break
+		fi
+	done
+
+	echo ${id}
+}
+
 zone_show() {
 	local zone=3D${1}
=20
@@ -1114,6 +1183,23 @@ zone_config_id_is_valid() {
 	[ -f ${zone_path}/configs/*.${id} ];
 }
=20
+# This function checks if a given hid is valid for a zone
+# Return True when yes and false when no
+zone_config_hid_is_valid() {
+	assert [ $# -eq 2 ]
+	local zone=3D${1}
+	local hid=3D${2}
+
+	local _hid
+	for _hid in $(zone_config_list_hids ${zone}); do
+		if [[ ${_hid} =3D=3D ${hid} ]]; then
+			return ${EXIT_TRUE}
+		fi
+	done
+
+	return ${EXIT_FALSE}
+}
+
 zone_config_get_hook_from_id() {
 	# Returns the hook for a given id
 	assert [ $# -eq 2 ]
--=20
2.6.3


--===============1397113276228325812==--