]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
Move SA Query mechanism into a file that can be shared more easily
authorMahesh Palivela <mpalivel@qca.qualcomm.com>
Mon, 17 Oct 2011 14:30:43 +0000 (17:30 +0300)
committerJouni Malinen <j@w1.fi>
Mon, 17 Oct 2011 14:33:17 +0000 (17:33 +0300)
This is the first step in allowing SA Query mechanism in hostapd to be
used with drivers that implement authentication and association MLME/SME
(i.e., do not use ieee802_11.c).

hostapd/Makefile
src/ap/ieee802_11.c
src/ap/ieee802_11.h
src/ap/ieee802_11_shared.c [new file with mode: 0644]
wpa_supplicant/Makefile

index bc468c599e63516ca1943b7fe72127f8eac2a91c..3a31034080428183336f60b7809ba767023b3781 100644 (file)
@@ -51,6 +51,7 @@ OBJS += ../src/ap/ap_mlme.o
 OBJS += ../src/ap/wpa_auth_ie.o
 OBJS += ../src/ap/preauth_auth.o
 OBJS += ../src/ap/pmksa_cache_auth.o
+OBJS += ../src/ap/ieee802_11_shared.o
 
 OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
 
index 8e43015502e2bda01b0f7eb469c7fad161f14a06..afa870a79d7d520f8c3a747f932e1930dd68338c 100644 (file)
@@ -199,34 +199,6 @@ u8 * hostapd_eid_ext_capab(struct hostapd_data *hapd, u8 *eid)
 }
 
 
