From patchwork Mon Feb 24 09:14:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peer, Ilan" X-Patchwork-Id: 1242933 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=LEmbtQa0; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48QxsR1WxQz9sRQ for ; Mon, 24 Feb 2020 20:41:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=6fe01VAmz9KUXPHm1H8+KxqpxuGcsjiVLgKttkxN5Wc=; b=LEmbtQa0j2ySZ5Dtg3/cKOnR0y BJ7YtKOoPtwAJFqCG4lbueV01acudv9NsiMV2Sv8fUiP0QDH/EwjX4sfBk83JvyLTMJ/pNmxiMjD5 4J520w+R8kxPxXhjZtxDzWRPGXBbZcgbsmupXFfDqsGiS845BzGy1nZpx7RBaqXpZySjc9i10X4P9 SAweTxeoQtXKCJnrljMEN3cv3enSy5/nKp4dr0TVLDKCfmMWo5jC/jFI3rwLgLDh2LiLMunezyRPE fUu8g9L/5xbqAC2AE1juy/DN4T+sXKAXF8XBERWxwXcMvc3HSZsKos+PDGJcsRAUEiX0HgEeZMZC5 /73hjCAg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6AEu-0002bX-Cm; Mon, 24 Feb 2020 09:41:24 +0000 Received: from mga11.intel.com ([192.55.52.93]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j69pC-0006C4-C9 for hostap@lists.infradead.org; Mon, 24 Feb 2020 09:14:52 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Feb 2020 01:14:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,479,1574150400"; d="scan'208";a="225914128" Received: from jed01681.jer.intel.com ([10.12.190.127]) by orsmga007.jf.intel.com with ESMTP; 24 Feb 2020 01:14:46 -0800 From: Ilan Peer To: hostap@lists.infradead.org Subject: [PATCH 04/12] nl80211: Allow Tx status for authentication frames Date: Mon, 24 Feb 2020 11:14:29 +0200 Message-Id: <20200224091437.15212-5-ilan.peer@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200224091437.15212-1-ilan.peer@intel.com> References: <20200224091437.15212-1-ilan.peer@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200224_011450_668582_5E8A7AF3 X-CRM114-Status: GOOD ( 12.10 ) X-Spam-Score: -5.0 (-----) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-5.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [192.55.52.93 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilan Peer MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org To support PASN authentication flow, where authentication frames are sent by the wpa_supplicant using send_mlme() callback, modify the logic in driver_nl80211 to also send EVENT_TX_STATUS for authentication frames. Signed-off-by: Ilan Peer --- src/drivers/driver_nl80211_event.c | 39 ++++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c index 8327644fb1..ec2b643a7e 100644 --- a/src/drivers/driver_nl80211_event.c +++ b/src/drivers/driver_nl80211_event.c @@ -683,29 +683,36 @@ static void mlme_event_mgmt_tx_status(struct wpa_driver_nl80211_data *drv, size_t len, struct nlattr *ack) { union wpa_event_data event; - const struct ieee80211_hdr *hdr; - u16 fc; + const struct ieee80211_hdr *hdr = (const struct ieee80211_hdr *)frame; + u16 fc = le_to_host16(hdr->frame_control); wpa_printf(MSG_DEBUG, "nl80211: Frame TX status event"); + + if (WLAN_FC_GET_TYPE(fc) != WLAN_FC_TYPE_MGMT) + return; + if (!is_ap_interface(drv->nlmode)) { - u64 cookie_val; + if (WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_ACTION) { + u64 cookie_val; - if (!cookie) - return; + if (!cookie) + return; - cookie_val = nla_get_u64(cookie); - wpa_printf(MSG_DEBUG, - "nl80211: Frame TX status: cookie=0x%llx%s (ack=%d)", - (long long unsigned int) cookie_val, - cookie_val == drv->send_frame_cookie ? - " (match)" : " (unknown)", ack != NULL); - if (cookie_val != drv->send_frame_cookie) - return; + cookie_val = nla_get_u64(cookie); + wpa_printf(MSG_DEBUG, + "nl80211: Frame TX status: cookie=0x%llx%s (ack=%d)", + (long long unsigned int) cookie_val, + cookie_val == drv->send_frame_cookie ? + " (match)" : " (unknown)", ack != NULL); + if (cookie_val != drv->send_frame_cookie) + return; + } else if (WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_AUTH) { + wpa_printf(MSG_DEBUG, + "nl80211: Auth TX status: ack=%d", + !!ack); + } } - hdr = (const struct ieee80211_hdr *) frame; - fc = le_to_host16(hdr->frame_control); - os_memset(&event, 0, sizeof(event)); event.tx_status.type = WLAN_FC_GET_TYPE(fc); event.tx_status.stype = WLAN_FC_GET_STYPE(fc);