Moved ieee802_11_parse_elems() into common code
[libeap.git] / hostapd / ieee802_11.c
index 52d9ca8..0e5b08e 100644 (file)
@@ -290,87 +290,6 @@ u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
 }
 
 
-#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
-                               * 00:50:F2 */
-
-static int ieee802_11_parse_vendor_specific(struct hostapd_data *hapd,
-                                           u8 *pos, size_t elen,
-                                           struct ieee802_11_elems *elems,
-                                           int show_errors)
-{
-       unsigned int oui;
-
-       /* first 3 bytes in vendor specific information element are the IEEE
-        * OUI of the vendor. The following byte is used a vendor specific
-        * sub-type. */
-       if (elen < 4) {
-               if (show_errors) {
-                       wpa_printf(MSG_MSGDUMP, "short vendor specific "
-                                  "information element ignored (len=%lu)",
-                                  (unsigned long) elen);
-               }
-               return -1;
-       }
-
-       oui = WPA_GET_BE24(pos);
-       switch (oui) {
-       case OUI_MICROSOFT:
-               /* Microsoft/Wi-Fi information elements are further typed and
-                * subtyped */
-               switch (pos[3]) {
-               case 1:
-                       /* Microsoft OUI (00:50:F2) with OUI Type 1:
-                        * real WPA information element */
-                       elems->wpa_ie = pos;
-                       elems->wpa_ie_len = elen;
-                       break;
-               case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
-                       if (elen < 5) {
-                               wpa_printf(MSG_MSGDUMP, "short WME "
-                                          "information element ignored "
-                                          "(len=%lu)",
-                                          (unsigned long) elen);
-                               return -1;
-                       }
-                       switch (pos[4]) {
-                       case WME_OUI_SUBTYPE_INFORMATION_ELEMENT:
-                       case WME_OUI_SUBTYPE_PARAMETER_ELEMENT:
-                               elems->wme = pos;
-                               elems->wme_len = elen;
-                               break;
-                       case WME_OUI_SUBTYPE_TSPEC_ELEMENT:
-                               elems->wme_tspec = pos;
-                               elems->wme_tspec_len = elen;
-                               break;
-                       default:
-                               wpa_printf(MSG_MSGDUMP, "unknown WME "
-                                          "information element ignored "
-                                          "(subtype=%d len=%lu)",
-                                          pos[4], (unsigned long) elen);
-                               return -1;
-                       }
-                       break;
-               default:
-                       wpa_printf(MSG_MSGDUMP, "Unknown Microsoft "
-                                  "information element ignored "
-                                  "(type=%d len=%lu)\n",
-                                  pos[3], (unsigned long) elen);
-                       return -1;
-               }
-               break;
-
-       default:
-               wpa_printf(MSG_MSGDUMP, "unknown vendor specific information "
-                          "element ignored (vendor OUI %02x:%02x:%02x "
-                          "len=%lu)",
-                          pos[0], pos[1], pos[2], (unsigned long) elen);
-               return -1;
-       }
-
-       return 0;
-}
-
-
 #ifdef CONFIG_IEEE80211W
 static u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
                                            struct sta_info *sta, u8 *eid)
@@ -390,131 +309,6 @@ static u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
 #endif /* CONFIG_IEEE80211W */
 
 
