From patchwork Fri May 4 01:00:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wang X-Patchwork-Id: 908619 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NM2ky/F6"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cmHL42ZVz9s3G for ; Fri, 4 May 2018 19:02:22 +1000 (AEST) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Message-Id:Date: MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=oMYwgRqOb8dc7/6ryeiHfY41gfxQV+CWkblClSk0WQI=; b=NM2ky/F6Wntr/3 qn72XITntExmE0ir5Dpcf65yQWg0nVP88Bh1eFm6aY0nVDLA1yt9LbiU/KkxO7xRYiuBCT8ohHzCY VktXXjTxM3++N8vq9ePhlaBPxmgfZyKY57VCRaugRhBDJmif4Q5amAiPgVRlutW1E0JkR/5dUnxIl eR5tndRTJ0Ppu8Yv9BhT0uLbgenlrYxhakwhjo9JEFrShFRyCUL7dPraRS7Qh0uuf8XlpvN+f8bgM RfD4esvoWoE91T4SUeOaw+ewbxHhln1Yr7h434Ist0/+LmiGjHWKeed4cqdhA4MGxL5MxZQdldd3R b6pNrFzsupxItRf7XbEw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fEWbZ-0001xL-IS; Fri, 04 May 2018 09:02:17 +0000 Received: from mail-ua0-f201.google.com ([209.85.217.201]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fEP5w-0005Mv-Sf for hostap@lists.infradead.org; Fri, 04 May 2018 01:01:29 +0000 Received: by mail-ua0-f201.google.com with SMTP id j3so16746628ual.6 for ; Thu, 03 May 2018 18:00:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=LiS8LxR4RsIMUOekiU1Zj67LkTO90oaFPYrMJhOPjgs=; b=OA3Q8wJRtrPk/h5aSlZuy+YDtXJ3zLa5ZFaGXzKss3uUqLpYo+EOTMy57nBHIDxE5h 8mkUEytfcjlzxfII45rd407iq9DOzU2Pb4Mt+0bn/NEccPt7lJTDVqzu11HovXihCEaA poGu1tH6vVWx6O7+yAINZ3nKZAyFCk212pzXQaraTylsql6rd86xVFiFHgGLuqtAzY6e 8xzUaq3EPW7GM/T/t0Vj3baf+cevYObgb3MwJfAHTY2/XLDWoYpQQfoMJN+Pgkk6Z4Xe a3x1Ypt847YzJq0eMyKy8IGR3bgg6W4ImXRSv2TYMy9wkJbbyLC6kgptv4myPjNImLDb NIKQ== X-Gm-Message-State: ALQs6tC1o1X2NptIX7izUnGUwhdmAM7LzwQNin+KOkUaJZx92sv1tCix q83vbZ/zTQqyjdlhjsA+u03L5eZ/jqL6/R/JV0g= X-Google-Smtp-Source: AB8JxZqnAlt79mjMF3Q1wPxllpizWkRloxybNMfUk3bhoETI9cQ5M8ylIW51skLwyGVJwMUZWoTMZNtPzDuZNNOLmd4= MIME-Version: 1.0 X-Received: by 10.176.2.73 with SMTP id 67mr12643688uas.46.1525395656199; Thu, 03 May 2018 18:00:56 -0700 (PDT) Date: Thu, 3 May 2018 18:00:52 -0700 Message-Id: <20180504010052.66020-1-matthewmwang@chromium.org> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog Subject: [PATCH] dbus: export BSS Transition Management status to dbus From: Matthew Wang To: j@w1.fi, hostap@lists.infradead.org, matthewmwang@chromium.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180503_180108_994994_143356DF X-CRM114-Status: GOOD ( 13.32 ) X-Spam-Score: 0.2 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.217.201 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.217.201 listed in wl.mailspike.net] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record X-Mailman-Approved-At: Fri, 04 May 2018 02:02:15 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hostap@lists.infradead.org, matthewmwang@chromium.org Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Added new Interface properties "BSSTMStatus", which carries the status of the most recent BSS Transition Management request. This property will be logged in UMA to measure 802.11v success. Signed-off-by: Matthew Wang --- doc/dbus.doxygen | 5 +++++ wpa_supplicant/dbus/dbus_new.c | 9 +++++++++ wpa_supplicant/dbus/dbus_new.h | 1 + wpa_supplicant/dbus/dbus_new_handlers.c | 22 ++++++++++++++++++++++ wpa_supplicant/dbus/dbus_new_handlers.h | 1 + wpa_supplicant/notify.c | 9 +++++++++ wpa_supplicant/notify.h | 1 + wpa_supplicant/wnm_sta.c | 4 ++++ wpa_supplicant/wpa_supplicant_i.h | 1 + 9 files changed, 53 insertions(+) diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index d3003b31d..cf5129474 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -784,6 +784,11 @@ fi.w1.wpa_supplicant1.CreateInterface.

The most recent BSS session length in milliseconds.

