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

Move definitions away from hostapd_defs.h

Browse source 
Clean up definitions to reduce need to include header files from the
hostapd directory into files under the src subdirectories.
This commit is contained in:
Jouni Malinen 2009-11-23 16:14:39 +02:00 • committed by Jouni Malinen
parent c1bb3e0a62
commit d994a9b54e
11 changed files with 53 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/common/ieee802_11_defs.h
View file

@ -237,6 +237,25 @@
#pragma pack(push, 1)
#endif /* _MSC_VER */
struct ieee80211_hdr {
le16 frame_control;
le16 duration_id;
u8 addr1[6];
u8 addr2[6];
u8 addr3[6];
le16 seq_ctrl;
/* followed by 'u8 addr4[6];' if ToDS and FromDS is set in data frame
*/
} STRUCT_PACKED;
#define IEEE80211_DA_FROMDS addr1
#define IEEE80211_BSSID_FROMDS addr2
#define IEEE80211_SA_FROMDS addr3
#define IEEE80211_HDRLEN (sizeof(struct ieee80211_hdr))
#define IEEE80211_FC(type, stype) host_to_le16((type << 2) | (stype << 4))
struct ieee80211_mgmt {
le16 frame_control;
le16 duration;

1
src/drivers/driver_nl80211.c
View file

@ -36,7 +36,6 @@
#include "radiotap.h"
#include "radiotap_iter.h"
#include "../../hostapd/hostapd_defs.h"
#include "../../hostapd/sta_flags.h"
#endif /* CONFIG_AP || HOSTAPD */

4
src/drivers/driver_roboswitch.c
View file

@ -23,10 +23,6 @@
#include "driver.h"
#include "l2_packet/l2_packet.h"
#ifndef ETH_P_EAPOL
#define ETH_P_EAPOL 0x888e
#endif
#define ROBO_PHY_ADDR 0x1e /* RoboSwitch PHY address */
/* MII access registers */

15
src/drivers/driver_wired.c
View file

@ -30,10 +30,23 @@
#ifdef HOSTAPD
#include "eloop.h"
#include "../../hostapd/hostapd_defs.h"
#include "../../hostapd/sta_info.h"
#endif /* HOSTAPD */
#ifdef _MSC_VER
#pragma pack(push, 1)
#endif /* _MSC_VER */
struct ieee8023_hdr {
u8 dest[6];
u8 src[6];
u16 ethertype;
} STRUCT_PACKED;
#ifdef _MSC_VER
#pragma pack(pop)
#endif /* _MSC_VER */
static const u8 pae_group_addr[ETH_ALEN] =
{ 0x01, 0x80, 0xc2, 0x00, 0x00, 0x03 };

8
src/rsn_supp/wpa.h
View file

@ -19,14 +19,6 @@
#include "eapol_common.h"
#include "wpa_common.h"
#ifndef ETH_P_EAPOL
#define ETH_P_EAPOL 0x888e
#endif
#ifndef ETH_P_RSN_PREAUTH
#define ETH_P_RSN_PREAUTH 0x88c7
#endif
struct wpa_sm;
struct eapol_sm;
struct wpa_config_blob;

18
src/utils/common.h
View file

@ -314,6 +314,24 @@ static inline unsigned int wpa_swap_32(unsigned int v)
#ifndef ETH_ALEN
#define ETH_ALEN 6
#endif
#ifndef IFNAMSIZ
#define IFNAMSIZ 16
#endif
#ifndef ETH_P_ALL
#define ETH_P_ALL 0x0003
#endif
#ifndef ETH_P_PAE
#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
#endif /* ETH_P_PAE */
#ifndef ETH_P_EAPOL
#define ETH_P_EAPOL ETH_P_PAE
#endif /* ETH_P_EAPOL */
#ifndef ETH_P_RSN_PREAUTH
#define ETH_P_RSN_PREAUTH 0x88c7
#endif /* ETH_P_RSN_PREAUTH */
#ifndef ETH_P_RRB
#define ETH_P_RRB 0x890D
#endif /* ETH_P_RRB */
#ifdef __GNUC__