]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Remove src/common from default header file path
authorJouni Malinen <j@w1.fi>
Sun, 29 Nov 2009 15:51:55 +0000 (17:51 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 29 Nov 2009 15:51:55 +0000 (17:51 +0200)
This makes it clearer which files are including header from src/common.
Some of these cases should probably be cleaned up in the future not to
do that.

In addition, src/common/nl80211_copy.h and wireless_copy.h were moved
into src/drivers since they are only used by driver wrappers and do not
need to live in src/common.

82 files changed:
hostapd/Makefile
hostapd/config.c
hostapd/config.h
hostapd/eapol_sm.h
hostapd/hostapd.c
hostapd/hostapd_cli.c
hostapd/hw_features.c
hostapd/ieee802_11.c
hostapd/ieee802_11.h
hostapd/ieee802_1x.c
hostapd/main.c
hostapd/peerkey.c
hostapd/preauth.c
hostapd/sta_info.h
hostapd/tkip_countermeasures.c
hostapd/wpa.h
hostapd/wpa_ft.c
hostapd/wps_hostapd.c
src/drivers/driver.h
src/drivers/driver_atheros.c
src/drivers/driver_bsd.c
src/drivers/driver_hostap.c
src/drivers/driver_madwifi.c
src/drivers/driver_ndis.c
src/drivers/driver_nl80211.c
src/drivers/driver_none.c
src/drivers/driver_privsep.c
src/drivers/driver_ps3.c
src/drivers/driver_ralink.c
src/drivers/driver_test.c
src/drivers/driver_wext.c
src/drivers/nl80211_copy.h [moved from src/common/nl80211_copy.h with 100% similarity]
src/drivers/scan_helpers.c
src/drivers/wireless_copy.h [moved from src/common/wireless_copy.h with 100% similarity]
src/eap_peer/eap.c
src/eap_peer/eap.h
src/eap_peer/eap_mschapv2.c
src/eap_server/eap.h
src/eapol_supp/eapol_supp_sm.c
src/eapol_supp/eapol_supp_sm.h
src/l2_packet/l2_packet_privsep.c
src/radius/radius_server.c
src/rsn_supp/peerkey.c
src/rsn_supp/preauth.c
src/rsn_supp/wpa.c
src/rsn_supp/wpa.h
src/rsn_supp/wpa_ft.c
src/rsn_supp/wpa_ie.c
src/wps/wps.c
src/wps/wps_registrar.c
wpa_supplicant/Makefile
wpa_supplicant/config_ssid.h
wpa_supplicant/ctrl_iface.c
wpa_supplicant/ctrl_iface_dbus_handlers.c
wpa_supplicant/ctrl_iface_dbus_new_handlers.c
wpa_supplicant/ctrl_iface_named_pipe.c
wpa_supplicant/ctrl_iface_udp.c
wpa_supplicant/events.c
wpa_supplicant/mlme.c
wpa_supplicant/nmake.mak
wpa_supplicant/sme.c
wpa_supplicant/symbian/wpa_supplicant.mmp
wpa_supplicant/tests/test_wpa.c
wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
wpa_supplicant/wpa_cli.c
wpa_supplicant/wpa_gui-qt4/addinterface.cpp
wpa_supplicant/wpa_gui-qt4/peers.cpp
wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
wpa_supplicant/wpa_gui-qt4/wpagui.cpp
wpa_supplicant/wpa_gui/scanresults.ui
wpa_supplicant/wpa_gui/userdatarequest.ui
wpa_supplicant/wpa_gui/wpa_gui.pro
wpa_supplicant/wpa_gui/wpagui.ui
wpa_supplicant/wpa_priv.c
wpa_supplicant/wpa_supplicant.c
wpa_supplicant/wpas_glue.c
wpa_supplicant/wps_supplicant.c
wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj

index 2667a36b82cf3975165515b2e539e68a5c5093fc..f27abb47b7f0b6a49f839baefd6fc028f2aedcea 100644 (file)
@@ -13,7 +13,6 @@ CFLAGS += -DHOSTAPD_DUMP_STATE
 CFLAGS += -I../src
 CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
 
 # Uncomment following line and set the path to your kernel tree include
 # directory if your C library does not include all header files.
index c8c22bb75e57e913af8d6f297fe75544c7bb8ad3..e0571aa940075b4a13c5f6a1ecbed8c1bab88569 100644 (file)
@@ -23,7 +23,7 @@
 #include "sha1.h"
 #include "eap_server/eap.h"
 #include "radius/radius_client.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "wpa.h"
 #include "uuid.h"
 #include "eap_common/eap_wsc_common.h"
index 29b73846a00b3a1ae5a4f79c0680e4260542da25..beb6b7a61ea9d30d193d5138025fd657d7fd1c11 100644 (file)
@@ -16,9 +16,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "ip_addr.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 
 typedef u8 macaddr[ETH_ALEN];
 
index b8064431b3ebb88f6eddb3bef70f99b91b8543d1..c09c1eb601dd95012f9033dfea96bc0f60a47acb 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef EAPOL_SM_H
 #define EAPOL_SM_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "radius/radius.h"
 
 /* IEEE Std 802.1X-2004, Ch. 8.2 */
index 551766ecf9279ed3f81cbc04d1c1d487996da8c4..47941c53e0a97e4c6ae3c0358ddf255cbfc2b355 100644 (file)
@@ -22,7 +22,7 @@
 #include "accounting.h"
 #include "eapol_sm.h"
 #include "iapp.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "ieee802_11_auth.h"
 #include "sta_info.h"
 #include "ap_list.h"
@@ -37,7 +37,6 @@
 #include "eap_server/eap_sim_db.h"
 #include "eap_server/eap.h"
 #include "eap_server/tncs.h"
-#include "version.h"
 #include "l2_packet/l2_packet.h"
 #include "wps_hostapd.h"
 #include "tkip_countermeasures.h"
index 84e8641952d55ec0a83b21a11aab295e536f8f9a..bac430938024ceae3b1135fb51a2693dfc362355 100644 (file)
@@ -15,9 +15,9 @@
 #include "includes.h"
 #include <dirent.h>
 
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "common.h"
-#include "version.h"
+#include "common/version.h"
 
 
 static const char *hostapd_cli_version =
index 2f614650c86297db24945d7da486d317fc950001..e6caf506fbcf96ddfa1ef00510e8f998260b548a 100644 (file)
@@ -17,8 +17,8 @@
 #include "includes.h"
 
 #include "hostapd.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "eloop.h"
 #include "hw_features.h"
 #include "driver_i.h"
index be9a3a1907e50fe4c026876d14bb3e3c93934ee2..9a2a67c7eb3325bdbb9f252fd0b24994ca568307 100644 (file)
@@ -36,7 +36,7 @@
 #include "accounting.h"
 #include "driver_i.h"
 #include "mlme.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 
 u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid)
