X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=blobdiff_plain;f=src%2Fhooks%2Fports%2Fwireless-ap;h=6db39b8c99537af98c9a69139b63ae8dcdc28e13;hp=5e000146163e7fa1438ab712dd0f9874ae652ae4;hb=7842c2ce43d1f185e65bb9f2beead96376e2bd34;hpb=40c95a6b261e8fdadca97f21ff7cd2a11af3bfb3

diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index 5e000146..6db39b8c 100644
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -24,11 +24,11 @@
 HOOK_PORT_PATTERN="${PORT_PATTERN_ACCESSPOINT}"
 
 HOOK_SETTINGS="ADDRESS BROADCAST_SSID CHANNEL CHANNEL_BANDWIDTH DFS MODE PHY"
-HOOK_SETTINGS="${HOOK_SETTINGS} ENCRYPTION KEY SSID"
+HOOK_SETTINGS="${HOOK_SETTINGS} ENCRYPTION ENVIRONMENT KEY SSID"
 
 ADDRESS=$(mac_generate)
 BROADCAST_SSID=on
-CHANNEL=0
+CHANNEL=
 CHANNEL_BANDWIDTH=
 ENCRYPTION=""
 KEY=""
@@ -37,6 +37,8 @@ SSID=
 # Perform radar detection by default when possible
 DFS="on"
 
+ENVIRONMENT="${WIRELESS_DEFAULT_ENVIRONMENT}"
+
 hook_check_settings() {
 	assert isset ADDRESS
 	assert ismac ADDRESS
@@ -57,6 +59,8 @@ hook_check_settings() {
 		assert [ ${#KEY} -ge 8 ]
 		assert [ ${#KEY} -le 63 ]
 	fi
+
+	assert wireless_environment_is_valid "${ENVIRONMENT}"
 }
 
 hook_parse_cmdline() {
@@ -86,6 +90,14 @@ hook_parse_cmdline() {
 			--encryption=*)
 				ENCRYPTION=$(cli_get_val "${1}")
 				;;
+			--environment=*)
+				ENVIRONMENT="$(cli_get_val "${1}")"
+
+				if ! wireless_environment_is_valid "${ENVIRONMENT}"; then
+					error "Invalid wireless environment: ${ENVIRONMENT}"
+					return ${EXIT_ERROR}
+				fi
+				;;
 			--key=*)
 				KEY=$(cli_get_val "${1}")
 				;;
@@ -125,9 +137,16 @@ hook_parse_cmdline() {
 		return ${EXIT_ERROR}
 	fi
 
+	# Automatically enable ACS if no channel is set and ACS is available
+	if ! isset CHANNEL && phy_supports_acs "${PHY}"; then
+		CHANNEL="0"
+
+		log INFO "Automatic Channel Selection (ACS) enabled"
+	fi
+
 	# Channel bandwidth must match the mode
 	if isset CHANNEL_BANDWIDTH && ! wireless_channel_bandwidth_is_valid "${MODE}" "${CHANNEL_BANDWIDTH}"; then
-		error "Channel Bandwidth '${CHANNEL_BANDWIDTH}' is not supported"
+		error "Channel Bandwidth '${CHANNEL_BANDWIDTH}' is not supported for ${MODE}"
 		return ${EXIT_ERROR}
 	fi