Changeset 1504

Timestamp:

04/15/06 06:09:57 (3 years ago)

Author:

kelmo

Message:

Use IWEVGENIE to report IEs for RSN and WPA in a human readabe form.
This replaces the IWEVCUSTOM custom event on systems supporting WEXT
18 or higher.

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

Files:

• trunk/net80211/ieee80211_wireless.c (modified) (2 diffs)

trunk/net80211/ieee80211_wireless.c

@@ -1536 +1536 @@
-
-        if (se->se_rsn_ie != NULL) {
+                memset(&iwe, 0, sizeof(iwe));
+#ifdef IWEVGENIE
+                memcpy(buf, se->se_rsn_ie, se->se_rsn_ie[1] + 2);
+                iwe.cmd = IWEVGENIE;
+                iwe.u.data.length = se->se_rsn_ie[1] + 2;
+#else   
-                static const char rsn_leader[] = "rsn_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
-                iwe.cmd = IWEVCUSTOM;
-                if (se->se_rsn_ie[0] == IEEE80211_ELEMID_RSN)
@@ -1544 +1548 @@
-                                se->se_rsn_ie, se->se_rsn_ie[1] + 2,
-                                rsn_leader, sizeof(rsn_leader) - 1);
+#endif
-                if (iwe.u.data.length != 0)
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,
-                                &iwe, buf);
-        }
+
-        if (se->se_wpa_ie != NULL) {
+                memset(&iwe, 0, sizeof(iwe));
+#ifdef IWEVGENIE
+                memcpy(buf, se->se_wpa_ie, se->se_wpa_ie[1] + 2);
+                iwe.cmd = IWEVGENIE;
+                iwe.u.data.length = se->se_wpa_ie[1] + 2;
+#else
-                static const char wpa_leader[] = "wpa_ie=";
-
-                memset(&iwe, 0, sizeof(iwe));
-                iwe.cmd = IWEVCUSTOM;
-                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);
+#endif
-                if (iwe.u.data.length != 0)
-                        current_ev = iwe_stream_add_point(current_ev, end_buf,