Ticket #132: madwifi-ng.wpa+rsn.patch

net80211/ieee80211_node.c

@@ -646 +646 @@
-        ni->ni_rssi = se->se_rssi;
-        if (se->se_wpa_ie != NULL)
-                ieee80211_saveie(&ni->ni_wpa_ie, se->se_wpa_ie);
+        if (se->se_rsn_ie != NULL)
+                ieee80211_saveie(&ni->ni_rsn_ie, se->se_rsn_ie);
-        if (se->se_wme_ie != NULL)
-                ieee80211_saveie(&ni->ni_wme_ie, se->se_wme_ie);
-        if (se->se_ath_ie != NULL)
@@ -791 +793 @@
-        ic->ic_node_cleanup(ni);
-        if (ni->ni_wpa_ie != NULL)
-                FREE(ni->ni_wpa_ie, M_DEVBUF);
+        if (ni->ni_rsn_ie != NULL)
+                FREE(ni->ni_rsn_ie, M_DEVBUF);
-        if (ni->ni_wme_ie != NULL)
-                FREE(ni->ni_wme_ie, M_DEVBUF);
-        if (ni->ni_ath_ie != NULL)
@@ -1177 +1181 @@
-                        ieee80211_saveie(&ni->ni_wme_ie, sp->wme);
-                if (sp->wpa != NULL)
-                        ieee80211_saveie(&ni->ni_wpa_ie, sp->wpa);
+                if (sp->rsn != NULL)
+                        ieee80211_saveie(&ni->ni_rsn_ie, sp->rsn);
-                if (sp->ath != NULL)
-                        ieee80211_saveath(ni, sp->ath);
-

net80211/ieee80211_scan.h

@@ -144 +144 @@
-        u_int8_t        *xrates;
-        u_int8_t        *doth;
-        u_int8_t        *wpa;
+        u_int8_t        *rsn;
-        u_int8_t        *wme;
-        u_int8_t        *ath;
-};
@@ -172 +173 @@
-        u_int8_t        se_erp;         /* ERP from beacon/probe resp */
-        int8_t          se_rssi;        /* avg'd recv ssi */
-        u_int8_t        se_dtimperiod;  /* DTIM period */
-
+
+
-        u_int8_t        *se_wme_ie;     /* captured WME ie */
-        u_int8_t        *se_ath_ie;     /* captured Atheros ie */
-        u_int           se_age;         /* age of entry (0 on create) */

net80211/ieee80211_node.h

@@ -122 +122 @@
-        u_int16_t               ni_txpower;     /* current transmit power */
-        u_int16_t               ni_vlan;        /* vlan tag */
-        u_int32_t               *ni_challenge;  /* shared-key challenge */
-
+
+
-        u_int8_t                *ni_wme_ie;     /* captured WME ie */
-        u_int8_t                *ni_ath_ie;     /* captured Atheros ie */
-        u_int16_t               ni_txseqs[17];  /* tx seq per-tid */

net80211/ieee80211_scan_sta.c

@@ -272 +272 @@
-        }
-        saveie(&ise->se_wme_ie, sp->wme);
-        saveie(&ise->se_wpa_ie, sp->wpa);
+        saveie(&ise->se_rsn_ie, sp->rsn);
-        saveie(&ise->se_ath_ie, sp->ath);
-
-        /* clear failure count after STA_FAIL_AGE passes */

net80211/ieee80211_wireless.c

@@ -1432 +1432 @@
-        iwe.u.data.length = strlen(buf);
-        current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-
-wpa
+rsn
-                static const char rsn_leader[] = "rsn_ie=";
-                static const char wpa_leader[] = "wpa_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
-                iwe.cmd = IWEVCUSTOM;
-wpa
+rsn
-                        iwe.u.data.length = encode_ie(buf, sizeof(buf),
-wpa_ie, se->se_wpa
+rsn_ie, se->se_rsn
-                                rsn_leader, sizeof(rsn_leader)-1);
-
+
+
+
+
+
+
+
+
+
-                        iwe.u.data.length = encode_ie(buf, sizeof(buf),
-                                se->se_wpa_ie, se->se_wpa_ie[1]+2,
-                                wpa_leader, sizeof(wpa_leader)-1);