-#ifdef CONFIG_IEEE80211W
-static u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
-                                           struct sta_info *sta, u8 *eid)
-{
-       u8 *pos = eid;
-       u32 timeout, tu;
-       struct os_time now, passed;
-
-       *pos++ = WLAN_EID_TIMEOUT_INTERVAL;
-       *pos++ = 5;
-       *pos++ = WLAN_TIMEOUT_ASSOC_COMEBACK;
-       os_get_time(&now);
-       os_time_sub(&now, &sta->sa_query_start, &passed);
-       tu = (passed.sec * 1000000 + passed.usec) / 1024;
-       if (hapd->conf->assoc_sa_query_max_timeout > tu)
-               timeout = hapd->conf->assoc_sa_query_max_timeout - tu;
-       else
-               timeout = 0;
-       if (timeout < hapd->conf->assoc_sa_query_max_timeout)
-               timeout++; /* add some extra time for local timers */
-       WPA_PUT_LE32(pos, timeout);
-       pos += 4;
-
-       return pos;
-}
-#endif /* CONFIG_IEEE80211W */
-
-
 void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len)
 {
        int i;
@@ -1263,81 +1235,11 @@ static void handle_beacon(struct hostapd_data *hapd,
 
 #ifdef CONFIG_IEEE80211W
 
-/* MLME-SAQuery.request */
-void ieee802_11_send_sa_query_req(struct hostapd_data *hapd,
-                                 const u8 *addr, const u8 *trans_id)
-{
-       struct ieee80211_mgmt mgmt;
-       u8 *end;
-
-       wpa_printf(MSG_DEBUG, "IEEE 802.11: Sending SA Query Request to "
-                  MACSTR, MAC2STR(addr));
-       wpa_hexdump(MSG_DEBUG, "IEEE 802.11: SA Query Transaction ID",
-                   trans_id, WLAN_SA_QUERY_TR_ID_LEN);
-
-       os_memset(&mgmt, 0, sizeof(mgmt));
-       mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
-                                         WLAN_FC_STYPE_ACTION);
-       os_memcpy(mgmt.da, addr, ETH_ALEN);
-       os_memcpy(mgmt.sa, hapd->own_addr, ETH_ALEN);
-       os_memcpy(mgmt.bssid, hapd->own_addr, ETH_ALEN);
-       mgmt.u.action.category = WLAN_ACTION_SA_QUERY;
-       mgmt.u.action.u.sa_query_req.action = WLAN_SA_QUERY_REQUEST;
-       os_memcpy(mgmt.u.action.u.sa_query_req.trans_id, trans_id,
-                 WLAN_SA_QUERY_TR_ID_LEN);
-       end = mgmt.u.action.u.sa_query_req.trans_id + WLAN_SA_QUERY_TR_ID_LEN;
-       if (hostapd_drv_send_mlme(hapd, &mgmt, end - (u8 *) &mgmt) < 0)
-               perror("ieee802_11_send_sa_query_req: send");
-}
-
-
-static void hostapd_sa_query_request(struct hostapd_data *hapd,
-                                    const struct ieee80211_mgmt *mgmt)
-{
-       struct sta_info *sta;
-       struct ieee80211_mgmt resp;
-       u8 *end;
-
-       wpa_printf(MSG_DEBUG, "IEEE 802.11: Received SA Query Request from "
-                  MACSTR, MAC2STR(mgmt->sa));
-       wpa_hexdump(MSG_DEBUG, "IEEE 802.11: SA Query Transaction ID",
-                   mgmt->u.action.u.sa_query_resp.trans_id,
-                   WLAN_SA_QUERY_TR_ID_LEN);
-
-       sta = ap_get_sta(hapd, mgmt->sa);
-       if (sta == NULL || !(sta->flags & WLAN_STA_ASSOC)) {
-               wpa_printf(MSG_DEBUG, "IEEE 802.11: Ignore SA Query Request "
-                          "from unassociated STA " MACSTR, MAC2STR(mgmt->sa));
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "IEEE 802.11: Sending SA Query Response to "
-                  MACSTR, MAC2STR(mgmt->sa));
-
-       os_memset(&resp, 0, sizeof(resp));
-       resp.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
-                                         WLAN_FC_STYPE_ACTION);
-       os_memcpy(resp.da, mgmt->sa, ETH_ALEN);
-       os_memcpy(resp.sa, hapd->own_addr, ETH_ALEN);
-       os_memcpy(resp.bssid, hapd->own_addr, ETH_ALEN);
-       resp.u.action.category = WLAN_ACTION_SA_QUERY;
-       resp.u.action.u.sa_query_req.action = WLAN_SA_QUERY_RESPONSE;
-       os_memcpy(resp.u.action.u.sa_query_req.trans_id,
-                 mgmt->u.action.u.sa_query_req.trans_id,
-                 WLAN_SA_QUERY_TR_ID_LEN);
-       end = resp.u.action.u.sa_query_req.trans_id + WLAN_SA_QUERY_TR_ID_LEN;
-       if (hostapd_drv_send_mlme(hapd, &resp, end - (u8 *) &resp) < 0)
-               perror("hostapd_sa_query_request: send");
-}
-
-
 static void hostapd_sa_query_action(struct hostapd_data *hapd,
                                    const struct ieee80211_mgmt *mgmt,
                                    size_t len)
 {
-       struct sta_info *sta;
        const u8 *end;
-       int i;
 
        end = mgmt->u.action.u.sa_query_resp.trans_id +
                WLAN_SA_QUERY_TR_ID_LEN;
@@ -1347,50 +1249,9 @@ static void hostapd_sa_query_action(struct hostapd_data *hapd,
                return;
        }
 
-       if (mgmt->u.action.u.sa_query_resp.action == WLAN_SA_QUERY_REQUEST) {
-               hostapd_sa_query_request(hapd, mgmt);
-               return;
-       }
-
-       if (mgmt->u.action.u.sa_query_resp.action != WLAN_SA_QUERY_RESPONSE) {
-               wpa_printf(MSG_DEBUG, "IEEE 802.11: Unexpected SA Query "
-                          "Action %d", mgmt->u.action.u.sa_query_resp.action);
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "IEEE 802.11: Received SA Query Response from "
-                  MACSTR, MAC2STR(mgmt->sa));
-       wpa_hexdump(MSG_DEBUG, "IEEE 802.11: SA Query Transaction ID",
-                   mgmt->u.action.u.sa_query_resp.trans_id,
-                   WLAN_SA_QUERY_TR_ID_LEN);
-
-       /* MLME-SAQuery.confirm */
-
-       sta = ap_get_sta(hapd, mgmt->sa);
-       if (sta == NULL || sta->sa_query_trans_id == NULL) {
-               wpa_printf(MSG_DEBUG, "IEEE 802.11: No matching STA with "
-                          "pending SA Query request found");
-               return;
-       }
-
-       for (i = 0; i < sta->sa_query_count; i++) {
-               if (os_memcmp(sta->sa_query_trans_id +
-                             i * WLAN_SA_QUERY_TR_ID_LEN,
-                             mgmt->u.action.u.sa_query_resp.trans_id,
-                             WLAN_SA_QUERY_TR_ID_LEN) == 0)
-                       break;
-       }
-
-       if (i >= sta->sa_query_count) {
-               wpa_printf(MSG_DEBUG, "IEEE 802.11: No matching SA Query "
-                          "transaction identifier found");
-               return;
-       }
-
-       hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
-                      HOSTAPD_LEVEL_DEBUG,
-                      "Reply to pending SA Query received");
-       ap_sta_stop_sa_query(hapd, sta);
+       ieee802_11_sa_query_action(hapd, mgmt->sa,
+                                  mgmt->u.action.u.sa_query_resp.action,
+                                  mgmt->u.action.u.sa_query_resp.trans_id);
 }
 
 
