Moved ieee802_11_parse_elems() into common code

[libeap.git] / hostapd / ieee802_11.h

diff --git a/hostapd/ieee802_11.h b/hostapd/ieee802_11.h
index 5454812..bb88ede 100644 (file)
--- a/hostapd/ieee802_11.h
+++ b/hostapd/ieee802_11.h
@@ -17,53 +17,7 @@
 #define IEEE802_11_H
 
 #include "ieee802_11_defs.h"
-
-/* Parsed Information Elements */
-struct ieee802_11_elems {
-       u8 *ssid;
-       u8 ssid_len;
-       u8 *supp_rates;
-       u8 supp_rates_len;
-       u8 *fh_params;
-       u8 fh_params_len;
-       u8 *ds_params;
-       u8 ds_params_len;
-       u8 *cf_params;
-       u8 cf_params_len;
-       u8 *tim;
-       u8 tim_len;
-       u8 *ibss_params;
-       u8 ibss_params_len;
-       u8 *challenge;
-       u8 challenge_len;
-       u8 *erp_info;
-       u8 erp_info_len;
-       u8 *ext_supp_rates;
-       u8 ext_supp_rates_len;
-       u8 *wpa_ie;
-       u8 wpa_ie_len;
-       u8 *rsn_ie;
-       u8 rsn_ie_len;
-       u8 *wme;
-       u8 wme_len;
-       u8 *wme_tspec;
-       u8 wme_tspec_len;
-       u8 *power_cap;
-       u8 power_cap_len;
-       u8 *supp_channels;
-       u8 supp_channels_len;
-       u8 *mdie;
-       u8 mdie_len;
-       u8 *ftie;
-       u8 ftie_len;
-       u8 *ht_capabilities;
-       u8 ht_capabilities_len;
-       u8 *ht_operation;
-       u8 ht_operation_len;
-};
-
-typedef enum { ParseOK = 0, ParseUnknown = 1, ParseFailed = -1 } ParseRes;
-
+#include "ieee802_11_common.h"
 
 struct hostapd_frame_info {
        u32 phytype;
@@ -83,9 +37,6 @@ void ieee802_11_mgmt(struct hostapd_data *hapd, u8 *buf, size_t len,
                     u16 stype, struct hostapd_frame_info *fi);
 void ieee802_11_mgmt_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
                        u16 stype, int ok);
-ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
-                               struct ieee802_11_elems *elems,
-                               int show_errors);
 void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len);
 void ieee80211_michael_mic_failure(struct hostapd_data *hapd, const u8 *addr,
                                   int local);