From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Jun 2019 10:00:02 +0000 (+0200)
Subject: vlan: Validate and always set MAC address
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb655547c79f72b97451c02ba285b13c68e5a2a;p=people%2Fstevee%2Fnetwork.git

vlan: Validate and always set MAC address

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

diff --git a/src/hooks/ports/vlan b/src/hooks/ports/vlan
index 69f5144c..0147e54e 100644
--- a/src/hooks/ports/vlan
+++ b/src/hooks/ports/vlan
@@ -66,6 +66,12 @@ hook_parse_cmdline() {
 				;;
 			--address=*)
 				ADDRESS=$(cli_get_val "${1}")
+
+				# Validate address
+				if ! mac_is_valid "${ADDRESS}"; then
+					error "Invalid MAC address given: ${ADDRESS}"
+					return ${EXIT_CONF_ERROR}
+				fi
 				;;
 			--tag=*)
 				TAG=$(cli_get_val "${1}")
@@ -73,6 +79,11 @@ hook_parse_cmdline() {
 		esac
 		shift
 	done
+
+	# Generate a random MAC address if none given
+	if ! isset ADDRESS; then
+		ADDRESS="$(mac_generate)"
+	fi
 }
 
 hook_create() {