DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Rename some src/ap files to avoid duplicate file names

Browse source 
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.
This commit is contained in:
Jouni Malinen 2009-12-26 00:05:40 +02:00
parent fcfda83bf9
commit 6226e38d00
41 changed files with 199 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
hostapd/Makefile
View file

@ -42,15 +42,15 @@ OBJS += ../src/ap/ap_drv_ops.o
OBJS += ../src/ap/utils.o OBJS += ../src/ap/utils.o
OBJS += ../src/ap/authsrv.o OBJS += ../src/ap/authsrv.o
OBJS += ../src/ap/ieee802_1x.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/ieee802_11_auth.o
OBJS += ../src/ap/sta_info.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/tkip_countermeasures.o
OBJS += ../src/ap/mlme.o OBJS += ../src/ap/ap_mlme.o
OBJS += ../src/ap/wpa_auth_ie.o OBJS += ../src/ap/wpa_auth_ie.o
OBJS += ../src/ap/preauth.o OBJS += ../src/ap/preauth_auth.o
OBJS += ../src/ap/pmksa_cache.o OBJS += ../src/ap/pmksa_cache_auth.o
NEED_RC4=y NEED_RC4=y
NEED_AES=y NEED_AES=y
@ -137,7 +137,7 @@ endif
ifdef CONFIG_PEERKEY ifdef CONFIG_PEERKEY
CFLAGS += -DCONFIG_PEERKEY CFLAGS += -DCONFIG_PEERKEY
OBJS += ../src/ap/peerkey.o OBJS += ../src/ap/peerkey_auth.o
endif endif
ifdef CONFIG_IEEE80211W ifdef CONFIG_IEEE80211W
@ -148,7 +148,7 @@ endif
ifdef CONFIG_IEEE80211R ifdef CONFIG_IEEE80211R
CFLAGS += -DCONFIG_IEEE80211R CFLAGS += -DCONFIG_IEEE80211R
OBJS += ../src/ap/wpa_ft.o OBJS += ../src/ap/wpa_auth_ft.o
NEED_SHA256=y NEED_SHA256=y
NEED_AES_OMAC1=y NEED_AES_OMAC1=y
NEED_AES_UNWRAP=y NEED_AES_UNWRAP=y

10
hostapd/config_file.c
View file

@ -12,19 +12,19 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
#include <grp.h> #include <grp.h>
#endif /* CONFIG_NATIVE_WINDOWS */ #endif /* CONFIG_NATIVE_WINDOWS */
#include "common.h" #include "utils/common.h"
#include "uuid.h" #include "utils/uuid.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "eap_server/eap.h" #include "eap_server/eap.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "ap/wpa.h" #include "ap/wpa_auth.h"
#include "ap/config.h" #include "ap/ap_config.h"
#include "config_file.h" #include "config_file.h"

12
hostapd/ctrl_iface.c
View file

@ -1,6 +1,6 @@
/* /*
* hostapd / UNIX domain socket -based control interface * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -12,7 +12,7 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
@ -20,14 +20,14 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <stddef.h> #include <stddef.h>
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "ap/hostapd.h" #include "ap/hostapd.h"
#include "ap/config.h" #include "ap/ap_config.h"
#include "ap/ieee802_1x.h" #include "ap/ieee802_1x.h"
#include "ap/wpa.h" #include "ap/wpa_auth.h"
#include "ap/ieee802_11.h" #include "ap/ieee802_11.h"
#include "ap/sta_info.h" #include "ap/sta_info.h"
#include "ap/accounting.h" #include "ap/accounting.h"

6
hostapd/dump_state.c
View file

@ -12,16 +12,16 @@
* See README and COPYING for more details. * 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_client.h"
#include "radius/radius_server.h" #include "radius/radius_server.h"
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h" #include "eapol_auth/eapol_auth_sm_i.h"
#include "eap_server/eap.h" #include "eap_server/eap.h"
#include "ap/hostapd.h" #include "ap/hostapd.h"
#include "ap/config.h" #include "ap/ap_config.h"
#include "ap/sta_info.h" #include "ap/sta_info.h"
#include "dump_state.h" #include "dump_state.h"

8
hostapd/main.c
View file

@ -12,20 +12,20 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
#include <syslog.h> #include <syslog.h>
#endif /* CONFIG_NATIVE_WINDOWS */ #endif /* CONFIG_NATIVE_WINDOWS */
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "crypto/tls.h" #include "crypto/tls.h"
#include "common/version.h" #include "common/version.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "eap_server/eap.h" #include "eap_server/eap.h"
#include "eap_server/tncs.h" #include "eap_server/tncs.h"
#include "ap/hostapd.h" #include "ap/hostapd.h"
#include "ap/config.h" #include "ap/ap_config.h"
#include "config_file.h" #include "config_file.h"
#include "eap_register.h" #include "eap_register.h"
#include "dump_state.h" #include "dump_state.h"

