From c259c985bc98ad89350f81b68db58925163a43eb Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 24 Sep 2018 23:29:25 +0200
Subject: [PATCH] bridge: Set proper defaults

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/functions/functions.hook | 12 ++++++++++++
 src/hooks/zones/bridge       | 20 +++++++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/functions/functions.hook b/src/functions/functions.hook
index ad51ad5a..2f3ced09 100644
--- a/src/functions/functions.hook
+++ b/src/functions/functions.hook
@@ -124,6 +124,18 @@ hook_help() {
 	exit $?
 }
 
+# Sets all settings in HOOK_SETTINGS to their DEFAULT_* values
+hook_set_defaults() {
+	local setting
+	for setting in ${HOOK_SETTINGS}; do
+		local default="DEFAULT_${setting}"
+
+		if isset ${default}; then
+			assign "${setting}" "${!default}"
+		fi
+	done
+}
+
 config_get_hook() {
 	local config=${1}
 
diff --git a/src/hooks/zones/bridge b/src/hooks/zones/bridge
index fb81673c..1144ba06 100644
--- a/src/hooks/zones/bridge
+++ b/src/hooks/zones/bridge
@@ -29,12 +29,10 @@ HOOK_SETTINGS="${HOOK_SETTINGS} STP_PRIORITY MTU"
 HOOK_PORT_SETTINGS="COST PRIORITY"
 
 # Default values
-MTU=1500
-STP="on"
-STP_FORWARD_DELAY=0
-STP_HELLO=2
-STP_MAXAGE=20
-STP_PRIORITY=512
+DEFAULT_STP_FORWARD_DELAY=0
+DEFAULT_STP_HELLO=2
+DEFAULT_STP_MAXAGE=20
+DEFAULT_STP_PRIORITY=512
 
 hook_check_settings() {
 	assert ismac ADDRESS
@@ -117,10 +115,18 @@ hook_parse_cmdline() {
 	done
 
 	# Generate a random MAC address if the user passed no one
-	if isset ADDRESS; then
+	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}
 }
 
-- 
2.39.2