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.

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 9a53245bc5f314885423ca6fc3e3d86a17cef63e..37fd8bb5bf3f919da737168528b2bc31bd5bf63c 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -42,15 +42,15 @@ OBJS += ../src/ap/ap_drv_ops.o
 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
@@ -137,7 +137,7 @@ endif
 
 ifdef CONFIG_PEERKEY
 CFLAGS += -DCONFIG_PEERKEY
-OBJS += ../src/ap/peerkey.o
+OBJS += ../src/ap/peerkey_auth.o
 endif
 
 ifdef CONFIG_IEEE80211W
@@ -148,7 +148,7 @@ endif
 
 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

diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 8983f447a6d55b18d46336f1c43e5f563794e5c3..0ec83b09891893cc5af391cae4b9d89cba2e9792 100644 (file)
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -12,19 +12,19 @@
  * 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"
 
 

diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c
index ccb2266f3053ea0378eacb917be56ec82cfa858d..bf42bca2cdcf71f29d532fed95c2e3612c61ea20 100644 (file)
--- a/hostapd/ctrl_iface.c
+++ b/hostapd/ctrl_iface.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -12,7 +12,7 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
 #ifndef CONFIG_NATIVE_WINDOWS
 
@@ -20,14 +20,14 @@
 #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"

diff --git a/hostapd/dump_state.c b/hostapd/dump_state.c
index 7eeb2924f735bfa645a4a6d9e92deea034a0c21e..bba3068ccd810c2598b770cedf33da18bc250ec0 100644 (file)
--- a/hostapd/dump_state.c
+++ b/hostapd/dump_state.c
@@ -12,16 +12,16 @@
  * 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"
 

diff --git a/hostapd/main.c b/hostapd/main.c
index d69e1e637289927342141d9a10cb7a3b370c3d1f..eb0ef595c6d6b2552ede4d81f6af5086272978bf 100644 (file)
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -12,20 +12,20 @@
  * 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"

diff --git a/src/ap/accounting.c b/src/ap/accounting.c
index 12678bcf1601ab0ad205bbfbb52af9cd08b1ae6e..7939c680f5804ffca894ad2a346730843960d625 100644 (file)
--- 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
similarity index 99%
rename from src/ap/config.c
rename to src/ap/ap_config.c
index e62a9c28bb908eadd258e806592d615178eb2e27..c695de13d6d8d03012be630b2ac98f844b663b79 100644 (file)
--- 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
similarity index 100%
rename from src/ap/config.h
rename to src/ap/ap_config.h

diff --git a/src/ap/ap_list.c b/src/ap/ap_list.c
index 4878104cda624d8bac104169a44eb014e37dc5d1..0b7a8a109ccc7a901dac614d7747667221e27691 100644 (file)
--- 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
similarity index 98%
rename from src/ap/mlme.c
rename to src/ap/ap_mlme.c
index adc7ce6aadd2dfd744583522de30bd06b536033e..5f8fd87759ebf6dd3eb5b69a0d48a7458b81dee6 100644 (file)
--- 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
similarity index 100%
rename from src/ap/mlme.h
rename to src/ap/ap_mlme.h

diff --git a/src/ap/authsrv.c b/src/ap/authsrv.c
index 508688ea63b6cf7b6c90dd34eec0c42139661299..b9011436278a20aee757e8fa13cd99345894bb5f 100644 (file)
--- 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 d2a012ab9b70ad2531b596fd9acecc8555b540b2..aa09bea2d4f56ade5a9192964d64398f7f94b27d 100644 (file)
--- 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 7940f801c7ddea89c1b96c291a30f634d2a394aa..e50b0a70ca95d546303cc7f657f285d7c8cb9f93 100644 (file)
--- 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 aa280f79cd9af7c2e99f3bc00eeea4eeb6e8d0f8..9ab1b4ad83097a899bb958750cd62ac23d48c2bc 100644 (file)
--- 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 0722191709c5aaaa3af68637bd98111093807d9e..abf9163f0864a148f5fdb48918b860050c16ae3f 100644 (file)
--- 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 fe7a3c52c0689b37b7f277e7e5839e06502364fa..e6151d56b294871d288a516a5a41851fa1a52420 100644 (file)
--- 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 e89c9d7e568c27ffdbc1e711b277fe63730a3032..f4081cff6a8d1209b2660557d14c63e8554b5e64 100644 (file)
--- 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 4545bfaf42ea0869ad0d998286f1881e2a7ae48c..e9a86168eb27447882f64f1193d2e463fbe2dce6 100644 (file)
--- 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 316965b14285c57ca4044448864c55cf54207bae..91d4b978ae3211a8e1f515f4f83a6b7d8960ee0c 100644 (file)
--- 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 51551002eadd2f5bfeb10b2dc8644d6f3959f6a8..a3b4fdc99d483d1fc728ef670a086a57bb7a56a2 100644 (file)
--- 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 1cf612b6eb27178a183b99688276461f6ea43734..30e2e44c55d071bc2074441dd634ff377fe8bbac 100644 (file)
--- 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 a619b157140e003ceb8ead205c7806a78f7da307..69df06eece53e4b2fbf27f41d98947f1d84c1519 100644 (file)
--- 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
similarity index 98%
rename from src/ap/peerkey.c
rename to src/ap/peerkey_auth.c
index 4bee2d94b49ee78d75951dabb0a69a00f46cf8e1..f68c47909ae6e00cdb1759be52fa56ab33a9bff5 100644 (file)
--- 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
similarity index 98%
rename from src/ap/pmksa_cache.c
rename to src/ap/pmksa_cache_auth.c
index 2df6c817794d103ba31fe88d8b455c8aef9a2a1f..22f44b78464a6cf00e0bcd56b6dab54c2b19329a 100644 (file)
--- 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
similarity index 100%
rename from src/ap/pmksa_cache.h
rename to src/ap/pmksa_cache_auth.h

