From patchwork Wed Nov 4 23:42:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 317918 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82A59C56202 for ; Wed, 4 Nov 2020 23:42:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2ADAD22203 for ; Wed, 4 Nov 2020 23:42:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fFbhY/7i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732911AbgKDXmo (ORCPT ); Wed, 4 Nov 2020 18:42:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732826AbgKDXmd (ORCPT ); Wed, 4 Nov 2020 18:42:33 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1706FC0613CF for ; Wed, 4 Nov 2020 15:42:33 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id i7so192610pgh.6 for ; Wed, 04 Nov 2020 15:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Yytsr00+6Kp33M5vY3Jf40tOEkQR8081Jx2QjpPNKpM=; b=fFbhY/7iEzmKzuKMgNTCpl6re4tZf7KqZ4u2Xr1i6YnJB747eG0/jBjOTzEVM6tSsx Ws5DSYURK/gYtyz2A3ZepaA84JkBvSo7Fu48zXdyw6rWYdc2N8xOrZJpcUcLvEHNfTZ1 I3jyLtQHdGhUj+1aA5Lh/n5QE3NbtKNwVgmehCQS0znVZWldyH6tZXr+liea0oZSiRNG Y+CowgTxSKz2z4sy0IwoQaQkdo0+jD/BtJHpQah3UZR2cyHQxdndCLyBUfgnYjnsl6Fu whOq0ZlHAWfIrZQamiDn5/+kQVnkQ53m/Fefjf2efYJhk4vKnBPH20dkJ4zKJ9V8f4G7 XooA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yytsr00+6Kp33M5vY3Jf40tOEkQR8081Jx2QjpPNKpM=; b=MQ+jOuwehYK4xngxNXqfLP/cQgqkJrS9Ox6Wys+n2fiQ9yCLkO/sxphfU3RHWmA11l gjXtHH/ONj9RihOXJBY2MWP0KLrrupQqLPoM5ZCBixTipVzKhZ3vciiTWLWd5W2gqvr1 uRnqL80jucWZ+HIIArG1yft3tado71lb1LThDUTACsMFmVP2Fwv7Vlrbsns9e9WBi4Ex 8DakZfeOCj/weRElbjsGfaECB2J2dYoRncvvssRaj/nI+hC5ghoJgFVPCwQj8hDH4xLK jh8cBEg2Z+vfL0NKUxN1hYoVvXEBxM8xjJ+vMZjif8zvSQJOX669QokQL+SUAe5MFpBQ hIrw== X-Gm-Message-State: AOAM530ur0OJ2hrCd1rKLTHxL6GstVwwIfO0MAkv5yqnX+J8dh+0mVrj NtJn1qpw0Z8dcdraMUUmTqJuRc5if8Q7AQ== X-Google-Smtp-Source: ABdhPJz9xzNI0H4mykZOMY9w2F2XIDwuUhWztyblolJgsNNm+REGHPKeg/kuNn+FAjQ0HMPJoPgqHw== X-Received: by 2002:a17:90a:540e:: with SMTP id z14mr274258pjh.187.1604533352343; Wed, 04 Nov 2020 15:42:32 -0800 (PST) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id 30sm3361513pgl.45.2020.11.04.15.42.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 15:42:31 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 2/8] test-runner: Fix using removed options Date: Wed, 4 Nov 2020 15:42:22 -0800 Message-Id: <20201104234228.2257427-2-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104234228.2257427-1-luiz.dentz@gmail.com> References: <20201104234228.2257427-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This removes -nodefconfig and -balloon which are not longer valid options: qemu-system-x86_64: -nodefconfig: invalid option qemu-system-x86_64: -balloon: invalid option --- tools/test-runner.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/test-runner.c b/tools/test-runner.c index 6b7c33734..5d2dbb992 100644 --- a/tools/test-runner.c +++ b/tools/test-runner.c @@ -181,7 +181,6 @@ static void prepare_sandbox(void) static char *const qemu_argv[] = { "", "-nodefaults", - "-nodefconfig", "-no-user-config", "-monitor", "none", "-display", "none", @@ -190,7 +189,6 @@ static char *const qemu_argv[] = { "-nographic", "-vga", "none", "-net", "none", - "-balloon", "none", "-no-acpi", "-no-hpet", "-no-reboot", From patchwork Wed Nov 4 23:42:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 317919 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8ADE3C56201 for ; Wed, 4 Nov 2020 23:42:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26B1B21734 for ; Wed, 4 Nov 2020 23:42:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rBRhtl/w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732914AbgKDXmo (ORCPT ); Wed, 4 Nov 2020 18:42:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732846AbgKDXmf (ORCPT ); Wed, 4 Nov 2020 18:42:35 -0500 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2615C0613CF for ; Wed, 4 Nov 2020 15:42:33 -0800 (PST) Received: by mail-pg1-x542.google.com with SMTP id f38so207041pgm.2 for ; Wed, 04 Nov 2020 15:42:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=TDGhHpoe/eWfJsY+oKVEuX03napklo56SUJ6Lc7Lye0=; b=rBRhtl/wC/GWgwvcvEI4X8u0nJSTue+xwkyXVUdUb+bhR1vFN/fbttf1qEug50V8kl Un3oIUxnFmWJd2SFpnzRidOsg1KdazGeW5ZFwG1Kf68uMEX01SNU78EJZrP0FwHnmg1f Cm/x8dqPSEnaC9PKTurdjXbsMkn7AAAPN3tqGeonXhm+uibS125Rz/zYNsaT9g0OhO0P U0CWTxuB7N3iTuw6WtVNuCX1FD1RavhnWJfrMCMWqIT8O9THfL4b1VP37uILc7XVEza1 AjxdQELq8uGOFv1jzAUW2g92b44Iud1YCRZquGU3dVheeM+75bFxuE3luZ0DvLmfKQHW EozQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TDGhHpoe/eWfJsY+oKVEuX03napklo56SUJ6Lc7Lye0=; b=HZumO2vdk6UokxF8M4/F990acI1N/RmBAtyJydfnS/+ORE7s/A7bsitll/H5Anol7F uE7JGYgZenauCkMsWUhyZn9i8jL8GEHmBUUhBsb3826CeJCZCYI0OrEDx7yZM/dGBWT+ +OTXyKwQWIhVkExetPj94SyTyQejliz/8CkZOPGlpoNsnZcrgKxEpJh7hkUw9yCA4RvO BKJ4ZZNxR0UGwzvL7LUZXTWJElS0JCUDtQIPo5qLc+mtAWoP+RZlaIRSvoD2rHHBfkCZ G3p1fjBmEPdsTbdQaTSG9tmeWZmoCzbxNH0NyI5pPy4akGSdUc54F8hLeCrvpkmLWTm0 HApQ== X-Gm-Message-State: AOAM530/s3/bkMrqgDF4sOq9pPbr2rbGeglOtyDlJ9p4OnSGPLmFaNa+ Dx+VuhkkJmAu+tJHeiiZ39mH7q82a5+Ipg== X-Google-Smtp-Source: ABdhPJzxGDHeIaUN782tj1aNcCfvp3LGpPFhHEyoinZjwlO9a28IXnyUP87fjQu6m1EtFHaSRR1STQ== X-Received: by 2002:a17:90a:6288:: with SMTP id d8mr336120pjj.210.1604533353393; Wed, 04 Nov 2020 15:42:33 -0800 (PST) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id 30sm3361513pgl.45.2020.11.04.15.42.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 15:42:32 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 3/8] mgmt-tester: Print out the HCI received and expected cmd value Date: Wed, 4 Nov 2020 15:42:23 -0800 Message-Id: <20201104234228.2257427-3-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104234228.2257427-1-luiz.dentz@gmail.com> References: <20201104234228.2257427-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This make it simpler to debug when the kernel has been updated and parameters no longer match: --- tools/mgmt-tester.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 27a5f0bab..4775fb18a 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -6381,7 +6381,9 @@ static void command_hci_callback(uint16_t opcode, const void *param, } if (memcmp(param, expect_hci_param, length) != 0) { - tester_warn("Unexpected HCI command parameter value"); + tester_warn("Unexpected HCI command parameter value:"); + util_hexdump('>', param, length, print_debug, ""); + util_hexdump('!', expect_hci_param, length, print_debug, ""); tester_test_failed(); return; } From patchwork Wed Nov 4 23:42:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 317920 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 395D4C388F7 for ; Wed, 4 Nov 2020 23:42:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D3F9620786 for ; Wed, 4 Nov 2020 23:42:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qSj75rtK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732892AbgKDXmn (ORCPT ); Wed, 4 Nov 2020 18:42:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732852AbgKDXmg (ORCPT ); Wed, 4 Nov 2020 18:42:36 -0500 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D18CEC0613D2 for ; Wed, 4 Nov 2020 15:42:34 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id t6so72640plq.11 for ; Wed, 04 Nov 2020 15:42:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6NChTZTWnrvWHkaUljYKkJ1mGz7635riVFxovhAsZBY=; b=qSj75rtKdvs5RsFohOV4J/dJbx49tZafKZVSj/Sq29uTeK1p9q0Ufzq7wxw3ECcift b/gAqYNPFypjEvF1lyomaTsJdJvbIsaUMgWmHYC2eNXh9L28efGHftDX3hrS4ljcZc8C JXzx/CVnr48VHPOxfR5uPqnZSlZZ53xilb+1sk85w7eJzFnXokiT96f1rL81XqeQd7d3 9JsoXFuxIy959qojzUOShC9gL4ZdeTEYelfJK8I0lLWk49G5ITyjOAzBGlpoRN4IK7Vm xZCtukT4Up5VpSDkrAzIYtfabudhBELOcnRF3eLQ7EgjSLQwdPbBFEsJIQjbmcwZIWUP 9n0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6NChTZTWnrvWHkaUljYKkJ1mGz7635riVFxovhAsZBY=; b=NM2pDZRvfGGbuJ9+XaBdoxKUW7pq29eww3oCAcjV8KI2o+JfhST/unXmW0WCP+qTEj CZe3JmBZyF0DdlQ0Hidz64s2SAoXvVPM/z8/oH8NvpY7oxlyi1zsF+fogfjKRLsyClCv hIrjkk2ejkldElNN/2kBqPxmEl5m/1/EEm/zwnUTlqo7cJrL0J5FhVJsjuStiDCk69sA uYIlghEUxPppCjzZMaV/KzyB66kCl0OG6UMDspHA4jhgM7RB1kmko/gO1CYoSr50ML6X 762wB0J5oHgdEfSHn4VhLngxZcxosXBmzzqViiHzO0mQXgLkJagJUssvZjFRzlauGW+i lWWg== X-Gm-Message-State: AOAM531XgQrRVj86gUZA2aty8mJy6u+tSRrKpmKsnXdTdXaPSTxz5ve3 mJjoLMNFZld1nJP+1BEcVGTjGJL/DXc+Hw== X-Google-Smtp-Source: ABdhPJw6Sd7rJm9xmVR+oVEQQ9LKzCKlYKAuUU/PHHV6Eb4fdd5q5RmwIx0uMq0c5Xxb077GmfEwow== X-Received: by 2002:a17:902:778d:b029:d6:489c:67ee with SMTP id o13-20020a170902778db02900d6489c67eemr362047pll.52.1604533354192; Wed, 04 Nov 2020 15:42:34 -0800 (PST) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id 30sm3361513pgl.45.2020.11.04.15.42.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 15:42:33 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 4/8] mgmt-tester: Update set_connectable_off_adv_param Date: Wed, 4 Nov 2020 15:42:24 -0800 Message-Id: <20201104234228.2257427-4-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104234228.2257427-1-luiz.dentz@gmail.com> References: <20201104234228.2257427-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz Parameters have been changed in the kernel which now uses the following: < HCI Command: LE Set Advertising Parameters (0x08|0x0006) plen 15 Min advertising interval: 62.500 msec (0x0064) Max advertising interval: 93.750 msec (0x0096) Type: Scannable undirected - ADV_SCAN_IND (0x02) Own address type: Random (0x01) Direct address type: Public (0x00) Direct address: 00:00:00:00:00:00 (OUI 00-00-00) Channel map: 37, 38, 39 (0x07) Filter policy: Allow Scan Request from Any, Allow Connect Request from Any (0x00) --- tools/mgmt-tester.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 4775fb18a..55df2953c 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -898,10 +898,10 @@ static uint16_t settings_powered_le_connectable_advertising[] = { MGMT_OP_SET_ADVERTISING, MGMT_OP_SET_POWERED, 0 }; -static uint8_t set_connectable_off_adv_param[] = { - 0x00, 0x08, /* min_interval */ - 0x00, 0x08, /* max_interval */ - 0x03, /* type */ +static uint8_t set_connectable_off_scan_adv_param[] = { + 0x64, 0x00, /* min_interval */ + 0x96, 0x00, /* max_interval */ + 0x02, /* type */ 0x01, /* own_addr_type */ 0x00, /* direct_addr_type */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* direct_addr */ @@ -919,8 +919,8 @@ static const struct generic_data set_connectable_off_le_test_2 = { .expect_len = sizeof(set_connectable_off_le_settings_2), .expect_settings_unset = MGMT_SETTING_CONNECTABLE, .expect_hci_command = BT_HCI_CMD_LE_SET_ADV_PARAMETERS, - .expect_hci_param = set_connectable_off_adv_param, - .expect_hci_len = sizeof(set_connectable_off_adv_param), + .expect_hci_param = set_connectable_off_scan_adv_param, + .expect_hci_len = sizeof(set_connectable_off_scan_adv_param), }; static uint16_t settings_powered_le_discoverable[] = { @@ -946,8 +946,8 @@ static const struct generic_data set_connectable_off_le_test_3 = { .expect_len = sizeof(set_connectable_off_le_settings_2), .expect_settings_unset = MGMT_SETTING_CONNECTABLE, .expect_hci_command = BT_HCI_CMD_LE_SET_ADV_PARAMETERS, - .expect_hci_param = set_connectable_off_adv_param, - .expect_hci_len = sizeof(set_connectable_off_adv_param), + .expect_hci_param = set_connectable_off_scan_adv_param, + .expect_hci_len = sizeof(set_connectable_off_scan_adv_param), }; static const struct generic_data set_connectable_off_le_test_4 = { @@ -961,8 +961,8 @@ static const struct generic_data set_connectable_off_le_test_4 = { .expect_len = sizeof(set_connectable_off_le_settings_2), .expect_settings_unset = MGMT_SETTING_CONNECTABLE, .expect_hci_command = BT_HCI_CMD_LE_SET_ADV_PARAMETERS, - .expect_hci_param = set_connectable_off_adv_param, - .expect_hci_len = sizeof(set_connectable_off_adv_param), + .expect_hci_param = set_connectable_off_scan_adv_param, + .expect_hci_len = sizeof(set_connectable_off_scan_adv_param), }; static const char set_fast_conn_on_param[] = { 0x01 }; @@ -4738,17 +4738,6 @@ static uint16_t settings_powered_le_connectable[] = { MGMT_OP_SET_LE, MGMT_OP_SET_CONNECTABLE, 0 }; -static uint8_t set_connectable_off_scan_adv_param[] = { - 0x00, 0x08, /* min_interval */ - 0x00, 0x08, /* max_interval */ - 0x02, /* type */ - 0x01, /* own_addr_type */ - 0x00, /* direct_addr_type */ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* direct_addr */ - 0x07, /* channel_map */ - 0x00, /* filter_policy */ -}; - static const struct generic_data add_advertising_success_13 = { .setup_settings = settings_powered_le, .send_opcode = MGMT_OP_ADD_ADVERTISING, @@ -4762,6 +4751,17 @@ static const struct generic_data add_advertising_success_13 = { .expect_hci_len = sizeof(set_connectable_off_scan_adv_param), }; +static uint8_t set_connectable_off_adv_param[] = { + 0x64, 0x00, /* min_interval */ + 0x96, 0x00, /* max_interval */ + 0x03, /* type */ + 0x01, /* own_addr_type */ + 0x00, /* direct_addr_type */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* direct_addr */ + 0x07, /* channel_map */ + 0x00, /* filter_policy */ +}; + static const struct generic_data add_advertising_success_14 = { .setup_settings = settings_powered_le, .send_opcode = MGMT_OP_ADD_ADVERTISING, From patchwork Wed Nov 4 23:42:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 317921 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD65C55178 for ; Wed, 4 Nov 2020 23:42:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 05B4020786 for ; Wed, 4 Nov 2020 23:42:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ilBoYZZW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732863AbgKDXmm (ORCPT ); Wed, 4 Nov 2020 18:42:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732861AbgKDXmh (ORCPT ); Wed, 4 Nov 2020 18:42:37 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3C96C0613CF for ; Wed, 4 Nov 2020 15:42:37 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id b12so89306plr.4 for ; Wed, 04 Nov 2020 15:42:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GioplUM0BRUba4km2iUOfXJ3MZny2/Sz0TzOafj3MFE=; b=ilBoYZZWduAKQ+zAhFA77qwfZEGD4H0rs1qbmTs46ikvzyRx/REqYU7Q+7oW5ZGc/w GKFEYIIsosOcUhOBVm5YgJ021RnAwLT9BcWPDrYxSjP6PbHExEhtqmn1nEz6i83MwFZF 9u2/90KXZcmS4/iXIGjNd9LAHHDmBFigzDbxHm1Q9UX+3moh0KMgTT3Kr5TQiRURU0IC Rz2+KuN+q9JdnEZxZErn2c/K9kNBpZRqtcW8kcekgFugO4/qdqp9j0/2l8jInffcW44Q 2g7r5upJi2b+vSWlKqN3y02forNOtUhC6QQAwsdvOwnWujva9LkNHE061/dXypI92Gg/ ieEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GioplUM0BRUba4km2iUOfXJ3MZny2/Sz0TzOafj3MFE=; b=LwPM0HmOpKNBD4kujGhDvyd9q/qFP+BGg5M9KplE0rga75vuaS1wtua4w76ddBaTZS ENFOUaBJoOKZAwXVLSNW0khBn49TveyxOtWk6bW9WPpBQ4wu8eei/Ia70SpupreK21v0 5L01oTg/JJARyFmPDrKNFClhhQ37SgS7rrGuChC/ImiJ/YflKyLe2umGOhpMsW4OZgTN 0ZMgdbyESBi1Kr+2WlKbGB0/jjP0EhDe9mBgK0FOFQaE8yEvcNow6DUqtPnwPbo7xCF0 VagAnuf0eHy7bqmS+qC/KiZqwGWbuwO7EHt5HfCVx1j9kQV46h5hqwZ8kHr8KuqgixCj em9w== X-Gm-Message-State: AOAM531e0R8+AnOGP4GKuIqaJazPYvaMWQID/3txRuG3MaMO55Z0jhVk 8JHfBZjeZtb89+ubW7nPAwfqlyjBOcldig== X-Google-Smtp-Source: ABdhPJz74nHZz5vISKD1nJ4pZbUsHF2q9y+4ewfED84PgECmN4tAkLivI6+1ipGNz6aQtBjtTT5KpA== X-Received: by 2002:a17:902:6bc2:b029:d6:e0ba:f2ff with SMTP id m2-20020a1709026bc2b02900d6e0baf2ffmr464168plt.10.1604533357249; Wed, 04 Nov 2020 15:42:37 -0800 (PST) Received: from localhost.localdomain (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id 30sm3361513pgl.45.2020.11.04.15.42.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 15:42:36 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 7/8] mgmt-tester: Fix failing pairing tests Date: Wed, 4 Nov 2020 15:42:27 -0800 Message-Id: <20201104234228.2257427-7-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104234228.2257427-1-luiz.dentz@gmail.com> References: <20201104234228.2257427-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz Just-works pairing does request user confirmation. --- tools/mgmt-tester.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index f6eac30a5..d8554411f 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -6051,12 +6051,6 @@ static void user_confirm_request_callback(uint16_t index, uint16_t length, struct mgmt_cp_user_confirm_reply cp; uint16_t opcode; - if (test->just_works) { - tester_warn("User Confirmation received for just-works case"); - tester_test_failed(); - return; - } - memset(&cp, 0, sizeof(cp)); memcpy(&cp.addr, &ev->addr, sizeof(cp.addr));