hostapd: Use network_get_device instead of uci_get_state

[openwrt/staging/stintel.git] / package / network / services / hostapd / files / netifd.sh

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index a3ffd9395475c91f764e532379ab9a741c55e7b7..1c91bbf3c85f8764ecfe43e07b2d2933d7a7c130 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -1,3 +1,5 @@
+. /lib/functions/network.sh
+
 wpa_supplicant_add_rate() {
        local var="$1"
        local val="$(($2 / 1000))"
@@ -120,6 +122,7 @@ hostapd_common_add_bss_config() {
 
        config_add_boolean rsn_preauth auth_cache
        config_add_int ieee80211w
+       config_add_int eapol_version
 
        config_add_string 'auth_server:host' 'server:host'
        config_add_string auth_secret
@@ -140,6 +143,7 @@ hostapd_common_add_bss_config() {
 
        config_add_int dynamic_vlan vlan_naming
        config_add_string vlan_tagged_interface vlan_bridge
+       config_add_string vlan_file
 
        config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
 
@@ -182,7 +186,7 @@ hostapd_set_bss_options() {
                wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
                wps_device_type wps_device_name wps_manufacturer wps_pin \
                macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
-               iapp_interface
+               iapp_interface eapol_version
 
        set_default isolate 0
        set_default maxassoc 0
@@ -192,6 +196,7 @@ hostapd_set_bss_options() {
        set_default hidden 0
        set_default wmm 1
        set_default uapsd 1
+       set_default eapol_version 0
 
        append bss_conf "ctrl_interface=/var/run/hostapd"
        if [ "$isolate" -gt 0 ]; then
@@ -237,6 +242,8 @@ hostapd_set_bss_options() {
                                [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
                                append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
                        }
+                       [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
+
                        wps_possible=1
                        append wpa_key_mgmt "WPA-PSK"
                ;;
@@ -248,7 +255,7 @@ hostapd_set_bss_options() {
                                ownip \
                                eap_reauth_period dynamic_vlan \
                                vlan_naming vlan_tagged_interface \
-                               vlan_bridge
+                               vlan_bridge vlan_file
 
                        # legacy compatibility
                        [ -n "$auth_server" ] || json_get_var auth_server server
@@ -291,7 +298,13 @@ hostapd_set_bss_options() {
                                        append bss_conf "vlan_bridge=$vlan_bridge" "$N"
                                [ -n "$vlan_tagged_interface" ] && \
                                        append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
+                               [ -n "$vlan_file" ] && {
+                                       [ -e "$vlan_file" ] || touch "$vlan_file"
+                                       append bss_conf "vlan_file=$vlan_file" "$N"
+                               }
                        }
+
+                       [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
                ;;
                wep)
                        local wep_keyidx=0
@@ -340,8 +353,9 @@ hostapd_set_bss_options() {
        append bss_conf "ssid=$ssid" "$N"
        [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
        [ -n "$iapp_interface" ] && {
-               iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")"
-               [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N"
+               local ifname
+               network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
+               append bss_conf "iapp_interface=$ifname" "$N"
        }
 
        if [ "$wpa" -ge "1" ]; then