-ParseRes ieee802_11_parse_elems(struct hostapd_data *hapd, u8 *start,
-                               size_t len,
-                               struct ieee802_11_elems *elems,
-                               int show_errors)
-{
-       size_t left = len;
-       u8 *pos = start;
-       int unknown = 0;
-
-       os_memset(elems, 0, sizeof(*elems));
-
-       while (left >= 2) {
-               u8 id, elen;
-
-               id = *pos++;
-               elen = *pos++;
-               left -= 2;
-
-               if (elen > left) {
-                       if (show_errors) {
-                               wpa_printf(MSG_DEBUG, "IEEE 802.11 element "
-                                          "parse failed (id=%d elen=%d "
-                                          "left=%lu)",
-                                          id, elen, (unsigned long) left);
-                               wpa_hexdump(MSG_MSGDUMP, "IEs", start, len);
-                       }
-                       return ParseFailed;
-               }
-
-               switch (id) {
-               case WLAN_EID_SSID:
-                       elems->ssid = pos;
-                       elems->ssid_len = elen;
-                       break;
-               case WLAN_EID_SUPP_RATES:
-                       elems->supp_rates = pos;
-                       elems->supp_rates_len = elen;
-                       break;
-               case WLAN_EID_FH_PARAMS:
-                       elems->fh_params = pos;
-                       elems->fh_params_len = elen;
-                       break;
-               case WLAN_EID_DS_PARAMS:
-                       elems->ds_params = pos;
-                       elems->ds_params_len = elen;
-                       break;
-               case WLAN_EID_CF_PARAMS:
-                       elems->cf_params = pos;
-                       elems->cf_params_len = elen;
-                       break;
-               case WLAN_EID_TIM:
-                       elems->tim = pos;
-                       elems->tim_len = elen;
-                       break;
-               case WLAN_EID_IBSS_PARAMS:
-                       elems->ibss_params = pos;
-                       elems->ibss_params_len = elen;
-                       break;
-               case WLAN_EID_CHALLENGE:
-                       elems->challenge = pos;
-                       elems->challenge_len = elen;
-                       break;
-               case WLAN_EID_ERP_INFO:
-                       elems->erp_info = pos;
-                       elems->erp_info_len = elen;
-                       break;
-               case WLAN_EID_EXT_SUPP_RATES:
-                       elems->ext_supp_rates = pos;
-                       elems->ext_supp_rates_len = elen;
-                       break;
-               case WLAN_EID_VENDOR_SPECIFIC:
-                       if (ieee802_11_parse_vendor_specific(hapd, pos, elen,
-                                                            elems,
-                                                            show_errors))
-                               unknown++;
-                       break;
-               case WLAN_EID_RSN:
-                       elems->rsn_ie = pos;
-                       elems->rsn_ie_len = elen;
-                       break;
-               case WLAN_EID_PWR_CAPABILITY:
-                       elems->power_cap = pos;
-                       elems->power_cap_len = elen;
-                       break;
-               case WLAN_EID_SUPPORTED_CHANNELS:
-                       elems->supp_channels = pos;
-                       elems->supp_channels_len = elen;
-                       break;
-               case WLAN_EID_MOBILITY_DOMAIN:
-                       elems->mdie = pos;
-                       elems->mdie_len = elen;
-                       break;
-               case WLAN_EID_FAST_BSS_TRANSITION:
-                       elems->ftie = pos;
-                       elems->ftie_len = elen;
-                       break;
-               case WLAN_EID_HT_CAP:
-                       elems->ht_capabilities = pos;
-                       elems->ht_capabilities_len = elen;
-                       break;
-               case WLAN_EID_HT_OPERATION:
-                       elems->ht_operation = pos;
-                       elems->ht_operation_len = elen;
-                       break;
-               default:
-                       unknown++;
-                       if (!show_errors)
-                               break;
-                       wpa_printf(MSG_MSGDUMP, "IEEE 802.11 element parse "
-                                  "ignored unknown element (id=%d elen=%d)",
-                                  id, elen);
-                       break;
-               }
-
-               left -= elen;
-               pos += elen;
-       }
-
-       if (left)
-               return ParseFailed;
-
-       return unknown ? ParseUnknown : ParseOK;
-}
-
-
 void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len)
 {
        int i;
@@ -569,8 +363,6 @@ static void ieee802_11_sta_authenticate(void *eloop_ctx, void *timeout_ctx)
        os_memset(&mgmt, 0, sizeof(mgmt));
        mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
                                          WLAN_FC_STYPE_AUTH);
-       /* Request TX callback */
-       mgmt.frame_control |= host_to_le16(BIT(1));
        os_memcpy(mgmt.da, hapd->conf->assoc_ap_addr, ETH_ALEN);
        os_memcpy(mgmt.sa, hapd->own_addr, ETH_ALEN);
        os_memcpy(mgmt.bssid, hapd->conf->assoc_ap_addr, ETH_ALEN);
@@ -607,8 +399,6 @@ static void ieee802_11_sta_associate(void *eloop_ctx, void *timeout_ctx)
        os_memset(mgmt, 0, sizeof(*mgmt));
        mgmt->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
                                          WLAN_FC_STYPE_ASSOC_REQ);
-       /* Request TX callback */
-       mgmt->frame_control |= host_to_le16(BIT(1));
        os_memcpy(mgmt->da, hapd->conf->assoc_ap_addr, ETH_ALEN);
        os_memcpy(mgmt->sa, hapd->own_addr, ETH_ALEN);
        os_memcpy(mgmt->bssid, hapd->conf->assoc_ap_addr, ETH_ALEN);
@@ -707,8 +497,6 @@ static void send_auth_reply(struct hostapd_data *hapd,
        reply = (struct ieee80211_mgmt *) buf;
        reply->frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
                                            WLAN_FC_STYPE_AUTH);
-       /* Request TX callback */
-       reply->frame_control |= host_to_le16(BIT(1));
        os_memcpy(reply->da, dst, ETH_ALEN);
        os_memcpy(reply->sa, hapd->own_addr, ETH_ALEN);
        os_memcpy(reply->bssid, bssid, ETH_ALEN);
@@ -1034,8 +822,8 @@ static void handle_assoc(struct hostapd_data *hapd,
 
        /* followed by SSID and Supported rates; and HT capabilities if 802.11n
         * is used */
-       if (ieee802_11_parse_elems(hapd, pos, left, &elems, 1) == ParseFailed
-           || !elems.ssid) {
+       if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed ||
+           !elems.ssid) {
                printf("STA " MACSTR " sent invalid association request\n",
                       MAC2STR(sta->addr));
                resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
@@ -1390,9 +1178,6 @@ static void handle_assoc(struct hostapd_data *hapd,
 #endif /* CONFIG_IEEE80211W */
 
                send_len += p - reply->u.assoc_resp.variable;
-
-               /* Request TX callback */
-               reply->frame_control |= host_to_le16(BIT(1));
        }
 
        if (hostapd_send_mgmt_frame(hapd, reply, send_len, 0) < 0)
@@ -1570,7 +1355,7 @@ static void handle_beacon(struct hostapd_data *hapd,
                return;
        }
 
-       (void) ieee802_11_parse_elems(hapd, mgmt->u.beacon.variable,
+       (void) ieee802_11_parse_elems(mgmt->u.beacon.variable,
                                      len - (IEEE80211_HDRLEN +
                                             sizeof(mgmt->u.beacon)), &elems,
                                      0);