X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;h=dd77f79648ed604e5cc0539328207d30f1b56dbe;hb=ee2c54569f605befa12ea6bca7c0ec5ab2634f40;hp=cd03b3082c2f4bbf03436e1d4cf7f9d823ec8868;hpb=946291c8d56c01d634c0f032a8fc52b2bf8febf5;p=oweals%2Fopenwrt.git diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index cd03b3082c..dd77f79648 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -173,13 +173,18 @@ disable_mac80211() ( set_wifi_down "$device" # kill all running hostapd and wpa_supplicant processes that # are running on atheros/mac80211 vifs - for pid in `pidof hostapd wpa_supplicant`; do - grep "$phy" /proc/$pid/cmdline >/dev/null && \ + for pid in `pidof hostapd`; do + grep -E "$phy" /proc/$pid/cmdline >/dev/null && \ kill $pid done include /lib/network for wdev in $(ls /sys/class/ieee80211/${phy}/device/net 2>/dev/null); do + [ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1 + for pid in `pidof wpa_supplicant`; do + grep "$wdev" /proc/$pid/cmdline >/dev/null && \ + kill $pid + done ifconfig "$wdev" down 2>/dev/null unbridge "$dev" iw dev "$wdev" del @@ -229,7 +234,6 @@ enable_mac80211() { } config_set "$vif" ifname "$ifname" - config_get enc "$vif" encryption config_get mode "$vif" mode config_get ssid "$vif" ssid @@ -242,6 +246,7 @@ enable_mac80211() { # Hostapd will handle recreating the interface and # it's accompanying monitor apidx="$(($apidx + 1))" + i=$(($i + 1)) [ "$apidx" -gt 1 ] || iw phy "$phy" interface add "$ifname" type managed ;; mesh) @@ -282,57 +287,19 @@ enable_mac80211() { [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac" config_set "$vif" macaddr "$vif_mac" - # Valid values are: - # wpa / wep / none - # # !! ap !! # # ALL ap functionality will be passed to hostapd # - # !! mesh / adhoc / station !! - # none -> NO encryption + # !! station !! # - # wep + keymgmt = '' -> we use iw to connect to the - # network. + # ALL station functionality will be passed to wpa_supplicant # - # wep + keymgmt = 'NONE' -> wpa_supplicant will be - # configured to handle the wep connection if [ ! "$mode" = "ap" ]; then # We attempt to set the channel for all interfaces, although # mac80211 may not support it or the driver might not yet # for ap mode this is handled by hostapd [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" - - local key keystring - - case "$enc" in - *wep*) - config_get keymgmt "$vif" keymgmt - if [ -z "$keymgmt" ]; then - 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}" - if [ -n "$ckey" ]; then - [ $idx -eq $key ] && zidx="d:${zidx}" - append keystring "${zidx}:$(prepare_key_wep "$ckey")" - fi - done - ;; - *) - keystring="d:0:$(prepare_key_wep "$key")" - ;; - esac - fi - ;; - *psk*|*wpa*) - config_get key "$vif" key - ;; - esac fi # txpower is not yet implemented in iw @@ -351,52 +318,6 @@ enable_mac80211() { if [ -n "$rts" ]; then iw phy "$phy" set rts "${rts%%.*}" fi - - ifconfig "$ifname" up - - [ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname" - - case "$mode" in - adhoc) - config_get bssid "$vif" bssid - iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid - ;; - sta|mesh) - config_get bssid "$vif" bssid - case "$enc" in - *wep*) - if [ -z "$keymgmt" ]; then - [ -n "$keystring" ] && - iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key $keystring - else - if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then - wpa_supplicant_setup_vif "$vif" wext || { - echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - continue - } - fi - fi - ;; - *wpa*|*psk*) - config_get key "$vif" key - if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then - wpa_supplicant_setup_vif "$vif" wext || { - echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - continue - } - fi - ;; - *) - iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid - ;; - esac - - ;; - esac done local start_hostapd= @@ -408,20 +329,50 @@ enable_mac80211() { start_hostapd=1 done - [ -n "$start_hostapd" ] || return 0 + [ -n "$start_hostapd" ] && { + hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || { + echo "Failed to start hostapd for $phy" + return + } + sleep 2 - hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || { - echo "Failed to start hostapd for $phy" - return + for vif in $vifs; do + config_get mode "$vif" mode + config_get ifname "$vif" ifname + [ "$mode" = "ap" ] || continue + mac80211_start_vif "$vif" "$ifname" + done } - sleep 2 for vif in $vifs; do config_get mode "$vif" mode config_get ifname "$vif" ifname - [ "$mode" = "ap" ] || continue - mac80211_start_vif "$vif" "$ifname" + [ ! "$mode" = "ap" ] || continue + ifconfig "$ifname" up + + if [ ! "$mode" = "ap" ]; then + mac80211_start_vif "$vif" "$ifname" + + case "$mode" in + adhoc) + config_get bssid "$vif" bssid + config_get ssid "$vif" ssid + iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid + ;; + sta) + if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then + wpa_supplicant_setup_vif "$vif" wext || { + echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2 + # make sure this wifi interface won't accidentally stay open without encryption + ifconfig "$ifname" down + continue + } + fi + ;; + esac + fi done + }