+
  • +

    BSSTMStatus - i - (read)

    +

    The most recent BSS Transition Management status code.

    +
    • +

  • EapolVersion - s - (read/write)

    IEEE 802.1X/EAPOL version number

    diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 168e9baf6..2f4b2bf46 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -2171,6 +2171,9 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, case WPAS_DBUS_PROP_SESSION_LENGTH: prop = "SessionLength"; break; + case WPAS_DBUS_PROP_BSS_TM_STATUS: + prop = "BSSTMStatus"; + break; default: wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", __func__, property); @@ -2758,6 +2761,12 @@ static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = { NULL, NULL }, + { + "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "i", + wpas_dbus_getter_bss_tm_status, + NULL, + NULL + }, { NULL, NULL, NULL, NULL, NULL, NULL } }; diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h index 08f4858b1..bec9a4153 100644 --- a/wpa_supplicant/dbus/dbus_new.h +++ b/wpa_supplicant/dbus/dbus_new.h @@ -34,6 +34,7 @@ enum wpas_dbus_prop { WPAS_DBUS_PROP_ROAM_TIME, WPAS_DBUS_PROP_ROAM_COMPLETE, WPAS_DBUS_PROP_SESSION_LENGTH, + WPAS_DBUS_PROP_BSS_TM_STATUS, }; enum wpas_dbus_bss_prop { diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 4e3412cdc..367d26d14 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -3223,6 +3223,28 @@ dbus_bool_t wpas_dbus_getter_session_length( } +/** + * wpas_dbus_getter_bss_tm_status - Get most BSS Transition Management request + * status code + * @iter: Pointer to incoming dbus message iter + * @error: Location to store error on failure + * @user_data: Function specific data + * Returns: TRUE on success, FALSE on failure + * + * Getter for "BSSTMStatus" property. + */ +dbus_bool_t wpas_dbus_getter_bss_tm_status( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + dbus_int32_t bss_tm_status = wpa_s->bss_tm_status; + + return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT32, + &bss_tm_status, error); +} + + /** * wpas_dbus_getter_bss_expire_age - Get BSS entry expiration age * @iter: Pointer to incoming dbus message iter diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h index 7a03b7f9f..25ab9991c 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.h +++ b/wpa_supplicant/dbus/dbus_new_handlers.h @@ -151,6 +151,7 @@ DECLARE_ACCESSOR(wpas_dbus_getter_assoc_status_code); DECLARE_ACCESSOR(wpas_dbus_getter_roam_time); DECLARE_ACCESSOR(wpas_dbus_getter_roam_complete); DECLARE_ACCESSOR(wpas_dbus_getter_session_length); +DECLARE_ACCESSOR(wpas_dbus_getter_bss_tm_status); DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_age); DECLARE_ACCESSOR(wpas_dbus_setter_bss_expire_age); DECLARE_ACCESSOR(wpas_dbus_getter_bss_expire_count); diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index a2b04716d..b171e8e87 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -176,6 +176,15 @@ void wpas_notify_session_length(struct wpa_supplicant *wpa_s) } +void wpas_notify_bss_tm_status(struct wpa_supplicant *wpa_s) +{ + if (wpa_s->p2p_mgmt) + return; + + wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSS_TM_STATUS); +} + + void wpas_notify_network_changed(struct wpa_supplicant *wpa_s) { if (wpa_s->p2p_mgmt) diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h index bde20e83d..9605785cf 100644 --- a/wpa_supplicant/notify.h +++ b/wpa_supplicant/notify.h @@ -27,6 +27,7 @@ void wpas_notify_assoc_status_code(struct wpa_supplicant *wpa_s); void wpas_notify_roam_time(struct wpa_supplicant *wpa_s); void wpas_notify_roam_complete(struct wpa_supplicant *wpa_s); void wpas_notify_session_length(struct wpa_supplicant *wpa_s); +void wpas_notify_bss_tm_status(struct wpa_supplicant *wpa_s); void wpas_notify_network_changed(struct wpa_supplicant *wpa_s); void wpas_notify_ap_scan_changed(struct wpa_supplicant *wpa_s); void wpas_notify_bssid_changed(struct wpa_supplicant *wpa_s); diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c index 7c410e730..1dbc90352 100644 --- a/wpa_supplicant/wnm_sta.c +++ b/wpa_supplicant/wnm_sta.c @@ -20,6 +20,7 @@ #include "ctrl_iface.h" #include "bss.h" #include "wnm_sta.h" +#include "notify.h" #include "hs20_supplicant.h" #define MAX_TFS_IE_LEN 1024 @@ -938,6 +939,9 @@ static void wnm_send_bss_transition_mgmt_resp( return; } + wpa_s->bss_tm_status = status; + wpas_notify_bss_tm_status(wpa_s); + wpabuf_put_u8(buf, WLAN_ACTION_WNM); wpabuf_put_u8(buf, WNM_BSS_TRANS_MGMT_RESP); wpabuf_put_u8(buf, dialog_token); diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h index a4d56b810..70da2a4b1 100644 --- a/wpa_supplicant/wpa_supplicant_i.h +++ b/wpa_supplicant/wpa_supplicant_i.h @@ -1059,6 +1059,7 @@ struct wpa_supplicant { struct neighbor_report *wnm_neighbor_report_elements; struct os_reltime wnm_cand_valid_until; u8 wnm_cand_from_bss[ETH_ALEN]; + enum bss_trans_mgmt_status_code bss_tm_status; #ifdef CONFIG_MBO unsigned int wnm_mbo_trans_reason_present:1; u8 wnm_mbo_transition_reason;