Changeset 3703

Timestamp:

03/09/08 17:47:27 (9 months ago)

Author:

spaetzle

Message:

added preliminary atheros wpa support

Files:

• trunk/freewrt/package/madwifi/Makefile (modified) (1 diff)
• trunk/freewrt/package/madwifi/files/wl-atheros (modified) (2 diffs)

trunk/freewrt/package/madwifi/Makefile

@@ -10 +10 @@
-PKG_NAME:=              madwifi
-PKG_VERSION:=           0.9.3.3
-3
+4
-PKG_MD5SUM:=            3b454351fd533bdf361a7fbc525a525f
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2

trunk/freewrt/package/madwifi/files/wl-atheros

@@ -88 +88 @@
-                        security_wep
-                ;;
+                wpa-psk)
+                        security_wpa
+                ;;
-                *)
-                        mstate 1
@@ -160 +163 @@
-}
-
+security_wpa() {
+        case $IF_WIRELESS_ENCRYPTION in
+        tkip)
+                wpapair="TKIP"
+        ;;
+        aes)
+                wpapair="CCMP"
+        ;;
+        aes+tkip)
+                wpapair="CCMP TKIP"
+        ;;
+        *)
+                merr "Unknown wireless encryption $IF_WIRELESS_ENCRYPTION"
+                return 1
+
+        ;;
+        esac
+
+        case $IF_WIRELESS_AUTHORIZATION in
+        psk)
+                wpa=1
+        ;;
+        psk2)
+                wpa=2
+        ;;
+        "psk psk2")
+                wpa=3
+        ;;
+        *)
+                merr "Unknown wireless authorisation $IF_WIRELESS_AUTHORISATION"
+                return 1
+
+        ;;
+        esac
+
+        BRIDGE_IFACE=
+        get_bridge_iface
+
+        if [[ $BRIDGE_IFACE == "" ]]; then
+                merr "only bridged mode supported and no bridge configured"
+                return 1
+        fi
+
+        mkdir -p /var/run/hostapd
+        cat > /var/run/hostapd/${IFACE}.conf <<EOF
+driver=madwifi
+debug=0
+interface=$IFACE
+bridge=$BRIDGE_IFACE
+ssid=$IF_WIRELESS_SSID
+wpa=$wpa
+wpa_pairwise=$wpapair
+wpa_passphrase=$IF_WIRELESS_WPA_KEY
+EOF
+        hostapd -B /var/run/hostapd/${IFACE}.conf
+}
+
-if_postdown() {
-        init_debug wlanconfig $IFACE destroy
+}
+
+get_bridge_iface() {
+        [[ -x $(whence -p brctl) ]] || return 1
+        brctl show 2>&- | grep -q $IFACE || return 1
+        for var in $(brctl show 2>&- | grep -o ^[a-z]*[^[:space:]]); do
+                brctl showstp $var | grep -q ^${IFACE}[[:space:]] || continue
+                BRIDGE_IFACE=$var
+                return 0
+        done
-}
-