From patchwork Tue Nov 26 09:10:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=0hVCyEVU; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=Sl8Dj01H; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH7m11Vwz1yQf for ; Tue, 26 Nov 2024 20:18:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tz/nlYElEjq3HRKsTzV6i9w1ryGiewK17CssohNesJc=; b=0hVCyEVUShjBcl LY49y/OdCgEgqTkp3aUD3Lhw8TNTKFWoVH3otlb8ByqWc8YDWjRmCtca5867yj185fGrxJa5G8Ww8 qlUXF2TpHPbnZ438kzLHVavF/CekVym+Xh5WD/d2BFEm1trsu74E3gRrGX+cBNInBdUrUXZVwsHLE 4XDJlcp+LqDFnoK21VH9sOYjjuzvFkyfFY8iqeDdH7GqEAar1Yq9sgSuMl1fUQkZZeqwKQuGyYxVq 2oqc7ta2MS9Ju943IOBjGAQLZpgwD3+Lw6dffrFeU7XJHu4ae1Cmf08zJKDiAYXigAJ0GASR8G1Y/ F7YwyvAxC5omxtusfYVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFriL-0000000A4Yr-09eL; Tue, 26 Nov 2024 09:18:33 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFrhn-0000000A4RS-3uvi for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612680; x=1764148680; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wB1gqcoEEMrcLlZohe5c7aIy55fRdO+eHKnHzELtNGU=; b=Sl8Dj01H6u97D8g8gEKp1RahuEsW0bZxwtAtZ+Rr4ZvYBEhuQLZSUG3u rs5eI0zrCz28Wo95NItPOK/gSh0GfFOqpOIyPlzdjwn2u8jgzYo4SdJHM 0XDpffKfnBWlZLhrsXUr8dOdBbnjS9A4bwZuOIb3Xz/jp+A/p3QsIPl6I BPSO9umHgHlyIHoIDQMOAvg8gWfaeL22CZZ0GlPQzGKrVDEIUbhFITaOb 5CGwnlyrftFpO2LGmBlU0IqSa1V5f5A5GEtWZylKrROz5oROv3Xw7CC36 HOVlAi3uabh2Fu1WQI9ZV8rtyaj7V06Au0To9NKDv12BCiHHmQTlYQ1rm A==; X-CSE-ConnectionGUID: etsWT3TkRwmsBpigFxSFLw== X-CSE-MsgGUID: goWgRsogRhWPa+vPF9ID4Q== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909300" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909300" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:17:59 -0800 X-CSE-ConnectionGUID: LBkW97UaQOOR+9bm3IsHNg== X-CSE-MsgGUID: scp0mqgzTk2Qt4mAgT13RQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364363" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:17:59 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 01/11] NAN: Remove excessive print Date: Tue, 26 Nov 2024 11:10:10 +0200 Message-ID: <20241126091021.3561063-2-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011800_019613_63C41A30 X-CRM114-Status: GOOD ( 10.70 ) X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: As it polutes the log too much. Signed-off-by: Andrei Otcheretianski --- src/common/nan_de.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/nan_de.c b/src/common/nan_de.c index c38fd9ba60..e4c5f0e435 100644 --- a/src/common/nan_de.c +++ b/src/common/nan_de.c @@ -673,7 +673,7 @@ static void nan_de_timer(void *eloop_ [...] Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org As it polutes the log too much. Signed-off-by: Andrei Otcheretianski --- src/common/nan_de.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/nan_de.c b/src/common/nan_de.c index c38fd9ba60..e4c5f0e435 100644 --- a/src/common/nan_de.c +++ b/src/common/nan_de.c @@ -673,7 +673,7 @@ static void nan_de_timer(void *eloop_ctx, void *timeout_ctx) if (next == 0) next = 1; - wpa_printf(MSG_DEBUG, "NAN: Next timer in %u ms", next); + eloop_register_timeout(next / 1000, (next % 1000) * 1000, nan_de_timer, de, NULL); } From patchwork Tue Nov 26 09:10:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015261 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=M3U/E6yg; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=jOzS0VBi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH7p2v5rz1yQh for ; Tue, 26 Nov 2024 20:19:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UYNcJDx3q01OSMsJIOlkg9+CDhmk3b43yscVCT6Dciw=; b=M3U/E6ygdQ4f1i aeJCAmT4notcDjKr1mC/OptJpxsTZlA6Dkfnly2U8EjeAVxtBYXMXc3TmO83airvm5TXXTpJXzzZK uH4a37bRFxN+KMFm6qU8FmYfWMqvu+aFHEwazO78T17v9mvxjkfOy5sLLDS1vqvvskn9mLScOw/m3 M/sfUjyuJsx5q9EIGS1qXgKI6NZ02BGqJXUr9WUwQo45GI758tpp4zncThdQBnZ8uEX4M49APd8uz U75aQfLUUtydEYnVFQgtJ6cr2Cz8nxfDAe0ykN9CWQrWaEblON5ijQd3yJFiurKiviny46IpkfdlE hC8vOVaBjyd0IeFZcOKQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFriM-0000000A4ZX-0JHk; Tue, 26 Nov 2024 09:18:34 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFrhr-0000000A4RS-37JZ for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612683; x=1764148683; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G4PBB3UXrJqYV0+NNIIsQ25/qOJmhezr9k4DkthlguU=; b=jOzS0VBiqj4rOQghlWX8f2rkwPrIkYz1Jw3QXYV4Lc9NC46aCb3qhMvh 9Z805Uz5JADRvrUkfBCAwnKnt3f0D5cfwEmGEsU28ni/9y5vLg3/e3non vHLAZq4qDwqTUsmYnejNG2prQO/ssNAK0udgp46/Mz7F4TDwGWArPdPem Bt6k1n+tgeK3yT4bF/LCGkSqXzWOZ6dUK6Z+dO915eWDvrbBqEpWgh77I 23Gyo6me7nHg+sme2RnF+ukDm3d5LfQXaMDQZucbAX8VoA5kSj+KhRrc4 plZzYm+jm2lXW6dquX9W6DgP1c5/dXYs4KnTYnq8eM06I/8G8dgsAQClT g==; X-CSE-ConnectionGUID: 9UbOSa7rS8SsqPGaMohYiw== X-CSE-MsgGUID: tTwbTxdvQMOLJv99rbb75w== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909302" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909302" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:03 -0800 X-CSE-ConnectionGUID: PhyESh9NRJ+ItaHJgG3yug== X-CSE-MsgGUID: U8SQnpY0TnSBRkcrssvTew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364386" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:03 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 02/11] P2P2: Report p2p2 information in P2P-DEVICE-FOUND event Date: Tue, 26 Nov 2024 11:10:11 +0200 Message-ID: <20241126091021.3561063-3-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011803_829033_75BADAB8 X-CRM114-Status: UNSURE ( 9.22 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Add PCEA capability information, supported PASN types and bootstrap methods in P2P-DEVICE-FOUND event. This is needed to be able to start P2P2 pairing with the discovered peer. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/p2p_supplicant.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add PCEA capability information, supported PASN types and bootstrap methods in P2P-DEVICE-FOUND event. This is needed to be able to start P2P2 pairing with the discovered peer. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/p2p_supplicant.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index dab64971e5..99ee64f467 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -3047,7 +3047,9 @@ static void wpas_dev_found(void *ctx, const u8 *addr, wpa_msg_global(wpa_s, MSG_INFO, P2P_EVENT_DEVICE_FOUND MACSTR " p2p_dev_addr=" MACSTR " pri_dev_type=%s name='%s' config_methods=0x%x " - "dev_capab=0x%x group_capab=0x%x%s%s%s new=%d", + "dev_capab=0x%x group_capab=0x%x%s%s%s new=%d " + "pcea_cap_info=0x%x, bootstrap_methods=0x%x, " + "pasn_type=0x%x", MAC2STR(addr), MAC2STR(info->p2p_device_addr), wps_dev_type_bin2str(info->pri_dev_type, devtype, sizeof(devtype)), @@ -3056,7 +3058,9 @@ static void wpas_dev_found(void *ctx, const u8 *addr, wfd_dev_info_hex ? " wfd_dev_info=0x" : "", wfd_dev_info_hex ? wfd_dev_info_hex : "", info->vendor_elems ? " vendor_elems=1" : "", - new_device); + new_device, info->pcea_cap_info, + info->pairing_config.bootstrap_methods, + info->pairing_config.pasn_type); done: os_free(wfd_dev_info_hex); From patchwork Tue Nov 26 09:10:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=qz0bZCyg; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=MDO8cy0Z; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH7m15J2z1yQg for ; Tue, 26 Nov 2024 20:18:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RZdzteVcprubQ4pbRiVLJPT46gCgyW1oVVJ1o1n2fjg=; b=qz0bZCygo9qu3W gV86whxkPnr4AGzxSC6+jQTo9UeUJbnNu71htOLUcXz6HFvsns9Ogk5uh3sIgHEByQRQVTJiiRPKK 7rnKc/xCXvi3Rgirnp4joVkCgxpRV+4BW5FoZYh1QajnLqN6Y7Kw6/+1lX6zjMzjWH9FzSZChmZKa oThZCxNGqpviraTAyqmjvzvGInm+ToEGUf5obXhMPgwH7+uYpWKB9xzznkOjUkqMbVfMFKFCfgHJx jNq2PrZz1BthouWR2QmiT69hin1UlZpaC71t4SYRjBQqcV8AIkjr7K9bjja7S0Ogv5WJiSZNgi7py k1/ykX7YlrDc49djcWhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFriN-0000000A4aC-1AYW; Tue, 26 Nov 2024 09:18:35 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFrhw-0000000A4RS-3jq3 for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612689; x=1764148689; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WM6pQVdIAQ0YWmCBe4RHKrrX58fMp+hfHqjxjYJL8Uc=; b=MDO8cy0ZIujTYBcA3/pBK5PgEkgfHhQhTnJdSoejvGM8tg/Ulg57ahHG dA6MiywCqK7ZVXoo5sj/pApsS4341VgbVNwtdQ17u8WhxZ9V5tG2tWTit el8RA9YqMqDsToqYXdoK5yyMeC3VPkCvkMeGBtCbjDcEwYFCpXIWK45zr YC/rljBA2G/PGuXBkwqA0+B60QwT0h6+05jU6xnwBW4/omzUAqYERBZRZ j5WIbVRaoqsHmWDSH55sb95BIftwA8FVkuU9ls7MabBj9DZbaa6vJ4TEU alqD1URGqnPttiHyRVSC76sygJ6M/13CAC/34/zdh3AxaMxjagVit0hDl Q==; X-CSE-ConnectionGUID: PCW5TnJVTF6R0XE23FRiYg== X-CSE-MsgGUID: JWsIFn79QHewL/5LIzfzdQ== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909305" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909305" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:08 -0800 X-CSE-ConnectionGUID: m2eBQSoCTiKKwR/aAykkYw== X-CSE-MsgGUID: Da0JBl6mSTmEDJuhN5p25A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364400" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:08 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 03/11] P2P2: Make sure password is set when using non opportunistic methods Date: Tue, 26 Nov 2024 11:10:12 +0200 Message-ID: <20241126091021.3561063-4-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011808_997389_519BD01D X-CRM114-Status: UNSURE ( 8.61 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Otherwise the flow would continue, eventually falling back to PASN method instead of SAE even if not allowed in PBMA. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/ctrl_iface.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Otherwise the flow would continue, eventually falling back to PASN method instead of SAE even if not allowed in PBMA. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/ctrl_iface.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 3d15a74534..d30707fbbc 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -6356,6 +6356,30 @@ static int p2p_ctrl_asp_provision(struct wpa_supplicant *wpa_s, char *cmd) } +static bool bootstrap_pwd_required(u16 bootstrap) +{ + switch (bootstrap) { + case P2P_PBMA_OPPORTUNISTIC: + return false; + case P2P_PBMA_PIN_CODE_DISPLAY: + case P2P_PBMA_PASSPHRASE_DISPLAY: + case P2P_PBMA_QR_DISPLAY: + case P2P_PBMA_NFC_TAG: + case P2P_PBMA_PIN_CODE_KEYPAD: + case P2P_PBMA_PASSPHRASE_KEYPAD: + case P2P_PBMA_QR_SCAN: + case P2P_PBMA_NFC_READER: + return true; + case P2P_PBMA_SERVICE_MANAGED: + case P2P_PBMA_HANDSHAKE_SKIP: + default: + break; + } + + return false; +} + + static int p2p_ctrl_connect(struct wpa_supplicant *wpa_s, char *cmd, char *buf, size_t buflen) { @@ -6517,6 +6541,12 @@ static int p2p_ctrl_connect(struct wpa_supplicant *wpa_s, char *cmd, } } + if (bootstrap_pwd_required(bootstrap) && !password) { + wpa_printf(MSG_DEBUG, + "CTRL_IFACE: This P2P2 Bootstrap method requires password"); + return -1; + } + new_pin = wpas_p2p_connect(wpa_s, addr, pin, wps_method, persistent_group, automatic, join, auth, go_intent, freq, freq2, persistent_id, From patchwork Tue Nov 26 09:10:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Q7X7Hmu1; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=VaH2rpbQ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH7m0xM6z1yQc for ; Tue, 26 Nov 2024 20:18:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JW1NcwgDKH0NSjM9dFpwxwilIH1G6YBBQLcapJ/YhsU=; b=Q7X7Hmu1QXhcHh 0Z5TFez76SYOBL70Tg91T75ICetiTMbONMOxWxlIENSetQ6tWPTyBxuUlsNP+KMjnEvSQw1VZo1wi gvUik+YIYoHbAiLgiir85ht+Q7e+h2swqC0kFr23cvBQqmmFuhJGhXQ7idkOVIphnWNQLzVVALyWf z77A47WzSnkj+l8gS6I3f7jJe29HaMaU707WUn9GXGep9z70WZxwDjy6PjkyU9Uegq2kiC+/17qc1 DVpikpAxRLNqf4jyVj9xpPHmseQJMjZi44VOE2nCvqjxntM2sEQQNICOROo76ewqiTcDoV0HP8KDa NoLHCkP3n/EB0db02AMw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFriO-0000000A4aq-1Xwe; Tue, 26 Nov 2024 09:18:36 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFrhz-0000000A4RS-0lDe for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612691; x=1764148691; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ILYxl7oFyRMdHZDpIm2+3PgNepelvshbWoNK42F7YAQ=; b=VaH2rpbQPm75CS3ww0wnJcRC5IS9Wvtca+Y8/D/YwBvlgSyRM8aUvpHv vrDdTPTUPh99Newah6GZqRBgkJMB1nuCNJEihVOVC8Dt/bHkrWeLf8ULR /sDltm9i5bkZ0V3ALdAl97lxviRtSF/bHVUJOh27eBXYx7LN/MGIBQcq6 JUVGA4woSnserccqCShRPQjruXDbkvqdG2e+UUKAouEPJGXJGt1/sCkj+ 8PEM0ohApJWRscjRqf9cB+6GNh2IRGfU0sZylFXURE8tXoOOBuHn+IyrS vGW4hB4i3YF5a9DNWDvVDZ7mNfRp17i10XZA375pCraL1+C7YkcDo+QVi w==; X-CSE-ConnectionGUID: otFFfo3yS2apHFcN85G1pA== X-CSE-MsgGUID: XPZeLXjsSiSisN0c+s/KPw== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909306" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909306" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:11 -0800 X-CSE-ConnectionGUID: ZJ1PwC0iRXmQho4ZKNda7Q== X-CSE-MsgGUID: oG45ux3FSXuUM/+u+yiFqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364405" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:10 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 04/11] P2P2: Fix frequency selection for auto GO join Date: Tue, 26 Nov 2024 11:10:13 +0200 Message-ID: <20241126091021.3561063-5-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011811_270253_1EFF937B X-CRM114-Status: UNSURE ( 7.94 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: When reusing an existing GO for pairing, force its frequency in GO negotiation. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/p2p_supplicant.c | 2 ++ 1 file changed, 2 insertions(+) Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org When reusing an existing GO for pairing, force its frequency in GO negotiation. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/p2p_supplicant.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 99ee64f467..f87da3ef6a 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -6863,6 +6863,8 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr, ssid = NULL; continue; } + + force_freq = ifs->ap_iface->freq; break; } p2p_set_go_role(wpa_s->global->p2p, true); From patchwork Tue Nov 26 09:10:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=XHcG7ANz; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=fRc/lQuL; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH7m0zK6z1yQd for ; Tue, 26 Nov 2024 20:18:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MykFnK9jwva6NboXXUeeIYf5pihLaERTxfQcp2pkc9Q=; b=XHcG7ANzQbsOOi MV+JSWAIJDfgyPi+jtEY1UshEgGcByRHG7SxcbVZWT7Wvyov7Lw6M2OfoyOXofo9xMmE0+oJmZVN0 7GCK4olSVBWj4rYi9IaiHRG94CCoFYbCYeaWFnkBZ4c4qzjWh9UinonfW+8yer+DPaBCDnK8x3ap8 QrgZsFdruROr57/Ipeu1avSn3q6KNcp5y6CSvsyVTdON+nT0IJBwTEvqc/sf4XMqjOWCVzoXAQZOz webFJ1eRvUKCILEgthrk5mMc0wHIz058FnkE99wlAXN/ew0BEK0+SHxt3hmfSNhQ1dsfY13zr46Mo VyljSOtSDEafrKZ2fQpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFriP-0000000A4bL-25TY; Tue, 26 Nov 2024 09:18:37 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFri2-0000000A4RS-1MjR for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612694; x=1764148694; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dOinYKRQ2nvzicocU7AexOJokHFIPravTgIMDWZe3yk=; b=fRc/lQuL86rbBmCp0Z21YiK6M2tXt6IG4IRP8eRr37SDZcyDIBDYqGuh 2qDZlNzfubRsc14vdcaZ+KOMMbh30QAifFp9RwGGAf6oiEpBnJeFcIH2J 5+1tyTTJtbXCQHw7MZD4R8jgjyZ0ZKbFG9+sQ88Yk4U/BF8bztR1ZPtWB ZvPNlEzZqzOd9SRz6meEe3qkHwzGlv6EEl0921aauYr1zWOK65ei5Tnfn h4o4T8Z+49VjaUsKxiFEx2B2vHcNZ/5tcxNFlCp+pyHQ9m4BhNOuoEI1U I1A0JID4LWlzbrsgmdwAxGnAgx3x9Hf9u8jmulMjpOGbwXTaeo4AfuDuj g==; X-CSE-ConnectionGUID: hOmUKxnUQgOwmQ3k3DQ4Pg== X-CSE-MsgGUID: SGdzxGOMRJCdqFQl7q9dIQ== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909308" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909308" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:14 -0800 X-CSE-ConnectionGUID: LS8CztK+TMeotouY88jb9w== X-CSE-MsgGUID: 9OF7zpp1RUm86I7krCNOlg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364420" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:13 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 05/11] driver_nl80211: Allow PASN auth frames on P2P device interface Date: Tue, 26 Nov 2024 11:10:14 +0200 Message-ID: <20241126091021.3561063-6-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011814_413947_630EADEF X-CRM114-Status: GOOD ( 10.61 ) X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This is required for PASN based pairing used in P2P2. Signed-off-by: Andrei Otcheretianski --- src/drivers/driver_nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This is required for PASN based pairing used in P2P2. Signed-off-by: Andrei Otcheretianski --- src/drivers/driver_nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index b26d1c1215..6ca0b7a204 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -4400,7 +4400,8 @@ static int wpa_driver_nl80211_send_mlme(struct i802_bss *bss, const u8 *data, encrypt = 0; } - if (is_sta_interface(drv->nlmode) && + if ((is_sta_interface(drv->nlmode) || + drv->nlmode == NL80211_IFTYPE_P2P_DEVICE) && WLAN_FC_GET_TYPE(fc) == WLAN_FC_TYPE_MGMT && WLAN_FC_GET_STYPE(fc) == WLAN_FC_STYPE_AUTH) { if (freq == 0 && From patchwork Tue Nov 26 09:10:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=SMyO60z2; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=SKaTANEY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH7m0cW0z1yCv for ; Tue, 26 Nov 2024 20:18:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7LS+RppakPx3naGHjOcmBwo2F4d4akyk+5htSYwpimM=; b=SMyO60z2dGXGr9 eY65qgwdLyKxv0n5PLrRYaQfzTPp5nabdJQOEj6EfSKakDSA0ZGSQoJkAAMrr+3Pj5/tkF39mpIaS KmoJwxrQ9djBhbevFCyKZB60U2YZ89gPaajz9lCaQc/0bVGvxXiTeAhK6vALMoiWYKC9IJg07qPRO F0/hlptCJeNmyH0A01iAjYnbVQCpdqNvmOR/R5n1SuUFof3A3d4fhqQvFKxOTZ8o3lY1tQzOnQ6CE rcv4sDW49iZHZexE+vRdG3+Nx7ZPyCSk05uGxOrykLtdoZmnuaGvrc2DXAOec0EJI6H3D26HTrJMb KXn7x0l7w5xsKScHcBdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFriQ-0000000A4bq-2KE1; Tue, 26 Nov 2024 09:18:38 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFri5-0000000A4RS-2Ij4 for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612697; x=1764148697; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dUGPEsRh1EHapp8rK0+ev6LV8gTKAO3RR10KwtxUgP8=; b=SKaTANEYd71UJvBC2NJe84Zi1sp7pFmHDyDXhFH9CJ1Pamou+a7/Ie4M xIWlMdkh2Ihm0HfQ0Tu5KVJE3og/KYFGK6Zgf919087aT9atjeGUIN4oi AL2unU0QuwLoiPVwDMOdU5tXXq0nmsI1ZuYv09I5bEbfoPz6AqZqGOi6U qylMmb4l7GETsD+EZik+twNs1I5aLw/AHBQ/I2deZ+QdYdO6ea6hSc2vU wiT0unU8qhZVR1NJkiQm7o734l2gzGJM+V2gIZBHwSRw7dj8qTagO0L3y Cy4GltsOWAvixQZn3I+CPG8g+V/rC+VdhIhaQe57su/I+46JTc+lKOrCh A==; X-CSE-ConnectionGUID: S0NM5Wz2TjeOGhTRK9G/Og== X-CSE-MsgGUID: fJ6z9lXqQk6V6pR1kMeO3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909311" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909311" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:17 -0800 X-CSE-ConnectionGUID: /2kTYajjSw6cyu/Jd+qgkQ== X-CSE-MsgGUID: +zQi/nzjQBqeFZjv7ZuBqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364434" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:17 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 06/11] P2P2: Use global interface for USD Date: Tue, 26 Nov 2024 11:10:15 +0200 Message-ID: <20241126091021.3561063-7-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011817_638694_1EDC3B11 X-CRM114-Status: UNSURE ( 8.59 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Redirect NAN USD command and events to global interface, so it can be used for P2P. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/ctrl_iface.c | 1 + wpa_supplicant/notify.c | 40 ++++++++++++++++++ 2 files changed, 20 inse [...] Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Redirect NAN USD command and events to global interface, so it can be used for P2P. Signed-off-by: Andrei Otcheretianski --- wpa_supplicant/ctrl_iface.c | 1 + wpa_supplicant/notify.c | 40 ++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index d30707fbbc..a486350f2b 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -14172,6 +14172,7 @@ static char * wpas_global_ctrl_iface_redir_p2p(struct wpa_global *global, "NFC_REPORT_HANDOVER ", "P2P_ASP_PROVISION ", "P2P_ASP_PROVISION_RESP ", + "NAN_", #ifdef CONFIG_AP "STA ", "STA-NEXT ", diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index b894a4916d..06e006963e 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -1106,11 +1106,11 @@ void wpas_notify_nan_discovery_result(struct wpa_supplicant *wpa_s, return; if (ssi) wpa_snprintf_hex(ssi_hex, 2 * ssi_len + 1, ssi, ssi_len); - wpa_msg(wpa_s, MSG_INFO, NAN_DISCOVERY_RESULT - "subscribe_id=%d publish_id=%d address=" MACSTR - " fsd=%d fsd_gas=%d srv_proto_type=%u ssi=%s", - subscribe_id, peer_publish_id, MAC2STR(peer_addr), - fsd, fsd_gas, srv_proto_type, ssi_hex); + wpa_msg_global(wpa_s, MSG_INFO, NAN_DISCOVERY_RESULT + "subscribe_id=%d publish_id=%d address=" MACSTR + " fsd=%d fsd_gas=%d srv_proto_type=%u ssi=%s", + subscribe_id, peer_publish_id, MAC2STR(peer_addr), + fsd, fsd_gas, srv_proto_type, ssi_hex); os_free(ssi_hex); wpas_dbus_signal_nan_discovery_result(wpa_s, srv_proto_type, @@ -1133,11 +1133,11 @@ void wpas_notify_nan_replied(struct wpa_supplicant *wpa_s, return; if (ssi) wpa_snprintf_hex(ssi_hex, 2 * ssi_len + 1, ssi, ssi_len); - wpa_msg(wpa_s, MSG_INFO, NAN_REPLIED - "publish_id=%d address=" MACSTR - " subscribe_id=%d srv_proto_type=%u ssi=%s", - publish_id, MAC2STR(peer_addr), peer_subscribe_id, - srv_proto_type, ssi_hex); + wpa_msg_global(wpa_s, MSG_INFO, NAN_REPLIED + "publish_id=%d address=" MACSTR + " subscribe_id=%d srv_proto_type=%u ssi=%s", + publish_id, MAC2STR(peer_addr), peer_subscribe_id, + srv_proto_type, ssi_hex); os_free(ssi_hex); wpas_dbus_signal_nan_replied(wpa_s, srv_proto_type, publish_id, @@ -1157,9 +1157,9 @@ void wpas_notify_nan_receive(struct wpa_supplicant *wpa_s, int id, return; if (ssi) wpa_snprintf_hex(ssi_hex, 2 * ssi_len + 1, ssi, ssi_len); - wpa_msg(wpa_s, MSG_INFO, NAN_RECEIVE - "id=%d peer_instance_id=%d address=" MACSTR " ssi=%s", - id, peer_instance_id, MAC2STR(peer_addr), ssi_hex); + wpa_msg_global(wpa_s, MSG_INFO, NAN_RECEIVE + "id=%d peer_instance_id=%d address=" MACSTR " ssi=%s", + id, peer_instance_id, MAC2STR(peer_addr), ssi_hex); os_free(ssi_hex); wpas_dbus_signal_nan_receive(wpa_s, id, peer_instance_id, peer_addr, @@ -1186,10 +1186,9 @@ void wpas_notify_nan_publish_terminated(struct wpa_supplicant *wpa_s, int publish_id, enum nan_de_reason reason) { - wpa_msg(wpa_s, MSG_INFO, NAN_PUBLISH_TERMINATED - "publish_id=%d reason=%s", - publish_id, nan_reason_txt(reason)); - + wpa_msg_global(wpa_s, MSG_INFO, NAN_PUBLISH_TERMINATED + "publish_id=%d reason=%s", + publish_id, nan_reason_txt(reason)); wpas_dbus_signal_nan_publish_terminated(wpa_s, publish_id, nan_reason_txt(reason)); } @@ -1199,10 +1198,9 @@ void wpas_notify_nan_subscribe_terminated(struct wpa_supplicant *wpa_s, int subscribe_id, enum nan_de_reason reason) { - wpa_msg(wpa_s, MSG_INFO, NAN_SUBSCRIBE_TERMINATED - "subscribe_id=%d reason=%s", - subscribe_id, nan_reason_txt(reason)); - + wpa_msg_global(wpa_s, MSG_INFO, NAN_SUBSCRIBE_TERMINATED + "subscribe_id=%d reason=%s", + subscribe_id, nan_reason_txt(reason)); wpas_dbus_signal_nan_subscribe_terminated(wpa_s, subscribe_id, nan_reason_txt(reason)); } From patchwork Tue Nov 26 09:10:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=kap/a+Jt; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=RHKUru5o; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH8m5wyxz1yCv for ; Tue, 26 Nov 2024 20:19:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=484PJEO4IBczIibWAExG5CWheRISZlN9QrO5XgE2bzU=; b=kap/a+JtTtXAHr Hwu7iO8S3/FQSqWPH16hhtFjsJEJ/avI4JVXAQmJ5G1cklYfWZRFDTVjUDyGBEa1HIfopCn5Lzsaa DdUZmv7hard3M1MP9c9uevysjpVEfRDixAN716A7NzH7lHk3MBJZixxnsIMUe0YuuacLXKAjGF8Mg pCtPr1PaPWobyi2p8Ai4DttfPMzbU9jNKsU6MkCN+PQBfZFxxE+cwa538OPaXWqOtENwjoALGT7Kf GQZK1G0ENWtavs/TFyaLrRXbq7gKOHKX1aiOdzOgA4OcUgho5364zjRC5C0BPaZvHbIgLGu5XtshQ kDuVvPbZj1rfVYQJDfmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFrjI-0000000A5Lt-1xUo; Tue, 26 Nov 2024 09:19:32 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFri9-0000000A4RS-0sZm for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612701; x=1764148701; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4UZdatXO92c5KVHq2RHsQTOviOjNzgGWP8z0SYXdK/M=; b=RHKUru5oGEak7Uibww69hflXSPJJxBOVrteMNh5gTOA4iORPkCmHTkZl 8o7yZRqurwi2QbN0EnY8vUXySS7UsW7aVPol/PaoIepaMOzYhPw6Ri7Jt A8/zOL6uvCDdcEtnXbGpbI2yua2btLvU4EpG3bReAWV/mKQ2PaOrdbPN6 kWPIaSIhyQHFzA2JVg6j0B9D8oU0tQvOSx/oJEpqJmYICI3rzj7sBhsoi WaVtS1CLw6oJickI8COBZa1feydg0tOR1dWArEeGHtPUA3VQnxwsY5uT9 zvlZyPSo8g0u1T0FRP4GOcDIqXLl2AxaONZN/2I9OfdBNI9WojCOtLDi1 g==; X-CSE-ConnectionGUID: T/6V4CcRQ+qv3JfkIA1yvw== X-CSE-MsgGUID: SgosmEApTJOU73X7SivOBg== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909319" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909319" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:21 -0800 X-CSE-ConnectionGUID: AJlgAQNzSGq7IevyNX4hpw== X-CSE-MsgGUID: bZNkLUZ4Qf2XezZk8kzEHQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364449" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:20 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 07/11] tests: Use global interface for P2P2 tests Date: Tue, 26 Nov 2024 11:10:16 +0200 Message-ID: <20241126091021.3561063-8-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011821_333893_E6EF05B3 X-CRM114-Status: UNSURE ( 9.53 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: These commands should be redirected to P2P device interace, thus use global interface both for USD and pairing commands. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_p2p2.py | 134 +++++++++++++++++++ 1 file changed, 67 insertions(+), 67 deletions(-) Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org These commands should be redirected to P2P device interace, thus use global interface both for USD and pairing commands. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_p2p2.py | 134 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/tests/hwsim/test_p2p2.py b/tests/hwsim/test_p2p2.py index 43635a1ef6..a67ebefe85 100644 --- a/tests/hwsim/test_p2p2.py +++ b/tests/hwsim/test_p2p2.py @@ -19,11 +19,11 @@ def check_p2p2_capab(dev): check_pasn_capab(dev) def set_p2p2_configs(dev): - dev.request("P2P_SET pasn_type 3") - dev.request("P2P_SET supported_bootstrapmethods 6") - dev.request("P2P_SET pairing_setup 1") - dev.request("P2P_SET pairing_cache 1") - dev.request("P2P_SET pairing_verification 1") + dev.global_request("P2P_SET pasn_type 3") + dev.global_request("P2P_SET supported_bootstrapmethods 6") + dev.global_request("P2P_SET pairing_setup 1") + dev.global_request("P2P_SET pairing_cache 1") + dev.global_request("P2P_SET pairing_verification 1") def test_p2p_usd_publish_invalid_param(dev): """P2P USD Publish with invalid parameters""" @@ -31,7 +31,7 @@ def test_p2p_usd_publish_invalid_param(dev): # Both solicited and unsolicited disabled is invalid cmd = "NAN_PUBLISH service_name=_test solicited=0 unsolicited=0 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" not in id0: raise Exception("NAN_PUBLISH accepts both solicited=0 and unsolicited=0 with p2p=1") @@ -39,19 +39,19 @@ def test_p2p_usd_publish(dev, apdev): """P2P USD Publish""" check_p2p2_capab(dev[0]) cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_PUBLISH for P2P failed") cmd = "NAN_UPDATE_PUBLISH publish_id=" + id0 + " ssi=1122334455" - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_UPDATE_PUBLISH for P2P failed") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id0 - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed") - ev = dev[0].wait_event(["NAN-PUBLISH-TERMINATED"], timeout=1) + ev = dev[0].wait_global_event(["NAN-PUBLISH-TERMINATED"], timeout=1) if ev is None: raise Exception("PublishTerminated event not seen") if "publish_id=" + id0 not in ev: @@ -62,16 +62,16 @@ def test_p2p_usd_publish(dev, apdev): cmd = "NAN_PUBLISH service_name=_test p2p=1" count = 0 for i in range(256): - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): break count += 1 logger.info("Maximum services: %d" % count) for i in range(count): cmd = "NAN_CANCEL_PUBLISH publish_id=%s" % (i + 1) - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH failed") - ev = dev[0].wait_event(["NAN-PUBLISH-TERMINATED"], timeout=1) + ev = dev[0].wait_global_event(["NAN-PUBLISH-TERMINATED"], timeout=1) if ev is None: raise Exception("PublishTerminated event not seen") @@ -79,15 +79,15 @@ def test_p2p_usd_subscribe(dev, apdev): """P2P USD Subscribe""" check_p2p2_capab(dev[0]) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed") - ev = dev[0].wait_event(["NAN-SUBSCRIBE-TERMINATED"], timeout=1) + ev = dev[0].wait_global_event(["NAN-SUBSCRIBE-TERMINATED"], timeout=1) if ev is None: raise Exception("SubscribeTerminated event not seen") if "subscribe_id=" + id0 not in ev: @@ -100,12 +100,12 @@ def test_p2p_usd_match(dev, apdev): check_p2p2_capab(dev[0]) check_p2p2_capab(dev[1]) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=5 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed") @@ -116,7 +116,7 @@ def test_p2p_usd_match(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = dev[0].wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = dev[0].wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -124,8 +124,8 @@ def test_p2p_usd_match(dev, apdev): if "ssi=6677" not in ev.split(' '): raise Exception("Unexpected ssi: " + ev) - dev[0].request("NAN_CANCEL_SUBSCRIBE id=" + id0) - dev[1].request("NAN_CANCEL_PUBLISH id=" + id1) + dev[0].global_request("NAN_CANCEL_SUBSCRIBE id=" + id0) + dev[1].global_request("NAN_CANCEL_PUBLISH id=" + id1) def test_p2p_pairing_password(dev, apdev): """P2P Pairing with Password""" @@ -136,12 +136,12 @@ def test_p2p_pairing_password(dev, apdev): set_p2p2_configs(dev[1]) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 ttl=10 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=10 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed") @@ -152,7 +152,7 @@ def test_p2p_pairing_password(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = dev[0].wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = dev[0].wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -161,19 +161,19 @@ def test_p2p_pairing_password(dev, apdev): raise Exception("Unexpected ssi: " + ev) cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id1 - if "FAIL" in dev[1].request(cmd): + if "FAIL" in dev[1].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed") cmd = "P2P_CONNECT " + dev[0].p2p_dev_addr() + " pair he go_intent=15 p2p2 bstrapmethod=2 auth password=975310123 freq=2437" - id0 = dev[1].request(cmd) + id0 = dev[1].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT auth Failed") cmd = "P2P_CONNECT " + dev[1].p2p_dev_addr() + " pair he go_intent=5 p2p2 bstrapmethod=32 password=975310123" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT Failed") @@ -201,12 +201,12 @@ def test_p2p_pairing_opportunistic(dev, apdev): set_p2p2_configs(dev[1]) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 ttl=10 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=10 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed") @@ -217,7 +217,7 @@ def test_p2p_pairing_opportunistic(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = dev[0].wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = dev[0].wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -226,19 +226,19 @@ def test_p2p_pairing_opportunistic(dev, apdev): raise Exception("Unexpected ssi: " + ev) cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id1 - if "FAIL" in dev[1].request(cmd): + if "FAIL" in dev[1].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed") cmd = "P2P_CONNECT " + dev[0].p2p_dev_addr() + " pair he go_intent=15 p2p2 bstrapmethod=1 auth freq=2437" - id0 = dev[1].request(cmd) + id0 = dev[1].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT auth Failed") cmd = "P2P_CONNECT " + dev[1].p2p_dev_addr() + " pair he go_intent=5 p2p2 bstrapmethod=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT Failed") @@ -267,12 +267,12 @@ def test_p2p_auto_go_and_client_join(dev, apdev): set_p2p2_configs(dev[1]) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 ttl=10 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=10 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed") @@ -283,7 +283,7 @@ def test_p2p_auto_go_and_client_join(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = dev[0].wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = dev[0].wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -292,14 +292,14 @@ def test_p2p_auto_go_and_client_join(dev, apdev): raise Exception("Unexpected ssi: " + ev) cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id1 - if "FAIL" in dev[1].request(cmd): + if "FAIL" in dev[1].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed") cmd = "P2P_GROUP_ADD p2p2" - res = dev[1].request(cmd) + res = dev[1].global_request(cmd) if "FAIL" in res: raise Exception("P2P_GROUP_ADD failed") @@ -308,12 +308,12 @@ def test_p2p_auto_go_and_client_join(dev, apdev): raise Exception("Group formation timed out(2)") cmd = "P2P_CONNECT " + dev[0].p2p_dev_addr() + " pair he go_intent=15 p2p2 bstrapmethod=1 join auth" - id0 = dev[1].request(cmd) + id0 = dev[1].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT auth failed") cmd = "P2P_CONNECT " + dev[1].p2p_dev_addr() + " pair p2p2 join bstrapmethod=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT failed") @@ -338,12 +338,12 @@ def test_p2p_auto_go_and_client_join_sae(dev, apdev): set_p2p2_configs(dev[1]) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 ttl=10 p2p=1" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=10 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed") @@ -354,7 +354,7 @@ def test_p2p_auto_go_and_client_join_sae(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = dev[0].wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = dev[0].wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -363,14 +363,14 @@ def test_p2p_auto_go_and_client_join_sae(dev, apdev): raise Exception("Unexpected ssi: " + ev) cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in dev[0].request(cmd): + if "FAIL" in dev[0].global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id1 - if "FAIL" in dev[1].request(cmd): + if "FAIL" in dev[1].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed") cmd = "P2P_GROUP_ADD p2p2" - res = dev[1].request(cmd) + res = dev[1].global_request(cmd) if "FAIL" in res: raise Exception("P2P_GROUP_ADD failed") @@ -379,12 +379,12 @@ def test_p2p_auto_go_and_client_join_sae(dev, apdev): raise Exception("Group formation timed out(2)") cmd = "P2P_CONNECT " + dev[0].p2p_dev_addr() + " pair he go_intent=15 p2p2 bstrapmethod=2 join auth password=975310123" - id0 = dev[1].request(cmd) + id0 = dev[1].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT auth failed") cmd = "P2P_CONNECT " + dev[1].p2p_dev_addr() + " pair p2p2 join bstrapmethod=32 password=975310123" - id0 = dev[0].request(cmd) + id0 = dev[0].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT failed") @@ -425,12 +425,12 @@ def test_p2p_pairing_verification(dev, apdev): wpas.global_request("SAVE_CONFIG") cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 ttl=10 p2p=1" - id0 = wpas.request(cmd) + id0 = wpas.global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=10 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed") @@ -441,7 +441,7 @@ def test_p2p_pairing_verification(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = wpas.wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = wpas.wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -450,19 +450,19 @@ def test_p2p_pairing_verification(dev, apdev): raise Exception("Unexpected ssi: " + ev) cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in wpas.request(cmd): + if "FAIL" in wpas.global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id1 - if "FAIL" in dev[1].request(cmd): + if "FAIL" in dev[1].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed") cmd = "P2P_CONNECT " + wpas.p2p_dev_addr() + " pair he go_intent=15 p2p2 bstrapmethod=2 auth password=975310123 freq=2437 persistent" - id0 = dev[1].request(cmd) + id0 = dev[1].global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT auth Failed") cmd = "P2P_CONNECT " + dev[1].p2p_dev_addr() + " pair he go_intent=5 p2p2 bstrapmethod=32 password=975310123 persistent" - id0 = wpas.request(cmd) + id0 = wpas.global_request(cmd) if "FAIL" in id0: raise Exception("P2P_CONNECT Failed") @@ -485,12 +485,12 @@ def test_p2p_pairing_verification(dev, apdev): wpas.interface_add("wlan5", config=config) cmd = "NAN_SUBSCRIBE service_name=_test active=1 srv_proto_type=2 ssi=1122334455 ttl=10 p2p=1" - id0 = wpas.request(cmd) + id0 = wpas.global_request(cmd) if "FAIL" in id0: raise Exception("NAN_SUBSCRIBE for P2P failed (2)") cmd = "NAN_PUBLISH service_name=_test unsolicited=0 srv_proto_type=2 ssi=6677 ttl=10 p2p=1" - id1 = dev[1].request(cmd) + id1 = dev[1].global_request(cmd) if "FAIL" in id1: raise Exception("NAN_PUBLISH for P2P failed (2)") @@ -501,7 +501,7 @@ def test_p2p_pairing_verification(dev, apdev): if ev is None: raise Exception("Peer not found") - ev = wpas.wait_event(["NAN-DISCOVERY-RESULT"], timeout=5) + ev = wpas.wait_global_event(["NAN-DISCOVERY-RESULT"], timeout=5) if ev is None: raise Exception("DiscoveryResult event not seen") if "srv_proto_type=2" not in ev.split(' '): @@ -510,10 +510,10 @@ def test_p2p_pairing_verification(dev, apdev): raise Exception("Unexpected ssi: " + ev) cmd = "NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0 - if "FAIL" in wpas.request(cmd): + if "FAIL" in wpas.global_request(cmd): raise Exception("NAN_CANCEL_SUBSCRIBE for P2P failed (2)") cmd = "NAN_CANCEL_PUBLISH publish_id=" + id1 - if "FAIL" in dev[1].request(cmd): + if "FAIL" in dev[1].global_request(cmd): raise Exception("NAN_CANCEL_PUBLISH for P2P failed (2)") wpas.global_request("SET persistent_reconnect 1") @@ -522,7 +522,7 @@ def test_p2p_pairing_verification(dev, apdev): if 'persistent' not in peer: raise Exception("Missing information on persistent group for the peer") cmd = "P2P_INVITE persistent=" + peer['persistent'] + " peer=" + dev[1].p2p_dev_addr() + " p2p2" - id0 = wpas.request(cmd) + id0 = wpas.global_request(cmd) if "FAIL" in id0: raise Exception("P2P_INVITE Failed") @@ -549,7 +549,7 @@ def test_p2p_auto_go_pcc_with_two_cli(dev, apdev): set_p2p2_configs(dev[0]) cmd = "P2P_GROUP_ADD p2p2 p2pmode=2 freq=2462" - res = dev[0].request(cmd) + res = dev[0].global_request(cmd) if "FAIL" in res: raise Exception("P2P_GROUP_ADD failed") ev = dev[0].wait_global_event(["P2P-GROUP-STARTED"], timeout=10) @@ -563,7 +563,7 @@ def test_p2p_auto_go_pcc_with_two_cli(dev, apdev): raise Exception("passphrase mismatch(2)") logger.info("Connect legacy non-WPS P2P client") - dev[1].request("P2P_SET disabled 1") + dev[1].global_request("P2P_SET disabled 1") dev[0].dump_monitor() dev[1].connect(ssid=res['ssid'], psk=res['passphrase'], proto='RSN', key_mgmt='WPA-PSK', pairwise='CCMP', @@ -572,7 +572,7 @@ def test_p2p_auto_go_pcc_with_two_cli(dev, apdev): try: logger.info("Connect P2P2 client") - dev[2].request("P2P_SET disabled 1") + dev[2].global_request("P2P_SET disabled 1") dev[0].dump_monitor() dev[2].set("rsn_overriding", "1") dev[2].set("sae_pwe", "2") From patchwork Tue Nov 26 09:10:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=dilja/3f; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=BuAq9yxF; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH8k0tDsz1yCv for ; Tue, 26 Nov 2024 20:19:50 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wh4A+VPw/h+MuaAvw711gMaEDzRfG1dU6bwG940vkrc=; b=dilja/3fmnppQd /QlhPn1qZlsruqXPSWltHY8HGIQ3iZkCv7axXRPda7muIjIjYDVz/pcdSaGznq82Q0icQBkWi2yw9 lipKxN1BzvVYguuqeNs3SxoSZgEFxdGjXJCLbPg8HJJoygMM1GUlGooKV/e4G8UQnGMru7DW0lryE QgajtFucDp/xx4/lTcWtU1LvhcR/rglWsO/ASasOJViZr4X47YbVmOBw9V0U8XEmvwcchLGbgG4Uk rkhMDYS7x8NsWLe87s8UeW1qmpvd7XpDIHTl/ign0Ii4OEgUgHDqIixnxj64rXg7wPKi/yKzijXDE DvDW7arS+UCSxcZvZs8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFrjK-0000000A5NO-39sj; Tue, 26 Nov 2024 09:19:34 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFriC-0000000A4RS-3nbA for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612705; x=1764148705; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=odOSlyCGlNwzTRu7m8suxD3J7e4teJWKdaK6sbjWT94=; b=BuAq9yxF9mVxW8ZzxxRtthJhj7TvEaDDE6QzAvfM4oOg3iRYvKff0SpI kyaAVGHdjMz3CGxzEGo1J+/l1G3eTxzIynbOatWgh/mP1MXo4Recj+6gH RJ/cvfA/qUE61BlEL81mXvhe5UTpFD3U58G4X+DiIUTUJK7nzLVpz67xs uB1aRwytgH9XIv/KtBS1xviEL20ewLkDs/+O4O+eZOAhdEjptxVa1C5ZU rt/xILnnJliYEl/b3a1NEqcGgv94DiVDycMQ8QrjlWeaxw3IU0ZmXnKzY zHVdFPSZ0PpYckGr1JvOy8SLYygdBRO/Pimo2gfbLIBkRNsI9/cE6eGZp Q==; X-CSE-ConnectionGUID: GaOqVYvFSWe2Yu6s06fVCg== X-CSE-MsgGUID: hSVtUIZMRC+ITn50CGp5rQ== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909321" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909321" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:24 -0800 X-CSE-ConnectionGUID: jz8vKg8SQwSqNIpnFjbllg== X-CSE-MsgGUID: 01n3JSn6S0qmG5Hwid12Ew== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364464" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:24 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 08/11] tests: Properly cancel NAN publish/subscribe Date: Tue, 26 Nov 2024 11:10:17 +0200 Message-ID: <20241126091021.3561063-9-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011824_994593_766C164F X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Wrong command was used. Fix it. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_p2p2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_p2p2.py b/tests/hwsim/test_p2p2.py index a67ebefe85..aac6202261 100644 --- a/tests/hwsim/test_p2p2.py +++ b/tests/hwsim/test_p2p2.py @@ -124,8 +124,8 @@ def test_p2p_usd_ [...] Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Wrong command was used. Fix it. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_p2p2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_p2p2.py b/tests/hwsim/test_p2p2.py index a67ebefe85..aac6202261 100644 --- a/tests/hwsim/test_p2p2.py +++ b/tests/hwsim/test_p2p2.py @@ -124,8 +124,8 @@ def test_p2p_usd_match(dev, apdev): if "ssi=6677" not in ev.split(' '): raise Exception("Unexpected ssi: " + ev) - dev[0].global_request("NAN_CANCEL_SUBSCRIBE id=" + id0) - dev[1].global_request("NAN_CANCEL_PUBLISH id=" + id1) + dev[0].global_request("NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0) + dev[1].global_request("NAN_CANCEL_PUBLISH publish_id=" + id1) def test_p2p_pairing_password(dev, apdev): """P2P Pairing with Password""" From patchwork Tue Nov 26 09:10:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015267 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=b7LJBq33; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=IvzNiIRh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH8n49nfz1yQc for ; Tue, 26 Nov 2024 20:19:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uKFqliRgeWesyCB59UXbA+wvM2+TqOVEl++Xz6z1QEE=; b=b7LJBq33BQfr12 M0GbxuA0XnDYe7xNGH7F9h1qUhsL2+5P6W1zRf6XP5XBMn+hKWBefr6SRAiiaEms77rFJ5hJrhwvy hQ90NTaQhCjYILMGMxAbuXBpTfTYbVG9nz/qBnwhJOUQzWF3Rx/5DnWBFn6/+Jw0hLZy50OsUishT l2WTd0ZOPLIUY4sBzBiIudJxaqLdvc+u/KzdPnSGd0M96/QAt9Uxfbq7MPspHquzUNLp/JJdrCIlY mFS8+LTPR4nXKlxyBidywdXkoyrAxQGeYaK3ATYGn8hPnj+GRpLvY6rsCzxpKIdtNB7MQMb25rw8N 9QwEnTXjRjsrf4uJbzgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFrjM-0000000A5OY-0wCh; Tue, 26 Nov 2024 09:19:36 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFriG-0000000A4RS-38gG for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612708; x=1764148708; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6OuepJYjs1mGIPk7/Oj97CP/whct6pPXngJcFbg9ERg=; b=IvzNiIRhYWMBiLTtxuG028sQfnmZZ8oGyb7ghafOOJCnPNMlUXfDfYvL 5wDeYfu/vDzf2pmG92qtrEIN7e3KwZzoGV/uqL8JRNzQCYnA4kqxsQlcH jjldkE/QyZfrWR/cWlFlWKdeP7cw5qKUewFTPzx32Nr/6RpWRJK1DUxjA gzU3SPZaJGIMnOzUnPq6o5OF8zljgYHe++N1NwQViD+LcvwXsVqkgzvfI zoH0IArIOOFgjw0sixWZ7IUQ/kJbjd8tL+1WDGEjsEzWpf7uZW2dKUVXh MQZd13Pz28oqBENxf8FKZ268eENoJ6eXvStRKcqzOwTa6vryytw3K2QFy w==; X-CSE-ConnectionGUID: 3pQD4adATWSWtWTymrzf6A== X-CSE-MsgGUID: y88gkeO+TL+YshcUTUPZrw== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909324" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909324" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:28 -0800 X-CSE-ConnectionGUID: bvLdOE3VRFa0qk+arNfcnw== X-CSE-MsgGUID: ArGuXCAiRemeLTDdtmMnbA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364473" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:28 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 09/11] tests: Support parsing group formation events without password Date: Tue, 26 Nov 2024 11:10:18 +0200 Message-ID: <20241126091021.3561063-10-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011828_836163_CEE369D3 X-CRM114-Status: GOOD ( 11.14 ) X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: P2P2 clients don't acquire group password with PASN SAE pairing. Support parsing GROUP-STARTED events without password. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/wpasupplicant.py | 33 +++++++++++++++++++ 1 file changed, 19 insertions(+), 14 deletions(-) Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org P2P2 clients don't acquire group password with PASN SAE pairing. Support parsing GROUP-STARTED events without password. Signed-off-by: Andrei Otcheretianski --- tests/hwsim/wpasupplicant.py | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py index c6fb1d9a4e..17830b73c1 100644 --- a/tests/hwsim/wpasupplicant.py +++ b/tests/hwsim/wpasupplicant.py @@ -699,7 +699,7 @@ class WpaSupplicant: vals[name] = value return vals - def group_form_result(self, ev, expect_failure=False, go_neg_res=None): + def group_form_result(self, ev, expect_failure=False, go_neg_res=None, no_pwd=False): if expect_failure: if "P2P-GROUP-STARTED" in ev: raise Exception("Group formation succeeded when expecting failure") @@ -715,13 +715,17 @@ class WpaSupplicant: if "P2P-GROUP-STARTED" not in ev: raise Exception("No P2P-GROUP-STARTED event seen") - exp = r'<.>(P2P-GROUP-STARTED) ([^ ]*) ([^ ]*) ssid="(.*)" freq=([0-9]*) ((?:psk=.*)|(?:passphrase=".*")) go_dev_addr=([0-9a-f:]*) ip_addr=([0-9.]*) ip_mask=([0-9.]*) go_ip_addr=([0-9.]*)' + pwd = '' if no_pwd else r'((?:psk=.*)|(?:passphrase=".*")) ' + offset = 0 if no_pwd else 1 + exp = r'<.>(P2P-GROUP-STARTED) ([^ ]*) ([^ ]*) ssid="(.*)" freq=([0-9]*) ' + pwd + \ + r'go_dev_addr=([0-9a-f:]*) ip_addr=([0-9.]*) ip_mask=([0-9.]*) go_ip_addr=([0-9.]*)' s = re.split(exp, ev) - if len(s) < 11: - exp = r'<.>(P2P-GROUP-STARTED) ([^ ]*) ([^ ]*) ssid="(.*)" freq=([0-9]*) ((?:psk=.*)|(?:passphrase=".*")) go_dev_addr=([0-9a-f:]*)' + if len(s) < 10 + offset: + exp = r'<.>(P2P-GROUP-STARTED) ([^ ]*) ([^ ]*) ssid="(.*)" freq=([0-9]*) ' + pwd + \ + r'go_dev_addr=([0-9a-f:]*)' s = re.split(exp, ev) - if len(s) < 8: - raise Exception("Could not parse P2P-GROUP-STARTED") + if len(s) < 7 + offset: + raise Exception("Could not parse P2P-GROUP-STARTED %d" % len(s)) res = {} res['result'] = 'success' res['ifname'] = s[2] @@ -751,14 +755,15 @@ class WpaSupplicant: p = re.match(r'passphrase="(.*)"', s[6]) if p: res['passphrase'] = p.group(1) - res['go_dev_addr'] = s[7] - - if len(s) > 8 and len(s[8]) > 0 and "[PERSISTENT]" not in s[8]: - res['ip_addr'] = s[8] - if len(s) > 9: - res['ip_mask'] = s[9] - if len(s) > 10: - res['go_ip_addr'] = s[10] + + res['go_dev_addr'] = s[6 + offset] + + if len(s) > 7 + offset and len(s[7 + offset]) > 0 and "[PERSISTENT]" not in s[7 + offset]: + res['ip_addr'] = s[7 + offset] + if len(s) > 8 + offset: + res['ip_mask'] = s[8 + offset] + if len(s) > 9 + offset: + res['go_ip_addr'] = s[9 + offset] if go_neg_res: exp = r'<.>(P2P-GO-NEG-SUCCESS) role=(GO|client) freq=([0-9]*)' From patchwork Tue Nov 26 09:10:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=DY1zeZc0; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=jO+faSZi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH8n1yW3z1yQb for ; Tue, 26 Nov 2024 20:19:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jmVwqXeIdDQmrz+gqTKhMptl+Urn3sIER2Nxo4MyK0s=; b=DY1zeZc0M/kdy8 VTwFITVHEG/gbR1T65vxYJMlXvsMegG1ymwW5JSgLDuY6yftQ4NEJJPVKfO4dAthmVtU2uTGHDp0D HXxPqK5ulDbBuCBr5aLUJHfySPPpBRwPavNFpTmHO9h/7K7+scg3G0Xei3CDMAkjgQbG9wiMsdPvq kp2ZbPgFiiCVmsZWmDgvzMxxxxUmmqGixxLJVye/R7ABszGdSOaW5KDcbpB2juDcXovyYZD9VidAM L9MnnrFm7ic6f6J5kQ1whPMjH1XuH5MiptWcb93rCZlrnVyF3kEC/kk7qZ4erjLnBYZhJB9FaZD0z 9d2oy4pnzOiHLr5+WYCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFrjN-0000000A5Q5-2u0w; Tue, 26 Nov 2024 09:19:37 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFriM-0000000A4RS-2q7q for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612714; x=1764148714; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wZAboT9VS8+PKWKbDb+HeYZ2z8WWPfkWAA0Wlt93u2Y=; b=jO+faSZiJaWeHiQTcdKWwr2/xOGz019b3Mtj19nDZoxq/zHGsT7pgPnd XgdubbYooM58eU9sf4ThiRYMZcUKePiRthin+/iSmfsnS1FCb6HiJus7f yJmRPOLCsrUV7xvz4ttft1D3K/PMaqrpYbImIRRYA6X5e3dywENhATP73 T5zaKAeHZJyzHbH3BOYSEkAklNUJZuNxENtsvz+N+t/44pLmFmhxNN3U+ 8o7B0rEUZruAD1TYpCYkaICFrjbKH1iMmz0y75tcYmkQkbxBWtKOcDoLy ed0FSPXghAmbeewyk45TtzIxrmmjFEQDtfZAa6jl8b4YQBUKwd2imaj9T Q==; X-CSE-ConnectionGUID: Ti9Zew2MRjuNk+AmFY12Kg== X-CSE-MsgGUID: CG+baplfTQWQERzLdFT31g== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909327" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909327" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:34 -0800 X-CSE-ConnectionGUID: MG9Xk/ynTLC5C7MLmuasAQ== X-CSE-MsgGUID: 4FrhUFc6QpCPp3cPcGmEgA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364484" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:33 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 10/11] tests: Add a couple of P2P2 pairing tests with P2P device Date: Tue, 26 Nov 2024 11:10:19 +0200 Message-ID: <20241126091021.3561063-11-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011834_781321_DE96AEB0 X-CRM114-Status: UNSURE ( 8.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_p2p2.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/test_p2p2.py b/tests/hwsim/test_p2p2.py index aac6202261..2a73f9cff7 100644 --- a/tests/hwsim/test_p2p2.py +++ b/tests/hwsim/test_p2p2.py @@ -6,6 +6,9 @@ # See README for more [...] Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 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 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Andrei Otcheretianski --- tests/hwsim/test_p2p2.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/hwsim/test_p2p2.py b/tests/hwsim/test_p2p2.py index aac6202261..2a73f9cff7 100644 --- a/tests/hwsim/test_p2p2.py +++ b/tests/hwsim/test_p2p2.py @@ -6,6 +6,9 @@ # See README for more details. import logging + +from hwsim import HWSimRadio + logger = logging.getLogger() import os import hwsim_utils @@ -127,7 +130,7 @@ def test_p2p_usd_match(dev, apdev): dev[0].global_request("NAN_CANCEL_SUBSCRIBE subscribe_id=" + id0) dev[1].global_request("NAN_CANCEL_PUBLISH publish_id=" + id1) -def test_p2p_pairing_password(dev, apdev): +def run_p2p_pairing_password(dev): """P2P Pairing with Password""" check_p2p2_capab(dev[0]) check_p2p2_capab(dev[1]) @@ -180,18 +183,37 @@ def test_p2p_pairing_password(dev, apdev): ev = dev[0].wait_global_event(["P2P-GROUP-STARTED"], timeout=10) if ev is None: raise Exception("Group formation timed out") - #dev[0].group_form_result(ev) + dev[0].group_form_result(ev, no_pwd=True) dev[0].dump_monitor() ev = dev[1].wait_global_event(["P2P-GROUP-STARTED"], timeout=10) if ev is None: raise Exception("Group formation timed out(2)") - #dev[1].group_form_result(ev) + dev[1].group_form_result(ev) dev[1].remove_group() dev[0].wait_go_ending_session() dev[0].dump_monitor() +def test_p2p_pairing_password(dev, apdev): + """P2P Pairing with Password""" + run_p2p_pairing_password(dev) + +def test_p2p_pairing_password_dev(dev, apdev): + """P2P Pairing with Password with dedicated P2P device""" + with HWSimRadio(use_p2p_device=True) as (radio, iface): + wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') + wpas.interface_add(iface) + run_p2p_pairing_password([dev[0], wpas]) + +def test_p2p_pairing_password_dev2(dev, apdev): + """P2P Pairing with Password with dedicated P2P device (reversed) and no group interface""" + with HWSimRadio(use_p2p_device=True) as (radio, iface): + wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') + wpas.interface_add(iface) + wpas.global_request("SET p2p_no_group_iface 1") + run_p2p_pairing_password([wpas, dev[0]]) + def test_p2p_pairing_opportunistic(dev, apdev): """P2P Pairing with Opportunistic""" check_p2p2_capab(dev[0]) From patchwork Tue Nov 26 09:10:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 2015268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=CKIynqwT; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=bYEY2E/W; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XyH8r3GN6z1yCv for ; Tue, 26 Nov 2024 20:19:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=B4BT8ZAO+7gkvUTvooXce8GdvdMu6ZBWet0c4eX3Al0=; b=CKIynqwTzcwmdi F7hA4o7kNTGPxgJ4d5IP/RSbOQA9Muua7z8l8RqLmdL9YbrwKuWcpTX6MilTQHHj5wbPjUwW63qs3 wU5VK++bR56qw749d5rNcU2OWad/MDO4Pwfjg9uF/r/DTVYLI5ID1+cT8U2IccSqvIg7rhIPUtGLV iUTUQEpnSqCJ2pwp2W9UxDfwv91hEphjZDafypmf+xnJ+ecggEpV2mDwTro5elUhIAheaHYagAHwB cJ2S+nmHTOC3kt+xMzrHbZHv0wNKmMq5JPPtonwqWzUbOGwqjVzp7k7n6I6Ms1VReGUt9geFjUTRG /Tdh6i4mAfLEKRSimqBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tFrjQ-0000000A5Tq-1dAm; Tue, 26 Nov 2024 09:19:40 +0000 Received: from mgamail.intel.com ([198.175.65.16]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tFriR-0000000A4RS-0SsV for hostap@lists.infradead.org; Tue, 26 Nov 2024 09:18:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1732612719; x=1764148719; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Wqh8VzlM0JUgh9S3WBVY6z3D7J/rP/v3n5fvE83PLQA=; b=bYEY2E/WvOEWi6gEfF93re/v8zer+CnW5fEuwC8vLFfIR822YhOARc4X 7SaPHp20IajgwhetC3bemzaqDDNYZPPe3iL0LZWhT0K1dr+Pqz0EmKWr0 NZCR0DT7+siujczVzF5+QaAU0dvGaA+vBGD6B04mgfp2+Ed0XOcma5aAy BL9qoLOOIXhd+t82gSR5927+CQ3a0IWS3wgIP0lN7mPNi6Z3p89onoaj8 ROQMjOozw3b+QM5UrKF2W6OfVi9TgSwigSyAU1Le6pcvgSI9bl+O5Jz1l Q4PpgH9YzKVuoEixBuXyhGe5kLKjT3NEFPTZyX+r/Sn/P/orYqFfdrZzG A==; X-CSE-ConnectionGUID: gv0GXNNqSf23ZtJy+wdW4w== X-CSE-MsgGUID: 4r3vONrzTLuZJvMkNiraOg== X-IronPort-AV: E=McAfee;i="6700,10204,11267"; a="32909332" X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="32909332" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:39 -0800 X-CSE-ConnectionGUID: LKVNr6auTWGqaM76+hFMQA== X-CSE-MsgGUID: RI4k9cKpQE+gDd89NbqO2Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,185,1728975600"; d="scan'208";a="92364488" Received: from weis0042.iil.intel.com ([10.12.217.211]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2024 01:18:38 -0800 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Andrei Otcheretianski Subject: [PATCH 11/11] tests: Enable NAN_USD hwsim tests Date: Tue, 26 Nov 2024 11:10:20 +0200 Message-ID: <20241126091021.3561063-12-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> References: <20241126091021.3561063-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241126_011839_201276_BED401E7 X-CRM114-Status: UNSURE ( 7.79 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -4.4 (----) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Signed-off-by: Andrei Otcheretianski --- tests/hwsim/example-hostapd.config | 1 + tests/hwsim/example-wpa_supplicant.config | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/hwsim/example-hostapd.config b/tests/hwsim/example-hostapd.config index 210b7fb860..c75395c00a 100644 --- a/tests/hwsim/example-hostapd.config +++ b/tests/hwsim/example-hostapd.conf [...] Content analysis details: (-4.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-trusted.bondedsender.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.175.65.16 listed in list.dnswl.org] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in bl.score.senderscore.com] 0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [198.175.65.16 listed in sa-accredit.habeas.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Andrei Otcheretianski --- tests/hwsim/example-hostapd.config | 1 + tests/hwsim/example-wpa_supplicant.config | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/hwsim/example-hostapd.config b/tests/hwsim/example-hostapd.config index 210b7fb860..c75395c00a 100644 --- a/tests/hwsim/example-hostapd.config +++ b/tests/hwsim/example-hostapd.config @@ -123,3 +123,4 @@ CONFIG_WEP=y CONFIG_PASN=y CONFIG_AIRTIME_POLICY=y CONFIG_IEEE80211BE=y +CONFIG_NAN_USD=y diff --git a/tests/hwsim/example-wpa_supplicant.config b/tests/hwsim/example-wpa_supplicant.config index 123f397e3e..c7b56996d1 100644 --- a/tests/hwsim/example-wpa_supplicant.config +++ b/tests/hwsim/example-wpa_supplicant.config @@ -166,3 +166,4 @@ CONFIG_DPP2=y CONFIG_DPP3=y CONFIG_WEP=y CONFIG_PASN=y +CONFIG_NAN_USD=y