Changeset 13756

Timestamp:

01/29/10 04:59:02 (3 years ago)

Author:

BrainSlayer

Message:

enhance ie parsing

Location:

src/router/services/tools

Files:

• site_survey_madwifi.c (modified) (2 diffs)
• site_survey_madwifi_11n.c (modified) (2 diffs)

src/router/services/tools/site_survey_madwifi.c

@@ -121 +121 @@
 }
 
+static __inline int isrsnoui(const unsigned char *frm)
+{
+        return frm[1] > 3
+            && LE_READ_4(frm + 2) == ((WPA_OUI_TYPE << 24) | RSN_OUI);
+}
+
 static __inline int iswmeoui(const unsigned char *frm)
 {
@@ -149 +155 @@
                         if (iswpaoui(vp))
                                 strcat(encinfo, "WPA ");
+                        if (isrsnoui(vp))
+                                strcat(encinfo, "WPA2 ");
                         else if (iswmeoui(vp))
                                 strcat(encinfo, "WME ");

src/router/services/tools/site_survey_madwifi_11n.c

@@ -126 +126 @@
 }
 
+static __inline int isrsnoui(const unsigned char *frm)
+{
+        return frm[1] > 3
+            && LE_READ_4(frm + 2) == ((WPA_OUI_TYPE << 24) | RSN_OUI);
+}
+
 static __inline int iswmeoui(const unsigned char *frm)
 {
@@ -200 +206 @@
                         if (iswpaoui(vp))
                                 strcat(encinfo, "WPA ");
+                        if (isrsnoui(vp))
+                                strcat(encinfo, "WPA2 ");
                         if (iswmeoui(vp))
                                 strcat(encinfo, "WME ");