X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/115b6d53ffe601b92586f20e19f687bedc74d28b..9587f988b7e9f5b15eb3e561eeef81fedafde8eb:/package/hostapd/files/hostapd.sh diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh index c4e91689d..29d8c7297 100644 --- a/package/hostapd/files/hostapd.sh +++ b/package/hostapd/files/hostapd.sh @@ -9,6 +9,9 @@ hostapd_set_bss_options() { config_get device "$vif" device config_get hwmode "$device" hwmode + config_get phy "$device" phy + + append "$var" "ctrl_interface=/var/run/hostapd-$phy" "$N" if [ "$ap_isolate" -gt 0 ]; then append "$var" "ap_isolate=$ap_isolate" "$N" @@ -47,8 +50,8 @@ hostapd_set_bss_options() { esac # enforce CCMP for 11ng and 11na - case "$hwmode" in - *ng|*na) crypto="CCMP";; + case "$hwmode:$crypto" in + *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";; esac # use crypto/auth settings for building the hostapd config @@ -65,19 +68,28 @@ hostapd_set_bss_options() { *wpa*) # required fields? formats? # hostapd is particular, maybe a default configuration for failures - config_get server "$vif" server - append "$var" "auth_server_addr=$server" "$N" - config_get port "$vif" port - port=${port:-1812} - append "$var" "auth_server_port=$port" "$N" - config_get secret "$vif" key - append "$var" "auth_server_shared_secret=$secret" "$N" + config_get auth_server "$vif" auth_server + [ -z "$auth_server" ] && config_get auth_server "$vif" server + append "$var" "auth_server_addr=$auth_server" "$N" + config_get auth_port "$vif" auth_port + [ -z "$auth_port" ] && config_get auth_port "$vif" port + auth_port=${auth_port:-1812} + append "$var" "auth_server_port=$auth_port" "$N" + config_get auth_secret "$vif" auth_secret + [ -z "$auth_secret" ] && config_get auth_secret "$vif" key + append "$var" "auth_server_shared_secret=$auth_secret" "$N" + config_get acct_server "$vif" acct_server + [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N" + config_get acct_port "$vif" acct_port + [ -n "$acct_port" ] && acct_port=${acct_port:-1813} + [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N" + config_get acct_secret "$vif" acct_secret + [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N" config_get nasid "$vif" nasid append "$var" "nas_identifier=$nasid" "$N" append "$var" "eapol_key_index_workaround=1" "$N" append "$var" "radius_acct_interim_interval=300" "$N" append "$var" "ieee8021x=1" "$N" - append "$var" "auth_algs=1" "$N" append "$var" "wpa_key_mgmt=WPA-EAP" "$N" append "$var" "wpa_group_rekey=300" "$N" append "$var" "wpa_gmk_rekey=640" "$N" @@ -101,6 +113,14 @@ hostapd_set_bss_options() { append "$var" "wep_default_key=0" "$N" ;; esac + case "$enc" in + *shared*) + auth_algs=2 + ;; + *mixed*) + auth_algs=3 + ;; + esac wpa=0 crypto= ;; @@ -109,6 +129,7 @@ hostapd_set_bss_options() { crypto= ;; esac + append "$var" "auth_algs=${auth_algs:-1}" "$N" append "$var" "wpa=$wpa" "$N" [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N" [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N" @@ -116,33 +137,59 @@ hostapd_set_bss_options() { config_get ssid "$vif" ssid config_get bridge "$vif" bridge config_get ieee80211d "$vif" ieee80211d + config_get iapp_interface "$vif" iapp_interface config_get_bool wps_pbc "$vif" wps_pushbutton 0 - [ -n "$wps_possible" -a "$wps_pbc" -gt 0 ] && { + config_get_bool wps_label "$vif" wps_label 0 + + config_get config_methods "$vif" wps_config + [ "$wps_pbc" -gt 0 ] && append config_methods push_button + + [ -n "$wps_possible" -a -n "$config_methods" ] && { + config_get device_type "$vif" wps_device_type "6-0050F204-1" + config_get device_name "$vif" wps_device_name "OpenWrt AP" + config_get manufacturer "$vif" wps_manufacturer "openwrt.org" + append "$var" "eap_server=1" "$N" append "$var" "wps_state=2" "$N" append "$var" "ap_setup_locked=1" "$N" - append "$var" "config_methods=push_button" "$N" + append "$var" "device_type=$device_type" "$N" + append "$var" "device_name=$device_name" "$N" + append "$var" "manufacturer=$manufacturer" "$N" + append "$var" "config_methods=$config_methods" "$N" } append "$var" "ssid=$ssid" "$N" [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N" [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N" - - [ "$wpa" -ge "2" ] && config_get ieee80211w "$vif" ieee80211w - case "$ieee80211w" in - [012]) - append "$var" "ieee80211w=$ieee80211w" "$N" - [ "$ieee80211w" -gt "0" ] && { - config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout - config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout - [ -n "$ieee80211w_max_timeout" ] && \ - append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N" - [ -n "$ieee80211w_retry_timeout" ] && \ - append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N" - } - ;; - esac + [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N" + + if [ "$wpa" -ge "2" ] + then + # RSN -> allow preauthentication + config_get rsn_preauth "$vif" rsn_preauth + if [ -n "$bridge" -a "$rsn_preauth" = 1 ] + then + append "$var" "rsn_preauth=1" "$N" + append "$var" "rsn_preauth_interfaces=$bridge" "$N" + fi + + # RSN -> allow management frame protection + config_get ieee80211w "$vif" ieee80211w + case "$ieee80211w" in + [012]) + append "$var" "ieee80211w=$ieee80211w" "$N" + [ "$ieee80211w" -gt "0" ] && { + config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout + config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout + [ -n "$ieee80211w_max_timeout" ] && \ + append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N" + [ -n "$ieee80211w_retry_timeout" ] && \ + append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N" + } + ;; + esac + fi } hostapd_setup_vif() { @@ -162,7 +209,6 @@ hostapd_setup_vif() { [ "$channel" = auto ] && channel= [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device" cat > /var/run/hostapd-$ifname.conf <