From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 15 Aug 2017 21:02:44 +0000 (+0000)
Subject: ports: Make a generic hook_new function
X-Git-Tag: 010~263
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54bae947921793183fec8062a2c0ac4cfe292e3a;p=network.git

ports: Make a generic hook_new function

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/header-port b/src/header-port
index 238749e6..9fd2503a 100644
--- a/src/header-port
+++ b/src/header-port
@@ -40,8 +40,23 @@ hook_hotplug_rename() {
 	exit ${EXIT_FALSE}
 }
 
-hook_add() {
-	cmd_not_implemented
+hook_default_new() {
+	if ! hook_parse_cmdline "$@"; then
+		return ${EXIT_ERROR}
+	fi
+
+	assert isset HOOK_PORT_PATTERN
+
+	local port=$(port_find_free ${HOOK_PORT_PATTERN})
+	assert isset port
+
+	port_settings_write "${port}" ${HOOK_SETTINGS}
+
+	exit ${EXIT_OK}
+}
+
+hook_new() {
+	hook_default_new "$@"
 }
 
 hook_default_edit() {
@@ -115,6 +130,7 @@ hook_default_up() {
 	done
 }
 
+# Depends on the port existing
 hook_up() {
 	hook_default_up $@
 }
diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index 9c77bb13..9c0375cc 100644
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -21,6 +21,8 @@
 
 . /usr/lib/network/header-port
 
+HOOK_PORT_PATTERN="${PORT_PATTERN_ACCESSPOINT}"
+
 HOOK_SETTINGS="HOOK ADDRESS BROADCAST_SSID CHANNEL MODE PHY SSID"
 HOOK_SETTINGS="${HOOK_SETTINGS} ENCRYPTION KEY"
 
@@ -92,19 +94,6 @@ hook_parse_cmdline() {
 	PHY=$(phy_get_address ${PHY})
 }
 
-hook_new() {
-	if ! hook_parse_cmdline $@; then
-		return ${EXIT_ERROR}
-	fi
-
-	local port=$(port_find_free ${PORT_PATTERN_ACCESSPOINT})
-	assert isset port
-
-	port_settings_write "${port}" ${HOOK_SETTINGS}
-
-	exit ${EXIT_OK}
-}
-
 hook_edit() {
 	local port=${1}
 	assert isset port