From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 4/5] config hooks: hook_parse_cmdline take id as an argument
Date: Sat, 12 Aug 2017 12:22:28 +0200
Message-ID: <1502533349-13935-4-git-send-email-jonatan.schlag@ipfire.org>
In-Reply-To: <1502533349-13935-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0108965879675492383=="
List-Id: <network.lists.ipfire.org>

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

All hook_parse_cmdline take now the id as the first argument. This is require=
d because
zone_config_check_same_setting needs the id to ignore the config we edit in t=
he moment.
All hook_parse_cmdline functions are changed to keep the generic hook_edit fu=
nction working.
Another option was to write an own hook_edit function for the ipv4-static and=
 ipv6-static hook.
But this solution is not easier then to keep things more generic and equal. M=
akes also maintaining easier.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/hooks/configs/dhcp         | 4 ++++
 src/hooks/configs/ipv4-static  | 7 ++++++-
 src/hooks/configs/ipv6-auto    | 5 +++++
 src/hooks/configs/ipv6-static  | 7 ++++++-
 src/hooks/configs/pppoe-server | 5 +++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/hooks/configs/dhcp b/src/hooks/configs/dhcp
index 7f6780b..f1c43f3 100644
--- a/src/hooks/configs/dhcp
+++ b/src/hooks/configs/dhcp
@@ -35,6 +35,10 @@ hook_check_config_settings() {
 }
=20
 hook_parse_cmdline() {
+	local id=3D${1}
+	shift
+
+	assert isinteger id
 	while [ $# -gt 0 ]; do
 		case "${1}" in
 			--enable-ipv6)
diff --git a/src/hooks/configs/ipv4-static b/src/hooks/configs/ipv4-static
index ef74991..a6b010f 100644
--- a/src/hooks/configs/ipv4-static
+++ b/src/hooks/configs/ipv4-static
@@ -36,6 +36,11 @@ hook_check_config_settings() {
 }
=20
 hook_parse_cmdline() {
+	local id=3D${1}
+	shift
+
+	assert isinteger id
+
 	local arg
=20
 	while read -r arg; do
@@ -99,7 +104,7 @@ hook_parse_cmdline() {
 		exit ${EXIT_CONF_ERROR}
 	fi
=20
-	if zone_config_check_same_setting "${zone}" "ipv4-static" "ADDRESS" "${ADDR=
ESS}"; then
+	if zone_config_check_same_setting "${zone}" "ipv4-static" ${id} "ADDRESS" "=
${ADDRESS}"; then
 		error "An ipv4-static config with the same IPv4 address is already configu=
red"
 		exit ${EXIT_CONF_ERROR}
 	fi
diff --git a/src/hooks/configs/ipv6-auto b/src/hooks/configs/ipv6-auto
index 375e585..e89af28 100644
--- a/src/hooks/configs/ipv6-auto
+++ b/src/hooks/configs/ipv6-auto
@@ -31,6 +31,11 @@ hook_check_config_settings() {
 }
=20
 hook_parse_cmdline() {
+	local id=3D${1}
+	shift
+
+	assert isinteger id
+
 	local arg
=20
 	while read arg; do
diff --git a/src/hooks/configs/ipv6-static b/src/hooks/configs/ipv6-static
index c41401c..bb75240 100644
--- a/src/hooks/configs/ipv6-static
+++ b/src/hooks/configs/ipv6-static
@@ -34,6 +34,11 @@ hook_check_config_settings() {
 }
=20
 hook_parse_cmdline() {
+	local id=3D${1}
+	shift
+
+	assert isinteger id
+
 	while [ $# -gt 0 ]; do
 		case "${1}" in
 			--address=3D*)
@@ -49,7 +54,7 @@ hook_parse_cmdline() {
 		shift
 	done
=20
-	if zone_config_check_same_setting "${zone}" "ipv6-static" "ADDRESS" "${ADDR=
ESS}"; then
+	if zone_config_check_same_setting "${zone}" "ipv6-static" ${id} "ADDRESS" "=
${ADDRESS}"; then
 		error "An ipv6-static config with the same IPv6 address is already configu=
red"
 		exit ${EXIT_CONF_ERROR}
 	fi
diff --git a/src/hooks/configs/pppoe-server b/src/hooks/configs/pppoe-server
index b4d2538..5861e70 100644
--- a/src/hooks/configs/pppoe-server
+++ b/src/hooks/configs/pppoe-server
@@ -49,6 +49,11 @@ hook_check_config_settings() {
 }
=20
 hook_parse_cmdline() {
+	local id=3D${1}
+	shift
+
+	assert isinteger id
+
 	while [ $# -gt 0 ]; do
 		case "${1}" in
 			--dns-server=3D*)
--=20
2.6.3


--===============0108965879675492383==--