12
src/ap/accounting.c
View file

@ -12,18 +12,18 @@
* See README and COPYING for more details. * 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 "utils/eloop.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "radius/radius.h" #include "radius/radius.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "eloop.h" #include "hostapd.h"
#include "accounting.h"
#include "ieee802_1x.h" #include "ieee802_1x.h"
#include "config.h" #include "ap_config.h"
#include "sta_info.h" #include "sta_info.h"
#include "accounting.h"
/* Default interval in seconds for polling TX/RX octets from the driver if /* Default interval in seconds for polling TX/RX octets from the driver if

8
src/ap/config.c → src/ap/ap_config.c
View file

@ -12,18 +12,18 @@
* See README and COPYING for more details. * 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 "crypto/sha1.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/eapol_common.h" #include "common/eapol_common.h"
#include "eap_common/eap_wsc_common.h" #include "eap_common/eap_wsc_common.h"
#include "eap_server/eap.h" #include "eap_server/eap.h"
#include "wpa.h" #include "wpa_auth.h"
#include "sta_info.h" #include "sta_info.h"
#include "config.h" #include "ap_config.h"
static void hostapd_config_free_vlan(struct hostapd_bss_config *bss) static void hostapd_config_free_vlan(struct hostapd_bss_config *bss)

0
src/ap/config.h → src/ap/ap_config.h
View file

2
src/ap/ap_list.c
View file

@ -20,7 +20,7 @@
#include "utils/eloop.h" #include "utils/eloop.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "hostapd.h" #include "hostapd.h"
#include "config.h" #include "ap_config.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "sta_info.h" #include "sta_info.h"
#include "beacon.h" #include "beacon.h"

8
src/ap/mlme.c → src/ap/ap_mlme.c
View file

@ -14,13 +14,13 @@
* See README and COPYING for more details. * 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 "ieee802_11.h"
#include "wpa.h" #include "wpa_auth.h"
#include "sta_info.h" #include "sta_info.h"
#include "mlme.h" #include "ap_mlme.h"
#ifndef CONFIG_NO_HOSTAPD_LOGGER #ifndef CONFIG_NO_HOSTAPD_LOGGER

0
src/ap/mlme.h → src/ap/ap_mlme.h
View file

2
src/ap/authsrv.c
View file

@ -21,7 +21,7 @@
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "radius/radius_server.h" #include "radius/radius_server.h"
#include "hostapd.h" #include "hostapd.h"
#include "config.h" #include "ap_config.h"
#include "sta_info.h" #include "sta_info.h"
#include "authsrv.h" #include "authsrv.h"

12
src/ap/beacon.c
View file

@ -14,19 +14,19 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
#include "common.h" #include "utils/common.h"
#include "drivers/driver.h"
#include "hostapd.h" #include "hostapd.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "wpa.h" #include "wpa_auth.h"
#include "wmm.h" #include "wmm.h"
#include "beacon.h" #include "ap_config.h"
#include "drivers/driver.h"
#include "config.h"
#include "sta_info.h" #include "sta_info.h"
#include "beacon.h"
static u8 ieee802_11_erp_info(struct hostapd_data *hapd) static u8 ieee802_11_erp_info(struct hostapd_data *hapd)

16
src/ap/ctrl_iface_ap.c
View file

@ -12,15 +12,15 @@
* See README and COPYING for more details. * 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 "hostapd.h"
#include "ap/ieee802_1x.h" #include "ieee802_1x.h"
#include "ap/wpa.h" #include "wpa_auth.h"
#include "ap/ieee802_11.h" #include "ieee802_11.h"
#include "ap/sta_info.h" #include "sta_info.h"
#include "ap/wps_hostapd.h" #include "wps_hostapd.h"
#include "ctrl_iface_ap.h" #include "ctrl_iface_ap.h"

2
src/ap/driver_i.h
View file

@ -16,7 +16,7 @@
#define DRIVER_I_H #define DRIVER_I_H
#include "drivers/driver.h" #include "drivers/driver.h"
#include "ap/config.h" #include "ap/ap_config.h"
static inline int static inline int
hostapd_set_ieee8021x(struct hostapd_data *hapd, struct wpa_bss_params *params) hostapd_set_ieee8021x(struct hostapd_data *hapd, struct wpa_bss_params *params)

24
src/ap/drv_callbacks.c
View file

@ -12,20 +12,20 @@
* See README and COPYING for more details. * 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 "radius/radius.h"
#include "ap/hostapd.h" #include "hostapd.h"
#include "ap/ieee802_11.h" #include "ieee802_11.h"
#include "ap/sta_info.h" #include "sta_info.h"
#include "ap/accounting.h" #include "accounting.h"
#include "ap/tkip_countermeasures.h" #include "tkip_countermeasures.h"
#include "ap/iapp.h" #include "iapp.h"
#include "ap/ieee802_1x.h" #include "ieee802_1x.h"
#include "ap/wpa.h" #include "wpa_auth.h"
#include "ap/wmm.h" #include "wmm.h"
#include "ap/wps_hostapd.h" #include "wps_hostapd.h"
#include "driver_i.h" #include "driver_i.h"

30
src/ap/hostapd.c
View file

@ -12,24 +12,24 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "ap/hostapd.h" #include "hostapd.h"
#include "ap/authsrv.h" #include "authsrv.h"
#include "ap/sta_info.h" #include "sta_info.h"
#include "ap/accounting.h" #include "accounting.h"
#include "ap/ap_list.h" #include "ap_list.h"
#include "ap/beacon.h" #include "beacon.h"
#include "ap/iapp.h" #include "iapp.h"
#include "ap/ieee802_1x.h" #include "ieee802_1x.h"
#include "ap/ieee802_11_auth.h" #include "ieee802_11_auth.h"
#include "ap/vlan_init.h" #include "vlan_init.h"
#include "ap/wpa.h" #include "wpa_auth.h"
#include "ap/wps_hostapd.h" #include "wps_hostapd.h"
#include "hw_features.h" #include "hw_features.h"
#include "driver_i.h" #include "driver_i.h"
#include "wpa_auth_glue.h" #include "wpa_auth_glue.h"

6
src/ap/hw_features.c
View file

@ -20,10 +20,10 @@
#include "utils/eloop.h" #include "utils/eloop.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
#include "ap/hostapd.h" #include "hostapd.h"
#include "ap/config.h" #include "ap_config.h"
#include "hw_features.h"
#include "driver_i.h" #include "driver_i.h"
#include "hw_features.h"
void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features, void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,

8
src/ap/iapp.c
View file

@ -48,10 +48,10 @@
#include "utils/common.h" #include "utils/common.h"
#include "utils/eloop.h" #include "utils/eloop.h"
#include "ap/hostapd.h" #include "hostapd.h"
#include "ap/config.h" #include "ap_config.h"
#include "ap/ieee802_11.h" #include "ieee802_11.h"
#include "ap/sta_info.h" #include "sta_info.h"
#include "iapp.h" #include "iapp.h"

8
src/ap/ieee802_11.c
View file

@ -24,17 +24,17 @@
#include "radius/radius.h" #include "radius/radius.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "hostapd.h" #include "hostapd.h"
#include "ieee802_11.h"
#include "beacon.h" #include "beacon.h"
#include "ieee802_11_auth.h" #include "ieee802_11_auth.h"
#include "sta_info.h" #include "sta_info.h"
#include "ieee802_1x.h" #include "ieee802_1x.h"
#include "wpa.h" #include "wpa_auth.h"
#include "wmm.h" #include "wmm.h"
#include "ap_list.h" #include "ap_list.h"
#include "accounting.h" #include "accounting.h"
#include "config.h" #include "ap_config.h"
#include "mlme.h" #include "ap_mlme.h"
#include "ieee802_11.h"
u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid) u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid)

16
src/ap/ieee802_11_auth.c
View file

@ -1,6 +1,6 @@
/* /*
* hostapd / IEEE 802.11 authentication (ACL) * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -17,18 +17,18 @@
* authentication frame processing. * authentication frame processing.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
#include "common.h" #include "utils/common.h"
#include "hostapd.h" #include "utils/eloop.h"
#include "config.h"
#include "ieee802_11.h"
#include "ieee802_11_auth.h"
#include "radius/radius.h" #include "radius/radius.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "eloop.h" #include "hostapd.h"
#include "ap_config.h"
#include "ieee802_11.h"
#include "ieee802_11_auth.h"
#define RADIUS_ACL_TIMEOUT 30 #define RADIUS_ACL_TIMEOUT 30

6
src/ap/ieee802_11_ht.c
View file

@ -13,12 +13,12 @@
* See README and COPYING for more details. * 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 "drivers/driver.h"
#include "hostapd.h" #include "hostapd.h"
#include "config.h" #include "ap_config.h"
#include "sta_info.h" #include "sta_info.h"
#include "beacon.h" #include "beacon.h"
#include "ieee802_11.h" #include "ieee802_11.h"

18
src/ap/ieee802_1x.c
View file

@ -12,27 +12,27 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "crypto/md5.h" #include "crypto/md5.h"
#include "crypto/crypto.h" #include "crypto/crypto.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/wpa_ctrl.h" #include "common/wpa_ctrl.h"
#include "radius/radius.h" #include "radius/radius.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "eap_server/eap.h"
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h" #include "eapol_auth/eapol_auth_sm_i.h"
#include "hostapd.h" #include "hostapd.h"
#include "ieee802_1x.h"
#include "accounting.h" #include "accounting.h"
#include "sta_info.h" #include "sta_info.h"
#include "wpa.h" #include "wpa_auth.h"
#include "preauth.h" #include "preauth_auth.h"
#include "pmksa_cache.h" #include "pmksa_cache_auth.h"
#include "config.h" #include "ap_config.h"
#include "eap_server/eap.h" #include "ieee802_1x.h"
static void ieee802_1x_finished(struct hostapd_data *hapd, static void ieee802_1x_finished(struct hostapd_data *hapd,

10
src/ap/peerkey.c → src/ap/peerkey_auth.c
View file

@ -1,6 +1,6 @@
/* /*
* hostapd - PeerKey for Direct Link Setup (DLS) * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -12,13 +12,13 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "crypto/sha1.h" #include "crypto/sha1.h"
#include "crypto/sha256.h" #include "crypto/sha256.h"
#include "wpa.h" #include "wpa_auth.h"
#include "wpa_auth_i.h" #include "wpa_auth_i.h"
#include "wpa_auth_ie.h" #include "wpa_auth_ie.h"

13
src/ap/pmksa_cache.c → src/ap/pmksa_cache_auth.c
View file

@ -12,16 +12,15 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#include "common.h" #include "utils/common.h"
#include "sta_info.h" #include "utils/eloop.h"
#include "config.h"
#include "common.h"
#include "eloop.h"
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.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; static const int pmksa_cache_max_entries = 1024;

0
src/ap/pmksa_cache.h → src/ap/pmksa_cache_auth.h
View file

18
src/ap/preauth.c → src/ap/preauth_auth.c
View file

@ -12,22 +12,22 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifdef CONFIG_RSN_PREAUTH #ifdef CONFIG_RSN_PREAUTH
#include "common.h" #include "utils/common.h"
#include "hostapd.h" #include "utils/eloop.h"
#include "config.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "ieee802_1x.h"
#include "eloop.h"
#include "sta_info.h"
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "eapol_auth/eapol_auth_sm_i.h" #include "eapol_auth/eapol_auth_sm_i.h"
#include "wpa.h" #include "hostapd.h"
#include "preauth.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 #ifndef ETH_P_PREAUTH
#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */ #define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */

