jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

driver_test: Merge drv->hapd into drv->ctx

Browse source 
A separate struct hostapd_data pointer is not really needed anymore
and the generic context pointer can be used instead.
This commit is contained in:
Jouni Malinen 2009-12-13 18:57:57 +02:00
parent 8043e72589
commit 85cc05110d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/drivers/driver_test.c
View file

@ -1,6 +1,6 @@
/* /*
* WPA Supplicant - testing driver interface * Testing driver interface for a simulated network driver
* Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi> * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -93,7 +93,6 @@ struct wpa_driver_test_data {
int privacy; int privacy;
int ap; int ap;
struct hostapd_data *hapd;
struct test_client_socket *cli; struct test_client_socket *cli;
struct test_driver_bss *bss; struct test_driver_bss *bss;
int udp_port; int udp_port;
@ -458,7 +457,7 @@ static int wpa_driver_test_send_mlme(void *priv, const u8 *data,
hdr = (struct ieee80211_hdr *) data; hdr = (struct ieee80211_hdr *) data;
fc = le_to_host16(hdr->frame_control); fc = le_to_host16(hdr->frame_control);
#ifdef HOSTAPD #ifdef HOSTAPD
hostapd_mgmt_tx_cb(drv->hapd, (u8 *) data, data_len, hostapd_mgmt_tx_cb(drv->ctx, (u8 *) data, data_len,
WLAN_FC_GET_STYPE(fc), ret >= 0); WLAN_FC_GET_STYPE(fc), ret >= 0);
#else /* HOSTAPD */ #else /* HOSTAPD */
if (drv->ap) { if (drv->ap) {
@ -508,7 +507,7 @@ static void test_driver_scan(struct wpa_driver_test_data *drv,
wpa_hexdump(MSG_MSGDUMP, "test_driver: scan IEs", ie, ielen); wpa_hexdump(MSG_MSGDUMP, "test_driver: scan IEs", ie, ielen);
#ifdef HOSTAPD #ifdef HOSTAPD
hostapd_probe_req_rx(drv->hapd, sa, ie, ielen); hostapd_probe_req_rx(drv->ctx, sa, ie, ielen);
#endif /* HOSTAPD */ #endif /* HOSTAPD */
} }
@ -633,7 +632,7 @@ static void test_driver_disassoc(struct wpa_driver_test_data *drv,
return; return;
#ifdef HOSTAPD #ifdef HOSTAPD
hostapd_notif_disassoc(drv->hapd, cli->addr); hostapd_notif_disassoc(drv->ctx, cli->addr);
#endif /* HOSTAPD */ #endif /* HOSTAPD */
} }
@ -732,7 +731,7 @@ static void test_driver_mlme(struct wpa_driver_test_data *drv,
return; return;
} }
#ifdef HOSTAPD #ifdef HOSTAPD
hostapd_mgmt_rx(drv->hapd, data, datalen, WLAN_FC_GET_STYPE(fc), NULL); hostapd_mgmt_rx(drv->ctx, data, datalen, WLAN_FC_GET_STYPE(fc), NULL);
#else /* HOSTAPD */ #else /* HOSTAPD */
ap_mgmt_rx(drv->ctx, data, datalen, WLAN_FC_GET_STYPE(fc), NULL); ap_mgmt_rx(drv->ctx, data, datalen, WLAN_FC_GET_STYPE(fc), NULL);
#endif /* HOSTAPD */ #endif /* HOSTAPD */
@ -1141,7 +1140,7 @@ static void * test_driver_init(struct hostapd_data *hapd,
return NULL; return NULL;
} }
drv->hapd = hapd; drv->ctx = hapd;
/* Generate a MAC address to help testing with multiple APs */ /* Generate a MAC address to help testing with multiple APs */
params->own_addr[0] = 0x02; /* locally administered */ params->own_addr[0] = 0x02; /* locally administered */