Full rewrite IE operations.

The way I interpreted IEs was wrong, which lead to the code being absolutely useless and broken (The last commit happened because of the lack of tests).

Author: abdelali221

gc/ogc/wd.h

@@ -62,6 +62,12 @@ enum WDIOCTLV
 
 #define CAPAB_SECURED_FLAG 0x10
 
+// Information Elements IDs :
+
+#define IEID_SSID 0x0
+#define IEID_VENDORSPECIFIC 0xDD
+#define IEID_SECURITY 0x30
+
 // WD Modes :
 
 enum MODES
@@ -124,10 +130,17 @@ typedef struct BSSDescriptor
     u16 channel;
     u16 CF_period;
     u16 CF_max_duration;
-    // IE -> Information Elements
     u16 IEs_length;
 } BSSDescriptor;
 
+// Information Element Header :
+
+typedef struct IE_hdr
+{
+    u8 ID;
+    u8 len;
+} IE_hdr;
+
 // General Purpose :
 
 s32 NCD_LockWirelessDriver();
@@ -142,7 +155,7 @@ u8 WD_GetRadioLevel(BSSDescriptor* Bss);
 int WD_Scan(ScanParameters *settings, u8* buff, u16 buffsize);
 int WD_ScanOnce(ScanParameters *settings, u8* buff, u16 buffsize);
 u8 WD_GetNumberOfIEs(BSSDescriptor* Bss);
-u8 WD_GetIELength(BSSDescriptor* Bss, u8 ID);
+int WD_GetIELength(BSSDescriptor* Bss, u8 ID, u8* len);
 int WD_GetIE(BSSDescriptor* Bss, u8 ID, u8* buff, u8 buffsize);
 void WD_SetDefaultScanParameters(ScanParameters* set);
 

libogc/wd.c

@@ -194,56 +194,57 @@ u8 WD_GetNumberOfIEs(BSSDescriptor* Bss) {
     u8 ret = 0;
 
     u8* ptr = (u8*)Bss;
-    size_t offset = 0;
+    IE_hdr* hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor)];
+    u16 offset = 0;
 
-    for(;
-        offset < Bss->IEs_length && ptr[offset + 0x3F] != 0;
-        offset += ptr[offset + 0x3F])
+    while(offset < Bss->IEs_length && hdr->len != 0 )
     {
+        hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor) + offset];
+        offset += hdr->len + sizeof(IE_hdr);
         ret++;
     }
 
     return ret;
 }
 
-u8 WD_GetIELength(BSSDescriptor* Bss, u8 ID) {
-    if(ID > WD_GetNumberOfIEs(Bss)) return -1;
-
-    
+int WD_GetIELength(BSSDescriptor* Bss, u8 ID, u8* len) {
     u16 IEslen = Bss->IEs_length;
 
     u8* ptr = (u8*)Bss;
-    size_t offset = 0;
+    IE_hdr* hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor)];
+    u16 offset = 0;
 
-    for(u8 IE = 0;
-        (IE < ID) && ((offset + ptr[offset + 0x3F]) < IEslen && ptr[offset + 0x3F] != 0);
-        offset += ptr[offset + 0x3F])
+    while(hdr->ID != ID && (offset + hdr->len) < IEslen && hdr->len != 0)
     {
-        IE++;
+        hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor) + offset];
+        offset += hdr->len + sizeof(IE_hdr);
     }
-    
-    return ptr[offset + 0x3F];
+
+    if(hdr->ID != ID) return -1;
+
+    *len = hdr->len;
+    return 0;
 }
 
 int WD_GetIE(BSSDescriptor* Bss, u8 ID, u8* buff, u8 buffsize) {
-    if(ID > WD_GetNumberOfIEs(Bss)) return -1;
-
     if(!buff) return -2;
 
     u16 IEslen = Bss->IEs_length;
 
     u8* ptr = (u8*)Bss;
-    size_t offset = 0;
+    IE_hdr* hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor)];
+    u16 offset = 0;
 
-    for(u8 IE = 0;
-        (IE < ID) && ((offset + WD_GetIELength(Bss, ID)) < IEslen && WD_GetIELength(Bss, ID) != 0);
-        offset += WD_GetIELength(Bss, ID))
+    while(hdr->ID != ID && (offset + hdr->len) < IEslen && hdr->len != 0)
     {
-        IE++;
+        hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor) + offset];
+        offset += hdr->len + sizeof(IE_hdr);
     }
 
+    if(hdr->ID != ID) return -1;
+
     memset(buff, 0, buffsize);
-    memcpy(buff, &ptr[offset + 0x3F + 1], WD_GetIELength(Bss, ID));
+    memcpy(buff, &ptr[offset + sizeof(BSSDescriptor) + sizeof(IE_hdr)], hdr->len);
 
     return 0;
 }