From f1a487108457c0e27fccc0c5511b9e0f251490a3 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 25 Mar 2009 12:23:42 +0200 Subject: [PATCH] Link in AP functionality from hostapd when CONFIG_AP=y This is only allowing the code to be compiled and linked in; the actual functionality is not yet enabled. --- wpa_supplicant/Makefile | 40 ++++++++++++ wpa_supplicant/ap.c | 138 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 wpa_supplicant/ap.c diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 0d213b33e..421cafb6a 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -139,6 +139,7 @@ ifdef CONFIG_CLIENT_MLME OBJS_d += ../src/utils/radiotap.o endif NEED_SME=y +NEED_AP_MLME=y endif ifdef CONFIG_DRIVER_PRISM54 @@ -622,6 +623,45 @@ endif ifdef CONFIG_AP CFLAGS += -DCONFIG_AP +OBJS += ap.o +CFLAGS += -DCONFIG_NO_RADIUS +CFLAGS += -DCONFIG_NO_ACCOUNTING +CFLAGS += -DCONFIG_NO_VLAN +OBJS += ../hostapd/sta_info.o +OBJS += ../hostapd/wpa.o +OBJS += ../hostapd/pmksa_cache.o +OBJS += ../hostapd/wpa_auth_ie.o +OBJS += ../hostapd/tkip_countermeasures.o +OBJS += ../hostapd/mlme.o +OBJS += ../hostapd/ieee802_1x.o +OBJS += ../hostapd/eapol_sm.o +OBJS += ../hostapd/ieee802_11_auth.o +OBJS += ../hostapd/drv_callbacks.o +ifdef CONFIG_IEEE80211R +OBJS += ../hostapd/wpa_ft.o +endif +ifdef CONFIG_PEERKEY +OBJS += ../hostapd/peerkey.o +endif + +CFLAGS += -DEAP_SERVER +OBJS += ../src/eap_server/eap.o +OBJS += ../src/eap_server/eap_identity.o +OBJS += ../src/eap_server/eap_methods.o + +ifdef NEED_AP_MLME +OBJS += ../hostapd/beacon.o +OBJS += ../hostapd/wme.o +OBJS += ../hostapd/ap_list.o +OBJS += ../hostapd/ieee802_11.o +OBJS += ../hostapd/hw_features.o +CFLAGS += -DNEED_MLME +endif +ifdef CONFIG_WPS +CFLAGS += -DEAP_SERVER_WSC +OBJS += ../hostapd/wps_hostapd.o +OBJS += ../src/eap_server/eap_wsc.o +endif endif ifdef CONFIG_EAP_SERVER diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c new file mode 100644 index 000000000..7b9b2431a --- /dev/null +++ b/wpa_supplicant/ap.c @@ -0,0 +1,138 @@ +/* + * WPA Supplicant - Basic AP mode support routines + * Copyright (c) 2003-2009, Jouni Malinen + * Copyright (c) 2009, Atheros Communications + * + * 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 + * published by the Free Software Foundation. + * + * Alternatively, this software may be distributed under the terms of BSD + * license. + * + * See README and COPYING for more details. + */ + +#include "includes.h" + +#include "common.h" +#include "../hostapd/hostapd.h" +#include "eap_common/eap_defs.h" +#include "eap_server/eap_methods.h" +#include "eap_common/eap_wsc_common.h" + + +int hostapd_reload_config(struct hostapd_iface *iface) +{ + /* TODO */ + return -1; +} + + +int hostapd_maclist_found(struct mac_acl_entry *list, int num_entries, + const u8 *addr, int *vlan_id) +{ + int start, end, middle, res; + + start = 0; + end = num_entries - 1; + + while (start <= end) { + middle = (start + end) / 2; + res = os_memcmp(list[middle].addr, addr, ETH_ALEN); + if (res == 0) { + if (vlan_id) + *vlan_id = list[middle].vlan_id; + return 1; + } + if (res < 0) + start = middle + 1; + else + end = middle - 1; + } + + return 0; +} + + +int hostapd_rate_found(int *list, int rate) +{ + int i; + + if (list == NULL) + return 0; + + for (i = 0; list[i] >= 0; i++) + if (list[i] == rate) + return 1; + + return 0; +} + + +const char * hostapd_get_vlan_id_ifname(struct hostapd_vlan *vlan, int vlan_id) +{ + return NULL; +} + + +int hostapd_for_each_interface(int (*cb)(struct hostapd_iface *iface, + void *ctx), void *ctx) +{ + /* TODO */ + return 0; +} + + +const struct hostapd_eap_user * +hostapd_get_eap_user(const struct hostapd_bss_config *conf, const u8 *identity, + size_t identity_len, int phase2) +{ + struct hostapd_eap_user *user = conf->eap_user; + +#ifdef CONFIG_WPS + if (conf->wps_state && identity_len == WSC_ID_ENROLLEE_LEN && + os_memcmp(identity, WSC_ID_ENROLLEE, WSC_ID_ENROLLEE_LEN) == 0) { + static struct hostapd_eap_user wsc_enrollee; + os_memset(&wsc_enrollee, 0, sizeof(wsc_enrollee)); + wsc_enrollee.methods[0].method = eap_server_get_type( + "WSC", &wsc_enrollee.methods[0].vendor); + return &wsc_enrollee; + } + + if (conf->wps_state && conf->ap_pin && + identity_len == WSC_ID_REGISTRAR_LEN && + os_memcmp(identity, WSC_ID_REGISTRAR, WSC_ID_REGISTRAR_LEN) == 0) { + static struct hostapd_eap_user wsc_registrar; + os_memset(&wsc_registrar, 0, sizeof(wsc_registrar)); + wsc_registrar.methods[0].method = eap_server_get_type( + "WSC", &wsc_registrar.methods[0].vendor); + wsc_registrar.password = (u8 *) conf->ap_pin; + wsc_registrar.password_len = os_strlen(conf->ap_pin); + return &wsc_registrar; + } +#endif /* CONFIG_WPS */ + + while (user) { + if (!phase2 && user->identity == NULL) { + /* Wildcard match */ + break; + } + + if (user->phase2 == !!phase2 && user->wildcard_prefix && + identity_len >= user->identity_len && + os_memcmp(user->identity, identity, user->identity_len) == + 0) { + /* Wildcard prefix match */ + break; + } + + if (user->phase2 == !!phase2 && + user->identity_len == identity_len && + os_memcmp(user->identity, identity, identity_len) == 0) + break; + user = user->next; + } + + return user; +}