From 90973fb2fd4d9d3a6982e42581b08fafc145877b Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 29 Nov 2009 17:51:55 +0200 Subject: [PATCH] Remove src/common from default header file path 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. --- hostapd/Makefile | 1 - hostapd/config.c | 2 +- hostapd/config.h | 4 ++-- hostapd/eapol_sm.h | 2 +- hostapd/hostapd.c | 3 +-- hostapd/hostapd_cli.c | 4 ++-- hostapd/hw_features.c | 4 ++-- hostapd/ieee802_11.c | 2 +- hostapd/ieee802_11.h | 4 ++-- hostapd/ieee802_1x.c | 4 ++-- hostapd/main.c | 2 +- hostapd/peerkey.c | 1 - hostapd/preauth.c | 2 +- hostapd/sta_info.h | 2 +- hostapd/tkip_countermeasures.c | 2 +- hostapd/wpa.h | 6 +++--- hostapd/wpa_ft.c | 1 - hostapd/wps_hostapd.c | 6 +++--- src/drivers/driver.h | 2 +- src/drivers/driver_atheros.c | 2 +- src/drivers/driver_bsd.c | 2 +- src/drivers/driver_hostap.c | 2 +- src/drivers/driver_madwifi.c | 2 +- src/drivers/driver_ndis.c | 2 +- src/drivers/driver_nl80211.c | 2 +- src/drivers/driver_none.c | 2 +- src/drivers/driver_privsep.c | 2 +- src/drivers/driver_ps3.c | 4 ++-- src/drivers/driver_ralink.c | 2 +- src/drivers/driver_test.c | 2 +- src/drivers/driver_wext.c | 4 ++-- src/{common => drivers}/nl80211_copy.h | 0 src/drivers/scan_helpers.c | 2 +- src/{common => drivers}/wireless_copy.h | 0 src/eap_peer/eap.c | 2 +- src/eap_peer/eap.h | 2 +- src/eap_peer/eap_mschapv2.c | 2 +- src/eap_server/eap.h | 2 +- src/eapol_supp/eapol_supp_sm.c | 2 +- src/eapol_supp/eapol_supp_sm.h | 2 +- src/l2_packet/l2_packet_privsep.c | 2 +- src/radius/radius_server.c | 1 - src/rsn_supp/peerkey.c | 2 +- src/rsn_supp/preauth.c | 2 +- src/rsn_supp/wpa.c | 2 +- src/rsn_supp/wpa.h | 6 +++--- src/rsn_supp/wpa_ft.c | 4 ++-- src/rsn_supp/wpa_ie.c | 2 +- src/wps/wps.c | 2 +- src/wps/wps_registrar.c | 2 +- wpa_supplicant/Makefile | 1 - wpa_supplicant/config_ssid.h | 2 +- wpa_supplicant/ctrl_iface.c | 4 ++-- wpa_supplicant/ctrl_iface_dbus_handlers.c | 2 +- wpa_supplicant/ctrl_iface_dbus_new_handlers.c | 2 +- wpa_supplicant/ctrl_iface_named_pipe.c | 2 +- wpa_supplicant/ctrl_iface_udp.c | 2 +- wpa_supplicant/events.c | 4 ++-- wpa_supplicant/mlme.c | 4 ++-- wpa_supplicant/nmake.mak | 2 +- wpa_supplicant/sme.c | 4 ++-- wpa_supplicant/symbian/wpa_supplicant.mmp | 2 +- wpa_supplicant/tests/test_wpa.c | 2 +- wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj | 4 ++-- wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj | 4 ++-- .../vs2005/wpa_supplicant/wpa_supplicant.vcproj | 4 ++-- wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj | 4 ++-- wpa_supplicant/wpa_cli.c | 4 ++-- wpa_supplicant/wpa_gui-qt4/addinterface.cpp | 2 +- wpa_supplicant/wpa_gui-qt4/peers.cpp | 2 +- wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp | 2 +- wpa_supplicant/wpa_gui-qt4/wpa_gui.pro | 2 +- wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 2 +- wpa_supplicant/wpa_gui/scanresults.ui | 2 +- wpa_supplicant/wpa_gui/userdatarequest.ui | 2 +- wpa_supplicant/wpa_gui/wpa_gui.pro | 2 +- wpa_supplicant/wpa_gui/wpagui.ui | 2 +- wpa_supplicant/wpa_priv.c | 6 +++--- wpa_supplicant/wpa_supplicant.c | 6 +++--- wpa_supplicant/wpas_glue.c | 6 +++--- wpa_supplicant/wps_supplicant.c | 8 ++++---- .../xcode/wpa_supplicant.xcodeproj/project.pbxproj | 2 -- 82 files changed, 106 insertions(+), 114 deletions(-) rename src/{common => drivers}/nl80211_copy.h (100%) rename src/{common => drivers}/wireless_copy.h (100%) diff --git a/hostapd/Makefile b/hostapd/Makefile index 2667a36b8..f27abb47b 100644 --- a/hostapd/Makefile +++ b/hostapd/Makefile @@ -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. diff --git a/hostapd/config.c b/hostapd/config.c index c8c22bb75..e0571aa94 100644 --- a/hostapd/config.c +++ b/hostapd/config.c @@ -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" diff --git a/hostapd/config.h b/hostapd/config.h index 29b73846a..beb6b7a61 100644 --- a/hostapd/config.h +++ b/hostapd/config.h @@ -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]; diff --git a/hostapd/eapol_sm.h b/hostapd/eapol_sm.h index b8064431b..c09c1eb60 100644 --- a/hostapd/eapol_sm.h +++ b/hostapd/eapol_sm.h @@ -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 */ diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c index 551766ecf..47941c53e 100644 --- a/hostapd/hostapd.c +++ b/hostapd/hostapd.c @@ -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" diff --git a/hostapd/hostapd_cli.c b/hostapd/hostapd_cli.c index 84e864195..bac430938 100644 --- a/hostapd/hostapd_cli.c +++ b/hostapd/hostapd_cli.c @@ -15,9 +15,9 @@ #include "includes.h" #include -#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 = diff --git a/hostapd/hw_features.c b/hostapd/hw_features.c index 2f614650c..e6caf506f 100644 --- a/hostapd/hw_features.c +++ b/hostapd/hw_features.c @@ -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" diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c index be9a3a190..9a2a67c7e 100644 --- a/hostapd/ieee802_11.c +++ b/hostapd/ieee802_11.c @@ -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) diff --git a/hostapd/ieee802_11.h b/hostapd/ieee802_11.h index 68ed983e7..9bcb30919 100644 --- a/hostapd/ieee802_11.h +++ b/hostapd/ieee802_11.h @@ -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; diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c index a6313fd6e..639949f71 100644 --- a/hostapd/ieee802_1x.c +++ b/hostapd/ieee802_1x.c @@ -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, diff --git a/hostapd/main.c b/hostapd/main.c index 8bcc74537..e7fddf444 100644 --- a/hostapd/main.c +++ b/hostapd/main.c @@ -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" diff --git a/hostapd/peerkey.c b/hostapd/peerkey.c index 83f3ce513..e74b936c4 100644 --- a/hostapd/peerkey.c +++ b/hostapd/peerkey.c @@ -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" diff --git a/hostapd/preauth.c b/hostapd/preauth.c index 011492bda..b26bb1ffa 100644 --- a/hostapd/preauth.c +++ b/hostapd/preauth.c @@ -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" diff --git a/hostapd/sta_info.h b/hostapd/sta_info.h index a3f94c574..52e2f2e15 100644 --- a/hostapd/sta_info.h +++ b/hostapd/sta_info.h @@ -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 diff --git a/hostapd/tkip_countermeasures.c b/hostapd/tkip_countermeasures.c index 92019b317..37efc8c69 100644 --- a/hostapd/tkip_countermeasures.c +++ b/hostapd/tkip_countermeasures.c @@ -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" diff --git a/hostapd/wpa.h b/hostapd/wpa.h index 824c2e435..760818a25 100644 --- a/hostapd/wpa.h +++ b/hostapd/wpa.h @@ -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) diff --git a/hostapd/wpa_ft.c b/hostapd/wpa_ft.c index 115f1fc29..55104239b 100644 --- a/hostapd/wpa_ft.c +++ b/hostapd/wpa_ft.c @@ -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" diff --git a/hostapd/wps_hostapd.c b/hostapd/wps_hostapd.c index 4fe483445..1ca0ff9ac 100644 --- a/hostapd/wps_hostapd.c +++ b/hostapd/wps_hostapd.c @@ -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" diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 14095762f..4b864e16d 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -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 diff --git a/src/drivers/driver_atheros.c b/src/drivers/driver_atheros.c index de1b048d2..3e1342a55 100644 --- a/src/drivers/driver_atheros.c +++ b/src/drivers/driver_atheros.c @@ -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 { diff --git a/src/drivers/driver_bsd.c b/src/drivers/driver_bsd.c index 2bd51a444..7cf615909 100644 --- a/src/drivers/driver_bsd.c +++ b/src/drivers/driver_bsd.c @@ -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 diff --git a/src/drivers/driver_hostap.c b/src/drivers/driver_hostap.c index 930a69ca8..6963de485 100644 --- a/src/drivers/driver_hostap.c +++ b/src/drivers/driver_hostap.c @@ -29,7 +29,7 @@ #include #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" diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c index ff63bb0fc..5af69a61b 100644 --- a/src/drivers/driver_madwifi.c +++ b/src/drivers/driver_madwifi.c @@ -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" /* diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c index 46f92c5db..b38d9a0c9 100644 --- a/src/drivers/driver_ndis.c +++ b/src/drivers/driver_ndis.c @@ -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); diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 33076a11d..77245eb95 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -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 diff --git a/src/drivers/driver_none.c b/src/drivers/driver_none.c index a5d66c420..aaeacd664 100644 --- a/src/drivers/driver_none.c +++ b/src/drivers/driver_none.c @@ -14,7 +14,7 @@ #include "includes.h" -#include "../hostapd/hostapd.h" +#include "common.h" #include "driver.h" diff --git a/src/drivers/driver_privsep.c b/src/drivers/driver_privsep.c index 35c5e37a9..baec7174e 100644 --- a/src/drivers/driver_privsep.c +++ b/src/drivers/driver_privsep.c @@ -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 { diff --git a/src/drivers/driver_ps3.c b/src/drivers/driver_ps3.c index d3eb419e6..19d44dea2 100644 --- a/src/drivers/driver_ps3.c +++ b/src/drivers/driver_ps3.c @@ -16,11 +16,11 @@ #include #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) diff --git a/src/drivers/driver_ralink.c b/src/drivers/driver_ralink.c index 1fc4f2d6c..431d38fd8 100644 --- a/src/drivers/driver_ralink.c +++ b/src/drivers/driver_ralink.c @@ -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" diff --git a/src/drivers/driver_test.c b/src/drivers/driver_test.c index 38325a5e7..439f72622 100644 --- a/src/drivers/driver_test.c +++ b/src/drivers/driver_test.c @@ -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" diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c index 2cedb326d..9d6a48d4d 100644 --- a/src/drivers/driver_wext.c +++ b/src/drivers/driver_wext.c @@ -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); diff --git a/src/common/nl80211_copy.h b/src/drivers/nl80211_copy.h similarity index 100% rename from src/common/nl80211_copy.h rename to src/drivers/nl80211_copy.h diff --git a/src/drivers/scan_helpers.c b/src/drivers/scan_helpers.c index 63387701e..a8c1c025d 100644 --- a/src/drivers/scan_helpers.c +++ b/src/drivers/scan_helpers.c @@ -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) diff --git a/src/common/wireless_copy.h b/src/drivers/wireless_copy.h similarity index 100% rename from src/common/wireless_copy.h rename to src/drivers/wireless_copy.h diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c index a95795311..dd9a8be3d 100644 --- a/src/eap_peer/eap.c +++ b/src/eap_peer/eap.c @@ -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" diff --git a/src/eap_peer/eap.h b/src/eap_peer/eap.h index d7a562812..40d0b6929 100644 --- a/src/eap_peer/eap.h +++ b/src/eap_peer/eap.h @@ -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" diff --git a/src/eap_peer/eap_mschapv2.c b/src/eap_peer/eap_mschapv2.c index 8b27bc1d3..d0ca44d05 100644 --- a/src/eap_peer/eap_mschapv2.c +++ b/src/eap_peer/eap_mschapv2.c @@ -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" diff --git a/src/eap_server/eap.h b/src/eap_server/eap.h index dc00c3198..27aa3ad29 100644 --- a/src/eap_server/eap.h +++ b/src/eap_server/eap.h @@ -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" diff --git a/src/eapol_supp/eapol_supp_sm.c b/src/eapol_supp/eapol_supp_sm.c index 19d57b9c4..f3dc4bfbf 100644 --- a/src/eapol_supp/eapol_supp_sm.c +++ b/src/eapol_supp/eapol_supp_sm.c @@ -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" diff --git a/src/eapol_supp/eapol_supp_sm.h b/src/eapol_supp/eapol_supp_sm.h index e6e8cc6d6..00fc8864a 100644 --- a/src/eapol_supp/eapol_supp_sm.h +++ b/src/eapol_supp/eapol_supp_sm.h @@ -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; diff --git a/src/l2_packet/l2_packet_privsep.c b/src/l2_packet/l2_packet_privsep.c index c0e7c495a..79d296815 100644 --- a/src/l2_packet/l2_packet_privsep.c +++ b/src/l2_packet/l2_packet_privsep.c @@ -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 { diff --git a/src/radius/radius_server.c b/src/radius/radius_server.c index 2d1259b93..7c8c525f5 100644 --- a/src/radius/radius_server.c +++ b/src/radius/radius_server.c @@ -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" diff --git a/src/rsn_supp/peerkey.c b/src/rsn_supp/peerkey.c index 36392ba1e..ae567ca9b 100644 --- a/src/rsn_supp/peerkey.c +++ b/src/rsn_supp/peerkey.c @@ -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" diff --git a/src/rsn_supp/preauth.c b/src/rsn_supp/preauth.c index f4e8cbb48..64e21460c 100644 --- a/src/rsn_supp/preauth.c +++ b/src/rsn_supp/preauth.c @@ -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) diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 55e9f2b78..887bf00ba 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -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" /** diff --git a/src/rsn_supp/wpa.h b/src/rsn_supp/wpa.h index cd503bb58..b2fa2e5d5 100644 --- a/src/rsn_supp/wpa.h +++ b/src/rsn_supp/wpa.h @@ -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; diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c index 9a39ed249..5b7d52867 100644 --- a/src/rsn_supp/wpa_ft.c +++ b/src/rsn_supp/wpa_ft.c @@ -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 diff --git a/src/rsn_supp/wpa_ie.c b/src/rsn_supp/wpa_ie.c index 84f2811b8..0feb1f690 100644 --- a/src/rsn_supp/wpa_ie.c +++ b/src/rsn_supp/wpa_ie.c @@ -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" diff --git a/src/wps/wps.c b/src/wps/wps.c index cc5baab59..251883d77 100644 --- a/src/wps/wps.c +++ b/src/wps/wps.c @@ -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" /** diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c index 3d8617437..fe4b49b4a 100644 --- a/src/wps/wps_registrar.c +++ b/src/wps/wps_registrar.c @@ -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" diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 43a545473..c91758b96 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -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 diff --git a/wpa_supplicant/config_ssid.h b/wpa_supplicant/config_ssid.h index e09e3edcd..e3dcabc5d 100644 --- a/wpa_supplicant/config_ssid.h +++ b/wpa_supplicant/config_ssid.h @@ -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 diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 48e445def..0855db81b 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -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" diff --git a/wpa_supplicant/ctrl_iface_dbus_handlers.c b/wpa_supplicant/ctrl_iface_dbus_handlers.c index 0e9d4afdb..55b1acb91 100644 --- a/wpa_supplicant/ctrl_iface_dbus_handlers.c +++ b/wpa_supplicant/ctrl_iface_dbus_handlers.c @@ -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" diff --git a/wpa_supplicant/ctrl_iface_dbus_new_handlers.c b/wpa_supplicant/ctrl_iface_dbus_new_handlers.c index 40c5a23d5..a017dbc1e 100644 --- a/wpa_supplicant/ctrl_iface_dbus_new_handlers.c +++ b/wpa_supplicant/ctrl_iface_dbus_new_handlers.c @@ -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" diff --git a/wpa_supplicant/ctrl_iface_named_pipe.c b/wpa_supplicant/ctrl_iface_named_pipe.c index e8b53b194..5f7e24de7 100644 --- a/wpa_supplicant/ctrl_iface_named_pipe.c +++ b/wpa_supplicant/ctrl_iface_named_pipe.c @@ -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 diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c index 18e40405a..110ca4f67 100644 --- a/wpa_supplicant/ctrl_iface_udp.c +++ b/wpa_supplicant/ctrl_iface_udp.c @@ -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 diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index dc28c2f71..d5223c52c 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -25,10 +25,10 @@ #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" diff --git a/wpa_supplicant/mlme.c b/wpa_supplicant/mlme.c index 9bdb9fb1a..a71df15ee 100644 --- a/wpa_supplicant/mlme.c +++ b/wpa_supplicant/mlme.c @@ -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" diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak index 430226068..8b9956f0e 100644 --- a/wpa_supplicant/nmake.mak +++ b/wpa_supplicant/nmake.mak @@ -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 diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index 7b2764c2f..b4fe000d0 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -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" diff --git a/wpa_supplicant/symbian/wpa_supplicant.mmp b/wpa_supplicant/symbian/wpa_supplicant.mmp index dc67ba860..e16e08383 100644 --- a/wpa_supplicant/symbian/wpa_supplicant.mmp +++ b/wpa_supplicant/symbian/wpa_supplicant.mmp @@ -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 diff --git a/wpa_supplicant/tests/test_wpa.c b/wpa_supplicant/tests/test_wpa.c index 4c341b6fc..af1aa0222 100644 --- a/wpa_supplicant/tests/test_wpa.c +++ b/wpa_supplicant/tests/test_wpa.c @@ -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" diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj index c4dd4527d..28cfa3db7 100755 --- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj +++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj @@ -40,7 +40,7 @@ #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 = diff --git a/wpa_supplicant/wpa_gui-qt4/addinterface.cpp b/wpa_supplicant/wpa_gui-qt4/addinterface.cpp index 02fecfea4..22cdc92e7 100644 --- a/wpa_supplicant/wpa_gui-qt4/addinterface.cpp +++ b/wpa_supplicant/wpa_gui-qt4/addinterface.cpp @@ -13,7 +13,7 @@ */ #include -#include "wpa_ctrl.h" +#include "common/wpa_ctrl.h" #include diff --git a/wpa_supplicant/wpa_gui-qt4/peers.cpp b/wpa_supplicant/wpa_gui-qt4/peers.cpp index 12ed18a76..d1439e234 100644 --- a/wpa_supplicant/wpa_gui-qt4/peers.cpp +++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp @@ -16,7 +16,7 @@ #include #include -#include "wpa_ctrl.h" +#include "common/wpa_ctrl.h" #include "wpagui.h" #include "stringquery.h" #include "peers.h" diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp b/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp index 42fbdbc7b..d8feb6cb6 100644 --- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp +++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp @@ -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, diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro index ec01b3b7d..7a7884328 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro +++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro @@ -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 \ diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp index fb7d74709..943bd5354 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp @@ -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" diff --git a/wpa_supplicant/wpa_gui/scanresults.ui b/wpa_supplicant/wpa_gui/scanresults.ui index 66c8b4b76..dea305b4f 100644 --- a/wpa_supplicant/wpa_gui/scanresults.ui +++ b/wpa_supplicant/wpa_gui/scanresults.ui @@ -151,7 +151,7 @@ - wpa_ctrl.h + common/wpa_ctrl.h wpagui.h networkconfig.h scanresults.ui.h diff --git a/wpa_supplicant/wpa_gui/userdatarequest.ui b/wpa_supplicant/wpa_gui/userdatarequest.ui index c3d545fa6..6106b1e8b 100644 --- a/wpa_supplicant/wpa_gui/userdatarequest.ui +++ b/wpa_supplicant/wpa_gui/userdatarequest.ui @@ -140,7 +140,7 @@ - wpa_ctrl.h + common/wpa_ctrl.h wpagui.h userdatarequest.ui.h diff --git a/wpa_supplicant/wpa_gui/wpa_gui.pro b/wpa_supplicant/wpa_gui/wpa_gui.pro index 6363db922..a42a4ac84 100644 --- a/wpa_supplicant/wpa_gui/wpa_gui.pro +++ b/wpa_supplicant/wpa_gui/wpa_gui.pro @@ -19,7 +19,7 @@ win32 { SOURCES += ../../src/utils/os_unix.c } -INCLUDEPATH += . .. ../../src/utils ../../src/common +INCLUDEPATH += . .. ../../src ../../src/utils HEADERS += wpamsg.h diff --git a/wpa_supplicant/wpa_gui/wpagui.ui b/wpa_supplicant/wpa_gui/wpagui.ui index 01666a363..b49d96b1e 100644 --- a/wpa_supplicant/wpa_gui/wpagui.ui +++ b/wpa_supplicant/wpa_gui/wpagui.ui @@ -414,7 +414,7 @@ wpamsg.h eventhistory.h scanresults.h - wpa_ctrl.h + common/wpa_ctrl.h dirent.h qmessagebox.h qapplication.h diff --git a/wpa_supplicant/wpa_priv.c b/wpa_supplicant/wpa_priv.c index 193c542b1..975a4ed6f 100644 --- a/wpa_supplicant/wpa_priv.c +++ b/wpa_supplicant/wpa_priv.c @@ -21,11 +21,11 @@ #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 { diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 5ea06f45b..b73010acb 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -30,12 +30,12 @@ #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" diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c index b1f8bf8bc..a59c0f187 100644 --- a/wpa_supplicant/wpas_glue.c +++ b/wpa_supplicant/wpas_glue.c @@ -20,14 +20,14 @@ #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" diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c index 938ad890d..de0a37049 100644 --- a/wpa_supplicant/wps_supplicant.c +++ b/wpa_supplicant/wps_supplicant.c @@ -15,16 +15,16 @@ #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" diff --git a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj index 7b7ecb50d..1d94554db 100644 --- a/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj +++ b/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj @@ -455,7 +455,6 @@ ../../src, ../../src/crypto, ../../src/utils, - ../../src/common, ../../src/rsn_supp, ); ONLY_ACTIVE_ARCH = YES; @@ -479,7 +478,6 @@ ../../src, ../../src/crypto, ../../src/utils, - ../../src/common, ../../src/rsn_supp, ); OTHER_CFLAGS = "-DCONFIG_XCODE_DEFAULTS"; -- 2.39.5