diff options
| author | Jouni Malinen <j@w1.fi> | 2009-01-13 19:37:22 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2009-01-13 19:37:22 +0200 |
| commit | 93ea8ed0346ab9eb2b9f1c37aa8dd3660fd265bb (patch) | |
| tree | 96bf42e86a49e19120a66c9da05576c2954705ad /wpa_supplicant | |
| parent | 0b8695bb2b1b5f3644a7d1f421ac06172d9c5cd5 (diff) | |
| download | external_wpa_supplicant_8_ti-93ea8ed0346ab9eb2b9f1c37aa8dd3660fd265bb.zip external_wpa_supplicant_8_ti-93ea8ed0346ab9eb2b9f1c37aa8dd3660fd265bb.tar.gz external_wpa_supplicant_8_ti-93ea8ed0346ab9eb2b9f1c37aa8dd3660fd265bb.tar.bz2 | |
Partial fix for test_wpa build
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/Makefile | 2 | ||||
| -rw-r--r-- | wpa_supplicant/tests/test_wpa.c | 18 |
2 files changed, 3 insertions, 17 deletions
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 7c51959..c5a8132 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -563,6 +563,8 @@ ifdef CONFIG_EAP_TNC CFLAGS += -DEAP_TNC OBJS += ../src/eap_peer/eap_tnc.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 endif diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c index 74bb5f8..61b6336 100644 --- a/wpa_supplicant/tests/test_wpa.c +++ b/wpa_supplicant/tests/test_wpa.c @@ -17,7 +17,7 @@ #include "common.h" #include "eloop.h" #include "ieee802_11_defs.h" -#include "config.h" +#include "../config.h" #include "wpa.h" #include "wpa_ie.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) { 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) { wpa_printf(MSG_DEBUG, "SUPP: %s", __func__); @@ -195,14 +181,12 @@ static int supp_init(struct wpa *wpa) ctx->ctx = wpa; ctx->set_state = supp_set_state; - ctx->get_ssid = supp_get_ssid; ctx->get_bssid = supp_get_bssid; ctx->ether_send = supp_ether_send; ctx->get_beacon_ie = supp_get_beacon_ie; ctx->alloc_eapol = supp_alloc_eapol; ctx->set_key = supp_set_key; ctx->mlme_setprotection = supp_mlme_setprotection; - ctx->cancel_scan = supp_cancel_scan; ctx->cancel_auth_timeout = supp_cancel_auth_timeout; wpa->supp = wpa_sm_init(ctx); if (wpa->supp == NULL) { |