net80211/ieee80211_input.c

@@ -1640 +1640 @@
- */
-static int
-ieee80211_parse_wpa(struct ieee80211vap *vap, u_int8_t *frm,
-
+_parm
-{
-        u_int8_t len = frm[1];
-        u_int32_t w;
@@ -1676 +1676 @@
-        frm += 2, len -= 2;
-
-        /* multicast/group cipher */
-
-
+_parm
+_parm
-                IEEE80211_DISCARD_IE(vap,
-                    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
-                    wh, "WPA", "mcast cipher mismatch; got %u, expected %u",
-
+_parm
-                return IEEE80211_REASON_IE_INVALID;
-        }
-        frm += 4, len -= 4;
@@ -1698 +1698 @@
-        }
-        w = 0;
-        for (; n > 0; n--) {
-
+_parm
-                frm += 4, len -= 4;
-        }
-
+_parm
-        if (w == 0) {
-                IEEE80211_DISCARD_IE(vap,
-                    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
@@ -1709 +1709 @@
-                return IEEE80211_REASON_IE_INVALID;
-        }
-        if (w & (1<<IEEE80211_CIPHER_TKIP))
-
+_parm
-        else
-
+_parm
-
-        /* key management algorithms */
-        n = LE_READ_2(frm);
@@ -1728 +1728 @@
-                w |= wpa_keymgmt(frm);
-                frm += 4, len -= 4;
-        }
-
+_parm
-        if (w == 0) {
-                IEEE80211_DISCARD_IE(vap,
-                    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
@@ -1736 +1736 @@
-                return IEEE80211_REASON_IE_INVALID;
-        }
-        if (w & WPA_ASE_8021X_UNSPEC)
-
+_parm
-        else
-
+_parm
-
-        if (len > 2)            /* optional capabilities */
-
+_parm
-
-        return 0;
-}
@@ -1808 +1808 @@
- */
-static int
-ieee80211_parse_rsn(struct ieee80211vap *vap, u_int8_t *frm,
-
+_parm
-{
-        u_int8_t len = frm[1];
-        u_int32_t w;
@@ -1843 +1843 @@
-        frm += 2, len -= 2;
-
-        /* multicast/group cipher */
-
-
+_parm
+_parm
-                IEEE80211_DISCARD_IE(vap,
-                    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
-                    wh, "RSN", "mcast cipher mismatch; got %u, expected %u",
-
+_parm
-                return IEEE80211_REASON_IE_INVALID;
-        }
-        frm += 4, len -= 4;
@@ -1865 +1865 @@
-        }
-        w = 0;
-        for (; n > 0; n--) {
-
+_parm
-                frm += 4, len -= 4;
-        }
-
+_parm
-        if (w == 0) {
-                IEEE80211_DISCARD_IE(vap,
-                    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
@@ -1876 +1876 @@
-                return IEEE80211_REASON_IE_INVALID;
-        }
-        if (w & (1<<IEEE80211_CIPHER_TKIP))
-
+_parm
-        else
-
+_parm
-
-        /* key management algorithms */
-        n = LE_READ_2(frm);
@@ -1895 +1895 @@
-                w |= rsn_keymgmt(frm);
-                frm += 4, len -= 4;
-        }
-
+_parm
-        if (w == 0) {
-                IEEE80211_DISCARD_IE(vap,
-                    IEEE80211_MSG_ELEMID | IEEE80211_MSG_WPA,
@@ -1903 +1903 @@
-                return IEEE80211_REASON_IE_INVALID;
-        }
-        if (w & RSN_ASE_8021X_UNSPEC)
-
+_parm
-        else
-
+_parm
-
-        /* optional RSN capabilities */
-        if (len > 2)
-
+_parm
-        /* XXXPMKID */
-
-        return 0;
@@ -2200 +2200 @@
-        struct ieee80211com *ic = vap->iv_ic;
-        struct ieee80211_frame *wh;
-        u_int8_t *frm, *efrm;
-
+rsn, *
-        u_int8_t rate;
-        int reassoc, resp, allocbs;
-        u_int8_t qosinfo;
@@ -2298 +2298 @@
-                                scan.erp = frm[2];
-                                break;
-                        case IEEE80211_ELEMID_RSN:
-wpa
+rsn
-                                break;
-                        case IEEE80211_ELEMID_VENDOR:
-                                if (iswpaoui(frm))
@@ -2673 +2673 @@
-        case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
-        case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: {
-                u_int16_t capinfo, bintval;
-
+_parm
-                u_int8_t reason;
-
-                if (vap->iv_opmode != IEEE80211_M_HOSTAP ||
@@ -2715 +2715 @@
-                bintval = le16toh(*(u_int16_t *)frm);   frm += 2;
-                if (reassoc)
-                        frm += 6;       /* ignore current AP info */
-
+rsn = 
-                while (frm < efrm) {
-                        switch (*frm) {
-                        case IEEE80211_ELEMID_SSID:
@@ -2730 +2730 @@
-                        /* XXX verify only one of RSN and WPA ie's? */
-                        case IEEE80211_ELEMID_RSN:
-                                if (vap->iv_flags & IEEE80211_F_WPA2)
-wpa
+rsn
-                                else
-                                        IEEE80211_DPRINTF(vap,
-                                                IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
@@ -2789 +2789 @@
-                        return; 
-                }
-                                
-wpa
+rsn
-                        /*
-                         * Parse WPA information element.  Note that
-                         * we initialize the param block from the node
@@ -2797 +2797 @@
-                         * our defaults.  The resulting parameters are
-                         * installed below after the association is assured.
-                         */
-
-wpa
-wpa, &rsn
+_parm
+rsn
+rsn, &rsn_parm
-                        else
-wpa, &rsn
+rsn, &rsn_parm
-                        if (reason != 0) {
-                                IEEE80211_SEND_MGMT(ni,
-                                    IEEE80211_FC0_SUBTYPE_DEAUTH, reason);
@@ -2814 +2814 @@
-                            IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
-                            wh->i_addr2,
-                            "%s ie: mc %u/%u uc %u/%u key %u caps 0x%x",
-wpa
-.rsn_mcastcipher, rsn
-.rsn_ucastcipher, rsn
-.rsn_keymgmt, rsn
+rsn
+_parm.rsn_mcastcipher, rsn_parm
+_parm.rsn_ucastcipher, rsn_parm
+_parm.rsn_keymgmt, rsn_parm
-                }
-                /* discard challenge after association */
-                if (ni->ni_challenge != NULL) {
@@ -2886 +2886 @@
-                         * node as using WPA and record information element
-                         * for applications that require it.
-                         */
-                        ni->ni_rsn = rsn;
-                        ieee80211_saveie(&ni->ni_wpa_ie, wpa);
-                } else if (ni->ni_wpa_ie != NULL) {
-                        /*
@@ -2895 +2894 @@
-                        FREE(ni->ni_wpa_ie, M_DEVBUF);
-                        ni->ni_wpa_ie = NULL;
-                }
+                if (rsn != NULL) {
+                        /*
+                         * Record WPA/RSN parameters for station, mark
+                         * node as using WPA and record information element
+                         * for applications that require it.
+                         */
+                        ni->ni_rsn = rsn_parm;
+                        ieee80211_saveie(&ni->ni_rsn_ie, rsn);
+                } else if (ni->ni_rsn_ie != NULL) {
+                        /*
+                         * Flush any state from a previous association.
+                         */
+                        FREE(ni->ni_rsn_ie, M_DEVBUF);
+                        ni->ni_rsn_ie = NULL;
+                }
-                if (wme != NULL) {
-                        /*
-                         * Record WME parameters for station, mark node