From patchwork Mon Apr 15 19:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akhouderchah@chromium.org X-Patchwork-Id: 1085878 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="l9SEYlou"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="J0pxFLNH"; 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 44jdrV0F15z9s00 for ; Tue, 16 Apr 2019 05:30:34 +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:MIME-Version: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=XEfW1+PO6drz9FlaFjNh3tTLoOQ8VU70EWdN5SrwxO0=; b=l9SEYlousDjO45 nmR7rDkzoTVgkW+e2V9dpxFOzW19WMzdqbmCetwr7ixqjq2Er/A2A9vhxzVFBZn0hL0Xr1b0AH5oK g9pW2sxv4jOptkYgETs9AV5Qz77epuiViaLSzKHHKLhDp2lWKsKvOgodk5y7OJGivwy7dXgRFX/on z3fDwR2ns7R6cN7Dr7X7uw6dgvW3HYdOFGKtb8Nxt8b6KQCWToJsnpQMFEdLB0kkEFPBsyvwkAKct /db26a60zwDHmYMkbtvfMReK3wgSOir0EFN8P6iWUW5deOSwcJBjlEF9jZHLtF40u/QXuU8hRZXKR MGknQE32SHUjn1VGGdVg==; 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 1hG7JF-00054W-WF; Mon, 15 Apr 2019 19:30:30 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG7AB-0001Ut-8v for hostap@lists.infradead.org; Mon, 15 Apr 2019 19:21:08 +0000 Received: by mail-pf1-x444.google.com with SMTP id c207so9092881pfc.7 for ; Mon, 15 Apr 2019 12:21:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EoWZl5LhTS0G2f5/9XDGWqnt/vbvEoYeyOVBc5VatOA=; b=J0pxFLNHSAzHm2+2pqp4dNCKC7A3UJIsgTOh3ONQLbF2DFxPaCto6elfMc7W7WhsXj SPo+ny7xdrl+fUgbMXG66k4kyMUjZHLqHCrzAfPckidPD/X41XZJ5M35VAiw9VB1S1xY UmHjxGeX9qe3Vos6y42/CuDOPjQNlDbe8cQ8M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EoWZl5LhTS0G2f5/9XDGWqnt/vbvEoYeyOVBc5VatOA=; b=H2E1YlRR9urenr/QHG7uvll1xgUcp3LFZL1C4kUzpPFlUP9vYXNq8zzPWNCLPAXv/3 iaQ0bbBeZKxOo1ZGipAnmM+G5H1+BVA/4tep0bO1MR8RbLqYvKYMihOSwvTkaxF5WrGO w035yYD0fpmpV0juFI+Mb/IOmzI1acgCNbJJh/7nzVljh2A80Jsf+RhtCUNk2jF7tUtu +lTI0NrKD89U83CKlVLNFwCqgP4DhOnMK8eE7FChZ27dqTP2pTD9mMGBos8tSWUPu08B DS7eeC6/xwQY5kbLrt9ftUmAi+Ph5rNOl2QZn7Y3fu8ZwsRf47jMTLJ/yY05EbSJE0X0 DoKg== X-Gm-Message-State: APjAAAUWteCKsQ66kGeKDzEzTKlJKIv27aOOKp+jnUX+j2SPUCK1nHoZ boDPqZJrCgg02Rgsl6pn8JSlyuJA9ZE= X-Google-Smtp-Source: APXvYqzKxGRX1ZQv9u4uQel3H4EX73WAdxUfhKOW8USyiTaJQbmnDhFQEdgKPC3Zb3BAwZGxyMocQg== X-Received: by 2002:a63:1c6:: with SMTP id 189mr73147208pgb.22.1555356065579; Mon, 15 Apr 2019 12:21:05 -0700 (PDT) Received: from akhouderchah.mtv.corp.google.com ([2620:15c:202:201:522e:e4c8:faf6:771]) by smtp.gmail.com with ESMTPSA id f1sm69633858pgl.35.2019.04.15.12.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:21:04 -0700 (PDT) From: akhouderchah@chromium.org To: hostap@lists.infradead.org Subject: [PATCH 1/2] Add 802.11 reason code strings Date: Mon, 15 Apr 2019 12:20:05 -0700 Message-Id: <20190415192006.52477-1-akhouderchah@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190413165223.218948-1-akhouderchah@chromium.org> References: <20190413165223.218948-1-akhouderchah@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_122107_359909_8C03096F X-CRM114-Status: GOOD ( 13.92 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 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 https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-Mailman-Approved-At: Mon, 15 Apr 2019 12:30:29 -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: Alex Khouderchah , Alex Khouderchah Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Alex Khouderchah Logs involving 802.11 reason codes output the reason code value, but do not provide any explanation of what the value means. This change provides a terse explanation of each reason code using the latter part of the reason code #define names. Signed-off-by: Alex Khouderchah --- src/common/ieee802_11_common.c | 71 +++++++++++++++++++++++++++++++++ src/common/ieee802_11_common.h | 1 + wpa_supplicant/events.c | 15 +++---- wpa_supplicant/sme.c | 6 +-- wpa_supplicant/wpa_supplicant.c | 6 ++- 5 files changed, 87 insertions(+), 12 deletions(-) diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c index e42a32744..e03f59e22 100644 --- a/src/common/ieee802_11_common.c +++ b/src/common/ieee802_11_common.c @@ -1315,6 +1315,77 @@ const char * fc2str(u16 fc) } +const char * reason2str(u16 reason) +{ +#define R2S(r) case WLAN_REASON_ ## r: return #r; + switch (reason) { + R2S(UNSPECIFIED) + R2S(PREV_AUTH_NOT_VALID) + R2S(DEAUTH_LEAVING) + R2S(DISASSOC_DUE_TO_INACTIVITY) + R2S(DISASSOC_AP_BUSY) + R2S(CLASS2_FRAME_FROM_NONAUTH_STA) + R2S(CLASS3_FRAME_FROM_NONASSOC_STA) + R2S(DISASSOC_STA_HAS_LEFT) + R2S(STA_REQ_ASSOC_WITHOUT_AUTH) + R2S(PWR_CAPABILITY_NOT_VALID) + R2S(SUPPORTED_CHANNEL_NOT_VALID) + R2S(BSS_TRANSITION_DISASSOC) + R2S(INVALID_IE) + R2S(MICHAEL_MIC_FAILURE) + R2S(4WAY_HANDSHAKE_TIMEOUT) + R2S(GROUP_KEY_UPDATE_TIMEOUT) + R2S(IE_IN_4WAY_DIFFERS) + R2S(GROUP_CIPHER_NOT_VALID) + R2S(PAIRWISE_CIPHER_NOT_VALID) + R2S(AKMP_NOT_VALID) + R2S(UNSUPPORTED_RSN_IE_VERSION) + R2S(INVALID_RSN_IE_CAPAB) + R2S(IEEE_802_1X_AUTH_FAILED) + R2S(CIPHER_SUITE_REJECTED) + R2S(TDLS_TEARDOWN_UNREACHABLE) + R2S(TDLS_TEARDOWN_UNSPECIFIED) + R2S(SSP_REQUESTED_DISASSOC) + R2S(NO_SSP_ROAMING_AGREEMENT) + R2S(BAD_CIPHER_OR_AKM) + R2S(NOT_AUTHORIZED_THIS_LOCATION) + R2S(SERVICE_CHANGE_PRECLUDES_TS) + R2S(UNSPECIFIED_QOS_REASON) + R2S(NOT_ENOUGH_BANDWIDTH) + R2S(DISASSOC_LOW_ACK) + R2S(EXCEEDED_TXOP) + R2S(STA_LEAVING) + R2S(END_TS_BA_DLS) + R2S(UNKNOWN_TS_BA) + R2S(TIMEOUT) + R2S(PEERKEY_MISMATCH) + R2S(AUTHORIZED_ACCESS_LIMIT_REACHED) + R2S(EXTERNAL_SERVICE_REQUIREMENTS) + R2S(INVALID_FT_ACTION_FRAME_COUNT) + R2S(INVALID_PMKID) + R2S(INVALID_MDE) + R2S(INVALID_FTE) + R2S(MESH_PEERING_CANCELLED) + R2S(MESH_MAX_PEERS) + R2S(MESH_CONFIG_POLICY_VIOLATION) + R2S(MESH_CLOSE_RCVD) + R2S(MESH_MAX_RETRIES) + R2S(MESH_CONFIRM_TIMEOUT) + R2S(MESH_INVALID_GTK) + R2S(MESH_INCONSISTENT_PARAMS) + R2S(MESH_INVALID_SECURITY_CAP) + R2S(MESH_PATH_ERROR_NO_PROXY_INFO) + R2S(MESH_PATH_ERROR_NO_FORWARDING_INFO) + R2S(MESH_PATH_ERROR_DEST_UNREACHABLE) + R2S(MAC_ADDRESS_ALREADY_EXISTS_IN_MBSS) + R2S(MESH_CHANNEL_SWITCH_REGULATORY_REQ) + R2S(MESH_CHANNEL_SWITCH_UNSPECIFIED) + } + return "UNKNOWN"; +#undef R2S +} + + int mb_ies_info_by_ies(struct mb_ies_info *info, const u8 *ies_buf, size_t ies_len) { diff --git a/src/common/ieee802_11_common.h b/src/common/ieee802_11_common.h index d41bd39e7..e402e9344 100644 --- a/src/common/ieee802_11_common.h +++ b/src/common/ieee802_11_common.h @@ -185,6 +185,7 @@ int mb_ies_info_by_ies(struct mb_ies_info *info, const u8 *ies_buf, struct wpabuf * mb_ies_by_info(struct mb_ies_info *info); const char * fc2str(u16 fc); +const char * reason2str(u16 reason); struct oper_class_map { enum hostapd_hw_mode mode; diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index a46ef187c..0baef0fe2 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -2988,8 +2988,8 @@ static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s, if (!is_zero_ether_addr(bssid) || wpa_s->wpa_state >= WPA_AUTHENTICATING) { wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR - " reason=%d%s", - MAC2STR(bssid), reason_code, + " reason=%u (%s)%s", + MAC2STR(bssid), reason_code, reason2str(reason_code), locally_generated ? " locally_generated=1" : ""); } } @@ -3596,8 +3596,9 @@ static void wpas_event_disassoc(struct wpa_supplicant *wpa_s, ie_len = info->ie_len; reason_code = info->reason_code; locally_generated = info->locally_generated; - wpa_dbg(wpa_s, MSG_DEBUG, " * reason %u%s", reason_code, - locally_generated ? " (locally generated)" : ""); + wpa_dbg(wpa_s, MSG_DEBUG, " * reason %u (%s)%s", reason_code, + reason2str(reason_code), + locally_generated ? " locally_generated=1" : ""); if (addr) wpa_dbg(wpa_s, MSG_DEBUG, " * address " MACSTR, MAC2STR(addr)); @@ -3650,9 +3651,9 @@ static void wpas_event_deauth(struct wpa_supplicant *wpa_s, ie_len = info->ie_len; reason_code = info->reason_code; locally_generated = info->locally_generated; - wpa_dbg(wpa_s, MSG_DEBUG, " * reason %u%s", - reason_code, - locally_generated ? " (locally generated)" : ""); + wpa_dbg(wpa_s, MSG_DEBUG, " * reason %u (%s)%s", + reason_code, reason2str(reason_code), + locally_generated ? " locally generated=1" : ""); if (addr) { wpa_dbg(wpa_s, MSG_DEBUG, " * address " MACSTR, MAC2STR(addr)); diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c index 4bb5f3aef..28ba41df5 100644 --- a/wpa_supplicant/sme.c +++ b/wpa_supplicant/sme.c @@ -1357,11 +1357,11 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) ric_ies, ric_ies_len) < 0) { wpa_dbg(wpa_s, MSG_DEBUG, "SME: FT Authentication response processing failed"); + u16 reason = WLAN_REASON_DEAUTH_LEAVING; wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" MACSTR - " reason=%d locally_generated=1", - MAC2STR(wpa_s->pending_bssid), - WLAN_REASON_DEAUTH_LEAVING); + " reason=%u (%s) locally_generated=1", + MAC2STR(wpa_s->pending_bssid), reason, reason2str(reason)); wpas_connection_failed(wpa_s, wpa_s->pending_bssid); wpa_supplicant_mark_disassoc(wpa_s); return; diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 4aebfc052..2b41f83ef 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -36,6 +36,7 @@ #include "rsn_supp/preauth.h" #include "rsn_supp/pmksa_cache.h" #include "common/wpa_ctrl.h" +#include "common/ieee802_11_common.h" #include "common/ieee802_11_defs.h" #include "common/hw_features_common.h" #include "common/gas_server.h" @@ -3413,9 +3414,10 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s, int zero_addr = 0; wpa_dbg(wpa_s, MSG_DEBUG, "Request to deauthenticate - bssid=" MACSTR - " pending_bssid=" MACSTR " reason=%d state=%s", + " pending_bssid=" MACSTR " reason=%d (%s) state=%s", MAC2STR(wpa_s->bssid), MAC2STR(wpa_s->pending_bssid), - reason_code, wpa_supplicant_state_txt(wpa_s->wpa_state)); + reason_code, reason2str(reason_code), + wpa_supplicant_state_txt(wpa_s->wpa_state)); if (!is_zero_ether_addr(wpa_s->pending_bssid) && (wpa_s->wpa_state == WPA_AUTHENTICATING || From patchwork Mon Apr 15 19:20:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: akhouderchah@chromium.org X-Patchwork-Id: 1085880 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="kiRpwQKl"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="FGu/dUwh"; 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 44jdrg0nXjz9s00 for ; Tue, 16 Apr 2019 05:30:43 +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:MIME-Version: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=SZ7fdIqkZZvkBm5UMyP0VJBJ2VvO0Q7AolZU6QdxHnU=; b=kiRpwQKlrcdLQ7 83iQPMCmDykrpRo0rO4s4jAleKBoK65s/Yr5RoBu+OLdVi+XvESb35W6UZ8lmtziepb8ozMwrv5Bk RVi0uaECl2+AUG0GPVFi40z/Ho6ifKDSulamB/BrtqhbA2ZScSq2NCjgRv4R4aF3Wr6DEQzwCkbEd cwVVBPfmFQKtb6Q1qPouAiN1NhvWPDyJSHBgATewAOqm2Z7hICEkvzb3utQoaXSZCUdSRWDU8E+lP L9Uz7ZMWO1xOgldHpWxdC6BwC6Yz0fz90PBFO72r/Su2a+X1T8YjTiZ4T20fKAKqsMir1me5LLvab /piMdcLGoXeQCIkp9XJA==; 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 1hG7JQ-0005Cp-Om; Mon, 15 Apr 2019 19:30:40 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG7AE-0001VC-2m for hostap@lists.infradead.org; Mon, 15 Apr 2019 19:21:11 +0000 Received: by mail-pf1-x444.google.com with SMTP id i17so9093123pfo.6 for ; Mon, 15 Apr 2019 12:21:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PTxhZOkd65Jycmztcih30d7h21zhSvDo1XNNTdXM5fA=; b=FGu/dUwhUCjFiDeSCl9OrgnX1bNl8Cq3UNkS59DKPk3GIkC2yyOVvWDePUbBTWKQT0 HwhTpFBhyk3FKxfDhEx++c8xCr+YbeMDmoiZ8AQ1QVieEyEzHm11e66touzupsxdeIdJ EPWWC1JNeu+jWMzgGWV1lbs8jAEOhE7VbPkSc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PTxhZOkd65Jycmztcih30d7h21zhSvDo1XNNTdXM5fA=; b=Rq1VcDSe89FM+8i/QWS19Q4p3Imk+6+/TAbCe5C8PIlxl3KjzQPWwxNoJGiaXjw1mH 0jqo/QhnK1CtD2zk1SVhBjy8iHps/7DMsrCnSYtuoSm7mDsHFSZr7QifiMGRe8dXyRj/ aaH5ZLOV99aUbIL1SjS63iBuEFCBjsIN0ae9E1Jc3tilReKRqPCbMng62MzTRwkYTKJY ENw2+epwi81MtPZOMfTPiZKaQ/J0g29aW+TFhBDI5f//jYZBuvMdP3+UO24gGtVPq4/L 4dQlU4FxPHumz3TzzBinDfvfalbfpQaZ9XF+xyss/OUS7FzHRpBPG/hKVan1E6VY0Bu+ RqlQ== X-Gm-Message-State: APjAAAXtSrwjUPbyk7BwFBaNUPSbM+GxbaBu7cB46POSVwRDLAEpKY4/ jQKxV7qdYPlJgsUGtx1nqQJj6ONZtD0= X-Google-Smtp-Source: APXvYqzlOevU8RRFwDHtc5MCCxp1uliefrSw02N8z3Diey8otTi/sSsJFbFVCLSetAHQTpzHRvx3jw== X-Received: by 2002:a62:205c:: with SMTP id g89mr77469050pfg.34.1555356069332; Mon, 15 Apr 2019 12:21:09 -0700 (PDT) Received: from akhouderchah.mtv.corp.google.com ([2620:15c:202:201:522e:e4c8:faf6:771]) by smtp.gmail.com with ESMTPSA id f1sm69633858pgl.35.2019.04.15.12.21.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 12:21:08 -0700 (PDT) From: akhouderchah@chromium.org To: hostap@lists.infradead.org Subject: [PATCH 2/2] Add 802.11 status code strings Date: Mon, 15 Apr 2019 12:20:06 -0700 Message-Id: <20190415192006.52477-2-akhouderchah@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190415192006.52477-1-akhouderchah@chromium.org> References: <20190413165223.218948-1-akhouderchah@chromium.org> <20190415192006.52477-1-akhouderchah@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_122110_133331_02AFBEB5 X-CRM114-Status: GOOD ( 15.28 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 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 https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-Mailman-Approved-At: Mon, 15 Apr 2019 12:30:38 -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: Alex Khouderchah , Alex Khouderchah Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Alex Khouderchah Logs involving 802.11 status codes output the status code value, but do not provide any explanation of what the value means. This change provides a terse explanation of each status code using the latter part of the status code #define names. Signed-off-by: Alex Khouderchah Reviewed-by: Brian Norris Reviewed-by: Brian Norris --- src/ap/ieee802_11.c | 12 ++-- src/ap/wpa_auth_ft.c | 8 +-- src/common/ieee802_11_common.c | 108 +++++++++++++++++++++++++++++++++ src/common/ieee802_11_common.h | 1 + wpa_supplicant/events.c | 5 +- 5 files changed, 122 insertions(+), 12 deletions(-) diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c index 096ad9906..e3c87f53b 100644 --- a/src/ap/ieee802_11.c +++ b/src/ap/ieee802_11.c @@ -1017,8 +1017,8 @@ static void handle_auth_sae(struct hostapd_data *hapd, struct sta_info *sta, hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_DEBUG, - "start SAE authentication (RX commit, status=%u)", - status_code); + "start SAE authentication (RX commit, status=%u (%s))", + status_code, status2str(status_code)); if ((hapd->conf->mesh & MESH_ENABLED) && status_code == WLAN_STATUS_ANTI_CLOGGING_TOKEN_REQ && @@ -1161,8 +1161,8 @@ static void handle_auth_sae(struct hostapd_data *hapd, struct sta_info *sta, } else if (auth_transaction == 2) { hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_DEBUG, - "SAE authentication (RX confirm, status=%u)", - status_code); + "SAE authentication (RX confirm, status=%u (%s))", + status_code, status2str(status_code)); if (status_code != WLAN_STATUS_SUCCESS) goto remove_sta; if (sta->sae->state >= SAE_CONFIRMED || @@ -1202,8 +1202,8 @@ static void handle_auth_sae(struct hostapd_data *hapd, struct sta_info *sta, } else { hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_DEBUG, - "unexpected SAE authentication transaction %u (status=%u)", - auth_transaction, status_code); + "unexpected SAE authentication transaction %u (status=%u (%s))", + auth_transaction, status_code, status2str(status_code)); if (status_code != WLAN_STATUS_SUCCESS) goto remove_sta; resp = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION; diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c index fdb7ebaa5..a51bcbef8 100644 --- a/src/ap/wpa_auth_ft.c +++ b/src/ap/wpa_auth_ft.c @@ -3089,8 +3089,8 @@ void wpa_ft_process_auth(struct wpa_state_machine *sm, const u8 *bssid, status = res; wpa_printf(MSG_DEBUG, "FT: FT authentication response: dst=" MACSTR - " auth_transaction=%d status=%d", - MAC2STR(sm->addr), auth_transaction + 1, status); + " auth_transaction=%d status=%u (%s)", + MAC2STR(sm->addr), auth_transaction + 1, status, status2str(status)); wpa_hexdump(MSG_DEBUG, "FT: Response IEs", resp_ies, resp_ies_len); cb(ctx, sm->addr, bssid, auth_transaction + 1, status, resp_ies, resp_ies_len); @@ -3448,8 +3448,8 @@ static int wpa_ft_send_rrb_auth_resp(struct wpa_state_machine *sm, u8 *pos; wpa_printf(MSG_DEBUG, "FT: RRB authentication response: STA=" MACSTR - " CurrentAP=" MACSTR " status=%d", - MAC2STR(sm->addr), MAC2STR(current_ap), status); + " CurrentAP=" MACSTR " status=%u (%s)", + MAC2STR(sm->addr), MAC2STR(current_ap), status, status2str(status)); wpa_hexdump(MSG_DEBUG, "FT: Response IEs", resp_ies, resp_ies_len); /* RRB - Forward action frame response to the Current AP */ diff --git a/src/common/ieee802_11_common.c b/src/common/ieee802_11_common.c index e03f59e22..c02b99dbc 100644 --- a/src/common/ieee802_11_common.c +++ b/src/common/ieee802_11_common.c @@ -1386,6 +1386,114 @@ const char * reason2str(u16 reason) } +const char * status2str(u16 status) +{ +#define S2S(s) case WLAN_STATUS_ ## s: return #s; + switch (status) { + S2S(SUCCESS) + S2S(UNSPECIFIED_FAILURE) + S2S(TDLS_WAKEUP_ALTERNATE) + S2S(TDLS_WAKEUP_REJECT) + S2S(SECURITY_DISABLED) + S2S(UNACCEPTABLE_LIFETIME) + S2S(NOT_IN_SAME_BSS) + S2S(CAPS_UNSUPPORTED) + S2S(REASSOC_NO_ASSOC) + S2S(ASSOC_DENIED_UNSPEC) + S2S(NOT_SUPPORTED_AUTH_ALG) + S2S(UNKNOWN_AUTH_TRANSACTION) + S2S(CHALLENGE_FAIL) + S2S(AUTH_TIMEOUT) + S2S(AP_UNABLE_TO_HANDLE_NEW_STA) + S2S(ASSOC_DENIED_RATES) + S2S(ASSOC_DENIED_NOSHORT) + S2S(SPEC_MGMT_REQUIRED) + S2S(PWR_CAPABILITY_NOT_VALID) + S2S(SUPPORTED_CHANNEL_NOT_VALID) + S2S(ASSOC_DENIED_NO_SHORT_SLOT_TIME) + S2S(ASSOC_DENIED_NO_HT) + S2S(R0KH_UNREACHABLE) + S2S(ASSOC_DENIED_NO_PCO) + S2S(ASSOC_REJECTED_TEMPORARILY) + S2S(ROBUST_MGMT_FRAME_POLICY_VIOLATION) + S2S(UNSPECIFIED_QOS_FAILURE) + S2S(DENIED_INSUFFICIENT_BANDWIDTH) + S2S(DENIED_POOR_CHANNEL_CONDITIONS) + S2S(DENIED_QOS_NOT_SUPPORTED) + S2S(REQUEST_DECLINED) + S2S(INVALID_PARAMETERS) + S2S(REJECTED_WITH_SUGGESTED_CHANGES) + S2S(INVALID_IE) + S2S(GROUP_CIPHER_NOT_VALID) + S2S(PAIRWISE_CIPHER_NOT_VALID) + S2S(AKMP_NOT_VALID) + S2S(UNSUPPORTED_RSN_IE_VERSION) + S2S(INVALID_RSN_IE_CAPAB) + S2S(CIPHER_REJECTED_PER_POLICY) + S2S(TS_NOT_CREATED) + S2S(DIRECT_LINK_NOT_ALLOWED) + S2S(DEST_STA_NOT_PRESENT) + S2S(DEST_STA_NOT_QOS_STA) + S2S(ASSOC_DENIED_LISTEN_INT_TOO_LARGE) + S2S(INVALID_FT_ACTION_FRAME_COUNT) + S2S(INVALID_PMKID) + S2S(INVALID_MDIE) + S2S(INVALID_FTIE) + S2S(REQUESTED_TCLAS_NOT_SUPPORTED) + S2S(INSUFFICIENT_TCLAS_PROCESSING_RESOURCES) + S2S(TRY_ANOTHER_BSS) + S2S(GAS_ADV_PROTO_NOT_SUPPORTED) + S2S(NO_OUTSTANDING_GAS_REQ) + S2S(GAS_RESP_NOT_RECEIVED) + S2S(STA_TIMED_OUT_WAITING_FOR_GAS_RESP) + S2S(GAS_RESP_LARGER_THAN_LIMIT) + S2S(REQ_REFUSED_HOME) + S2S(ADV_SRV_UNREACHABLE) + S2S(REQ_REFUSED_SSPN) + S2S(REQ_REFUSED_UNAUTH_ACCESS) + S2S(INVALID_RSNIE) + S2S(U_APSD_COEX_NOT_SUPPORTED) + S2S(U_APSD_COEX_MODE_NOT_SUPPORTED) + S2S(BAD_INTERVAL_WITH_U_APSD_COEX) + S2S(ANTI_CLOGGING_TOKEN_REQ) + S2S(FINITE_CYCLIC_GROUP_NOT_SUPPORTED) + S2S(CANNOT_FIND_ALT_TBTT) + S2S(TRANSMISSION_FAILURE) + S2S(REQ_TCLAS_NOT_SUPPORTED) + S2S(TCLAS_RESOURCES_EXCHAUSTED) + S2S(REJECTED_WITH_SUGGESTED_BSS_TRANSITION) + S2S(REJECT_WITH_SCHEDULE) + S2S(REJECT_NO_WAKEUP_SPECIFIED) + S2S(SUCCESS_POWER_SAVE_MODE) + S2S(PENDING_ADMITTING_FST_SESSION) + S2S(PERFORMING_FST_NOW) + S2S(PENDING_GAP_IN_BA_WINDOW) + S2S(REJECT_U_PID_SETTING) + S2S(REFUSED_EXTERNAL_REASON) + S2S(REFUSED_AP_OUT_OF_MEMORY) + S2S(REJECTED_EMERGENCY_SERVICE_NOT_SUPPORTED) + S2S(QUERY_RESP_OUTSTANDING) + S2S(REJECT_DSE_BAND) + S2S(TCLAS_PROCESSING_TERMINATED) + S2S(TS_SCHEDULE_CONFLICT) + S2S(DENIED_WITH_SUGGESTED_BAND_AND_CHANNEL) + S2S(MCCAOP_RESERVATION_CONFLICT) + S2S(MAF_LIMIT_EXCEEDED) + S2S(MCCA_TRACK_LIMIT_EXCEEDED) + S2S(DENIED_DUE_TO_SPECTRUM_MANAGEMENT) + S2S(ASSOC_DENIED_NO_VHT) + S2S(ENABLEMENT_DENIED) + S2S(RESTRICTION_FROM_AUTHORIZED_GDB) + S2S(AUTHORIZATION_DEENABLED) + S2S(FILS_AUTHENTICATION_FAILURE) + S2S(UNKNOWN_AUTHENTICATION_SERVER) + S2S(UNKNOWN_PASSWORD_IDENTIFIER) + } + return "UNKNOWN"; +#undef S2S +} + + int mb_ies_info_by_ies(struct mb_ies_info *info, const u8 *ies_buf, size_t ies_len) { diff --git a/src/common/ieee802_11_common.h b/src/common/ieee802_11_common.h index e402e9344..930d45420 100644 --- a/src/common/ieee802_11_common.h +++ b/src/common/ieee802_11_common.h @@ -186,6 +186,7 @@ struct wpabuf * mb_ies_by_info(struct mb_ies_info *info); const char * fc2str(u16 fc); const char * reason2str(u16 reason); +const char * status2str(u16 status); struct oper_class_map { enum hostapd_hw_mode mode; diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 0baef0fe2..71b107483 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -4246,8 +4246,9 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, wpa_supplicant_event_assoc_auth(wpa_s, data); if (data) { wpa_msg(wpa_s, MSG_INFO, - WPA_EVENT_SUBNET_STATUS_UPDATE "status=%u", - data->assoc_info.subnet_status); + WPA_EVENT_SUBNET_STATUS_UPDATE "status=%u (%s)", + data->assoc_info.subnet_status, + status2str(data->assoc_info.subnet_status)); } break; case EVENT_DISASSOC: