ports: Drop HOOK_SETTINGS variable

[people/ms/network.git] / src / hooks / ports / wireless-ap

diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index 7073cbc72a237c5094bc462479cb730c353e2f4b..e393f5f763959f256ad5d985a033ad841b790f01 100644 (file)
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -23,26 +23,32 @@
 
 HOOK_PORT_PATTERN="${PORT_PATTERN_ACCESSPOINT}"
 
-HOOK_SETTINGS="ADDRESS BROADCAST_SSID CHANNEL CHANNEL_BANDWIDTH DFS MODE PHY"
-HOOK_SETTINGS="${HOOK_SETTINGS} ENCRYPTION ENVIRONMENT KEY SSID"
-HOOK_SETTINGS="${HOOK_SETTINGS} MFP"
-
-ADDRESS=$(mac_generate)
-BROADCAST_SSID=on
-CHANNEL=
-CHANNEL_BANDWIDTH=
-ENCRYPTION=""
-KEY=""
-SSID=
+HOOK_SETTINGS=(
+       "ADDRESS"
+       "BROADCAST_SSID"
+       "CHANNEL"
+       "CHANNEL_BANDWIDTH"
+       "DFS"
+       "ENCRYPTION"
+       "ENVIRONMENT"
+       "KEY"
+       "MFP"
+       "MODE"
+       "PHY"
+       "SSID"
+)
+
+# Broadcast SSID by default
+DEFAULT_BROADCAST_SSID="on"
 
 # Perform radar detection by default when possible
-DFS="on"
+DEFAULT_DFS="on"
 
 # 802.11w - Management Frame Protection
 # Disable by default because many clients cannot connect when enabled
-MFP="off"
+DEFAULT_MFP="off"
 
-ENVIRONMENT="${WIRELESS_DEFAULT_ENVIRONMENT}"
+DEFAULT_ENVIRONMENT="${WIRELESS_DEFAULT_ENVIRONMENT}"
 
 hook_check_settings() {
        assert isset ADDRESS
@@ -191,7 +197,7 @@ hook_create() {
 
        device_exists "${port}" && exit ${EXIT_OK}
 
-       port_settings_read "${port}" ${HOOK_SETTINGS}
+       port_settings_read "${port}"
 
        # Check if the PHY is present.
        local phy=$(phy_get ${PHY})