diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-18 12:40:27 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-04-18 12:40:27 +0000 |
| commit | c352f2f98116127f5273363c1f3770427f632646 (patch) | |
| tree | 7279de5aba3f16cf34a4927c84d21ad10ee4738b /package/wireless-tools | |
| parent | 412c2b048f84147ebfa1c3ae533fd16b2ea8f978 (diff) | |
move hostapd setup script from wireless-tools to hostapd package
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7000 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/wireless-tools')
| -rw-r--r-- | package/wireless-tools/Makefile | 2 | ||||
| -rw-r--r-- | package/wireless-tools/files/wifi.sh | 66 |
2 files changed, 0 insertions, 68 deletions
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 0f790aa52..476efec0f 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -59,8 +59,6 @@ define Build/UninstallDev endef define Package/wireless-tools/install - $(INSTALL_DIR) $(1)/lib/wifi - $(INSTALL_DATA) ./files/wifi.sh $(1)/lib/wifi/generic.sh $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/sbin diff --git a/package/wireless-tools/files/wifi.sh b/package/wireless-tools/files/wifi.sh deleted file mode 100644 index 529462e6c..000000000 --- a/package/wireless-tools/files/wifi.sh +++ /dev/null @@ -1,66 +0,0 @@ -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 <<EOF -driver=$driver -interface=$ifname -${bridge:+bridge=$bridge} -ssid=$ssid -debug=0 -wpa=$wpa -wpa_pairwise=$crypto -$hostapd_cfg -EOF - hostapd -B /var/run/hostapd-$ifname.conf -} - |