0
src/ap/preauth.h → src/ap/preauth_auth.h
View file

16
src/ap/sta_info.c
View file

@ -12,24 +12,24 @@
* See README and COPYING for more details. * 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.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "drivers/driver.h" #include "drivers/driver.h"
#include "hostapd.h" #include "hostapd.h"
#include "sta_info.h"
#include "eloop.h"
#include "accounting.h" #include "accounting.h"
#include "ieee802_1x.h" #include "ieee802_1x.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "wpa.h" #include "wpa_auth.h"
#include "preauth.h" #include "preauth_auth.h"
#include "config.h" #include "ap_config.h"
#include "beacon.h" #include "beacon.h"
#include "mlme.h" #include "ap_mlme.h"
#include "vlan_init.h" #include "vlan_init.h"
#include "sta_info.h"
static int ap_sta_in_other_bss(struct hostapd_data *hapd, static int ap_sta_in_other_bss(struct hostapd_data *hapd,
struct sta_info *sta, u32 flags); struct sta_info *sta, u32 flags);

14
src/ap/tkip_countermeasures.c
View file

@ -12,15 +12,15 @@
* See README and COPYING for more details. * 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 "utils/eloop.h"
#include "eloop.h"
#include "sta_info.h"
#include "mlme.h"
#include "wpa.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "hostapd.h"
#include "sta_info.h"
#include "ap_mlme.h"
#include "wpa_auth.h"
#include "tkip_countermeasures.h" #include "tkip_countermeasures.h"