diff --git a/src/ap/preauth.c b/src/ap/preauth_auth.c
similarity index 97%
rename from src/ap/preauth.c
rename to src/ap/preauth_auth.c
index d544fc5187454bbe8be3fb533442f891ca7c573b..ade0a9e7f0dbad3bdcb20623a4e4a5d3b5a36f26 100644 (file)
--- 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
similarity index 100%
rename from src/ap/preauth.h
rename to src/ap/preauth_auth.h

diff --git a/src/ap/sta_info.c b/src/ap/sta_info.c
index 4016bd82f45985fc3aea5dca4242c7925550674c..c387519f6ed28f3bf6d909e03a04683e730d7913 100644 (file)
--- 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 e3c9f1bb0aa442270a60f44af52e944a85f9c44d..9690348e9ccfaa59ec66858aca074f3cad5631bb 100644 (file)
--- 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 3bce50c2a6b62d1de4b8e695e72850bd515f5a64..56032abf2dfa67618bdac1664878480098f9fc5f 100644 (file)
--- 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 2db2d8da5ebb4fd11d16460cfc52c2340a2dca95..403560ee427f0223258f461e3f1f8ac1c74ae436 100644 (file)
--- 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 fbaf8adc5ca7a2d8fe6b666c1e2c0256787853ad..96b04e890963433ec511ae349adbb4cfaf1d538d 100644 (file)
--- 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
similarity index 99%
rename from src/ap/wpa.c
rename to src/ap/wpa_auth.c
index 4af26e9cf962e93a6149cc9316547af72fd8e3a1..0db226a00f0924753ec6387167e1ebec9f7977e8 100644 (file)
--- 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
similarity index 100%
rename from src/ap/wpa.h
rename to src/ap/wpa_auth.h

diff --git a/src/ap/wpa_ft.c b/src/ap/wpa_auth_ft.c
similarity index 99%
rename from src/ap/wpa_ft.c
rename to src/ap/wpa_auth_ft.c
index 172a07ccbf11e1d83f51aed2f4524686ca6937dc..e2e6b208cbb6ce858e0f1c25edfa17432aca8a90 100644 (file)
--- 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 1c7b8756d7c0794a86afa4aca0665fc6d41b2f68..82e4bbf0c07346d570fbd6d6f95c83a56f16ce67 100644 (file)
--- 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 da37f82850ff3538f34f39a3a0ef7f2131b3318e..7b1d9b741abb0c8e3ebb31dca5cd0472a9e81982 100644 (file)
--- 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 965db26ca32d87ca80bb26a0693acaf042c37762..2c893f4bf966d7792a718018a93964677544f195 100644 (file)
--- 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"
 
 

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index 135ad10d75855fb74545e7f5a842cf1db88aabac..d7c874f66bbc371270717788e47765641161fd4e 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -591,11 +591,11 @@ OBJS += ../src/ap/hostapd.o
 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
@@ -635,14 +635,14 @@ endif
 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
 
@@ -665,14 +665,14 @@ OBJS_h += ../src/ap/ieee802_1x.o
 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
 

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index c730127c624a24046f29fda69c82ae2b19e4abcf..3b5488ef4e30fe179dccb0d984023aceea916885 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -13,11 +13,11 @@
  * 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 */