-hostapd_setup_vif() {
- local vif="$1"
- local driver="$2"
- local hostapd_cfg=
+hostapd_set_bss_options() {
+ local var="$1"
+ local vif="$2"
+ local enc wpa_group_rekey
+
+ config_get enc "$vif" encryption
+ config_get wpa_group_rekey "$vif" wpa_group_rekey
# Examples:
# psk-mixed/tkip => WPA1+2 PSK, TKIP
# crypto defaults: WPA2 vs WPA1
case "$enc" in
- wpa2*|WPA2*|*PSK2*|*psk2*)
+ wpa2*|*psk2*)
wpa=2
crypto="CCMP"
;;
wpa=3
crypto="CCMP TKIP"
;;
- *)
+ *)
wpa=1
crypto="TKIP"
;;
# explicit override for crypto setting
case "$enc" in
- *tkip+aes|*TKIP+AES|*tkip+ccmp|*TKIP+CCMP) crypto="CCMP TKIP";;
- *tkip|*TKIP) crypto="TKIP";;
- *aes|*AES|*ccmp|*CCMP) crypto="CCMP";;
+ *tkip+aes|*tkip+ccmp) crypto="CCMP TKIP";;
+ *aes|*ccmp) crypto="CCMP";;
+ *tkip) crypto="TKIP";;
esac
# use crypto/auth settings for building the hostapd config
case "$enc" in
- *psk*|*PSK*)
+ *psk*)
config_get psk "$vif" key
- append hostapd_cfg "wpa_passphrase=$psk" "$N"
+ if [ ${#psk} -eq 64 ]; then
+ append "$var" "wpa_psk=$psk" "$N"
+ else
+ append "$var" "wpa_passphrase=$psk" "$N"
+ fi
;;
- *wpa*|*WPA*)
- # required fields? formats?
- # hostapd is particular, maybe a default configuration for failures
+ *wpa*)
+ # required fields? formats?
+ # hostapd is particular, maybe a default configuration for failures
config_get server "$vif" server
- append hostapd_cfg "auth_server_addr=$server" "$N"
+ append "$var" "auth_server_addr=$server" "$N"
config_get port "$vif" port
port=${port:-1812}
- append hostapd_cfg "auth_server_port=$port" "$N"
+ append "$var" "auth_server_port=$port" "$N"
config_get secret "$vif" key
- append hostapd_cfg "auth_server_shared_secret=$secret" "$N"
+ append "$var" "auth_server_shared_secret=$secret" "$N"
config_get nasid "$vif" nasid
- append hostapd_cfg "nas_identifier=$nasid" "$N"
- append hostapd_cfg "eapol_key_index_workaround=1" "$N"
- append hostapd_cfg "radius_acct_interim_interval=300" "$N"
- append hostapd_cfg "ieee8021x=1" "$N"
- append hostapd_cfg "auth_algs=1" "$N"
- append hostapd_cfg "wpa_key_mgmt=WPA-EAP" "$N"
- append hostapd_cfg "wpa_group_rekey=300" "$N"
- append hostapd_cfg "wpa_gmk_rekey=640" "$N"
+ 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"
+ ;;
+ *wep*)
+ config_get key "$vif" key
+ key="${key:-1}"
+ case "$key" in
+ [1234])
+ for idx in 1 2 3 4; do
+ local zidx
+ zidx=$(($idx - 1))
+ config_get ckey "$vif" "key${idx}"
+ [ -n "$ckey" ] && \
+ append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N"
+ done
+ append "$var" "wep_default_key=$((key - 1))" "$N"
+ ;;
+ *)
+ append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N"
+ append "$var" "wep_default_key=0" "$N"
+ ;;
+ esac
+ wpa=0
+ crypto=
;;
*)
wpa=0
+ crypto=
;;
esac
- config_get ifname "$vif" ifname
- config_get bridge "$vif" bridge
+ 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"
+
config_get ssid "$vif" ssid
+ config_get bridge "$vif" bridge
+ config_get ieee80211d "$vif" ieee80211d
+
+ 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
+}
+
+hostapd_setup_vif() {
+ local vif="$1"
+ local driver="$2"
+ hostapd_cfg=
+
+ hostapd_set_bss_options hostapd_cfg "$vif"
+ config_get ifname "$vif" ifname
config_get device "$vif" device
config_get channel "$device" channel
+ config_get hwmode "$device" hwmode
+ case "$hwmode" in
+ *bg) hwmode=g;;
+ esac
+ [ "$channel" = auto ] && channel=
+ [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
cat > /var/run/hostapd-$ifname.conf <<EOF
+ctrl_interface=/var/run/hostapd-$ifname
driver=$driver
interface=$ifname
-hw_mode=g
-channel=$channel
-${bridge:+bridge=$bridge}
-ssid=$ssid
-debug=0
-wpa=$wpa
-wpa_pairwise=$crypto
+${hwmode:+hw_mode=${hwmode#11}}
+${channel:+channel=$channel}
$hostapd_cfg
EOF
- hostapd -B /var/run/hostapd-$ifname.conf
+ hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
}
projects / openwrt.git / blobdiff