Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WLANCONF]

Browse source 
- Fix my bit shifting fail

svn path=/branches/wlan-bringup/; revision=54885
This commit is contained in:
Cameron Gutman 2012-01-08 22:48:08 +00:00
parent 36ca688570
commit acdfc26b00
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
base/applications/network/wlanconf/wlanconf.c
View file

@ -315,7 +315,7 @@ WlanConnect(HANDLE hAdapter)
HeapFree(GetProcessHeap(), 0, SetOid); HeapFree(GetProcessHeap(), 0, SetOid);
SetOidSize = sizeof(NDISUIO_SET_OID) + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + SetOidSize = sizeof(NDISUIO_SET_OID) + FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) +
(strlen(sWepKey) >> 2); (strlen(sWepKey) >> 1);
SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize); SetOid = HeapAlloc(GetProcessHeap(), 0, SetOidSize);
if (!SetOid) if (!SetOid)
return FALSE; return FALSE;
@ -325,15 +325,15 @@ WlanConnect(HANDLE hAdapter)
WepData = (PNDIS_802_11_WEP)SetOid->Data; WepData = (PNDIS_802_11_WEP)SetOid->Data;
WepData->KeyIndex = 0x80000000; WepData->KeyIndex = 0x80000000;
WepData->KeyLength = strlen(sWepKey) >> 2; WepData->KeyLength = strlen(sWepKey) >> 1;
WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength; WepData->Length = FIELD_OFFSET(NDIS_802_11_WEP, KeyMaterial) + WepData->KeyLength;
/* Assemble the hex key */ /* Assemble the hex key */
i = 0; i = 0;
while (sWepKey[i << 2] != '\0') while (sWepKey[i << 1] != '\0')
{ {
WepData->KeyMaterial[i] = CharToHex(sWepKey[i << 2]) << 4; WepData->KeyMaterial[i] = CharToHex(sWepKey[i << 1]) << 4;
WepData->KeyMaterial[i] |= CharToHex(sWepKey[(i << 2) + 1]); WepData->KeyMaterial[i] |= CharToHex(sWepKey[(i << 1) + 1]);
i++; i++;
} }
@ -503,8 +503,11 @@ WlanScan(HANDLE hAdapter)
Rate = BssidInfo->SupportedRates[j]; Rate = BssidInfo->SupportedRates[j];
if (Rate != 0) if (Rate != 0)
{ {
/* Bit 7 is the basic rates bit */
Rate = Rate & 0x7F;
/* SupportedRates are in units of .5 */ /* SupportedRates are in units of .5 */
Rate = Rate << 2; Rate = Rate << 1;
_tprintf(_T("%u "), Rate); _tprintf(_T("%u "), Rate);
} }