Changeset 1453

Timestamp:

02/19/06 18:19:27 (5 years ago)

Author:

mrenzmann

Message:

This patch fixes issues with RSN and WPA IEs in combination with
hostapd, as described in ticket #241. You will need a recent snapshot
of hostapd-devel, patched with hostapd-devel-new.patch from ticket
#241 (until the patch is committed to the hostapd repository, at
least).

Signed-off-by: Charles Bovy <charles@bovy.nl>

Files:

• trunk/net80211/ieee80211_ioctl.h (modified) (1 diff)
• trunk/net80211/ieee80211_wireless.c (modified) (5 diffs)

trunk/net80211/ieee80211_ioctl.h

@@ -281 +281 @@
-        u_int8_t        wpa_macaddr[IEEE80211_ADDR_LEN];
-        u_int8_t        wpa_ie[IEEE80211_MAX_OPT_IE];
+        u_int8_t        rsn_ie[IEEE80211_MAX_OPT_IE];
-};
-

trunk/net80211/ieee80211_wireless.c

@@ -3232 +3232 @@
-                memcpy(wpaie.wpa_ie, ni->ni_wpa_ie, ielen);
-        }
+        if (ni->ni_rsn_ie != NULL) {
+                int ielen = ni->ni_rsn_ie[1] + 2;
+                if (ielen > sizeof(wpaie.rsn_ie))
+                        ielen = sizeof(wpaie.rsn_ie);
+                memcpy(wpaie.rsn_ie, ni->ni_rsn_ie, ielen);
+        }
-        ieee80211_free_node(ni);
-        return (copy_to_user(iwr->u.data.pointer, &wpaie, sizeof(wpaie)) ?
@@ -3272 +3278 @@
-{
-        *ielen = 0;
+        if (se->se_rsn_ie != NULL)
+                *ielen += 2 + se->se_rsn_ie[1];
-        if (se->se_wpa_ie != NULL)
-                *ielen += 2 + se->se_wpa_ie[1];
@@ -3326 +3334 @@
-        memcpy(cp, se->se_ssid + 2, sr->isr_ssid_len);
-        cp += sr->isr_ssid_len;
+        if (se->se_rsn_ie != NULL) {
+                memcpy(cp, se->se_rsn_ie, 2 + se->se_rsn_ie[1]);
+                cp += 2 + se->se_rsn_ie[1];
+        }
-        if (se->se_wpa_ie != NULL) {
-                memcpy(cp, se->se_wpa_ie, 2 + se->se_wpa_ie[1]);
@@ -3388 +3400 @@
-{
-        *ielen = 0;
+        if (ni->ni_rsn_ie != NULL)
+                *ielen += 2+ni->ni_rsn_ie[1];
-        if (ni->ni_wpa_ie != NULL)
-                *ielen += 2+ni->ni_wpa_ie[1];
@@ -3478 +3492 @@
-
-        cp = (u_int8_t *)(si+1);
+        if (ni->ni_rsn_ie != NULL) {
+                memcpy(cp, ni->ni_rsn_ie, 2 + ni->ni_rsn_ie[1]);
+                cp += 2 + ni->ni_rsn_ie[1];
+        }
-        if (ni->ni_wpa_ie != NULL) {
-                memcpy(cp, ni->ni_wpa_ie, 2 + ni->ni_wpa_ie[1]);