DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Resolved number of signed/unsigned mismatches and ntddndis.h location

Browse source
This commit is contained in:
Jouni Malinen 2008-12-11 00:55:33 +02:00
parent 47ce4bfc38
commit 702c349e5e
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/drivers/driver_ndis.c
View file

@ -25,7 +25,11 @@ int close(int fd);
#else /* CONFIG_USE_NDISUIO */ #else /* CONFIG_USE_NDISUIO */
#include <Packet32.h> #include <Packet32.h>
#endif /* CONFIG_USE_NDISUIO */ #endif /* CONFIG_USE_NDISUIO */
#ifdef __MINGW32_VERSION
#include <ddk/ntddndis.h>
#else /* __MINGW32_VERSION */
#include <ntddndis.h> #include <ntddndis.h>
#endif /* __MINGW32_VERSION */
#ifdef _WIN32_WCE #ifdef _WIN32_WCE
#include <winioctl.h> #include <winioctl.h>
@ -517,7 +521,7 @@ static int ndis_set_oid(struct wpa_driver_ndis_data *drv, unsigned int oid,
char txt[50]; char txt[50];
os_snprintf(txt, sizeof(txt), "NDIS: Set OID %08x", oid); os_snprintf(txt, sizeof(txt), "NDIS: Set OID %08x", oid);
wpa_hexdump_key(MSG_MSGDUMP, txt, data, len); wpa_hexdump_key(MSG_MSGDUMP, txt, (const u8 *) data, len);
buf = os_zalloc(sizeof(*o) + len); buf = os_zalloc(sizeof(*o) + len);
if (buf == NULL) if (buf == NULL)
@ -615,8 +619,8 @@ static int wpa_driver_ndis_get_bssid(void *priv, u8 *bssid)
return 0; return 0;
} }
return ndis_get_oid(drv, OID_802_11_BSSID, bssid, ETH_ALEN) < 0 ? return ndis_get_oid(drv, OID_802_11_BSSID, (char *) bssid, ETH_ALEN) <
-1 : 0; 0 ? -1 : 0;
} }
@ -675,7 +679,7 @@ static int wpa_driver_ndis_disconnect(struct wpa_driver_ndis_data *drv)
int i; int i;
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
ssid[i] = rand() & 0xff; ssid[i] = rand() & 0xff;
return wpa_driver_ndis_set_ssid(drv, ssid, 32); return wpa_driver_ndis_set_ssid(drv, (u8 *) ssid, 32);
} }
@ -900,7 +904,7 @@ static int wpa_driver_ndis_add_wep(struct wpa_driver_ndis_data *drv,
os_memcpy(wep->KeyMaterial, key, key_len); os_memcpy(wep->KeyMaterial, key, key_len);
wpa_hexdump_key(MSG_MSGDUMP, "NDIS: OID_802_11_ADD_WEP", wpa_hexdump_key(MSG_MSGDUMP, "NDIS: OID_802_11_ADD_WEP",
(char *) wep, len); (u8 *) wep, len);
res = ndis_set_oid(drv, OID_802_11_ADD_WEP, (char *) wep, len); res = ndis_set_oid(drv, OID_802_11_ADD_WEP, (char *) wep, len);
os_free(wep); os_free(wep);
@ -971,7 +975,7 @@ static int wpa_driver_ndis_set_key(void *priv, wpa_alg alg, const u8 *addr,
} }
wpa_hexdump_key(MSG_MSGDUMP, "NDIS: OID_802_11_ADD_KEY", wpa_hexdump_key(MSG_MSGDUMP, "NDIS: OID_802_11_ADD_KEY",
(char *) nkey, len); (u8 *) nkey, len);
res = ndis_set_oid(drv, OID_802_11_ADD_KEY, (char *) nkey, len); res = ndis_set_oid(drv, OID_802_11_ADD_KEY, (char *) nkey, len);
os_free(nkey); os_free(nkey);
@ -1084,7 +1088,8 @@ wpa_driver_ndis_associate(void *priv,
ndis_set_encr_status(drv, encr); ndis_set_encr_status(drv, encr);
if (params->bssid) { if (params->bssid) {
ndis_set_oid(drv, OID_802_11_BSSID, params->bssid, ETH_ALEN); ndis_set_oid(drv, OID_802_11_BSSID, (char *) params->bssid,
ETH_ALEN);
drv->oid_bssid_set = 1; drv->oid_bssid_set = 1;
} else if (drv->oid_bssid_set) { } else if (drv->oid_bssid_set) {
ndis_set_oid(drv, OID_802_11_BSSID, "\xff\xff\xff\xff\xff\xff", ndis_set_oid(drv, OID_802_11_BSSID, "\xff\xff\xff\xff\xff\xff",
@ -1123,7 +1128,7 @@ static int wpa_driver_ndis_set_pmkid(struct wpa_driver_ndis_data *drv)
os_memcpy(&p->BSSIDInfo[i].PMKID, entry->pmkid, 16); os_memcpy(&p->BSSIDInfo[i].PMKID, entry->pmkid, 16);
entry = entry->next; entry = entry->next;
} }
wpa_hexdump(MSG_MSGDUMP, "NDIS: OID_802_11_PMKID", (char *) p, len); wpa_hexdump(MSG_MSGDUMP, "NDIS: OID_802_11_PMKID", (u8 *) p, len);
ret = ndis_set_oid(drv, OID_802_11_PMKID, (char *) p, len); ret = ndis_set_oid(drv, OID_802_11_PMKID, (char *) p, len);
os_free(p); os_free(p);
return ret; return ret;
@ -1229,7 +1234,7 @@ static int wpa_driver_ndis_flush_pmkid(void *priv)
p.Length = 8; p.Length = 8;
p.BSSIDInfoCount = 0; p.BSSIDInfoCount = 0;
wpa_hexdump(MSG_MSGDUMP, "NDIS: OID_802_11_PMKID (flush)", wpa_hexdump(MSG_MSGDUMP, "NDIS: OID_802_11_PMKID (flush)",
(char *) &p, 8); (u8 *) &p, 8);
ret = ndis_set_oid(drv, OID_802_11_PMKID, (char *) &p, 8); ret = ndis_set_oid(drv, OID_802_11_PMKID, (char *) &p, 8);
if (prev_authmode != Ndis802_11AuthModeWPA2) if (prev_authmode != Ndis802_11AuthModeWPA2)
@ -1275,7 +1280,8 @@ static int wpa_driver_ndis_get_associnfo(struct wpa_driver_ndis_data *drv)
len = sizeof(buf); len = sizeof(buf);
} }
} }
wpa_hexdump(MSG_MSGDUMP, "NDIS: association information", buf, len); wpa_hexdump(MSG_MSGDUMP, "NDIS: association information",
(u8 *) buf, len);
if (len < sizeof(*ai)) { if (len < sizeof(*ai)) {
wpa_printf(MSG_DEBUG, "NDIS: too short association " wpa_printf(MSG_DEBUG, "NDIS: too short association "
"information"); "information");
@ -1296,14 +1302,14 @@ static int wpa_driver_ndis_get_associnfo(struct wpa_driver_ndis_data *drv)
} }
wpa_hexdump(MSG_MSGDUMP, "NDIS: Request IEs", wpa_hexdump(MSG_MSGDUMP, "NDIS: Request IEs",
buf + ai->OffsetRequestIEs, ai->RequestIELength); (u8 *) buf + ai->OffsetRequestIEs, ai->RequestIELength);
wpa_hexdump(MSG_MSGDUMP, "NDIS: Response IEs", wpa_hexdump(MSG_MSGDUMP, "NDIS: Response IEs",
buf + ai->OffsetResponseIEs, ai->ResponseIELength); (u8 *) buf + ai->OffsetResponseIEs, ai->ResponseIELength);
os_memset(&data, 0, sizeof(data)); os_memset(&data, 0, sizeof(data));
data.assoc_info.req_ies = buf + ai->OffsetRequestIEs; data.assoc_info.req_ies = (u8 *) buf + ai->OffsetRequestIEs;
data.assoc_info.req_ies_len = ai->RequestIELength; data.assoc_info.req_ies_len = ai->RequestIELength;
data.assoc_info.resp_ies = buf + ai->OffsetResponseIEs; data.assoc_info.resp_ies = (u8 *) buf + ai->OffsetResponseIEs;
data.assoc_info.resp_ies_len = ai->ResponseIELength; data.assoc_info.resp_ies_len = ai->ResponseIELength;
blen = 65535; blen = 65535;
@ -1658,7 +1664,7 @@ static void wpa_driver_ndis_get_capability(struct wpa_driver_ndis_data *drv)
return; return;
} }
wpa_hexdump(MSG_MSGDUMP, "OID_802_11_CAPABILITY", buf, len); wpa_hexdump(MSG_MSGDUMP, "OID_802_11_CAPABILITY", (u8 *) buf, len);
c = (NDIS_802_11_CAPABILITY *) buf; c = (NDIS_802_11_CAPABILITY *) buf;
if (len < sizeof(*c) || c->Version != 2) { if (len < sizeof(*c) || c->Version != 2) {
wpa_printf(MSG_DEBUG, "NDIS: unsupported " wpa_printf(MSG_DEBUG, "NDIS: unsupported "
@ -2734,7 +2740,7 @@ static void * wpa_driver_ndis_init(void *ctx, const char *ifname)
} }
if (ndis_get_oid(drv, OID_802_3_CURRENT_ADDRESS, if (ndis_get_oid(drv, OID_802_3_CURRENT_ADDRESS,
drv->own_addr, ETH_ALEN) < 0) { (char *) drv->own_addr, ETH_ALEN) < 0) {
wpa_printf(MSG_DEBUG, "NDIS: Get OID_802_3_CURRENT_ADDRESS " wpa_printf(MSG_DEBUG, "NDIS: Get OID_802_3_CURRENT_ADDRESS "
"failed"); "failed");
wpa_driver_ndis_adapter_close(drv); wpa_driver_ndis_adapter_close(drv);