OBJS += ../src/ap/utils.o
OBJS += ../src/ap/authsrv.o
OBJS += ../src/ap/ieee802_1x.o
-OBJS += ../src/ap/config.o
+OBJS += ../src/ap/ap_config.o
OBJS += ../src/ap/ieee802_11_auth.o
OBJS += ../src/ap/sta_info.o
-OBJS += ../src/ap/wpa.o
+OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/tkip_countermeasures.o
-OBJS += ../src/ap/mlme.o
+OBJS += ../src/ap/ap_mlme.o
OBJS += ../src/ap/wpa_auth_ie.o
-OBJS += ../src/ap/preauth.o
-OBJS += ../src/ap/pmksa_cache.o
+OBJS += ../src/ap/preauth_auth.o
+OBJS += ../src/ap/pmksa_cache_auth.o
NEED_RC4=y
NEED_AES=y
ifdef CONFIG_PEERKEY
CFLAGS += -DCONFIG_PEERKEY
-OBJS += ../src/ap/peerkey.o
+OBJS += ../src/ap/peerkey_auth.o
endif
ifdef CONFIG_IEEE80211W
ifdef CONFIG_IEEE80211R
CFLAGS += -DCONFIG_IEEE80211R
-OBJS += ../src/ap/wpa_ft.o
+OBJS += ../src/ap/wpa_auth_ft.o
NEED_SHA256=y
NEED_AES_OMAC1=y
NEED_AES_UNWRAP=y
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS
#include <grp.h>
#endif /* CONFIG_NATIVE_WINDOWS */
-#include "common.h"
-#include "uuid.h"
+#include "utils/common.h"
+#include "utils/uuid.h"
#include "common/ieee802_11_defs.h"
#include "drivers/driver.h"
#include "eap_server/eap.h"
#include "radius/radius_client.h"
-#include "ap/wpa.h"
-#include "ap/config.h"
+#include "ap/wpa_auth.h"
+#include "ap/ap_config.h"
#include "config_file.h"
/*
* hostapd / UNIX domain socket -based control interface
- * 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
* it under the terms of the GNU General Public License version 2 as
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS
#include <sys/stat.h>
#include <stddef.h>
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "drivers/driver.h"
#include "radius/radius_client.h"
#include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
#include "ap/ieee802_1x.h"
-#include "ap/wpa.h"
+#include "ap/wpa_auth.h"
#include "ap/ieee802_11.h"
#include "ap/sta_info.h"
#include "ap/accounting.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "radius/radius_client.h"
#include "radius/radius_server.h"
#include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h"
#include "eap_server/eap.h"
#include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
#include "ap/sta_info.h"
#include "dump_state.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS
#include <syslog.h>
#endif /* CONFIG_NATIVE_WINDOWS */
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "crypto/tls.h"
#include "common/version.h"
#include "drivers/driver.h"
#include "eap_server/eap.h"
#include "eap_server/tncs.h"
#include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
#include "config_file.h"
#include "eap_register.h"
#include "dump_state.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
-#include "hostapd.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "drivers/driver.h"
#include "radius/radius.h"
#include "radius/radius_client.h"
-#include "eloop.h"
-#include "accounting.h"
+#include "hostapd.h"
#include "ieee802_1x.h"
-#include "config.h"
+#include "ap_config.h"
#include "sta_info.h"
+#include "accounting.h"
/* Default interval in seconds for polling TX/RX octets from the driver if
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "crypto/sha1.h"
#include "radius/radius_client.h"
#include "common/ieee802_11_defs.h"
#include "common/eapol_common.h"
#include "eap_common/eap_wsc_common.h"
#include "eap_server/eap.h"
-#include "wpa.h"
+#include "wpa_auth.h"
#include "sta_info.h"
-#include "config.h"
+#include "ap_config.h"
static void hostapd_config_free_vlan(struct hostapd_bss_config *bss)
#include "utils/eloop.h"
#include "drivers/driver.h"
#include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
#include "ieee802_11.h"
#include "sta_info.h"
#include "beacon.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "ieee802_11.h"
-#include "wpa.h"
+#include "wpa_auth.h"
#include "sta_info.h"
-#include "mlme.h"
+#include "ap_mlme.h"
#ifndef CONFIG_NO_HOSTAPD_LOGGER
#include "eapol_auth/eapol_auth_sm.h"
#include "radius/radius_server.h"
#include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
#include "sta_info.h"
#include "authsrv.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS
-#include "common.h"
+#include "utils/common.h"
+#include "drivers/driver.h"
#include "hostapd.h"
#include "ieee802_11.h"
-#include "wpa.h"
+#include "wpa_auth.h"
#include "wmm.h"
-#include "beacon.h"
-#include "drivers/driver.h"
-#include "config.h"
+#include "ap_config.h"
#include "sta_info.h"
+#include "beacon.h"
static u8 ieee802_11_erp_info(struct hostapd_data *hapd)
* See README and COPYING for more details.
*/
-#include "includes.h"
-
-#include "common.h"
-#include "ap/hostapd.h"
-#include "ap/ieee802_1x.h"
-#include "ap/wpa.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
-#include "ap/wps_hostapd.h"
+#include "utils/includes.h"
+
+#include "utils/common.h"
+#include "hostapd.h"
+#include "ieee802_1x.h"
+#include "wpa_auth.h"
+#include "ieee802_11.h"
+#include "sta_info.h"
+#include "wps_hostapd.h"
#include "ctrl_iface_ap.h"
#define DRIVER_I_H
#include "drivers/driver.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
static inline int
hostapd_set_ieee8021x(struct hostapd_data *hapd, struct wpa_bss_params *params)
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "radius/radius.h"
-#include "ap/hostapd.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
-#include "ap/accounting.h"
-#include "ap/tkip_countermeasures.h"
-#include "ap/iapp.h"
-#include "ap/ieee802_1x.h"
-#include "ap/wpa.h"
-#include "ap/wmm.h"
-#include "ap/wps_hostapd.h"
+#include "hostapd.h"
+#include "ieee802_11.h"
+#include "sta_info.h"
+#include "accounting.h"
+#include "tkip_countermeasures.h"
+#include "iapp.h"
+#include "ieee802_1x.h"
+#include "wpa_auth.h"
+#include "wmm.h"
+#include "wps_hostapd.h"
#include "driver_i.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "common/ieee802_11_defs.h"
#include "radius/radius_client.h"
-#include "ap/hostapd.h"
-#include "ap/authsrv.h"
-#include "ap/sta_info.h"
-#include "ap/accounting.h"
-#include "ap/ap_list.h"
-#include "ap/beacon.h"
-#include "ap/iapp.h"
-#include "ap/ieee802_1x.h"
-#include "ap/ieee802_11_auth.h"
-#include "ap/vlan_init.h"
-#include "ap/wpa.h"
-#include "ap/wps_hostapd.h"
+#include "hostapd.h"
+#include "authsrv.h"
+#include "sta_info.h"
+#include "accounting.h"
+#include "ap_list.h"
+#include "beacon.h"
+#include "iapp.h"
+#include "ieee802_1x.h"
+#include "ieee802_11_auth.h"
+#include "vlan_init.h"
+#include "wpa_auth.h"
+#include "wps_hostapd.h"
#include "hw_features.h"
#include "driver_i.h"
#include "wpa_auth_glue.h"
#include "utils/eloop.h"
#include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
-#include "ap/hostapd.h"
-#include "ap/config.h"
-#include "hw_features.h"
+#include "hostapd.h"
+#include "ap_config.h"
#include "driver_i.h"
+#include "hw_features.h"
void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
#include "utils/common.h"
#include "utils/eloop.h"
-#include "ap/hostapd.h"
-#include "ap/config.h"
-#include "ap/ieee802_11.h"
-#include "ap/sta_info.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "ieee802_11.h"
+#include "sta_info.h"
#include "iapp.h"
#include "radius/radius.h"
#include "radius/radius_client.h"
#include "hostapd.h"
-#include "ieee802_11.h"
#include "beacon.h"
#include "ieee802_11_auth.h"
#include "sta_info.h"
#include "ieee802_1x.h"
-#include "wpa.h"
+#include "wpa_auth.h"
#include "wmm.h"
#include "ap_list.h"
#include "accounting.h"
-#include "config.h"
-#include "mlme.h"
+#include "ap_config.h"
+#include "ap_mlme.h"
+#include "ieee802_11.h"
u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid)
/*
* hostapd / IEEE 802.11 authentication (ACL)
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
*
* 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
* authentication frame processing.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS
-#include "common.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
+#include "radius/radius.h"
+#include "radius/radius_client.h"
#include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
#include "ieee802_11.h"
#include "ieee802_11_auth.h"
-#include "radius/radius.h"
-#include "radius/radius_client.h"
-#include "eloop.h"
#define RADIUS_ACL_TIMEOUT 30
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "drivers/driver.h"
#include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
#include "sta_info.h"
#include "beacon.h"
#include "ieee802_11.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "crypto/md5.h"
#include "crypto/crypto.h"
#include "common/ieee802_11_defs.h"
#include "common/wpa_ctrl.h"
#include "radius/radius.h"
#include "radius/radius_client.h"
+#include "eap_server/eap.h"
#include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h"
#include "hostapd.h"
-#include "ieee802_1x.h"
#include "accounting.h"
#include "sta_info.h"
-#include "wpa.h"
-#include "preauth.h"
-#include "pmksa_cache.h"
-#include "config.h"
-#include "eap_server/eap.h"
+#include "wpa_auth.h"
+#include "preauth_auth.h"
+#include "pmksa_cache_auth.h"
+#include "ap_config.h"
+#include "ieee802_1x.h"
static void ieee802_1x_finished(struct hostapd_data *hapd,
/*
* hostapd - PeerKey for Direct Link Setup (DLS)
- * Copyright (c) 2006-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2006-2009, Jouni Malinen <j@w1.fi>
*
* 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
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
-#include "wpa.h"
+#include "wpa_auth.h"
#include "wpa_auth_i.h"
#include "wpa_auth_ie.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
-#include "sta_info.h"
-#include "config.h"
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h"
-#include "pmksa_cache.h"
+#include "sta_info.h"
+#include "ap_config.h"
+#include "pmksa_cache_auth.h"
static const int pmksa_cache_max_entries = 1024;
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifdef CONFIG_RSN_PREAUTH
-#include "common.h"
-#include "hostapd.h"
-#include "config.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "l2_packet/l2_packet.h"
-#include "ieee802_1x.h"
-#include "eloop.h"
-#include "sta_info.h"
#include "common/wpa_common.h"
#include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h"
-#include "wpa.h"
-#include "preauth.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "ieee802_1x.h"
+#include "sta_info.h"
+#include "wpa_auth.h"
+#include "preauth_auth.h"
#ifndef ETH_P_PREAUTH
#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
#include "radius/radius.h"
#include "radius/radius_client.h"
#include "drivers/driver.h"
#include "hostapd.h"
-#include "sta_info.h"
-#include "eloop.h"
#include "accounting.h"
#include "ieee802_1x.h"
#include "ieee802_11.h"
-#include "wpa.h"
-#include "preauth.h"
-#include "config.h"
+#include "wpa_auth.h"
+#include "preauth_auth.h"
+#include "ap_config.h"
#include "beacon.h"
-#include "mlme.h"
+#include "ap_mlme.h"
#include "vlan_init.h"
+#include "sta_info.h"
static int ap_sta_in_other_bss(struct hostapd_data *hapd,
struct sta_info *sta, u32 flags);
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
#include "hostapd.h"
-#include "eloop.h"
#include "sta_info.h"
-#include "mlme.h"
-#include "wpa.h"
-#include "common/ieee802_11_defs.h"
+#include "ap_mlme.h"
+#include "wpa_auth.h"
#include "tkip_countermeasures.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "hostapd.h"
-#include "config.h"
+#include "ap_config.h"
#include "vlan_init.h"
#include <linux/if_bridge.h>
#include "drivers/priv_netlink.h"
-#include "eloop.h"
+#include "utils/eloop.h"
struct full_dynamic_vlan {
* hostapd / WMM (Wi-Fi Multimedia)
* Copyright 2002-2003, Instant802 Networks, Inc.
* Copyright 2005-2006, Devicescape Software, Inc.
+ * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
*
* 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
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "hostapd.h"
#include "ieee802_11.h"
#include "sta_info.h"
-#include "config.h"
+#include "ap_config.h"
#include "wmm.h"
#define WME_H
struct ieee80211_mgmt;
+struct wmm_tspec_element;
u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid);
int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid,
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS
-#include "common.h"
-#include "eloop.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
+#include "utils/state_machine.h"
#include "crypto/aes_wrap.h"
#include "crypto/crypto.h"
#include "crypto/sha1.h"
#include "crypto/sha256.h"
#include "eapol_auth/eapol_auth_sm.h"
-#include "config.h"
-#include "wpa.h"
+#include "ap_config.h"
#include "ieee802_11.h"
-#include "pmksa_cache.h"
-#include "state_machine.h"
+#include "wpa_auth.h"
+#include "pmksa_cache_auth.h"
#include "wpa_auth_i.h"
#include "wpa_auth_ie.h"
/*
* hostapd - IEEE 802.11r - Fast BSS Transition
- * Copyright (c) 2004-2007, 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
* it under the terms of the GNU General Public License version 2 as
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "crypto/aes_wrap.h"
-#include "config.h"
-#include "wpa.h"
+#include "ap_config.h"
#include "ieee802_11.h"
#include "wmm.h"
+#include "wpa_auth.h"
#include "wpa_auth_i.h"
#include "wpa_auth_ie.h"
#include "eapol_auth/eapol_auth_sm_i.h"
#include "eap_server/eap.h"
#include "l2_packet/l2_packet.h"
-#include "ap/hostapd.h"
-#include "ap/ieee802_1x.h"
-#include "ap/preauth.h"
-#include "ap/sta_info.h"
-#include "ap/tkip_countermeasures.h"
-#include "ap/wpa.h"
+#include "hostapd.h"
+#include "ieee802_1x.h"
+#include "preauth_auth.h"
+#include "sta_info.h"
+#include "tkip_countermeasures.h"
+#include "wpa_auth.h"
#include "driver_i.h"
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
-#include "config.h"
-#include "ieee802_11.h"
+#include "utils/common.h"
#include "eapol_auth/eapol_auth_sm.h"
-#include "wpa.h"
-#include "pmksa_cache.h"
+#include "ap_config.h"
+#include "ieee802_11.h"
+#include "wpa_auth.h"
+#include "pmksa_cache_auth.h"
#include "wpa_auth_ie.h"
#include "wpa_auth_i.h"
/*
* hostapd / WPS integration
- * Copyright (c) 2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2008-2009, Jouni Malinen <j@w1.fi>
*
* 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
#include "wps/wps.h"
#include "wps/wps_defs.h"
#include "wps/wps_dev_attr.h"
-#include "ap/hostapd.h"
-#include "ap/config.h"
-#include "ap/sta_info.h"
+#include "hostapd.h"
+#include "ap_config.h"
+#include "sta_info.h"
#include "wps_hostapd.h"
OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o
OBJS += ../src/ap/authsrv.o
-OBJS += ../src/ap/config.o
+OBJS += ../src/ap/ap_config.o
OBJS += ../src/utils/ip_addr.o
OBJS += ../src/ap/sta_info.o
OBJS += ../src/ap/tkip_countermeasures.o
-OBJS += ../src/ap/mlme.o
+OBJS += ../src/ap/ap_mlme.o
OBJS += ../src/ap/ieee802_1x.o
OBJS += ../src/eapol_auth/eapol_auth_sm.o
OBJS += ../src/ap/ieee802_11_auth.o
ifdef NEED_RSN_AUTHENTICATOR
CFLAGS += -DCONFIG_NO_RADIUS
NEED_AES_WRAP=y
-OBJS += ../src/ap/wpa.o
+OBJS += ../src/ap/wpa_auth.o
OBJS += ../src/ap/wpa_auth_ie.o
-OBJS += ../src/ap/pmksa_cache.o
+OBJS += ../src/ap/pmksa_cache_auth.o
ifdef CONFIG_IEEE80211R
-OBJS += ../src/ap/wpa_ft.o
+OBJS += ../src/ap/wpa_auth_ft.o
endif
ifdef CONFIG_PEERKEY
-OBJS += ../src/ap/peerkey.o
+OBJS += ../src/ap/peerkey_auth.o
endif
endif
endif
ifdef CONFIG_WPA_AUTHENTICATOR
-OBJS_h += ../src/ap/wpa.o
+OBJS_h += ../src/ap/wpa_auth.o
OBJS_h += ../src/ap/wpa_auth_ie.o
-OBJS_h += ../src/ap/pmksa_cache.o
+OBJS_h += ../src/ap/pmksa_cache_auth.o
ifdef CONFIG_IEEE80211R
-OBJS_h += ../src/ap/wpa_ft.o
+OBJS_h += ../src/ap/wpa_auth_ft.o
endif
ifdef CONFIG_PEERKEY
-OBJS_h += ../src/ap/peerkey.o
+OBJS_h += ../src/ap/peerkey_auth.o
endif
endif
* See README and COPYING for more details.
*/
-#include "includes.h"
+#include "utils/includes.h"
-#include "common.h"
+#include "utils/common.h"
#include "ap/hostapd.h"
-#include "ap/config.h"
+#include "ap/ap_config.h"
#ifdef NEED_AP_MLME
#include "ap/ieee802_11.h"
#endif /* NEED_AP_MLME */