mbox

[3/7] zone: add function to avoid multiple configs which are senseless

Message ID 1499183171-24236-3-git-send-email-jonatan.schlag@ipfire.org
State Accepted
Commit 41f8233d17da3465c0b873ecac40c173972a206e
Headers

Message

Jonatan Schlag July 5, 2017, 1:46 a.m. UTC 
  Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---
 src/functions/functions.zone | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

Comments

Michael Tremer July 5, 2017, 2:07 a.m. UTC | #1 
Perfect coding style here! :)

On Tue, 2017-07-04 at 17:46 +0200, Jonatan Schlag wrote:
> Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
> ---
>  src/functions/functions.zone | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/src/functions/functions.zone
> b/src/functions/functions.zone
> index 058110d..f2c5ddc 100644
> --- a/src/functions/functions.zone
> +++ b/src/functions/functions.zone
> @@ -1008,6 +1008,28 @@ zone_config_get_hook() {
>  	print "${HOOK}"
>  }
>  
> +zone_config_hook_is_configured() {
> +	# Checks if a zone has already at least one config with the
> given hook.
> +	# Returns True when yes and False when no
> +
> +	assert [ $# -eq 2 ]
> +	local zone=${1}
> +	local hook=${2}
> +
> +	local config
> +	for config in $(zone_configs_list "${zone}"); do
> +		local config_hook="$(zone_config_get_hook "${zone}"
> "${config}")"
> +		assert isset config_hook
> +		if [[ ${hook} == ${config_hook} ]]; then
> +			return ${EXIT_TRUE}
> +		fi
> +
> +	done
> +
> +	# If we get here the zone has no config with the given hook
> +	return ${EXIT_FALSE}
> +}
> +
>  zone_has_ip() {
>  	device_has_ip $@
>  }