From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [[PATCHv2]] Fix hook for static address configuration.
Date: Sat, 11 Aug 2018 21:52:13 +0200
Message-ID: <5881bbbb3b0e3ac3506312a4fc36ca977bb7f0f7.camel@ipfire.org>
In-Reply-To: <20180811191908.14010-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3385231851788703878=="
List-Id: <development.lists.ipfire.org>

--===============3385231851788703878==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Ignore this patch, I've forgot to cc the network mailing list.

Thanks in advance,

-Stefan
> Add the required hook_new function and "id" information which have
> been
> introduced in earlier commits to make this hook work again.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  src/hooks/configs/static | 21 ++++++++++++++++++++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
> 
> diff --git a/src/hooks/configs/static b/src/hooks/configs/static
> index 91bba8a..23ae2d8 100644
> --- a/src/hooks/configs/static
> +++ b/src/hooks/configs/static
> @@ -52,6 +52,8 @@ hook_check_config_settings() {
>  
>  hook_parse_cmdline() {
>  	local protocol
> +	local id="${1}"
> +	shift
>  
>  	while [ $# -gt 0 ]; do
>  		case "${1}" in
> @@ -153,12 +155,29 @@ hook_parse_cmdline() {
>  	fi
>  
>  	# Check any conflicts
> -	if zone_config_check_same_setting "${zone}" "static"
> "ADDRESS" "${ADDRESS}"; then
> +	if zone_config_check_same_setting "${zone}" "static" "${id}"
> "ADDRESS" "${ADDRESS}"; then
>  		error "A static configuration with the same address
> is already configured"
>  		return ${EXIT_CONF_ERROR}
>  	fi
>  }
>  
> +hook_new() {
> +	local zone="${1}"
> +	shift
> +
> +	local id=$(zone_config_get_new_id ${zone})
> +	log DEBUG "ID for the config is: ${id}"
> +
> +	if ! hook_parse_cmdline "${id}" "$@"; then
> +		# Return an error if the parsing of the cmd line
> fails
> +		return ${EXIT_ERROR}
> +	fi
> +
> +	zone_config_settings_write "${zone}" "${HOOK}" "${id}"
> +
> +	exit ${EXIT_OK}
> +}
> +
>  hook_up() {
>  	local zone="${1}"
>  	local config="${2}"

--===============3385231851788703878==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUVXTzBOWHRTcnZo
YXN5dERuVHRkT0ZZK1RzdDRGQWx0dlBtMEFDZ2tRVHRkT0ZZK1QKc3Q0ZzJRLy9UZVRBd3l6NmpP
TGc1ZGtkSlV3cmxBNWlOY3VzbnlvOEdRc0hZdFJld0lBa1VoNFNURnpUTVNMRApJSXhldjdabU45
Q1RtMnZ3cWt1STYyb1RLVU92NnlhbzAyNnJ4OVl2dFJncUZOVjA2VHFJN0MvTjJUc082MEF3Cmdm
MkNIY3RZeXhMRTZ0ZDNlUExWRVFoUW94TUpFVUgrT1lLTWRlY0ZmM3ZIWlZzNi9vblpaSlJTSGM0
T2NObWIKdDZuT3RYbUVER2ZLTksvKzNkbmJoY2lBcWNJd0R3R1VabUxsNkwxOU5KZTlzMWFhYzk1
QUt1RTFhNVlNc2VCMQpreDdWeUN4cjJXMCs1anVERjV1S2k2VlpiK09GRE9BQ2hoMVMwK1h6OWFP
N1VsbHM5ODA1ekR2dkJvM2dmNlozCnFnZ1FUd3loUEhmQTA4TzM5MWt0YWF3clFQaUdzMytBSFJt
aWo0TnRTUkxXS2E3bmpNd01IUnpxR3VCUnNkOWcKSGpjNElrMHFWQXl2aTBkMWNOUDFldStIUUlH
K20yM29hYnJOeHlqTjcxL2w3REhLUkZNUUtZYnN0cnhTeU11cgpTcEI3S05lQWl1b0IzeGpBdUEz
Z09SbGY4K1VVOGtpZ2RjSkpVTjkwMEVuWVNySUlKQVhoU1I0MGdrNkxubmNkCllxa0MvTDRHN20v
Y0Jlb1l2U1NvcWxhNENUTStPR0k1Z0ltQlI1RWhPdzNBN2l4YXlzblkrN2pPRTgvSXpPcnIKS3hV
QUZtNERHb3lLK0RvamovdXpTSGtDdk1Sb1ZpcnlIbDhkWTRFK1N3aUlrY2w0ajNueitQSW16WTIy
NkFMbgpyVzBtendDYVVQQUZHTzhWem81K1AvZUlYaEVXUnBGUXc2TU1ScThaUWJMMC9mYU5JczQ9
Cj1KZWhlCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============3385231851788703878==--