From patchwork Sat Apr 13 16:52:23 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: 1085216 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="jt7NXbUC"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ZE21d5Qz"; 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 44hR7v1dRJz9s4Y for ; Sun, 14 Apr 2019 06:24:38 +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=jt7NXbUCbhwmlU 03Uozz+cbk2eO7j18urIPIscot9RLkRClNGEX/rRwBtxM4IFoHYDG1vUtvktEiKB9HTNzzrFsiX/d FKZxCJn2BtfJ66bW77tdNs0lMPp+6lEFpbmDvvLw+SSWBqREuMaJwWeKBIZdGKsSMcyZwT2pX72xP hkS1zXNFZLLtcpkjKWcieyB0VpWv4JcUwDQLREdfxAN7GSF2YNPHqYSar/EJS98L9VBHTteiyy4fm 3vf2K8+47Yk+Yqbhv8em1HXsspmqBCQGe5ie5wUBrDxlbvR+zdgXLiqSNhfaBa4bLX81cK1EWTr+/ PNooE1QAnlrwILC1o2kQ==; 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 1hFPCN-0004PN-Dn; Sat, 13 Apr 2019 20:24:27 +0000 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hFLtO-0006ON-Jj for hostap@lists.infradead.org; Sat, 13 Apr 2019 16:52:40 +0000 Received: by mail-pg1-x541.google.com with SMTP id k3so6623766pga.6 for ; Sat, 13 Apr 2019 09:52:37 -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=ZE21d5QzxytJ707k0kgz/azps9L8NR6lWJ1x+M2xM4yGQDlUt5OjoLdCZQzsNAjMY8 QCb61aW8JS4vctmfpw/nwe/1JMDtfrZ8aVnbEsHKDWuvGLxXHXOpB3uwOStiJNhCtImC sY20UUEPe8pIcB+1IoMVlVAHF6z3fYwtDzn8g= 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=dLUd/epEtq1+zyhu+Ync4xnz32ogHn2zJkSafVA1PHfmc6FNFy7Orf7OniMNNTi4YD B2BXdaCqPDQFT0fqHz6gtythcrOJnLzjdLkbEFvSmCc4nGLoKVvI2j/RQicSWJU98ZXZ UIkSRUfZUPlgvjHL1iauG1pexDGnvKx1LaZaUdclBVKH1FiWulaWp3SIxAAQKzieoFM5 ZNSUsda+mWhB3dvzJKS8BCZb2t+pM/cNyHH2fJozwimgcZX5Ot7SMQDZIe+2jCoQ0oXP M12Slqzc5hW6tL6n+DAofEZKYPKvcVVKXAuDRITb/PaSV0U/Zpql1oJ2VB9utCOiTGXR cwgg== X-Gm-Message-State: APjAAAXqUTvOvGNa4xQ6sirV2Jlm+aInrDo6L8CpMw+rb5ARaPWzNbLJ mI0PV+sxdtYe2SSD5/24F3pATwz9BPc= X-Google-Smtp-Source: APXvYqx8MnB47u7Qx4YBJqqGC8+OW91sDPQfgTYX84sAkcufs+IA/1CMG0gSRoe8S+dJInjjfkDsFQ== X-Received: by 2002:a63:330e:: with SMTP id z14mr58956411pgz.4.1555174357142; Sat, 13 Apr 2019 09:52:37 -0700 (PDT) Received: from akhouderchah.mtv.corp.google.com ([2620:15c:202:201:522e:e4c8:faf6:771]) by smtp.gmail.com with ESMTPSA id n65sm123624324pfb.160.2019.04.13.09.52.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 09:52:36 -0700 (PDT) From: akhouderchah@chromium.org To: hostap@lists.infradead.org, j@w1.fi Subject: [PATCH] Add 802.11 reason code strings Date: Sat, 13 Apr 2019 09:52:23 -0700 Message-Id: <20190413165223.218948-1-akhouderchah@chromium.org> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog In-Reply-To: <20190413082836.GA5798@w1.fi> References: <20190413082836.GA5798@w1.fi> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190413_095238_653302_E6C5A49C X-CRM114-Status: GOOD ( 12.63 ) 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:541 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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: Sat, 13 Apr 2019 13:24:24 -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 ||