X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2ea8f22fbe87280385f5795c106cc6de89052871..a551eef759b5b191427d4e0f6864b1761e8d2734:/package/madwifi/files/lib/wifi/madwifi.sh diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index de9870ce6..6baf482dc 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -14,7 +14,7 @@ scan_atheros() { config_get mode "$vif" mode case "$mode" in - adhoc|sta|ap) + adhoc|ahdemo|sta|ap) append $mode "$vif" ;; wds) @@ -35,85 +35,22 @@ scan_atheros() { case "${adhoc:+1}:${sta:+1}:${ap+1}" in # valid mode combinations 1::) wds="";; + 1::1);; :1:1)config_set "$device" nosbeacon 1;; # AP+STA, can't use beacon timers for STA :1:);; ::1);; - :::);; + ::);; *) echo "$device: Invalid mode combination in config"; return 1;; esac - config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${wds:+$wds }" + config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }" } -hostapd_setup_vif() { - local vif="$1" - local driver="$2" - local hostapd_cfg= - - # Examples: - # psk-mixed/tkip => WPA1+2 PSK, TKIP - # wpa-psk2/tkip+aes => WPA2 PSK, CCMP+TKIP - # wpa2/tkip+aes => WPA2 RADIUS, CCMP+TKIP - # ... - - # TODO: move this parsing function somewhere generic, so that - # later it can be reused by drivers that don't use hostapd - - # crypto defaults: WPA2 vs WPA1 - case "$enc" in - wpa2*|WPA2*|*PSK2*|*psk2*) - wpa=2 - crypto="CCMP" - ;; - *mixed*) - wpa=3 - crypto="CCMP TKIP" - ;; - *) - wpa=1 - crypto="TKIP" - ;; - esac - - # 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";; - esac - - # use crypto/auth settings for building the hostapd config - case "$enc" in - *psk*|*PSK*) - config_get psk "$vif" key - append hostapd_cfg "wpa_passphrase=$psk" "$N" - ;; - *wpa*|*WPA*) - # FIXME: add wpa+radius here - ;; - *) - return 0; - ;; - esac - config_get ifname "$vif" ifname - config_get bridge "$vif" bridge - config_get ssid "$vif" ssid - cat > /var/run/hostapd-$ifname.conf </dev/null 2>/dev/null + ifconfig "$ifname" up + sleep 1 + iwpriv "$ifname" mode "$agmode" + iwpriv "$ifname" pureg "$pureg" + iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null + } + + config_get_bool hidden "$vif" hidden 0 + iwpriv "$ifname" hide_ssid "$hidden" + + config_get ff "$vif" ff + if [ -n "$ff" ]; then + iwpriv "$ifname" ff "$ff" + fi + config_get wds "$vif" wds case "$wds" in 1|on|enabled) wds=1;; @@ -169,7 +136,14 @@ enable_atheros() { iwconfig "$ifname" enc "[$idx]" "${key:-off}" done config_get key "$vif" key - iwconfig "$ifname" enc "[${key:-1}]" + key="${key:-1}" + case "$key" in + [1234]) iwconfig "$ifname" enc "[$key]";; + *) iwconfig "$ifname" enc "$key";; + esac + ;; + PSK|psk|PSK2|psk2) + config_get key "$vif" key ;; esac @@ -178,13 +152,92 @@ enable_atheros() { config_get addr "$vif" bssid iwpriv "$ifname" wds_add "$addr" ;; + adhoc|ahdemo) + config_get addr "$vif" bssid + [ -z "$addr" ] || { + iwconfig "$ifname" ap "$addr" + } + ;; + esac + config_get ssid "$vif" ssid + + config_get_bool bgscan "$vif" bgscan + [ -n "$bgscan" ] && iwpriv "$ifname" bgscan "$bgscan" + + config_get_bool antdiv "$device" diversity + [ -n "$antdiv" ] && sysctl -w dev."$device".diversity="$antdiv" >&- + + config_get antrx "$device" rxantenna + [ -n "$antrx" ] && sysctl -w dev."$device".rxantenna="$antrx" >&- + + config_get anttx "$device" txantenna + [ -n "$anttx" ] && sysctl -w dev."$device".txantenna="$anttx" >&- + + config_get distance "$device" distance + [ -n "$distance" ] && athctrl -i "$device" -d "$distance" >&- + + config_get txpwr "$vif" txpower + [ -n "$txpwr" ] && iwconfig "$ifname" txpower "${txpwr%%.*}" + + config_get rate "$vif" rate + [ -n "$rate" ] && iwconfig "$ifname" rate "${rate%%.*}" + + config_get mcast_rate "$vif" mcast_rate + [ -n "$mcast_rate" ] && iwpriv "$ifname" mcast_rate "${mcast_rate%%.*}" + + config_get frag "$vif" frag + [ -n "$frag" ] && iwconfig "$ifname" frag "${frag%%.*}" + + config_get rts "$vif" rts + [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}" + + config_get_bool doth "$vif" 80211h + [ -n "$doth" ] && iwpriv "$ifname" doth "$doth" + + config_get_bool comp "$vif" compression + [ -n "$comp" ] && iwpriv "$ifname" compression "$comp" + + config_get_bool burst "$vif" bursting + [ -n "$burst" ] && iwpriv "$ifname" burst "$burst" + + config_get_bool wmm "$vif" wmm + [ -n "$wmm" ] && iwpriv "$ifname" wmm "$wmm" + + config_get_bool xr "$vif" xr + [ -n "$xr" ] && iwpriv "$ifname" xr "$xr" + + config_get_bool ar "$vif" ar + [ -n "$ar" ] && iwpriv "$ifname" ar "$ar" + + config_get_bool turbo "$vif" turbo + [ -n "$turbo" ] && iwpriv "$ifname" turbo "$turbo" + + config_get maclist "$vif" maclist + [ -n "$maclist" ] && { + # flush MAC list + iwpriv "$ifname" maccmd 3 + for mac in $maclist; do + iwpriv "$ifname" addmac "$mac" + done + } + + config_get macpolicy "$vif" macpolicy + case "$macpolicy" in + allow) + iwpriv "$ifname" maccmd 1 + ;; + deny) + iwpriv "$ifname" maccmd 2 + ;; *) - config_get ssid "$vif" ssid + # default deny policy if mac list exists + [ -n "$maclist" ] && iwpriv "$ifname" maccmd 2 ;; esac - iwconfig "$ifname" channel "$channel" + ifconfig "$ifname" up - + iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null + local net_cfg bridge net_cfg="$(find_net_config "$vif")" [ -z "$net_cfg" ] || { @@ -192,21 +245,56 @@ enable_atheros() { config_set "$vif" bridge "$bridge" start_net "$ifname" "$net_cfg" } + iwconfig "$ifname" essid "$ssid" + set_wifi_up "$vif" "$ifname" case "$mode" in ap) - hostapd_setup_vif "$vif" madwifi || { - echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - wlanconfig "$ifname" destroy - continue - } + config_get_bool isolate "$vif" isolate 0 + iwpriv "$ifname" ap_bridge "$((isolate^1))" + + if eval "type hostapd_setup_vif" 2>/dev/null >/dev/null; then + hostapd_setup_vif "$vif" madwifi || { + echo "enable_atheros($device): Failed to set up wpa for interface $ifname" >&2 + # make sure this wifi interface won't accidentally stay open without encryption + ifconfig "$ifname" down + wlanconfig "$ifname" destroy + continue + } + fi ;; wds|sta) - iwconfig "$ifname" essid "$ssid" - # FIXME: implement wpa_supplicant calls here + case "$enc" in + PSK|psk|PSK2|psk2) + case "$enc" in + PSK|psk) + proto='proto=WPA' + passphrase="${key}" + ;; + PSK2|psk2) + proto='proto=RSN' + passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2` + ;; + esac + + cat > /var/run/wpa_supplicant-$ifname.conf <&-); do config_get type "$dev" type [ "$type" = atheros ] && return cat <