index 157198c8260758f4a0f5127a20a66cbb6fb86b17..ec113759c1de4914a42a7a4792f5779fb35e028b 100644 (file)
@@ -64,5 +64,10 @@ void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,
                       const u8 *buf, size_t len, int ack);
 void ieee802_11_rx_from_unknown(struct hostapd_data *hapd, const u8 *src,
                                int wds);
+u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
+                                    struct sta_info *sta, u8 *eid);
+void ieee802_11_sa_query_action(struct hostapd_data *hapd,
+                               const u8 *sa, const u8 action_type,
+                               const u8 *trans_id);
 
 #endif /* IEEE802_11_H */
diff --git a/src/ap/ieee802_11_shared.c b/src/ap/ieee802_11_shared.c
new file mode 100644 (file)
index 0000000..5bb92db
--- /dev/null
@@ -0,0 +1,169 @@
+/*
+ * hostapd / IEEE 802.11 Management
+ * Copyright (c) 2002-2010, Jouni Malinen <j@w1.fi>
+ *
+ * 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
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+
+#include "utils/includes.h"
+
+#include "utils/common.h"
+#include "common/ieee802_11_defs.h"
+#include "hostapd.h"
+#include "sta_info.h"
+#include "ap_config.h"
+#include "ap_drv_ops.h"
+
+
+#ifdef CONFIG_IEEE80211W
+
+u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
+                                    struct sta_info *sta, u8 *eid)
+{
+       u8 *pos = eid;
+       u32 timeout, tu;
+       struct os_time now, passed;
+
+       *pos++ = WLAN_EID_TIMEOUT_INTERVAL;
+       *pos++ = 5;
+       *pos++ = WLAN_TIMEOUT_ASSOC_COMEBACK;
+       os_get_time(&now);
+       os_time_sub(&now, &sta->sa_query_start, &passed);
+       tu = (passed.sec * 1000000 + passed.usec) / 1024;
+       if (hapd->conf->assoc_sa_query_max_timeout > tu)
+               timeout = hapd->conf->assoc_sa_query_max_timeout - tu;
+       else
+               timeout = 0;
+       if (timeout < hapd->conf->assoc_sa_query_max_timeout)
+               timeout++; /* add some extra time for local timers */
+       WPA_PUT_LE32(pos, timeout);
+       pos += 4;
+
+       return pos;
+}
+
+
+/* MLME-SAQuery.request */
+void ieee802_11_send_sa_query_req(struct hostapd_data *hapd,
+                                 const u8 *addr, const u8 *trans_id)
+{
+       struct ieee80211_mgmt mgmt;
+       u8 *end;
+
+       wpa_printf(MSG_DEBUG, "IEEE 802.11: Sending SA Query Request to "
+                  MACSTR, MAC2STR(addr));
+       wpa_hexdump(MSG_DEBUG, "IEEE 802.11: SA Query Transaction ID",
+                   trans_id, WLAN_SA_QUERY_TR_ID_LEN);
+
+       os_memset(&mgmt, 0, sizeof(mgmt));
+       mgmt.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
+                                         WLAN_FC_STYPE_ACTION);
+       os_memcpy(mgmt.da, addr, ETH_ALEN);
+       os_memcpy(mgmt.sa, hapd->own_addr, ETH_ALEN);
+       os_memcpy(mgmt.bssid, hapd->own_addr, ETH_ALEN);
+       mgmt.u.action.category = WLAN_ACTION_SA_QUERY;
+       mgmt.u.action.u.sa_query_req.action = WLAN_SA_QUERY_REQUEST;
+       os_memcpy(mgmt.u.action.u.sa_query_req.trans_id, trans_id,
+                 WLAN_SA_QUERY_TR_ID_LEN);
+       end = mgmt.u.action.u.sa_query_req.trans_id + WLAN_SA_QUERY_TR_ID_LEN;
+       if (hostapd_drv_send_mlme(hapd, &mgmt, end - (u8 *) &mgmt) < 0)
+               perror("ieee802_11_send_sa_query_req: send");
+}
+
+
+void ieee802_11_send_sa_query_resp(struct hostapd_data *hapd,
+                                  const u8 *sa, const u8 *trans_id)
+{
+       struct sta_info *sta;
+       struct ieee80211_mgmt resp;
+       u8 *end;
+
+       wpa_printf(MSG_DEBUG, "IEEE 802.11: Received SA Query Request from "
+                  MACSTR, MAC2STR(sa));
+       wpa_hexdump(MSG_DEBUG, "IEEE 802.11: SA Query Transaction ID",
+                   trans_id, WLAN_SA_QUERY_TR_ID_LEN);
+
+       sta = ap_get_sta(hapd, sa);
+       if (sta == NULL || !(sta->flags & WLAN_STA_ASSOC)) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: Ignore SA Query Request "
+                          "from unassociated STA " MACSTR, MAC2STR(sa));
+               return;
+       }
+
+       wpa_printf(MSG_DEBUG, "IEEE 802.11: Sending SA Query Response to "
+                  MACSTR, MAC2STR(sa));
+
+       os_memset(&resp, 0, sizeof(resp));
+       resp.frame_control = IEEE80211_FC(WLAN_FC_TYPE_MGMT,
+                                         WLAN_FC_STYPE_ACTION);
+       os_memcpy(resp.da, sa, ETH_ALEN);
+       os_memcpy(resp.sa, hapd->own_addr, ETH_ALEN);
+       os_memcpy(resp.bssid, hapd->own_addr, ETH_ALEN);
+       resp.u.action.category = WLAN_ACTION_SA_QUERY;
+       resp.u.action.u.sa_query_req.action = WLAN_SA_QUERY_RESPONSE;
+       os_memcpy(resp.u.action.u.sa_query_req.trans_id, trans_id,
+                 WLAN_SA_QUERY_TR_ID_LEN);
+       end = resp.u.action.u.sa_query_req.trans_id + WLAN_SA_QUERY_TR_ID_LEN;
+       if (hostapd_drv_send_mlme(hapd, &resp, end - (u8 *) &resp) < 0)
+               perror("ieee80211_mgmt_sa_query_request: send");
+}
+
+
+void ieee802_11_sa_query_action(struct hostapd_data *hapd, const u8 *sa,
+                               const u8 action_type, const u8 *trans_id)
+{
+       struct sta_info *sta;
+       int i;
+
+       if (action_type == WLAN_SA_QUERY_REQUEST) {
+               ieee802_11_send_sa_query_resp(hapd, sa, trans_id);
+               return;
+       }
+
+       if (action_type != WLAN_SA_QUERY_RESPONSE) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: Unexpected SA Query "
+                          "Action %d", action_type);
+               return;
+       }
+
+       wpa_printf(MSG_DEBUG, "IEEE 802.11: Received SA Query Response from "
+                  MACSTR, MAC2STR(sa));
+       wpa_hexdump(MSG_DEBUG, "IEEE 802.11: SA Query Transaction ID",
+                   trans_id, WLAN_SA_QUERY_TR_ID_LEN);
+
+       /* MLME-SAQuery.confirm */
+
+       sta = ap_get_sta(hapd, sa);
+       if (sta == NULL || sta->sa_query_trans_id == NULL) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: No matching STA with "
+                          "pending SA Query request found");
+               return;
+       }
+
+       for (i = 0; i < sta->sa_query_count; i++) {
+               if (os_memcmp(sta->sa_query_trans_id +
+                             i * WLAN_SA_QUERY_TR_ID_LEN,
+                             trans_id, WLAN_SA_QUERY_TR_ID_LEN) == 0)
+                       break;
+       }
+
+       if (i >= sta->sa_query_count) {
+               wpa_printf(MSG_DEBUG, "IEEE 802.11: No matching SA Query "
+                          "transaction identifier found");
+               return;
+       }
+
+       hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+                      HOSTAPD_LEVEL_DEBUG,
+                      "Reply to pending SA Query received");
+       ap_sta_stop_sa_query(hapd, sta);
+}
+
+#endif /* CONFIG_IEEE80211W */
index 2c46a85959e93f4879828011d931faa3ce5f7eb1..db453258c5aec4a5cfe80081c91acfd5991ecbde 100644 (file)
@@ -678,6 +678,7 @@ OBJS += ../src/ap/ap_mlme.o
 OBJS += ../src/ap/ieee802_1x.o
 OBJS += ../src/eapol_auth/eapol_auth_sm.o
 OBJS += ../src/ap/ieee802_11_auth.o
+OBJS += ../src/ap/ieee802_11_shared.o
 OBJS += ../src/ap/drv_callbacks.o
 OBJS += ../src/ap/ap_drv_ops.o
 ifdef CONFIG_IEEE80211N