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.
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.
#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"
#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];
#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 */
#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"
#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"
#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 =
#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"
#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)
#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;
#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,
#include "eloop.h"
#include "hostapd.h"
-#include "version.h"
+#include "common/version.h"
#include "config.h"
#include "tls.h"
#include "eap_server/eap.h"
#include "sha1.h"
#include "sha256.h"
#include "wpa.h"
-#include "defs.h"
#include "wpa_auth_i.h"
#include "wpa_auth_ie.h"
#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"
#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
#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"
#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)
#include "aes_wrap.h"
#include "ieee802_11.h"
#include "wme.h"
-#include "defs.h"
#include "wpa_auth_i.h"
#include "wpa_auth_ie.h"
#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"
#define WPA_SUPPLICANT_DRIVER_VERSION 4
-#include "defs.h"
+#include "common/defs.h"
#define HOSTAPD_CHAN_DISABLED 0x00000001
#define HOSTAPD_CHAN_PASSIVE_SCAN 0x00000002
#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 {
#include "common.h"
#include "driver.h"
#include "eloop.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
#include <net/if.h>
#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"
#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"
/*
#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);
#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>
#include "includes.h"
-#include "../hostapd/hostapd.h"
+#include "common.h"
#include "driver.h"
#include "common.h"
#include "driver.h"
#include "eloop.h"
-#include "privsep_commands.h"
+#include "common/privsep_commands.h"
struct wpa_driver_privsep_data {
#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)
#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"
#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"
#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);
#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)
#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"
#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"
#include "eap_i.h"
#include "eap_config.h"
#include "ms_funcs.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
#include "mschapv2.h"
#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"
#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"
#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;
#include "common.h"
#include "eloop.h"
#include "l2_packet.h"
-#include "privsep_commands.h"
+#include "common/privsep_commands.h"
struct l2_packet_data {
#include "common.h"
#include "radius.h"
#include "eloop.h"
-#include "defs.h"
#include "eap_server/eap.h"
#include "radius_server.h"
#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"
#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)
#include "wpa_i.h"
#include "wpa_ie.h"
#include "peerkey.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
/**
#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;
#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
#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"
#include "dh_group5.h"
#include "wps_i.h"
#include "wps_dev_attr.h"
-#include "ieee802_11_defs.h"
+#include "common/ieee802_11_defs.h"
/**
#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"
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
#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
#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"
#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"
#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"
#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
#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
#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"
#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"
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
#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"
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
#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"
<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
<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
<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
<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
#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 =
*/
#include <cstdio>
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
#include <QMessageBox>
#include <QImageReader>
#include <QMessageBox>
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
#include "wpagui.h"
#include "stringquery.h"
#include "peers.h"
#include "userdatarequest.h"
#include "wpagui.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
UserDataRequest::UserDataRequest(QWidget *parent, const char *, bool,
SOURCES += ../../src/utils/os_unix.c
}
-INCLUDEPATH += . .. ../../src/utils ../../src/common
+INCLUDEPATH += . .. ../../src ../../src/utils
HEADERS += wpamsg.h \
wpagui.h \
#include "wpagui.h"
#include "dirent.h"
-#include "wpa_ctrl.h"
+#include "common/wpa_ctrl.h"
#include "userdatarequest.h"
#include "networkconfig.h"
</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>
</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>
SOURCES += ../../src/utils/os_unix.c
}
-INCLUDEPATH += . .. ../../src/utils ../../src/common
+INCLUDEPATH += . .. ../../src ../../src/utils
HEADERS += wpamsg.h
<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>
#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 {
#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"
#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"
#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"
../../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";