Skip to content

WD : Add WD_GetVendorSpecificIE + Fix WD_GetRadioLevel #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abdelali221 wants to merge 1 commit into
base: master
Choose a base branch
from
+73 −17
Open

WD : Add WD_GetVendorSpecificIE + Fix WD_GetRadioLevel #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions gc/ogc/wd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,24 @@ enum WDIOCTLV
IOCTLV_WD_RECV_NOTIFICATION = 0x8001 // WD_ReceiveNotification
};

// Error Codes :

#define WD_SUCCESS 0
#define WD_UINITIALIZED -1
#define WD_INVALIDBUFF -2
#define WD_BUFFTOOSMALL -3
#define WD_NOTFOUND -4

// Capability flags :

#define CAPAB_SECURED_FLAG 0x10

// Information Elements IDs :

#define IEID_SSID 0x0
#define IEID_COUNTRY 0x7
#define IEID_SECURITY_RSN 0x30
#define IEID_VENDORSPECIFIC 0xDD
#define IEID_SECURITY 0x30

// Signal Strength :

Expand Down Expand Up @@ -161,9 +170,13 @@ int WD_GetInfo(WDInfo* inf);
u8 WD_GetRadioLevel(BSSDescriptor* Bss);
int WD_Scan(ScanParameters *settings, u8* buff, u16 buffsize);
int WD_ScanOnce(ScanParameters *settings, u8* buff, u16 buffsize);
void WD_SetDefaultScanParameters(ScanParameters* set);

// IE related :

u8 WD_GetNumberOfIEs(BSSDescriptor* Bss);
int WD_GetIELength(BSSDescriptor* Bss, u8 ID);
int WD_GetIE(BSSDescriptor* Bss, u8 ID, u8* buff, u8 buffsize);
void WD_SetDefaultScanParameters(ScanParameters* set);
int WD_GetIEIDList(BSSDescriptor* Bss, u8* buff, u8 buffsize);

#endif
73 changes: 58 additions & 15 deletions libogc/wd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ void WD_SetDefaultScanParameters(ScanParameters* set) {
int WD_Init(u8 mode) {
if(wd_fd < 0) {
wd_fd = IOS_Open("/dev/net/wd/command", 0x10000 | mode);
if (wd_fd < 0) return -1;
if (wd_fd < 0) return WD_UINITIALIZED;
}
return 0;
return WD_SUCCESS;
}

void WD_Deinit() {
Expand All @@ -116,13 +116,13 @@ void WD_Deinit() {
}

u8 WD_GetRadioLevel(BSSDescriptor* Bss) {
if (Bss->RSSI >= 0xc4)
if ((u8)Bss->RSSI >= 0xc4)
return WD_SIGNAL_STRONG; // Strong

if (Bss->RSSI >= 0xb5)
if ((u8)Bss->RSSI >= 0xb5)
return WD_SIGNAL_NORMAL; // Normal

if (Bss->RSSI >= 0xab)
if ((u8)Bss->RSSI >= 0xab)
return WD_SIGNAL_FAIR; // Fair

return WD_SIGNAL_WEAK; // Weak
Expand All @@ -131,7 +131,7 @@ u8 WD_GetRadioLevel(BSSDescriptor* Bss) {
int WD_GetInfo(WDInfo* info) {
s32 lockid = NCD_LockWirelessDriver();

if(WD_Init(AOSSAPScan) < 0) return -1;
if(WD_Init(AOSSAPScan) < 0) return WD_UINITIALIZED;

u8 inf[sizeof(WDInfo)] __attribute__((aligned(32)));

Expand All @@ -145,11 +145,11 @@ int WD_GetInfo(WDInfo* info) {
WD_Deinit();
NCD_UnlockWirelessDriver(lockid);

return 0;
return WD_SUCCESS;
}

int WD_Scan(ScanParameters *settings, u8* buff, u16 buffsize) {
if(wd_fd < 0) return -1;
if(wd_fd < 0) return WD_UINITIALIZED;

u8 buf[buffsize + 2] __attribute__((aligned(32)));
u8 settingsbuf[0x4e] __attribute__((aligned(32)));
Expand All @@ -168,20 +168,20 @@ int WD_Scan(ScanParameters *settings, u8* buff, u16 buffsize) {
usleep(100000);
memcpy(buff, buf, buffsize);

return 0;
return WD_SUCCESS;
}

int WD_ScanOnce(ScanParameters *settings, u8* buff, u16 buffsize) {
s32 lockid = NCD_LockWirelessDriver();

if(WD_Init(AOSSAPScan) < 0) return -1;
if(WD_Init(AOSSAPScan) < 0) return WD_UINITIALIZED;

WD_Scan(settings, buff, buffsize);

WD_Deinit();
NCD_UnlockWirelessDriver(lockid);

return 0;
return WD_SUCCESS;
}

u8 WD_GetNumberOfIEs(BSSDescriptor* Bss) {
Expand Down Expand Up @@ -214,13 +214,13 @@ int WD_GetIELength(BSSDescriptor* Bss, u8 ID) {
offset += hdr->len + sizeof(IE_hdr);
}

if(hdr->ID != ID) return -1;
if(hdr->ID != ID) return WD_NOTFOUND;

return hdr->len;
}

int WD_GetIE(BSSDescriptor* Bss, u8 ID, u8* buff, u8 buffsize) {
if(!buff) return -2;
if(!buff) return WD_INVALIDBUFF;

u16 IEslen = Bss->IEs_length;

Expand All @@ -234,12 +234,55 @@ int WD_GetIE(BSSDescriptor* Bss, u8 ID, u8* buff, u8 buffsize) {
offset += hdr->len + sizeof(IE_hdr);
}

if(hdr->ID != ID) return -1;
if(hdr->ID != ID) return WD_NOTFOUND;
if(buffsize < WD_GetIELength(Bss, ID)) return WD_BUFFTOOSMALL;

memset(buff, 0, buffsize);
memcpy(buff, &ptr[offset + sizeof(BSSDescriptor) + sizeof(IE_hdr)], hdr->len);

return 0;
return WD_SUCCESS;
}

int WD_GetIEIDList(BSSDescriptor* Bss, u8* buff, u8 buffsize) {
if(!buff) return WD_INVALIDBUFF;
if(buffsize < WD_GetNumberOfIEs(Bss)) return WD_BUFFTOOSMALL;

u8 n = 0;

u8* ptr = (u8*)Bss;
IE_hdr* hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor)];
u16 offset = 0;

while(offset < Bss->IEs_length && hdr->len != 0)
{
buff[n] = hdr->ID;
hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor) + offset];
offset += hdr->len + sizeof(IE_hdr);
n++;
}

return WD_SUCCESS;
}

int WD_GetVendorSpecificIE(BSSDescriptor* Bss, u32 OUI, u8* buff, u8 buffsize) {
if(!buff) return WD_INVALIDBUFF;

u16 IEslen = Bss->IEs_length;

u8* ptr = (u8*)Bss;
IE_hdr* hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor)];
u16 offset = 0;

while((hdr->ID != IEID_VENDORSPECIFIC && (u32)ptr[sizeof(BSSDescriptor) + offset + 2] != OUI) && (offset + hdr->len) < IEslen && hdr->len != 0)
{
hdr = (IE_hdr*)&ptr[sizeof(BSSDescriptor) + offset];
offset += hdr->len + sizeof(IE_hdr);
}

if( hdr->ID != IEID_VENDORSPECIFIC ||
(u32)ptr[sizeof(BSSDescriptor) + offset + 2] != OUI) return WD_NOTFOUND;

return WD_SUCCESS;
}

#endif