X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2eb1c2d1df2f93d1722ddee225a21561c689f689..1096da2e3ca38ba6ee61a5bfa66bfe2cd4a2993a:/package/hostapd/files/hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 9ee7657e2..9ef8282bd 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -68,6 +68,28 @@ hostapd_set_bss_options() {
 			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=
@@ -84,6 +106,21 @@ hostapd_set_bss_options() {
 	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() {
@@ -97,7 +134,7 @@ hostapd_setup_vif() {
 	config_get channel "$device" channel
 	config_get hwmode "$device" hwmode
 	case "$hwmode" in
-		bg) hwmode=g;;
+		*bg) hwmode=g;;
 	esac
 	[ "$channel" = auto ] && channel=
 	[ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
@@ -105,7 +142,7 @@ hostapd_setup_vif() {
 ctrl_interface=/var/run/hostapd-$ifname
 driver=$driver
 interface=$ifname
-${hwmode:+hw_mode=$hwmode}
+${hwmode:+hw_mode=${hwmode#11}}
 ${channel:+channel=$channel}
 $hostapd_cfg
 EOF