index 68ed983e7c9d4fd98583073fb15571c81c446749..9bcb30919a49c78eb6a9ed97f99947bd7459fe36 100644 (file)
@@ -16,8 +16,8 @@
 #ifndef IEEE802_11_H
 #define IEEE802_11_H
 
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 
 struct hostapd_iface;
 struct hostapd_data;
index a6313fd6ec66ae4257ea8eed50c144e739d590bb..639949f71c144d531cd32160042f19f6dd13543a 100644 (file)
@@ -30,8 +30,8 @@
 #include "driver_i.h"
 #include "hw_features.h"
 #include "eap_server/eap.h"
-#include "ieee802_11_defs.h"
-#include "wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_ctrl.h"
 
 
 static void ieee802_1x_finished(struct hostapd_data *hapd,
index 8bcc745379fdb974a006a67e6cd4c711796c3868..e7fddf444fc74fe49cd5331eeb117e9c609762fa 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "eloop.h"
 #include "hostapd.h"
-#include "version.h"
+#include "common/version.h"
 #include "config.h"
 #include "tls.h"
 #include "eap_server/eap.h"
index 83f3ce513de37002b555dc191507d76e69b9bede..e74b936c4030fff9c6100d7e295c91b65fd5e489 100644 (file)
@@ -19,7 +19,6 @@
 #include "sha1.h"
 #include "sha256.h"
 #include "wpa.h"
-#include "defs.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
index 011492bda708ab75fb98d7a4b10e04a8239e86f2..b26bb1ffa31b76511e3028f53559043ccbd5af87 100644 (file)
@@ -22,7 +22,7 @@
 #include "ieee802_1x.h"
 #include "eloop.h"
 #include "sta_info.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "eapol_sm.h"
 #include "wpa.h"
 #include "preauth.h"
index a3f94c574d14083141aceee44c5ccbec5532ec50..52e2f2e151efbdb3ecac2eadbd2c5d4b8f3055f5 100644 (file)
@@ -18,7 +18,7 @@
 #include "sta_flags.h"
 
 #ifdef CONFIG_IEEE80211N
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #endif /* CONFIG_IEEE80211N */
 
 /* Maximum number of supported rates (from both Supported Rates and Extended
index 92019b3179fd60ec191c7cda85480643d4071420..37efc8c695d6d82f4d8114bfed78ef8352dfd3e2 100644 (file)
@@ -20,7 +20,7 @@
 #include "sta_info.h"
 #include "mlme.h"
 #include "wpa.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "tkip_countermeasures.h"
 
 
index 824c2e4351808ab063aa7ebfc468286197d5f693..760818a25611bcf88caa6275bd574557d180f221 100644 (file)
@@ -15,9 +15,9 @@
 #ifndef WPA_AUTH_H
 #define WPA_AUTH_H
 
-#include "defs.h"
-#include "eapol_common.h"
-#include "wpa_common.h"
+#include "common/defs.h"
+#include "common/eapol_common.h"
+#include "common/wpa_common.h"
 
 #ifdef _MSC_VER
 #pragma pack(push, 1)
index 115f1fc29476f0f746eaf3b614dc03297f7d38fe..55104239beb19eb71494eeea1878ca25634c495b 100644 (file)
@@ -20,7 +20,6 @@
 #include "aes_wrap.h"
 #include "ieee802_11.h"
 #include "wme.h"
-#include "defs.h"
 #include "wpa_auth_i.h"
 #include "wpa_auth_ie.h"
 
index 4fe483445a0bd274be4f4ee41479eab5f9a16460..1ca0ff9ac131815661e24a35a2e50f8908b2c16f 100644 (file)
@@ -18,9 +18,9 @@
 #include "driver_i.h"
 #include "eloop.h"
 #include "uuid.h"
-#include "wpa_ctrl.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "sta_info.h"
 #include "eapol_sm.h"
 #include "wps/wps.h"
index 14095762f1757f2ae5691e60f091ffeee172fb0d..4b864e16dc9e382930169827413048e5714d3bf4 100644 (file)
@@ -17,7 +17,7 @@
 
 #define WPA_SUPPLICANT_DRIVER_VERSION 4
 
-#include "defs.h"
+#include "common/defs.h"
 
 #define HOSTAPD_CHAN_DISABLED 0x00000001
 #define HOSTAPD_CHAN_PASSIVE_SCAN 0x00000002
index de1b048d2bff5888661d8fa80bc7d318b8f7e4b0..3e1342a5528d61d28d5eeb3861d138c7323b1206 100644 (file)
@@ -67,7 +67,7 @@
 #include "l2_packet/l2_packet.h"
 
 #include "../hostapd/wps_hostapd.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 struct madwifi_driver_data {
index 2bd51a444ffd20c43dfef83ce100caf5c045c4a2..7cf6159099e3c12d8a95139f1836b0d321e5ad02 100644 (file)
@@ -19,7 +19,7 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 #include <net/if.h>
 
index 930a69ca84fa820284f1c8cfef5b7173cb8deb1f..6963de4858f15df05162a86587885b0eec28e001 100644 (file)
@@ -29,7 +29,7 @@
 #include <netpacket/packet.h>
 
 #include "priv_netlink.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "../../hostapd/hostapd.h"
 #include "../../hostapd/hw_features.h"
 #include "../../hostapd/sta_flags.h"
index ff63bb0fc227b28d4a1330ffa5d58691368563ba..5af69a61b764dc5c60a0488ba89d760581cb540d 100644 (file)
@@ -26,7 +26,7 @@
 #include "driver.h"
 #include "driver_wext.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wireless_copy.h"
 
 /*
index 46f92c5db1201173c43bf700630978844202b9c2..b38d9a0c9408642ae3dd6db68e0b846f236611fd 100644 (file)
@@ -40,7 +40,7 @@ int close(int fd);
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "driver_ndis.h"
 
 int wpa_driver_register_event_cb(struct wpa_driver_ndis_data *drv);
index 33076a11d3f0ffebf943973fdaecc7e3b4c70baf..77245eb95914f3d34fae1f18efaf1d2e8fb93197 100644 (file)
@@ -28,7 +28,7 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 #if defined(CONFIG_AP) || defined(HOSTAPD)
 #include <netpacket/packet.h>
index a5d66c420b0d6b15e3c7727269da0d44c4768488..aaeacd66435dd5b1dd747464dc59b836440d807a 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "includes.h"
 
-#include "../hostapd/hostapd.h"
+#include "common.h"
 #include "driver.h"
 
 
index 35c5e37a97a632b7ea5deae3d67915075d61dffe..baec7174e935d8e4b01982d20b75f5579720330d 100644 (file)
@@ -18,7 +18,7 @@
 #include "common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "privsep_commands.h"
+#include "common/privsep_commands.h"
 
 
 struct wpa_driver_privsep_data {
index d3eb419e6848a95a43ecde302b6d84f74dda0f07..19d44dea25fa26ed4cdd07dd69fc4d9317c4088b 100644 (file)
 #include <sys/ioctl.h>
 #include "wireless_copy.h"
 #include "common.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "driver.h"
 #include "eloop.h"
 #include "driver_wext.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 static int wpa_driver_ps3_set_wpa_key(struct wpa_driver_wext_data *drv,
                                struct wpa_driver_associate_params *params)
index 1fc4f2d6c161160d1086a8ad5e94dba8a85b56cc..431d38fd8aa29b8db0d7866c2db08057a9c4e65e 100644 (file)
@@ -22,7 +22,7 @@
 #include "driver.h"
 #include "l2_packet/l2_packet.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "priv_netlink.h"
 #include "driver_ralink.h"
 
index 38325a5e7751337c5507ac511b3562ade52a78b1..439f72622506f3f8b3f20c2c0cae92a25d494488 100644 (file)
@@ -32,7 +32,7 @@
 #include "l2_packet/l2_packet.h"
 #include "eloop.h"
 #include "sha1.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 #include "../../hostapd/hostapd.h"
 #include "../../hostapd/wpa.h"
index 2cedb326dba2e3e928223175b629ee1eb14d6f4c..9d6a48d4d259934190a100d2f0c56187b7f1ba80 100644 (file)
@@ -28,8 +28,8 @@
 #include "eloop.h"
 #include "priv_netlink.h"
 #include "driver_wext.h"
-#include "ieee802_11_defs.h"
-#include "wpa_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_common.h"
 
 
 static int wpa_driver_wext_flush_pmkid(void *priv);
index 63387701ea9aab1bfbfe900c130e0e234a680bec..a8c1c025df52dffe38135a5a39fc4aef9a4991f6 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "common.h"
 #include "drivers/driver.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 const u8 * wpa_scan_get_ie(const struct wpa_scan_res *res, u8 ie)
index a95795311351e0259f537305d66b82ae708db50d..dd9a8be3ddffa41ade9ae5dfe9de4e30eaa46295 100644 (file)
@@ -29,7 +29,7 @@
 #include "tls.h"
 #include "crypto.h"
 #include "pcsc_funcs.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "state_machine.h"
 #include "eap_common/eap_wsc_common.h"
 
index d7a562812bb36cc177fa7a2b58c1ff696e07ddc4..40d0b6929ce950d788a3ca3d01525b144a7b0f57 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef EAP_H
 #define EAP_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "eap_common/eap_defs.h"
 #include "eap_peer/eap_methods.h"
 
index 8b27bc1d3138544e20254884662f53fbeeb7cb27..d0ca44d05e8ad728c9038dcedaae8eb3e8ca877a 100644 (file)
@@ -25,7 +25,7 @@
 #include "eap_i.h"
 #include "eap_config.h"
 #include "ms_funcs.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "mschapv2.h"
 
 
index dc00c3198aa5a3d4e27f3aaeffa5b8d0b3c800db..27aa3ad29d7b91fde2cf14063645f1885615232e 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef EAP_H
 #define EAP_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "eap_common/eap_defs.h"
 #include "eap_server/eap_methods.h"
 #include "wpabuf.h"
index 19d57b9c49a742e7cadd470245940abcbca525ab..f3dc4bfbf64d90fedbe895447a59c7009cb2b8b7 100644 (file)
@@ -18,7 +18,7 @@
 #include "eapol_supp_sm.h"
 #include "eap_peer/eap.h"
 #include "eloop.h"
-#include "eapol_common.h"
+#include "common/eapol_common.h"
 #include "md5.h"
 #include "crypto.h"
 #include "state_machine.h"
index e6e8cc6d6b42a714c67267590dbbcc6a8246c66c..00fc8864a0e333e755fafee1c5ac97cb62e23936 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef EAPOL_SUPP_SM_H
 #define EAPOL_SUPP_SM_H
 
-#include "defs.h"
+#include "common/defs.h"
 
 typedef enum { Unauthorized, Authorized } PortStatus;
 typedef enum { Auto, ForceUnauthorized, ForceAuthorized } PortControl;
index c0e7c495a142a0703df880933a0343ced2e404ab..79d29681565a15e9805f4f7e655a1706e10a018f 100644 (file)
@@ -18,7 +18,7 @@
 #include "common.h"
 #include "eloop.h"
 #include "l2_packet.h"
-#include "privsep_commands.h"
+#include "common/privsep_commands.h"
 
 
 struct l2_packet_data {
index 2d1259b93c49a9ec15fa7257a1a006562089a039..7c8c525f5fbd52a5eae3b02a61095e7f51404fb1 100644 (file)
@@ -18,7 +18,6 @@
 #include "common.h"
 #include "radius.h"
 #include "eloop.h"
-#include "defs.h"
 #include "eap_server/eap.h"
 #include "radius_server.h"
 
index 36392ba1e0757d4f1ac7d652ba660aae0d645e33..ae567ca9b8ca703f502e546d76cee4ba33e6d8f5 100644 (file)
@@ -23,7 +23,7 @@
 #include "wpa.h"
 #include "wpa_i.h"
 #include "wpa_ie.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "peerkey.h"
 
 
index f4e8cbb489c29a4bf8898f3f21a1189aa9d4d35d..64e21460cf5bc7f2c96c230f6bcceca63ea6419f 100644 (file)
@@ -22,7 +22,7 @@
 #include "preauth.h"
 #include "pmksa_cache.h"
 #include "wpa_i.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA2)
index 55e9f2b7812568a4c07055142b7c8f8ff4758153..887bf00baf5b24cd3f2e950cb7711ab551fa07b8 100644 (file)
@@ -25,7 +25,7 @@
 #include "wpa_i.h"
 #include "wpa_ie.h"
 #include "peerkey.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 /**
index cd503bb58beaf0567d9ba9418acf513adf19dee6..b2fa2e5d51ac8b7c5b72b6bec224d6fd05722fc5 100644 (file)
@@ -15,9 +15,9 @@
 #ifndef WPA_H
 #define WPA_H
 
-#include "defs.h"
-#include "eapol_common.h"
-#include "wpa_common.h"
+#include "common/defs.h"
+#include "common/eapol_common.h"
+#include "common/wpa_common.h"
 
 struct wpa_sm;
 struct eapol_sm;
index 9a39ed24998d5472f347be93c42faa740dc03afe..5b7d52867f1c243316f018e3667faf2b86855bbe 100644 (file)
@@ -19,8 +19,8 @@
 #include "wpa_i.h"
 #include "wpa_ie.h"
 #include "aes_wrap.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 
 #ifdef CONFIG_IEEE80211R
 
index 84f2811b886199c7a12c0f8e90193bf79af107af..0feb1f6900007be9ed807667e7a15829d4bcaeff 100644 (file)
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "wpa.h"
 #include "pmksa_cache.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wpa_i.h"
 #include "wpa_ie.h"
 
index cc5baab594b2d8b8497a72c7ea655f25236c386c..251883d77024c531625cbad9dc01256ce8b95e72 100644 (file)
@@ -18,7 +18,7 @@
 #include "dh_group5.h"
 #include "wps_i.h"
 #include "wps_dev_attr.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 
 
 /**
index 3d86174373692aaf3d10e119408394d212efe4d2..fe4b49b4a1069d3bb3ffbe6fc5e7b43808d96224 100644 (file)
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "sha256.h"
 #include "base64.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "eloop.h"
 #include "wps_i.h"
 #include "wps_dev_attr.h"
index 43a54547353a4c4c9bbbc19d19539d581c8c4e8d..c91758b964b901bd24610db3a36353c57f7753be 100644 (file)
@@ -12,7 +12,6 @@ export BINDIR ?= /usr/local/sbin/
 CFLAGS += -I../src
 CFLAGS += -I../src/crypto
 CFLAGS += -I../src/utils
-CFLAGS += -I../src/common
 CFLAGS += -I../src/rsn_supp
 
 ALL=wpa_supplicant wpa_passphrase wpa_cli
index e09e3edcdadec52b1a95ddffc75cf4ce690de2fb..e3dcabc5d0c65e50e729671da4cc6a16e6a6762e 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef CONFIG_SSID_H
 #define CONFIG_SSID_H
 
-#include "defs.h"
+#include "common/defs.h"
 #include "eap_peer/eap_config.h"
 
 #define MAX_SSID_LEN 32
index 48e445defc9cc51b7198cf5f7124613600aac379..0855db81b266d48eb9d37408ac24f6a9a6d23c53 100644 (file)
@@ -25,9 +25,9 @@
 #include "l2_packet/l2_packet.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wps_supplicant.h"
 #include "wps/wps.h"
 #include "ibss_rsn.h"
index 0e9d4afdbe554cd050863ed4d42b9cdd02396e44..55b1acb91f1fab91bf86abaf9b9059a3f611700b 100644 (file)
@@ -23,7 +23,7 @@
 #include "notify.h"
 #include "eap_peer/eap_methods.h"
 #include "dbus_dict_helpers.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wps_supplicant.h"
index 40c5a23d5d5f499e09fc24285ac65f6496c3c6f5..a017dbc1e8fcf04531b36f87a860e060e32ab924 100644 (file)
@@ -25,7 +25,7 @@
 #include "notify.h"
 #include "eap_peer/eap_methods.h"
 #include "dbus_dict_helpers.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "wpas_glue.h"
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wps_supplicant.h"
index e8b53b1945815bb30a4eae09713e2becf1d489e7..5f7e24de794369b3359add8b07e01d08c52a9d7c 100644 (file)
@@ -20,7 +20,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa_supplicant_i.h"
 #include "ctrl_iface.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 #ifdef __MINGW32_VERSION
 /* mingw-w32api v3.1 does not yet include sddl.h, so define needed parts here
index 18e40405a7376c7b5416e36dd71af00708a969f4..110ca4f677d970f6915710990750d9004461072e 100644 (file)
@@ -20,7 +20,7 @@
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa_supplicant_i.h"
 #include "ctrl_iface.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 
 #define COOKIE_LEN 8
index dc28c2f71db941a3804afb458c96f02cc81e6d49..d5223c52c3a12305257a97d80a74e45c4786163f 100644 (file)
 #include "pcsc_funcs.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "eap_peer/eap.h"
 #include "notify.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "blacklist.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
index 9bdb9fb1a9bb42f38f7742ba9d6a7385a3cc0258..a71df15ee1f059c27f9d3de822d24c11842e5b81 100644 (file)
@@ -23,8 +23,8 @@
 #include "notify.h"
 #include "driver_i.h"
 #include "wpa.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
 #include "mlme.h"
 
 
index 43022606895e81c67384d85275da2675cfa40197..8b9956f0e6ac381fb4c03552195e9e3e1e7fef90 100644 (file)
@@ -48,7 +48,7 @@ CFLAGS = $(CFLAGS) /DPCSC_FUNCS
 CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE
 CFLAGS = $(CFLAGS) /DCONFIG_CTRL_IFACE_NAMED_PIPE
 CFLAGS = $(CFLAGS) /DCONFIG_DRIVER_NDIS
-CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\common /I..\src\crypto
+CFLAGS = $(CFLAGS) /I..\src /I..\src\utils /I..\src\crypto
 CFLAGS = $(CFLAGS) /I..\src\rsn_supp /I..\src\eapol_supp /I.
 CFLAGS = $(CFLAGS) /DWIN32
 CFLAGS = $(CFLAGS) /Fo$(OBJDIR)\\ /c
index 7b2764c2fcb5225de6155699384ae75bbb88d3c3..b4fe000d0511e84899d9496584b6baa9881b84b2 100644 (file)
@@ -15,9 +15,9 @@
 #include "includes.h"
 
 #include "common.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "eapol_supp/eapol_supp_sm.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "wpa.h"
 #include "pmksa_cache.h"
 #include "config.h"
index dc67ba860b359aace4bcd435ea31b84020ef0320..e16e08383dcc357c60d2e1665a6a1d5c32166834 100644 (file)
@@ -5,7 +5,7 @@ TARGETTYPE      exe
 
 SYSTEMINCLUDE \epoc32\include \epoc32\include\variant \epoc32\include\ecom \epoc32\include\libc
 
-USERINCLUDE    .. ..\..\src ..\..\src\utils ..\..\src\common ..\..\src\crypto ..\..\src\rsn_supp
+USERINCLUDE    .. ..\..\src ..\..\src\utils ..\..\src\crypto ..\..\src\rsn_supp
 
 SOURCEPATH     ..
 SOURCE         main_symbian.cpp
index 4c341b6fcd764b6684809fe565fc290d95f11998..af1aa0222ad2eaee71be69972fcc3910aaf79263 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "common.h"
 #include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "../config.h"
 #include "wpa.h"
 #include "wpa_ie.h"
index c4dd4527d900c8506e64c1e62c817b23fa60b423..28cfa3db736b4dd219e2baede3d998af58be4420 100755 (executable)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
index 6d36cba56c8f66bbb6309368722640f0a8581264..8edf12d60ba63daa81266e30c5338988f4a9b544 100755 (executable)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\common"\r
+                               AdditionalIncludeDirectories="..\..\..\src\utils"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils;..\..\..\src\common"\r
+                               AdditionalIncludeDirectories="..\..\..\src\utils"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
index 93d25e85148d54d0bca435f946e05bba46b37470..27918258cc39ee54c2844246b3faed97298dbc64 100755 (executable)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
index 6226271b633a80dee1049a5f66bdc5cfcf786a79..a10b66d9a245b56e511533659f3a9f78c425156d 100755 (executable)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\common;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..;..\..\..\src;..\..\..\src\utils;..\..\..\src\crypto;..\..\..\src\rsn_supp;C:\dev\WpdPack\include;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
index dc7ae6c9115a5d449e82410fd0c3648fb97f7f0c..82d7ae2732c733907979534df26f5b16522ef23d 100644 (file)
@@ -24,9 +24,9 @@
 #include <readline/history.h>
 #endif /* CONFIG_READLINE */
 
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "common.h"
-#include "version.h"
+#include "common/version.h"
 
 
 static const char *wpa_cli_version =
index 02fecfea42cd7b86e50ba2b47c74de4ca6be0d82..22cdc92e7f6b305ba51cea47cbec4391a8fc417a 100644 (file)
@@ -13,7 +13,7 @@
  */
 
 #include <cstdio>
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 #include <QMessageBox>
 
index 12ed18a7664b7b90120a509500a0a990c6528d31..d1439e234d58dd425a760ed7ae1d52eca3216872 100644 (file)
@@ -16,7 +16,7 @@
 #include <QImageReader>
 #include <QMessageBox>
 
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "wpagui.h"
 #include "stringquery.h"
 #include "peers.h"
index 42fbdbc7b4e424389e9b533669a59a837d6d6608..d8feb6cb6df3ca3e41d823a52e2948d474666d47 100644 (file)
@@ -14,7 +14,7 @@
 
 #include "userdatarequest.h"
 #include "wpagui.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 
 
 UserDataRequest::UserDataRequest(QWidget *parent, const char *, bool,
index ec01b3b7dfbc166b2312f364275722895934e6fe..7a78843285ba51eb2423a508f0050c9fb8f11f2e 100644 (file)
@@ -27,7 +27,7 @@ win32 {
   SOURCES += ../../src/utils/os_unix.c
 }
 
-INCLUDEPATH    += . .. ../../src/utils ../../src/common
+INCLUDEPATH    += . .. ../../src ../../src/utils
 
 HEADERS        += wpamsg.h \
        wpagui.h \
index fb7d747097b12507bdc49e79c77017840145e8fb..943bd5354463d4ee64747db2394328dde36021e6 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "wpagui.h"
 #include "dirent.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "userdatarequest.h"
 #include "networkconfig.h"
 
index 66c8b4b76f3294a502e2a3446ad3c405d04964b6..dea305b4f6576ff0975bd761a50b5ca6476bd9b3 100644 (file)
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">wpa_ctrl.h</include>
+    <include location="local" impldecl="in implementation">common/wpa_ctrl.h</include>
     <include location="local" impldecl="in implementation">wpagui.h</include>
     <include location="local" impldecl="in implementation">networkconfig.h</include>
     <include location="local" impldecl="in implementation">scanresults.ui.h</include>
index c3d545fa620a7f2ea0a5a4b7083baae465f21534..6106b1e8b3552f04216c90264102ca882e76f501 100644 (file)
     </connection>
 </connections>
 <includes>
-    <include location="local" impldecl="in implementation">wpa_ctrl.h</include>
+    <include location="local" impldecl="in implementation">common/wpa_ctrl.h</include>
     <include location="local" impldecl="in implementation">wpagui.h</include>
     <include location="local" impldecl="in implementation">userdatarequest.ui.h</include>
 </includes>
index 6363db92287ce63a8791933925d96b6bca41a05a..a42a4ac843f2aa0a5850f5737698ab6fa40cf291 100644 (file)
@@ -19,7 +19,7 @@ win32 {
   SOURCES += ../../src/utils/os_unix.c
 }
 
-INCLUDEPATH    += . .. ../../src/utils ../../src/common
+INCLUDEPATH    += . .. ../../src ../../src/utils
 
 HEADERS        += wpamsg.h
 
index 01666a363479b32ae6ca6ab637be3a367a6636ce..b49d96b1ebeb32792932c5fac6f2c649aecebe3c 100644 (file)
     <include location="local" impldecl="in declaration">wpamsg.h</include>
     <include location="local" impldecl="in declaration">eventhistory.h</include>
     <include location="local" impldecl="in declaration">scanresults.h</include>
-    <include location="local" impldecl="in implementation">wpa_ctrl.h</include>
+    <include location="local" impldecl="in implementation">common/wpa_ctrl.h</include>
     <include location="global" impldecl="in implementation">dirent.h</include>
     <include location="global" impldecl="in implementation">qmessagebox.h</include>
     <include location="global" impldecl="in implementation">qapplication.h</include>
index 193c542b12add3cb3a2eebfd1a362b7b95fe7458..975a4ed6f234aa8c7a6565e28716d12cc4c24124 100644 (file)
 
 #include "common.h"
 #include "eloop.h"
-#include "version.h"
+#include "common/version.h"
 #include "drivers/driver.h"
 #include "l2_packet/l2_packet.h"
-#include "privsep_commands.h"
-#include "ieee802_11_defs.h"
+#include "common/privsep_commands.h"
+#include "common/ieee802_11_defs.h"
 
 
 struct wpa_priv_interface {
index 5ea06f45b40c4282a57dae8a7b10e516f880f4ed..b73010acba62ac33b5345609b387dd1c08e1c120 100644 (file)
 #include "driver_i.h"
 #include "ctrl_iface.h"
 #include "pcsc_funcs.h"
-#include "version.h"
+#include "common/version.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "mlme.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
 #include "blacklist.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
index b1f8bf8bc6cc76861a274e85fb0ba7e8afa66160..a59c0f1870218d7aa6f5f8ca6abc5dc2f03fbe8e 100644 (file)
 #include "eloop.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
-#include "wpa_common.h"
+#include "common/wpa_common.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "pmksa_cache.h"
 #include "mlme.h"
 #include "sme.h"
-#include "ieee802_11_defs.h"
-#include "wpa_ctrl.h"
+#include "common/ieee802_11_defs.h"
+#include "common/wpa_ctrl.h"
 #include "wpas_glue.h"
 #include "wps_supplicant.h"
 
index 938ad890ddb2a680702f95c985427e58a967aed9..de0a3704941f06487f6cccfea07f7013338de8df 100644 (file)
 #include "includes.h"
 
 #include "common.h"
-#include "ieee802_11_defs.h"
-#include "ieee802_11_common.h"
-#include "wpa_common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
+#include "common/wpa_common.h"
 #include "config.h"
 #include "eap_peer/eap.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "eloop.h"
 #include "uuid.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
 #include "notify.h"
 #include "eap_common/eap_wsc_common.h"
 #include "blacklist.h"
index 7b7ecb50d096703af3d9be4ddf51b7442e04ca65..1d94554db755113a846de7f12570831dbcf2a0d6 100644 (file)
                                        ../../src,
                                        ../../src/crypto,
                                        ../../src/utils,
-                                       ../../src/common,
                                        ../../src/rsn_supp,
                                );
                                ONLY_ACTIVE_ARCH = YES;
                                        ../../src,
                                        ../../src/crypto,
                                        ../../src/utils,
-                                       ../../src/common,
                                        ../../src/rsn_supp,
                                );
                                OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS";