From patchwork Mon Jun 9 14:38:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Sharshakov X-Patchwork-Id: 895314 Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B79525CC47 for ; Mon, 9 Jun 2025 14:38:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479921; cv=none; b=apPhlb4QuYIAa1c32FpDfMP3fU3A8hcmdN5xifenUc2XyP80j2SrhOBe0ZdnU5mjXXoKMeU89Qa6xdJG4LT+p7jb4gl1e9l6y8AdU2wfKS0Ij4Yh7o3SfPUmZzCeFU25XQpERgoKYY56e+M+3sSIDHXUabATXIFouL8PNgcwKD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479921; c=relaxed/simple; bh=CARJzuCD62NiugVU5IfvkFLzmfWKWprypgaZ87qOQog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ne4oaZN1gfpnfNxixlX74mAZgMifay3gaXmvLL5q3CrmYN7C0Bj8KZzPu/EOemWBtH+gnDAIyVH+7pKCrIVr2CpAnT637IxEKvQMkcuRPRv+GAQFFjE57lSNf1h6sGUpk6nn+J9plkob3DAJU85Ydy3AKK+A/TwWGulKiJtSC/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZhN2iEoC; arc=none smtp.client-ip=209.85.218.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZhN2iEoC" Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-ad572ba1347so634111166b.1 for ; Mon, 09 Jun 2025 07:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749479917; x=1750084717; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aByIZHicOQ2HsLCTCCgDEfZpuMBO3JBFAAo4do5Gh+w=; b=ZhN2iEoColi3lVjdMUKX9erEr3abLTMVID0kx3p5otCRPj+g3cgthPiMP8BNgyRX9/ TAsgWA8WpHS3HX5uOWjESMs+LyzDjZ4DPGC2RRsFrH7b98pr+xslD+9GSPSnUXWoAeU3 uZJYLxmNR8Zbm0ggwyNe8RYBTAt1ji3y2uVvuh1mrazqEdjElFZfbOPQkAQYopEJypp8 2YVuUYEUd4QnWKXLM//v8bOnhw2o18FI+366ZD5JdLbUG8YQp/gd5ku4cKogTc9Fs4wj CXPKG0aPtsObkkWqrO9CfGFv8o6Ckr7NByBAeGHnNqIJCxCvg57iL5M2SAtKNj5f3U7l mmSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749479917; x=1750084717; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aByIZHicOQ2HsLCTCCgDEfZpuMBO3JBFAAo4do5Gh+w=; b=oWhfNgTHzSLsw57s14XpDfS5m7MixY8aQT/YkFcOAgyumfPoImLqMBhi2/KzSMMWwk LPgvOqE7QUFKRDowk+rl8WZ4i5uquGUFr6Z3mPyrtF2Bz3X98oTRi7la4JEr3vzGuFCz bJg0ox1Hxq6xE6xzNajh9MtCHyT1aTEutUswt+GvtzCu+w1xcypNcuysJvt+ZknhPW7V OyPSZOoPUT5zK20ULHbCwYo5CLgcukkmlO09w9t9HbLCDwY3EmrKo0dkzK4BEysTb3rW Y98DahubwnIUz3hHbbnDCQVhO+CsxLEKMwV2VlPE1GKmL0efKdCRVkTqpwPVXSZRy4sM 6hHg== X-Gm-Message-State: AOJu0YzfpKcYeRWN1CznsEo6eSHNyj6pQHcW/AaMv8iNXgpg/YGQ78nH knTehjFArgn1tunsqwfY/KcPSzopaVvQv5LR9OcoVIZjOOdnbAA708vgKxrUWw== X-Gm-Gg: ASbGncsWD78ejTVpfAhQcbqISxa+i6ewzGOj/+YrIofGDteVFYF4LiWIesYURVmV1fr 4x+QU4smaJLSs5xV19nf/rKCJG2tSz8Vava3UybqIIGmivDCXFaZbJJCzOOnI0QVFd8vegd9gst nZbErdArHPc5ULGi4cobikVghNa1i9VyiqRkhdrxYfDodKesvAOXWzptZorULLjdR0jqbjxfS1L CEUAbSskCiM6LQN/fEMsWt/UCdNM/FwKYm3sMSOp4tIv10uyr/z/EOOV1xbzgFRStvz8JHuPg4D IGdK8RVWrTvjucmUpEyZ1ief0LPqtk9bXQZnBOOpZuL3Tn88MG6UALy0lzfPCyI2Xfpv3uliRt0 TKwFb0MaDYldEBcb4XZI= X-Google-Smtp-Source: AGHT+IF3EybT6bfI8i/e7uzeth+78zo7igmTGQ8Cc79DQRFADJY9LiCX7wbzyfMxbbB44tZAWWuBjg== X-Received: by 2002:a17:906:c145:b0:ad5:6969:2086 with SMTP id a640c23a62f3a-ade1a9c786bmr1200823966b.37.1749479916774; Mon, 09 Jun 2025 07:38:36 -0700 (PDT) Received: from hyperion.tail59961f.ts.net (B-228.ahl.uni-linz.ac.at. [193.171.46.128]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ade34ea5adesm452017866b.80.2025.06.09.07.38.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jun 2025 07:38:36 -0700 (PDT) From: Dmitrii Sharshakov To: linux-bluetooth@vger.kernel.org Cc: Dmitrii Sharshakov Subject: [PATCH BlueZ 1/4] btdev: implement extended advertising Date: Mon, 9 Jun 2025 16:38:08 +0200 Message-ID: <20250609143811.566331-2-d3dx12.xx@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250609143811.566331-1-d3dx12.xx@gmail.com> References: <20250609143811.566331-1-d3dx12.xx@gmail.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Increase maximum advertising data length and implement LE Read Maximum Advertising Data Length command. As expected by Zephyr BAP Server --- emulator/btdev.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/emulator/btdev.c b/emulator/btdev.c index 7bb40670c..4cf48a5af 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -25,6 +25,8 @@ #include #include +#include + #include "lib/bluetooth.h" #include "lib/hci.h" @@ -45,6 +47,7 @@ #define CIG_SIZE 3 #define MAX_PA_DATA_LEN 252 +#define MAX_EXT_ADV_LEN 252 #define has_bredr(btdev) (!((btdev)->features[4] & 0x20)) #define has_le(btdev) (!!((btdev)->features[4] & 0x40)) @@ -99,9 +102,9 @@ struct le_ext_adv { uint8_t filter_policy; /* filter_policy */ uint8_t random_addr[6]; bool rpa; - uint8_t adv_data[252]; + uint8_t adv_data[MAX_EXT_ADV_LEN]; uint8_t adv_data_len; - uint8_t scan_data[252]; + uint8_t scan_data[MAX_EXT_ADV_LEN]; uint8_t scan_data_len; unsigned int broadcast_id; unsigned int timeout_id; @@ -4950,7 +4953,7 @@ static int cmd_set_ext_adv_data(struct btdev *dev, const void *data, return 0; } - ext_adv->adv_data_len = cmd->data_len; + ext_adv->adv_data_len = MIN(cmd->data_len, MAX_EXT_ADV_LEN); memcpy(ext_adv->adv_data, cmd->data, cmd->data_len); cmd_complete(dev, BT_HCI_CMD_LE_SET_EXT_ADV_DATA, &status, sizeof(status)); @@ -4974,7 +4977,7 @@ static int cmd_set_ext_scan_rsp_data(struct btdev *dev, const void *data, return 0; } - ext_adv->scan_data_len = cmd->data_len; + ext_adv->scan_data_len = MIN(cmd->data_len, MAX_EXT_ADV_LEN); memcpy(ext_adv->scan_data, cmd->data, cmd->data_len); cmd_complete(dev, BT_HCI_CMD_LE_SET_EXT_SCAN_RSP_DATA, &status, sizeof(status)); @@ -5008,7 +5011,7 @@ static void send_ext_adv(struct btdev *btdev, const struct btdev *remote, uint8_t num_reports; union { struct bt_hci_le_ext_adv_report lear; - uint8_t raw[24 + 31]; + uint8_t raw[24 + MAX_EXT_ADV_LEN]; }; } meta_event; @@ -5213,8 +5216,16 @@ exit_complete: static int cmd_read_max_adv_data_len(struct btdev *dev, const void *data, uint8_t len) { - /* TODO */ - return -ENOTSUP; + struct bt_hci_rsp_le_read_max_adv_data_len rsp; + + memset(&rsp, 0, sizeof(rsp)); + + rsp.status = BT_HCI_ERR_SUCCESS; + rsp.max_len = MAX_EXT_ADV_LEN; + cmd_complete(dev, BT_HCI_CMD_LE_READ_MAX_ADV_DATA_LEN, &rsp, + sizeof(rsp)); + + return 0; } static int cmd_read_num_adv_sets(struct btdev *dev, const void *data, From patchwork Mon Jun 9 14:38:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Sharshakov X-Patchwork-Id: 894930 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E35038385 for ; Mon, 9 Jun 2025 14:38:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479923; cv=none; b=r1JGaUWRHXgB1ry2B/epdaUieWMMF1e2RWodkBkhvChdLYwWnZC1kJBeV8x04F3rRNGb1O4PYzhjmqw2K1AiHiAvyeZp5cpsqio6DxNlG/9MDfsAwJnwQWyqKuGTfXMBUeeuo030wMkojlsKbs/qFMVs2HiqUeJJ0/4CCOmBRmU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479923; c=relaxed/simple; bh=MkTE3pdDFZyDIcj5hpkR43TYu5VoC+TcUgbuRMjuKx4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HHjGjKYmwpDvi1ZbEk/VoMlJ4L0m6Ug9s4FZxAe9y82zOH2KebWClOwPR831qugc+wk5Buk6XIzzIYjmAUI7GRj0BnAuLzXMiA2ZCPgnaDvFn4nwnJZC4Ti4datBNNzjPkFWhRVjLLwHCZ/V8v80jMQ7qwN3emra4bCbnnWY764= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HgbKP4AP; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HgbKP4AP" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-addfe17ec0bso1003221866b.1 for ; Mon, 09 Jun 2025 07:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749479919; x=1750084719; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3RxmAAAdiA+lyMQq48MGZOPPZS884cIpEO0SBqZO+/0=; b=HgbKP4APMBorJ2YR0/3v8eXGk0J1YukD4OBXh4riYMVB9ruEDcKngA06UL5s3xdmpq A/e5en8J8Ph3DfUhNENKuHFBmxeGzBzaV2SMLsEOYAaLsgkra5W9DlGL4VFD52X2fP3c 4xIGfdx64IN/4+O4HrzgHsSXOcZTQn/C1nVVg7X5GnfR1fwatI4AAoXEYt7TnLA64W1+ m+lXrU5xxUIlgII3HfcQLHGj5dGu8rqkNEJiemUv9QtwOMTmKGViLmj7k1OihnLtU8LB XsEm/k9qGaxXUq2GXuFCX9zqReKYcIRmpec+6kdiRVkiodh3KrXtxss8rxiGUXwQuRDh RWBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749479919; x=1750084719; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3RxmAAAdiA+lyMQq48MGZOPPZS884cIpEO0SBqZO+/0=; b=G/ehnacm8VwaVxagAF2KGdaYCKjYMgMF+ojm8q86vj/eKEM677rDPk0UhCGuSeJkIY weo2huWX3lXOdEokCfNlHKzOziPHGy54wSTiPZoxpflc+x3aOTV8L1O8VP5+Pf2uD9Yo HZI5Fy7C97GLQuf4CyKYueuHf0DK+2fpQIh/RFksuhTkcaNqm6ZuLwQrcLZkPUIQzXYC 6j79JAnQKXxmY2zw1ihCwU2Ch+NxGmH2W0wF0NXuua81yHSIGE3k1hSJuqvU9NU2bzeb iyWoyRDAxDAo0W0pv4Dpux0VHui1rxcGYT7fxFLL7DVuI0x0QnNu4kWlcFdXuUZeBijq S36w== X-Gm-Message-State: AOJu0YwkgCq302MkTwcAa3E4LOrDcVHvmcPYAgL/vFcz8kPTODM3Qvz1 7GHxTM6uB/3xn+uA4pyCTPbbz48DqkpwfE0PiqpdMkDz0zNz+pERoXLnd8HDFw== X-Gm-Gg: ASbGnctsZ5jXYuoj+kZJ52BRe5HWBvVfAqZmZG6U05qo2vyYKuW8CmE8Wby+BaLDZ46 ZjYSKbDdaIjs790ixOLl6IMN7lJ8FMrE0PxDOS+ebpRntVfRdQ68akPOqDPbZOJtLiL2ph16OkD prHTDXFIJmnuGKh0wq/q8+8q1NlGW4eQQfQhorQVYF7csxNrORD1MnpWJ27HQrx27FAz7VR9Umx /hh+tLXofRVLvzWRIVjEtI2nh2BmUqUGf0T0MDV5mTz1ABuCny46VFXVrEl2lLt5+F0UKbS1m5r GGE5vM4eyIudzVVjJksqLIYajDzI7KKjKoeei68z9XPoz8BpeJn71lXTpuYagyGhYdKQvuPHpaL X48A471lQnXN17RM+sv4= X-Google-Smtp-Source: AGHT+IGqu1FA5zPtpWwSFV8ZwReVNlNgk5KXQzuteW63if5nkcFLNadSryEPtqCs+Y8bzYDz75nPQw== X-Received: by 2002:a17:907:72ca:b0:ad8:9394:272a with SMTP id a640c23a62f3a-ade75ff350cmr13048666b.12.1749479919343; Mon, 09 Jun 2025 07:38:39 -0700 (PDT) Received: from hyperion.tail59961f.ts.net (B-228.ahl.uni-linz.ac.at. [193.171.46.128]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ade34ea5adesm452017866b.80.2025.06.09.07.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jun 2025 07:38:39 -0700 (PDT) From: Dmitrii Sharshakov To: linux-bluetooth@vger.kernel.org Cc: Dmitrii Sharshakov Subject: [PATCH BlueZ 2/4] btdev: fix LE Remove ISO Data Path command Date: Mon, 9 Jun 2025 16:38:09 +0200 Message-ID: <20250609143811.566331-3-d3dx12.xx@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250609143811.566331-1-d3dx12.xx@gmail.com> References: <20250609143811.566331-1-d3dx12.xx@gmail.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fix errors in BAP server --- emulator/btdev.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/emulator/btdev.c b/emulator/btdev.c index 4cf48a5af..551ccb6d7 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -6726,30 +6726,35 @@ done: static int cmd_remove_iso_path(struct btdev *dev, const void *data, uint8_t len) { const struct bt_hci_cmd_le_remove_iso_path *cmd = data; - uint8_t status = BT_HCI_ERR_SUCCESS; + struct bt_hci_rsp_le_remove_iso_path rsp; struct btdev_conn *conn; + memset(&rsp, 0, sizeof(rsp)); + + rsp.handle = cmd->handle; + conn = queue_find(dev->conns, match_handle, UINT_TO_PTR(cpu_to_le16(cmd->handle))); if (!conn) { - status = BT_HCI_ERR_UNKNOWN_CONN_ID; + rsp.status = BT_HCI_ERR_UNKNOWN_CONN_ID; goto done; } - switch (cmd->direction) { - case 0x00: + if (cmd->direction > 0x3) { + rsp.status = BT_HCI_ERR_INVALID_PARAMETERS; + goto done; + } + + if (cmd->direction & 0x1) { dev->le_iso_path[0] = 0x00; - break; - case 0x01: + } + if (cmd->direction & 0x2) { dev->le_iso_path[1] = 0x00; - break; - default: - status = BT_HCI_ERR_INVALID_PARAMETERS; } done: - cmd_complete(dev, BT_HCI_CMD_LE_REMOVE_ISO_PATH, &status, - sizeof(status)); + cmd_complete(dev, BT_HCI_CMD_LE_REMOVE_ISO_PATH, &rsp, + sizeof(rsp)); return 0; } From patchwork Mon Jun 9 14:38:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Sharshakov X-Patchwork-Id: 895313 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08D6325CC47 for ; Mon, 9 Jun 2025 14:38:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479924; cv=none; b=eZEyv71SkOLWL1bb+NIgug4PToBg+BfKz9uNc2JXlNtKki3jc/0May1sddXnACmTOYOp6ubqPTBu8AJIZHfsRl1gtwUY7biazXPfK831baa3mhVB18CIOyj5baTdvmt322SsxsMC5Y7eUFNvS3GnXyadsdWW08pSMX6O3Doc4GI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479924; c=relaxed/simple; bh=dkYezuD9DVTD1jDAbkDk8WX+WPoA8yiGVjz3xXMQfd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cyOTVfiVBvIoc47KG0c0w7B6Ylf+2mPw1RlaATvuZY3zRaHa/2atfdJCeRZPQhx0s9L5DtIpcjO8SMPWujHBXR11jYAyvvi11qFHDjRAMYjvnejyJCA7aB4lah+3yfO5bkPnk1qBRXFtUk0t6LeVuux9u2ZugFq++dpRMXUhAnA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=DJDmAijm; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DJDmAijm" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-adb4e36904bso852076266b.1 for ; Mon, 09 Jun 2025 07:38:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749479921; x=1750084721; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e9IKKzuBJsN4xaI8I7pHyZieW0xYgtEgESKs0w0VwH0=; b=DJDmAijmdgNFWJ+9QWSaqeGTXaswTKzqRps3rzVBE1Rar1hH5vNr6mqk33OjFbe9m4 bBS9qKxRr8T1mNyog/rYWW1p5uEe2AmsKr/HsoRPPWP/aUMeQfkAQ3/YaV3dLNux2d62 1XCEsHZttGHCHfbmTZoCZ6GXYFaN1yA16vLrXdVk743RdpsgUnz7uzpLMYOaJyJBVgGO Q1TCZ2FoQLAO7RbwClZM6SWrhP08UTBf7OznGhLLhs0j0xvcbtWCCsRJh4j1zBOW9bmE oesqUr8FMyNyTU8F0qA+j5NVUnJe3XXWFMjrTVPw7lGmXnp1TdRO3GrTervjH65Lg2Up GyRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749479921; x=1750084721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e9IKKzuBJsN4xaI8I7pHyZieW0xYgtEgESKs0w0VwH0=; b=IaQE/Ctj1cusewhACV9vn3ixVCn3tGMbJ4o6elyxbODgk3/CAel58ZU63kE7MIyg8D OvXGaG8FrgN2YpcfCqb1MlVxGzL3DmId7TUuroBFsbZ+1MvMPB8nM3NLqlaAD0yNR0sZ 1f3kSPZMewWg/lbtGIDvfHaFT01CAr5p4iIPIkG553Eu9sKrguPe28yOc0SiC/clk/62 MowkhRW5o5ejP1xRPda6CbeHTZurkVI5p1dHUCHW2xMeZU8ArZE5fumkxghOVV9wHa9w KtK6PXaXvW+qBmVAln0dpFGzfH8mDAZdwv3+7fUIrQaSXBF9EsypAGLG6bcbQOzCxm/N pGIw== X-Gm-Message-State: AOJu0YwhCjCf61Y7t/Fy6dXj5fySS1lx33lU3YotmRHQRYg5qxN+5fz8 EICYIf73TNa0PHDv5Gbt6b8QiAEf1OS4DKeLYFBf61SYL1hbwfHpERNzcMNfhw== X-Gm-Gg: ASbGncukMLObexynamM3tsJ49ugoIU0iwFPElav/xTUYurXLOQExlLHp08WKfPhoWT1 DrcJplkJ+nU2jNf71ZBeJoDEnuHP6NgYcoYplh9JlnO+Ud7YQ809y2mK9hk4xdw6sHJP8idY4MQ faHWP0o4E7o6yUJtNo5PcKg014BbsngAQ2CVtv2hfiF3VXHLiGcmMMbgQ2ZmUwe78Omzervtu1p 2w9U/RcTxxXiKDGNsB+ogS4S6dPQxVkRoeHq5iL4beWCYK5u3yr3Qupm7m4bfAnOZecKeYf9S/J MxQMJ655C976dtsA1+7lICBlngohRGhrcAYBxThUPpfIuf2qmf95lmkNgqWjAE2BPVvzzLf+fh3 5R159ShSK1vZhgT8WCtg= X-Google-Smtp-Source: AGHT+IGyCqTSmEWZiZoDWrPB3R8JzfmhxBdVy62xZNoptwGmv3Yv4NkvrVqW/UjfdlqR9kGKF70dtA== X-Received: by 2002:a17:907:8687:b0:ad8:93a3:299d with SMTP id a640c23a62f3a-ade1a9227fdmr1026402666b.30.1749479920769; Mon, 09 Jun 2025 07:38:40 -0700 (PDT) Received: from hyperion.tail59961f.ts.net (B-228.ahl.uni-linz.ac.at. [193.171.46.128]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ade34ea5adesm452017866b.80.2025.06.09.07.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jun 2025 07:38:40 -0700 (PDT) From: Dmitrii Sharshakov To: linux-bluetooth@vger.kernel.org Cc: Dmitrii Sharshakov Subject: [PATCH BlueZ 3/4] emulator: add option to listen on TCP Date: Mon, 9 Jun 2025 16:38:10 +0200 Message-ID: <20250609143811.566331-4-d3dx12.xx@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250609143811.566331-1-d3dx12.xx@gmail.com> References: <20250609143811.566331-1-d3dx12.xx@gmail.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- emulator/main.c | 20 ++++++++++++++++++-- emulator/server.c | 8 ++++---- emulator/server.h | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/emulator/main.c b/emulator/main.c index 928588254..0d2f1e34f 100644 --- a/emulator/main.c +++ b/emulator/main.c @@ -47,6 +47,7 @@ static void usage(void) "\t-d Enable debug\n" "\t-S Create local serial port\n" "\t-s Create local server sockets\n" + "\t-t[port=45550] Create a TCP server\n" "\t-l[num] Number of local controllers\n" "\t-L Create LE only controller\n" "\t-U[num] Number of test LE controllers\n" @@ -60,6 +61,7 @@ static const struct option main_options[] = { { "debug", no_argument, NULL, 'd' }, { "serial", no_argument, NULL, 'S' }, { "server", no_argument, NULL, 's' }, + { "tcp", optional_argument, NULL, 't' }, { "local", optional_argument, NULL, 'l' }, { "le", no_argument, NULL, 'L' }, { "bredr", no_argument, NULL, 'B' }, @@ -86,6 +88,7 @@ int main(int argc, char *argv[]) struct server *server5; bool debug_enabled = false; bool server_enabled = false; + uint16_t tcp_port = 0; bool serial_enabled = false; int letest_count = 0; int vhci_count = 0; @@ -97,7 +100,7 @@ int main(int argc, char *argv[]) for (;;) { int opt; - opt = getopt_long(argc, argv, "dSsl::LBAU::T::vh", + opt = getopt_long(argc, argv, "dSst::l::LBAU::T::vh", main_options, NULL); if (opt < 0) break; @@ -112,6 +115,12 @@ int main(int argc, char *argv[]) case 's': server_enabled = true; break; + case 't': + if (optarg) + tcp_port = atoi(optarg); + else + tcp_port = 45550; + break; case 'l': if (optarg) vhci_count = atoi(optarg); @@ -145,7 +154,7 @@ int main(int argc, char *argv[]) } if (letest_count < 1 && vhci_count < 1 && !server_enabled && - !serial_enabled) { + !tcp_port && !serial_enabled) { fprintf(stderr, "No emulator specified\n"); return EXIT_FAILURE; } @@ -213,5 +222,12 @@ int main(int argc, char *argv[]) fprintf(stderr, "Failed to open monitor server\n"); } + if (tcp_port) { + struct server *tcp_server = server_open_tcp(SERVER_TYPE_BREDRLE, tcp_port); + if (!tcp_server) + fprintf(stderr, "Failed to open TCP port\n"); + fprintf(stderr, "Listening TCP on 127.0.0.1:%d\n", tcp_port); + } + return mainloop_run_with_signal(signal_callback, NULL); } diff --git a/emulator/server.c b/emulator/server.c index ceb417a40..0ca7d42a3 100644 --- a/emulator/server.c +++ b/emulator/server.c @@ -311,7 +311,7 @@ struct server *server_open_unix(enum server_type type, const char *path) return server; } -static int open_tcp(void) +static int open_tcp(uint16_t port) { struct sockaddr_in addr; int fd, opt = 1; @@ -332,7 +332,7 @@ static int open_tcp(void) addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - addr.sin_port = htons(45550); + addr.sin_port = htons(port); if (bind(fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { perror("Failed to bind server socket"); @@ -349,7 +349,7 @@ static int open_tcp(void) return fd; } -struct server *server_open_tcp(enum server_type type) +struct server *server_open_tcp(enum server_type type, uint16_t port) { struct server *server; @@ -361,7 +361,7 @@ struct server *server_open_tcp(enum server_type type) server->type = type; server->id = 0x43; - server->fd = open_tcp(); + server->fd = open_tcp(port); if (server->fd < 0) { free(server); return NULL; diff --git a/emulator/server.h b/emulator/server.h index 294e86525..7d6b7be74 100644 --- a/emulator/server.h +++ b/emulator/server.h @@ -22,5 +22,5 @@ enum server_type { struct server; struct server *server_open_unix(enum server_type type, const char *path); -struct server *server_open_tcp(enum server_type type); +struct server *server_open_tcp(enum server_type type, uint16_t port); void server_close(struct server *server); From patchwork Mon Jun 9 14:38:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitrii Sharshakov X-Patchwork-Id: 894929 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3165425DCFD for ; Mon, 9 Jun 2025 14:38:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479925; cv=none; b=jB1xEf87MWhUrwErFgjmR6v7djVaPjEk3uCsc/FWQYtuSUh0wmECagRqZL9TtDgO5CmVEiirFMIAb369hIfyBOJpuJTQOZj2YhSv0NMQuN3dGxNv3eQ7yO9CDkKx+pGuidJRkbBkBIakHEX29lzx7WiT/+kqV28N2Ijf9URAIe4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749479925; c=relaxed/simple; bh=XLVpsgnf502PuJA/EKpENm5FX1SEnHTPOXj/uKv+kVk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NRzfWj6CVXYI0BCmYVk7ORhTyg1OOR9OYBQNVR1gG9yaoy9h8db79Ow5yxLjZnm67KpJKysbggyx9rMZnB0ot4SUBYzPu7fRMhbjpJVtkqiEZn54sgZtQE2klwJc1sREA/wTY2/9b08Af+fYpg64GnZll3uy8yMUBW5ELYfP4Ms= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VLxWBWhk; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VLxWBWhk" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-ade30256175so529524766b.1 for ; Mon, 09 Jun 2025 07:38:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749479922; x=1750084722; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WD6gevOLd8eK8I8WfRmarBD3Imp7HhIMM16g6xn3oHQ=; b=VLxWBWhkV429ZXdTwFrJQI8hQvzRv84tarW9lcWqhnXKbhHECLxZLcyTQj34eq7Vr6 xdG4VgyQz2jh1IWPSwciYoAj9LEfx5gQHw7Hl1wElL89HRapUiMfexwNN9tT5UdJQNeF WV0iudv9pyzfLGTOCU47Su6SxtAWmEjO5bXmSXFAoukrhf6tbM1QolxoKTD0x82LiSWf AsMES/fuQQdLMS/QLRxPyfZ8hj++AECKzNWYmIDFtDOXEgSps9I97c/jQjsMEPOp/aud +SJjR6RgtSQQk+i8Wk2tVmq0z0REt5OQhRhczFRTT7IPPzvh8rkDOThXC9OxFP6hyK/5 pZpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749479922; x=1750084722; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WD6gevOLd8eK8I8WfRmarBD3Imp7HhIMM16g6xn3oHQ=; b=BUP40I1mr3LmEQL9hAQlUW7UizC15L6UAaPVKbd9rulrsdhBsuZ/7I80PagCLlBMA2 39zAhwke1+mUy+QDREX33cD3nosMfn6hn13GsPZ4KtOB631PHWmT+RMuBQ8chXb5Wq+N X7ms+gyqxFZ+Zo7MkIKgnLuHCq4c6JlgSK6AJzMmLb7pkzcRxZRRg3OkGVLqAZlGxM13 ElWdyIIKg0rd3uyoJJUFXbH/jtD45cCC63giglpTJz5h3LDOfM/RAbxdEmxVnyLp7tBs LNR66/ck/M8mpXzzkTb7mXJvYYVXXDOFaZPWvhRzApOIsypw25B5Gyp94UMaXOBcW699 q5Pw== X-Gm-Message-State: AOJu0YwWdy5tEDE06ADUw06FIHjcAk950Ou5BKtIpI06X7evzg+b8izP 2N9R23vwa5YUvRKuBB39sgFsZG5TBk4XsWLaCLBvz/aysWyI92doleDxbpffkA== X-Gm-Gg: ASbGnct0CMx0Xh6JEz0c9dCEzA/QOp1VH+OX96k7ZJndR5jI1dQYXfQQk6k96yPKbCH 01bC91jjnBYRSTOAv5bQy/ViNLWIA/0Qwii1K4sGnozgoyljLUEyQZ/inPtTcuKdLMF/KjJqBIX Pn7+279C8HBVov78baCQyn3cH2mTzfCRE52e01myZFzT4WTCCO+jDgFBIPs0NxmP0FiHU5JZmqx H7gyOekip47YJmQfHCw4aA9OB/gHDGXlXMeMi04HB2mylb1FnvKpUimgdtgTdCplzNBY3H1jy0G 0nOQWtvPuPZRL9o7Rgqvs2ffqLmH9D5JUUDtnXC7PoOVOcgxib1SWgpxOmyPw2P3VqH0YPrpj8d 0+9tNJlbYd2PhhliwtJg= X-Google-Smtp-Source: AGHT+IGiPFnq9c3pMzqiDzHLbRtCHjfkCdFpF/QgvAX6bOVws86icpQR74QXjvjfHeCLVY5qQQdCqA== X-Received: by 2002:a17:907:9627:b0:ad2:4fa0:88cd with SMTP id a640c23a62f3a-ade1a9161d5mr1204272266b.9.1749479921920; Mon, 09 Jun 2025 07:38:41 -0700 (PDT) Received: from hyperion.tail59961f.ts.net (B-228.ahl.uni-linz.ac.at. [193.171.46.128]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ade34ea5adesm452017866b.80.2025.06.09.07.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jun 2025 07:38:41 -0700 (PDT) From: Dmitrii Sharshakov To: linux-bluetooth@vger.kernel.org Cc: Dmitrii Sharshakov Subject: [PATCH BlueZ 4/4] emulator: server: handle ISO, use BR/EDR+LE 5.2 by default Date: Mon, 9 Jun 2025 16:38:11 +0200 Message-ID: <20250609143811.566331-5-d3dx12.xx@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250609143811.566331-1-d3dx12.xx@gmail.com> References: <20250609143811.566331-1-d3dx12.xx@gmail.com> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Allow passing of ISO packets via the socket by parsing their header. Set version to 5.2 to expose ISO/CIS and other LE Audio related features when using server mode. --- emulator/server.c | 11 +++++++++-- lib/hci.h | 6 ++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/emulator/server.c b/emulator/server.c index 0ca7d42a3..d86342601 100644 --- a/emulator/server.c +++ b/emulator/server.c @@ -118,6 +118,7 @@ again: while (count > 0) { hci_command_hdr *cmd_hdr; hci_acl_hdr *acl_hdr; + hci_iso_hdr *iso_hdr; if (!client->pkt_data) { client->pkt_type = ptr[0]; @@ -140,8 +141,14 @@ again: client->pkt_data = malloc(client->pkt_expect); client->pkt_len = 0; break; + case HCI_ISODATA_PKT: + iso_hdr = (hci_iso_hdr*)(ptr + 1); + client->pkt_expect = HCI_ISO_HDR_SIZE + iso_hdr->dlen + 1; + client->pkt_data = malloc(client->pkt_expect); + client->pkt_len = 0; + break; default: - printf("packet error\n"); + printf("packet error, unknown type: %d\n", client->pkt_type); return; } @@ -218,7 +225,7 @@ static void server_accept_callback(int fd, uint32_t events, void *user_data) switch (server->type) { case SERVER_TYPE_BREDRLE: - type = BTDEV_TYPE_BREDRLE; + type = BTDEV_TYPE_BREDRLE52; break; case SERVER_TYPE_BREDR: type = BTDEV_TYPE_BREDR; diff --git a/lib/hci.h b/lib/hci.h index c39a72cef..96733efc1 100644 --- a/lib/hci.h +++ b/lib/hci.h @@ -2311,6 +2311,12 @@ typedef struct { } __attribute__ ((packed)) hci_msg_hdr; #define HCI_MSG_HDR_SIZE 6 +typedef struct { + uint16_t handle; + uint16_t dlen; +} __attribute__ ((packed)) hci_iso_hdr; +#define HCI_ISO_HDR_SIZE 4 + /* Command opcode pack/unpack */ #define cmd_opcode_pack(ogf, ocf) (uint16_t)((ocf & 0x03ff)|(ogf << 10)) #define cmd_opcode_ogf(op) (op >> 10)