aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2009-12-25 22:05:40 (GMT)
committerJouni Malinen <j@w1.fi>2009-12-25 22:05:40 (GMT)
commit6226e38d002cac786709ef1c24fe09811f70b6d7 (patch)
tree50fe2e34169addfca7ad10e4f73fff99997c5ef4 /src/ap
parentfcfda83bf9ea76a888bc8000f0286f62eec2533b (diff)
downloadhostap-6226e38d002cac786709ef1c24fe09811f70b6d7.zip
hostap-6226e38d002cac786709ef1c24fe09811f70b6d7.tar.gz
hostap-6226e38d002cac786709ef1c24fe09811f70b6d7.tar.bz2
Rename some src/ap files to avoid duplicate file names
Doxygen and some build tools may get a bit confused about same file name being used in different directories. Clean this up a bit by renaming some of the duplicated file names in src/ap.
Diffstat (limited to 'src/ap')
-rw-r--r--src/ap/accounting.c12
-rw-r--r--src/ap/ap_config.c (renamed from src/ap/config.c)8
-rw-r--r--src/ap/ap_config.h (renamed from src/ap/config.h)0
-rw-r--r--src/ap/ap_list.c2
-rw-r--r--src/ap/ap_mlme.c (renamed from src/ap/mlme.c)8
-rw-r--r--src/ap/ap_mlme.h (renamed from src/ap/mlme.h)0
-rw-r--r--src/ap/authsrv.c2
-rw-r--r--src/ap/beacon.c12
-rw-r--r--src/ap/ctrl_iface_ap.c18
-rw-r--r--src/ap/driver_i.h2
-rw-r--r--src/ap/drv_callbacks.c24
-rw-r--r--src/ap/hostapd.c30
-rw-r--r--src/ap/hw_features.c6
-rw-r--r--src/ap/iapp.c8
-rw-r--r--src/ap/ieee802_11.c8
-rw-r--r--src/ap/ieee802_11_auth.c14
-rw-r--r--src/ap/ieee802_11_ht.c6
-rw-r--r--src/ap/ieee802_1x.c18
-rw-r--r--src/ap/peerkey_auth.c (renamed from src/ap/peerkey.c)10
-rw-r--r--src/ap/pmksa_cache_auth.c (renamed from src/ap/pmksa_cache.c)13
-rw-r--r--src/ap/pmksa_cache_auth.h (renamed from src/ap/pmksa_cache.h)0
-rw-r--r--src/ap/preauth_auth.c (renamed from src/ap/preauth.c)18
-rw-r--r--src/ap/preauth_auth.h (renamed from src/ap/preauth.h)0
-rw-r--r--src/ap/sta_info.c16
-rw-r--r--src/ap/tkip_countermeasures.c12
-rw-r--r--src/ap/vlan_init.c8
-rw-r--r--src/ap/wmm.c7
-rw-r--r--src/ap/wmm.h1
-rw-r--r--src/ap/wpa_auth.c (renamed from src/ap/wpa.c)14
-rw-r--r--src/ap/wpa_auth.h (renamed from src/ap/wpa.h)0
-rw-r--r--src/ap/wpa_auth_ft.c (renamed from src/ap/wpa_ft.c)10
-rw-r--r--src/ap/wpa_auth_glue.c12
-rw-r--r--src/ap/wpa_auth_ie.c12
-rw-r--r--src/ap/wps_hostapd.c8
34 files changed, 160 insertions, 159 deletions
diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index 12678bc..7939c68 100644
--- a/src/ap/accounting.c
+++ b/src/ap/accounting.c
@@ -12,18 +12,18 @@
* 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
diff --git a/src/ap/config.c b/src/ap/ap_config.c
index e62a9c2..c695de1 100644
--- a/src/ap/config.c
+++ b/src/ap/ap_config.c
@@ -12,18 +12,18 @@
* 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)
diff --git a/src/ap/config.h b/src/ap/ap_config.h
index b8ce830..b8ce830 100644
--- a/src/ap/config.h
+++ b/src/ap/ap_config.h
diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index 4878104..0b7a8a1 100644
--- a/src/ap/ap_list.c
+++ b/src/ap/ap_list.c
@@ -20,7 +20,7 @@
#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"
diff --git a/src/ap/mlme.c b/src/ap/ap_mlme.c
index adc7ce6..5f8fd87 100644
--- a/src/ap/mlme.c
+++ b/src/ap/ap_mlme.c
@@ -14,13 +14,13 @@
* 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
diff --git a/src/ap/mlme.h b/src/ap/ap_mlme.h
index c77a939..c77a939 100644
--- a/src/ap/mlme.h
+++ b/src/ap/ap_mlme.h
diff --git a/src/ap/authsrv.c b/src/ap/authsrv.c
index 508688e..b901143 100644
--- a/src/ap/authsrv.c
+++ b/src/ap/authsrv.c
@@ -21,7 +21,7 @@
#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"
diff --git a/src/ap/beacon.c b/src/ap/beacon.c
index d2a012a..aa09bea 100644
--- a/src/ap/beacon.c
+++ b/src/ap/beacon.c
@@ -14,19 +14,19 @@
* 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)
diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c
index 7940f80..e50b0a7 100644
--- a/src/ap/ctrl_iface_ap.c
+++ b/src/ap/ctrl_iface_ap.c
@@ -12,15 +12,15 @@
* 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"
diff --git a/src/ap/driver_i.h b/src/ap/driver_i.h
index aa280f7..9ab1b4a 100644
--- a/src/ap/driver_i.h
+++ b/src/ap/driver_i.h
@@ -16,7 +16,7 @@
#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)
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index 0722191..abf9163 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -12,20 +12,20 @@
* 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"
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index fe7a3c5..e6151d5 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -12,24 +12,24 @@
* 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"
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
index e89c9d7..f4081cf 100644
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -20,10 +20,10 @@
#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,
diff --git a/src/ap/iapp.c b/src/ap/iapp.c
index 4545bfa..e9a8616 100644
--- a/src/ap/iapp.c
+++ b/src/ap/iapp.c
@@ -48,10 +48,10 @@
#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"
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index 316965b..91d4b97 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -24,17 +24,17 @@
#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)
diff --git a/src/ap/ieee802_11_auth.c b/src/ap/ieee802_11_auth.c
index 5155100..a3b4fdc 100644
--- a/src/ap/ieee802_11_auth.c
+++ b/src/ap/ieee802_11_auth.c
@@ -1,6 +1,6 @@
/*
* 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
@@ -17,18 +17,18 @@
* 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
diff --git a/src/ap/ieee802_11_ht.c b/src/ap/ieee802_11_ht.c
index 1cf612b..30e2e44 100644
--- a/src/ap/ieee802_11_ht.c
+++ b/src/ap/ieee802_11_ht.c
@@ -13,12 +13,12 @@
* 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"
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c
index a619b15..69df06e 100644
--- a/src/ap/ieee802_1x.c
+++ b/src/ap/ieee802_1x.c
@@ -12,27 +12,27 @@
* 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,
diff --git a/src/ap/peerkey.c b/src/ap/peerkey_auth.c
index 4bee2d9..f68c479 100644
--- a/src/ap/peerkey.c
+++ b/src/ap/peerkey_auth.c
@@ -1,6 +1,6 @@
/*
* 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
@@ -12,13 +12,13 @@
* 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"
diff --git a/src/ap/pmksa_cache.c b/src/ap/pmksa_cache_auth.c
index 2df6c81..22f44b7 100644
--- a/src/ap/pmksa_cache.c
+++ b/src/ap/pmksa_cache_auth.c
@@ -12,16 +12,15 @@
* 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;
diff --git a/src/ap/pmksa_cache.h b/src/ap/pmksa_cache_auth.h
index 9628b13..9628b13 100644
--- a/src/ap/pmksa_cache.h
+++ b/src/ap/pmksa_cache_auth.h
diff --git a/src/ap/preauth.c b/src/ap/preauth_auth.c
index d544fc5..ade0a9e 100644
--- a/src/ap/preauth.c
+++ b/src/ap/preauth_auth.c
@@ -12,22 +12,22 @@
* 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 */
diff --git a/src/ap/preauth.h b/src/ap/preauth_auth.h
index 5348bee..5348bee 100644
--- a/src/ap/preauth.h
+++ b/src/ap/preauth_auth.h
diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index 4016bd8..c387519 100644
--- a/src/ap/sta_info.c
+++ b/src/ap/sta_info.c
@@ -12,24 +12,24 @@
* 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);
diff --git a/src/ap/tkip_countermeasures.c b/src/ap/tkip_countermeasures.c
index e3c9f1b..9690348 100644
--- a/src/ap/tkip_countermeasures.c
+++ b/src/ap/tkip_countermeasures.c
@@ -12,15 +12,15 @@
* 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"
diff --git a/src/ap/vlan_init.c b/src/ap/vlan_init.c
index 3bce50c..56032ab 100644
--- a/src/ap/vlan_init.c
+++ b/src/ap/vlan_init.c
@@ -14,11 +14,11 @@
* 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"
@@ -31,7 +31,7 @@
#include <linux/if_bridge.h>
#include "drivers/priv_netlink.h"
-#include "eloop.h"
+#include "utils/eloop.h"
struct full_dynamic_vlan {
diff --git a/src/ap/wmm.c b/src/ap/wmm.c
index 2db2d8d..403560e 100644
--- a/src/ap/wmm.c
+++ b/src/ap/wmm.c
@@ -2,6 +2,7 @@
* 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
@@ -13,13 +14,13 @@
* 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"
diff --git a/src/ap/wmm.h b/src/ap/wmm.h
index fbaf8ad..96b04e8 100644
--- a/src/ap/wmm.h
+++ b/src/ap/wmm.h
@@ -17,6 +17,7 @@
#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,
diff --git a/src/ap/wpa.c b/src/ap/wpa_auth.c
index 4af26e9..0db226a 100644
--- a/src/ap/wpa.c
+++ b/src/ap/wpa_auth.c
@@ -12,22 +12,22 @@
* 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"
diff --git a/src/ap/wpa.h b/src/ap/wpa_auth.h
index 55d4ec2..55d4ec2 100644
--- a/src/ap/wpa.h
+++ b/src/ap/wpa_auth.h
diff --git a/src/ap/wpa_ft.c b/src/ap/wpa_auth_ft.c
index 172a07c..e2e6b20 100644
--- a/src/ap/wpa_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -1,6 +1,6 @@
/*
* 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
@@ -12,14 +12,14 @@
* 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"
diff --git a/src/ap/wpa_auth_glue.c b/src/ap/wpa_auth_glue.c
index 1c7b875..82e4bbf 100644
--- a/src/ap/wpa_auth_glue.c
+++ b/src/ap/wpa_auth_glue.c
@@ -20,12 +20,12 @@
#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"
diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c
index da37f82..7b1d9b7 100644
--- a/src/ap/wpa_auth_ie.c
+++ b/src/ap/wpa_auth_ie.c
@@ -12,14 +12,14 @@
* 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"
diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c
index 965db26..2c893f4 100644
--- a/src/ap/wps_hostapd.c
+++ b/src/ap/wps_hostapd.c
@@ -1,6 +1,6 @@
/*
* 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
@@ -26,9 +26,9 @@
#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"