8
src/ap/vlan_init.c
View file

@ -14,11 +14,11 @@
* See README and COPYING for more details. * 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 "hostapd.h"
#include "config.h" #include "ap_config.h"
#include "vlan_init.h" #include "vlan_init.h"
@ -31,7 +31,7 @@
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
#include "drivers/priv_netlink.h" #include "drivers/priv_netlink.h"
#include "eloop.h" #include "utils/eloop.h"
struct full_dynamic_vlan { struct full_dynamic_vlan {

7
src/ap/wmm.c
View file

@ -2,6 +2,7 @@
* hostapd / WMM (Wi-Fi Multimedia) * hostapd / WMM (Wi-Fi Multimedia)
* Copyright 2002-2003, Instant802 Networks, Inc. * Copyright 2002-2003, Instant802 Networks, Inc.
* Copyright 2005-2006, Devicescape Software, 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -13,13 +14,13 @@
* See README and COPYING for more details. * 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 "hostapd.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "sta_info.h" #include "sta_info.h"
#include "config.h" #include "ap_config.h"
#include "wmm.h" #include "wmm.h"

1
src/ap/wmm.h
View file

@ -17,6 +17,7 @@
#define WME_H #define WME_H
struct ieee80211_mgmt; struct ieee80211_mgmt;
struct wmm_tspec_element;
u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid); u8 * hostapd_eid_wmm(struct hostapd_data *hapd, u8 *eid);
int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid, int hostapd_eid_wmm_valid(struct hostapd_data *hapd, const u8 *eid,

14
src/ap/wpa.c → src/ap/wpa_auth.c
View file

@ -12,22 +12,22 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#ifndef CONFIG_NATIVE_WINDOWS #ifndef CONFIG_NATIVE_WINDOWS
#include "common.h" #include "utils/common.h"
#include "eloop.h" #include "utils/eloop.h"
#include "utils/state_machine.h"
#include "crypto/aes_wrap.h" #include "crypto/aes_wrap.h"
#include "crypto/crypto.h" #include "crypto/crypto.h"
#include "crypto/sha1.h" #include "crypto/sha1.h"
#include "crypto/sha256.h" #include "crypto/sha256.h"
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "config.h" #include "ap_config.h"
#include "wpa.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "pmksa_cache.h" #include "wpa_auth.h"
#include "state_machine.h" #include "pmksa_cache_auth.h"
#include "wpa_auth_i.h" #include "wpa_auth_i.h"
#include "wpa_auth_ie.h" #include "wpa_auth_ie.h"

0
src/ap/wpa.h → src/ap/wpa_auth.h
View file

10
src/ap/wpa_ft.c → src/ap/wpa_auth_ft.c
View file

@ -1,6 +1,6 @@
/* /*
* hostapd - IEEE 802.11r - Fast BSS Transition * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -12,14 +12,14 @@
* See README and COPYING for more details. * 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 "crypto/aes_wrap.h"
#include "config.h" #include "ap_config.h"
#include "wpa.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "wmm.h" #include "wmm.h"
#include "wpa_auth.h"
#include "wpa_auth_i.h" #include "wpa_auth_i.h"
#include "wpa_auth_ie.h" #include "wpa_auth_ie.h"

12
src/ap/wpa_auth_glue.c
View file

@ -20,12 +20,12 @@
#include "eapol_auth/eapol_auth_sm_i.h" #include "eapol_auth/eapol_auth_sm_i.h"
#include "eap_server/eap.h" #include "eap_server/eap.h"
#include "l2_packet/l2_packet.h" #include "l2_packet/l2_packet.h"
#include "ap/hostapd.h" #include "hostapd.h"
#include "ap/ieee802_1x.h" #include "ieee802_1x.h"
#include "ap/preauth.h" #include "preauth_auth.h"
#include "ap/sta_info.h" #include "sta_info.h"
#include "ap/tkip_countermeasures.h" #include "tkip_countermeasures.h"
#include "ap/wpa.h" #include "wpa_auth.h"
#include "driver_i.h" #include "driver_i.h"

12
src/ap/wpa_auth_ie.c
View file

@ -12,14 +12,14 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#include "includes.h" #include "utils/includes.h"
#include "common.h" #include "utils/common.h"
#include "config.h"
#include "ieee802_11.h"
#include "eapol_auth/eapol_auth_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "wpa.h" #include "ap_config.h"
#include "pmksa_cache.h" #include "ieee802_11.h"
#include "wpa_auth.h"
#include "pmksa_cache_auth.h"
#include "wpa_auth_ie.h" #include "wpa_auth_ie.h"
#include "wpa_auth_i.h" #include "wpa_auth_i.h"

8
src/ap/wps_hostapd.c
View file

@ -1,6 +1,6 @@
/* /*
* hostapd / WPS integration * 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 * 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 * it under the terms of the GNU General Public License version 2 as
@ -26,9 +26,9 @@
#include "wps/wps.h" #include "wps/wps.h"
#include "wps/wps_defs.h" #include "wps/wps_defs.h"
#include "wps/wps_dev_attr.h" #include "wps/wps_dev_attr.h"
#include "ap/hostapd.h" #include "hostapd.h"
#include "ap/config.h" #include "ap_config.h"
#include "ap/sta_info.h" #include "sta_info.h"
#include "wps_hostapd.h" #include "wps_hostapd.h"

20
wpa_supplicant/Makefile
View file

@ -591,11 +591,11 @@ OBJS += ../src/ap/hostapd.o
OBJS += ../src/ap/wpa_auth_glue.o OBJS += ../src/ap/wpa_auth_glue.o
OBJS += ../src/ap/utils.o OBJS += ../src/ap/utils.o
OBJS += ../src/ap/authsrv.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/utils/ip_addr.o
OBJS += ../src/ap/sta_info.o OBJS += ../src/ap/sta_info.o
OBJS += ../src/ap/tkip_countermeasures.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/ap/ieee802_1x.o
OBJS += ../src/eapol_auth/eapol_auth_sm.o OBJS += ../src/eapol_auth/eapol_auth_sm.o
OBJS += ../src/ap/ieee802_11_auth.o OBJS += ../src/ap/ieee802_11_auth.o
@ -635,14 +635,14 @@ endif
ifdef NEED_RSN_AUTHENTICATOR ifdef NEED_RSN_AUTHENTICATOR
CFLAGS += -DCONFIG_NO_RADIUS CFLAGS += -DCONFIG_NO_RADIUS
NEED_AES_WRAP=y 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/wpa_auth_ie.o
OBJS += ../src/ap/pmksa_cache.o OBJS += ../src/ap/pmksa_cache_auth.o
ifdef CONFIG_IEEE80211R ifdef CONFIG_IEEE80211R
OBJS += ../src/ap/wpa_ft.o OBJS += ../src/ap/wpa_auth_ft.o
endif endif
ifdef CONFIG_PEERKEY ifdef CONFIG_PEERKEY
OBJS += ../src/ap/peerkey.o OBJS += ../src/ap/peerkey_auth.o
endif endif
endif endif
@ -665,14 +665,14 @@ OBJS_h += ../src/ap/ieee802_1x.o
endif endif
ifdef CONFIG_WPA_AUTHENTICATOR 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/wpa_auth_ie.o
OBJS_h += ../src/ap/pmksa_cache.o OBJS_h += ../src/ap/pmksa_cache_auth.o
ifdef CONFIG_IEEE80211R ifdef CONFIG_IEEE80211R
OBJS_h += ../src/ap/wpa_ft.o OBJS_h += ../src/ap/wpa_auth_ft.o
endif endif
ifdef CONFIG_PEERKEY ifdef CONFIG_PEERKEY
OBJS_h += ../src/ap/peerkey.o OBJS_h += ../src/ap/peerkey_auth.o
endif endif
endif endif

6
wpa_supplicant/ap.c
View file

@ -13,11 +13,11 @@
* See README and COPYING for more details. * 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/hostapd.h"
#include "ap/config.h" #include "ap/ap_config.h"
#ifdef NEED_AP_MLME #ifdef NEED_AP_MLME
#include "ap/ieee802_11.h" #include "ap/ieee802_11.h"
#endif /* NEED_AP_MLME */ #endif /* NEED_AP_MLME */