From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 30 Mar 2019 12:10:58 +0000 (+0100)
Subject: hooks: Import zone default settings, too
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=commitdiff_plain;h=53e764a73d5a04f653a4fda3c7f8810e8de13ed8

hooks: Import zone default settings, too

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

diff --git a/src/header-zone b/src/header-zone
index ead4a32c..7ad3e39e 100644
--- a/src/header-zone
+++ b/src/header-zone
@@ -34,6 +34,11 @@ hook_new() {
 	assert isset zone
 	shift
 
+	local ${HOOK_SETTINGS}
+
+	# Import all default variables
+	hook_set_defaults
+
 	if ! hook_parse_cmdline "$@"; then
 		return ${EXIT_ERROR}
 	fi
diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge
index 93a3a314..33d58112 100644
--- a/src/hooks/zones/bridge
+++ b/src/hooks/zones/bridge
@@ -29,6 +29,7 @@ HOOK_SETTINGS="${HOOK_SETTINGS} STP_PRIORITY MTU"
 HOOK_PORT_SETTINGS="COST PRIORITY"
 
 # Default values
+DEFAULT_STP="on"
 DEFAULT_STP_FORWARD_DELAY=0
 DEFAULT_STP_HELLO=2
 DEFAULT_STP_MAXAGE=20
@@ -123,19 +124,11 @@ hook_parse_cmdline() {
 		shift
 	done
 
-	# Generate a random MAC address if the user passed no one
+	# Generate a random MAC address if the user passed none
 	if ! isset ADDRESS; then
 		ADDRESS="$(mac_generate)"
 	fi
 
-	# Enable Spanning Tree Protocol by default
-	if ! isset STP; then
-		STP="on"
-	fi
-
-	# Set all other defaults
-	hook_set_defaults
-
 	return ${EXIT_OK}
 }
 
diff --git a/src/hooks/zones/ip-tunnel b/src/hooks/zones/ip-tunnel
index c9c73bab..e4be361a 100644
--- a/src/hooks/zones/ip-tunnel
+++ b/src/hooks/zones/ip-tunnel
@@ -26,13 +26,7 @@ SUPPORTED_IP_TUNNEL_MODES="gre vti"
 HOOK_SETTINGS="HOOK MARK MODE PEER LOCAL_ADDRESS"
 
 # Default mode of the tunnel
-MODE="gre"
-
-# The IP address of the tunnel endpoint where to connect to
-PEER=
-
-# The local IP address of the tunnel endpoint
-LOCAL_ADDRESS=
+DEFAULT_MODE="gre"
 
 hook_check_settings() {
 	assert isset MODE && assert isoneof MODE ${SUPPORTED_IP_TUNNEL_MODES}
diff --git a/src/hooks/zones/modem b/src/hooks/zones/modem
index 1b4c3c02..50d43c75 100644
--- a/src/hooks/zones/modem
+++ b/src/hooks/zones/modem
@@ -27,47 +27,37 @@ MODEM_ALLOWED_AUTH_METHODS="${PPP_ALLOWED_AUTH_METHODS}"
 HOOK_SETTINGS="HOOK"
 
 # Access Point Name.
-APN=
 HOOK_SETTINGS="${HOOK_SETTINGS} APN"
 
 # Sets the authentication algortihm that must be used.
-AUTH=
 HOOK_SETTINGS="${HOOK_SETTINGS} AUTH"
 
 # Baudrate.
-BAUDRATE=921600
+DEFAULT_BAUDRATE=921600
 HOOK_SETTINGS="${HOOK_SETTINGS} BAUDRATE"
 
 # The device name of the serial device.
 # XXX how can we make sure that this does not change all the time?
-DEVICE=
 HOOK_SETTINGS="${HOOK_SETTINGS} DEVICE"
 
 # A monitor device.
 # Send AT commands to this device, when the primary device is
 # connected.
-MONITOR_DEVICE=
 HOOK_SETTINGS="${HOOK_SETTINGS} MONITOR_DEVICE"
 
 # Maximum transmission unit.
-MTU=
 HOOK_SETTINGS="${HOOK_SETTINGS} MTU"
 
 # User credentials.
-USERNAME=
-PASSWORD=
 HOOK_SETTINGS="${HOOK_SETTINGS} USERNAME PASSWORD"
 
 # PIN code.
-PIN=
 HOOK_SETTINGS="${HOOK_SETTINGS} PIN"
 
 # Phone number.
-PHONE_NUMBER=
 HOOK_SETTINGS="${HOOK_SETTINGS} PHONE_NUMBER"
 
 # IMSI
-IMSI=
 HOOK_SETTINGS="${HOOK_SETTINGS} IMSI"
 
 hook_check_settings() {
diff --git a/src/hooks/zones/pppoe b/src/hooks/zones/pppoe
index e113c92e..cd3913b6 100644
--- a/src/hooks/zones/pppoe
+++ b/src/hooks/zones/pppoe
@@ -24,31 +24,15 @@
 HOOK_SETTINGS="HOOK ACCESS_CONCENTRATOR AUTH USERNAME PASSWORD"
 HOOK_SETTINGS="${HOOK_SETTINGS} SERVICE_NAME MTU IPV6 PREFIX_DELEGATION"
 
-# User credentials for the dialin.
-USERNAME=""
-PASSWORD=""
-
-# Set the authentication mechanism.
-AUTH=
-
-# Access Concentrator.
-ACCESS_CONCENTRATOR=""
-
-# Service name.
-SERVICE_NAME=""
-
-# Maximum Transmission Unit.
-MTU=
-
 # This hook can work with all authentication methods supported by pppd.
 PPPOE_SUPPORTED_AUTH_METHODS="${PPP_SUPPORTED_AUTH_METHODS}"
 PPPOE_PLUGIN="rp-pppoe.so"
 
 # Request an IPv6 address.
-IPV6="true"
+DEFAULT_IPV6="true"
 
 # Use IPv6 prefix delegation.
-PREFIX_DELEGATION="true"
+DEFAULT_PREFIX_DELEGATION="true"
 
 hook_check_settings() {
 	assert isset USERNAME