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

Partial fix for test_wpa build

Browse source
This commit is contained in:
Jouni Malinen 2009-01-13 19:37:22 +02:00
parent 0b8695bb2b
commit 93ea8ed034
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/Makefile
View file

@ -563,6 +563,8 @@ ifdef CONFIG_EAP_TNC
CFLAGS += -DEAP_TNC CFLAGS += -DEAP_TNC
OBJS += ../src/eap_peer/eap_tnc.o OBJS += ../src/eap_peer/eap_tnc.o
OBJS += ../src/eap_peer/tncc.o OBJS += ../src/eap_peer/tncc.o
OBJS_h += ../src/eap_server/eap_tnc.o
OBJS_h += ../src/eap_server/tncs.o
NEED_BASE64=y NEED_BASE64=y
endif endif

18
wpa_supplicant/tests/test_wpa.c
View file

@ -17,7 +17,7 @@
#include "common.h" #include "common.h"
#include "eloop.h" #include "eloop.h"
#include "ieee802_11_defs.h" #include "ieee802_11_defs.h"
#include "config.h" #include "../config.h"
#include "wpa.h" #include "wpa.h"
#include "wpa_ie.h" #include "wpa_ie.h"
#include "../hostapd/wpa.h" #include "../hostapd/wpa.h"
@ -51,14 +51,6 @@ struct wpa {
}; };
static struct wpa_ssid * supp_get_ssid(void *ctx)
{
struct wpa *wpa = ctx;
wpa_printf(MSG_DEBUG, "SUPP: %s", __func__);
return &wpa->ssid;
}
static int supp_get_bssid(void *ctx, u8 *bssid) static int supp_get_bssid(void *ctx, u8 *bssid)
{ {
struct wpa *wpa = ctx; struct wpa *wpa = ctx;
@ -175,12 +167,6 @@ static int supp_mlme_setprotection(void *ctx, const u8 *addr,
} }
static void supp_cancel_scan(void *ctx)
{
wpa_printf(MSG_DEBUG, "SUPP: %s", __func__);
}
static void supp_cancel_auth_timeout(void *ctx) static void supp_cancel_auth_timeout(void *ctx)
{ {
wpa_printf(MSG_DEBUG, "SUPP: %s", __func__); wpa_printf(MSG_DEBUG, "SUPP: %s", __func__);
@ -195,14 +181,12 @@ static int supp_init(struct wpa *wpa)
ctx->ctx = wpa; ctx->ctx = wpa;
ctx->set_state = supp_set_state; ctx->set_state = supp_set_state;
ctx->get_ssid = supp_get_ssid;
ctx->get_bssid = supp_get_bssid; ctx->get_bssid = supp_get_bssid;
ctx->ether_send = supp_ether_send; ctx->ether_send = supp_ether_send;
ctx->get_beacon_ie = supp_get_beacon_ie; ctx->get_beacon_ie = supp_get_beacon_ie;
ctx->alloc_eapol = supp_alloc_eapol; ctx->alloc_eapol = supp_alloc_eapol;
ctx->set_key = supp_set_key; ctx->set_key = supp_set_key;
ctx->mlme_setprotection = supp_mlme_setprotection; ctx->mlme_setprotection = supp_mlme_setprotection;
ctx->cancel_scan = supp_cancel_scan;
ctx->cancel_auth_timeout = supp_cancel_auth_timeout; ctx->cancel_auth_timeout = supp_cancel_auth_timeout;
wpa->supp = wpa_sm_init(ctx); wpa->supp = wpa_sm_init(ctx);
if (wpa->supp == NULL) { if (wpa->supp == NULL) {