From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 2/2] header-zone: refactor hook_config_destroy
Date: Mon, 10 Jul 2017 13:53:58 +0200
Message-ID: <1499687638-6853-2-git-send-email-jonatan.schlag@ipfire.org>
In-Reply-To: <1499687638-6853-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7441443392791226024=="
List-Id: <network.lists.ipfire.org>

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

We now just bring the hook down, execute hook_destroy which can be not empty =
inside the hook,
because it is defined in src/header-config.
After this we delete the config file.

Fixes: #11416

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/header-config | 4 ++++
 src/header-zone   | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/header-config b/src/header-config
index b697797..d55d7e5 100644
--- a/src/header-config
+++ b/src/header-config
@@ -22,3 +22,7 @@
 hook_new() {
 	cmd_not_implemented
 }
+
+hook_destroy() {
+	return ${EXIT_OK}
+}
diff --git a/src/header-zone b/src/header-zone
index 2e3fa09..b4588fb 100644
--- a/src/header-zone
+++ b/src/header-zone
@@ -221,7 +221,13 @@ hook_config_destroy() {
 	local hook=3D$(zone_config_get_hook_from_id ${zone}  ${id})
 	assert isset hook
=20
+	# First we bring the hook down
+	hook_config_cmd "down" "${zone}" "${hook}" "${hook}.${id}"
+	# If a hook_destroy function is implemented in the hook this function will =
be executed.
+	# If not a empty defined in header-config is executed.
 	hook_config_cmd "destroy" "${zone}" "${hook}" "${hook}.${id}" "$@"
+	# Now we delete the config of the zone
+	zone_config_settings_destroy "${zone}" "${hook}.${id}"
 }
=20
 hook_config_edit() {
--=20
2.6.3


--===============7441443392791226024==--