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

driver_test: Share the same deinit() for hostapd and wpa_supplicant

Browse source
This commit is contained in:
Jouni Malinen 2009-09-10 17:03:51 +03:00 committed by Jouni Malinen
parent c6f726748d
commit 5d5b99ecd3
1 changed files with 33 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/drivers/driver_test.c
View file

@ -102,6 +102,9 @@ struct wpa_driver_test_data {
}; };
static void wpa_driver_test_deinit(void *priv);
static void test_driver_free_bss(struct test_driver_bss *bss) static void test_driver_free_bss(struct test_driver_bss *bss)
{ {
free(bss->ie); free(bss->ie);
@ -111,25 +114,6 @@ static void test_driver_free_bss(struct test_driver_bss *bss)
} }
static void test_driver_free_priv(struct wpa_driver_test_data *drv)
{
struct test_driver_bss *bss, *prev;
if (drv == NULL)
return;
bss = drv->bss;
while (bss) {
prev = bss;
bss = bss->next;
test_driver_free_bss(prev);
}
free(drv->own_socket_path);
free(drv->test_dir);
free(drv);
}
static struct test_client_socket * static struct test_client_socket *
test_driver_get_cli(struct wpa_driver_test_data *drv, struct sockaddr_un *from, test_driver_get_cli(struct wpa_driver_test_data *drv, struct sockaddr_un *from,
socklen_t fromlen) socklen_t fromlen)
@ -1186,7 +1170,7 @@ static void * test_driver_init(struct hostapd_data *hapd,
if (os_strlen(params->test_socket) >= if (os_strlen(params->test_socket) >=
sizeof(addr_un.sun_path)) { sizeof(addr_un.sun_path)) {
printf("Too long test_socket path\n"); printf("Too long test_socket path\n");
test_driver_free_priv(drv); wpa_driver_test_deinit(drv);
return NULL; return NULL;
} }
if (strncmp(params->test_socket, "DIR:", 4) == 0) { if (strncmp(params->test_socket, "DIR:", 4) == 0) {
@ -1205,7 +1189,7 @@ static void * test_driver_init(struct hostapd_data *hapd,
drv->own_socket_path = strdup(params->test_socket); drv->own_socket_path = strdup(params->test_socket);
} }
if (drv->own_socket_path == NULL && drv->udp_port == 0) { if (drv->own_socket_path == NULL && drv->udp_port == 0) {
test_driver_free_priv(drv); wpa_driver_test_deinit(drv);
return NULL; return NULL;
} }
@ -1213,7 +1197,7 @@ static void * test_driver_init(struct hostapd_data *hapd,
SOCK_DGRAM, 0); SOCK_DGRAM, 0);
if (drv->test_socket < 0) { if (drv->test_socket < 0) {
perror("socket"); perror("socket");
test_driver_free_priv(drv); wpa_driver_test_deinit(drv);
return NULL; return NULL;
} }
@ -1236,7 +1220,7 @@ static void * test_driver_init(struct hostapd_data *hapd,
close(drv->test_socket); close(drv->test_socket);
if (drv->own_socket_path) if (drv->own_socket_path)
unlink(drv->own_socket_path); unlink(drv->own_socket_path);
test_driver_free_priv(drv); wpa_driver_test_deinit(drv);
return NULL; return NULL;
} }
eloop_register_read_sock(drv->test_socket, eloop_register_read_sock(drv->test_socket,
@ -1248,35 +1232,6 @@ static void * test_driver_init(struct hostapd_data *hapd,
} }
static void test_driver_deinit(void *priv)
{
struct wpa_driver_test_data *drv = priv;
struct test_client_socket *cli, *prev;
cli = drv->cli;
while (cli) {
prev = cli;
cli = cli->next;
free(prev);
}
if (drv->test_socket >= 0) {
eloop_unregister_read_sock(drv->test_socket);
close(drv->test_socket);
if (drv->own_socket_path)
unlink(drv->own_socket_path);
}
/* There should be only one BSS remaining at this point. */
if (drv->bss == NULL)
wpa_printf(MSG_ERROR, "%s: drv->bss == NULL", __func__);
else if (drv->bss->next)
wpa_printf(MSG_ERROR, "%s: drv->bss->next != NULL", __func__);
test_driver_free_priv(drv);
}
static void wpa_driver_test_poll(void *eloop_ctx, void *timeout_ctx) static void wpa_driver_test_poll(void *eloop_ctx, void *timeout_ctx)
{ {
struct wpa_driver_test_data *drv = eloop_ctx; struct wpa_driver_test_data *drv = eloop_ctx;
@ -1943,7 +1898,32 @@ static void wpa_driver_test_close_test_socket(struct wpa_driver_test_data *drv)
static void wpa_driver_test_deinit(void *priv) static void wpa_driver_test_deinit(void *priv)
{ {
struct wpa_driver_test_data *drv = priv; struct wpa_driver_test_data *drv = priv;
struct test_client_socket *cli, *prev;
struct test_driver_bss *bss, *prev_bss;
int i; int i;
cli = drv->cli;
while (cli) {
prev = cli;
cli = cli->next;
os_free(prev);
}
#ifdef HOSTAPD
/* There should be only one BSS remaining at this point. */
if (drv->bss == NULL)
wpa_printf(MSG_ERROR, "%s: drv->bss == NULL", __func__);
else if (drv->bss->next)
wpa_printf(MSG_ERROR, "%s: drv->bss->next != NULL", __func__);
#endif /* HOSTAPD */
bss = drv->bss;
while (bss) {
prev_bss = bss;
bss = bss->next;
test_driver_free_bss(prev_bss);
}
wpa_driver_test_close_test_socket(drv); wpa_driver_test_close_test_socket(drv);
eloop_cancel_timeout(wpa_driver_test_scan_timeout, drv, drv->ctx); eloop_cancel_timeout(wpa_driver_test_scan_timeout, drv, drv->ctx);
eloop_cancel_timeout(wpa_driver_test_poll, drv, NULL); eloop_cancel_timeout(wpa_driver_test_poll, drv, NULL);
@ -2428,7 +2408,7 @@ const struct wpa_driver_ops wpa_driver_test_ops = {
"test", "test",
"wpa_supplicant test driver", "wpa_supplicant test driver",
.hapd_init = test_driver_init, .hapd_init = test_driver_init,
.hapd_deinit = test_driver_deinit, .hapd_deinit = wpa_driver_test_deinit,
.hapd_send_eapol = test_driver_send_eapol, .hapd_send_eapol = test_driver_send_eapol,
.send_mlme = wpa_driver_test_send_mlme, .send_mlme = wpa_driver_test_send_mlme,
.set_generic_elem = test_driver_set_generic_elem, .set_generic_elem = test_driver_set_generic_elem,