Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
From:   Iulia Tanasescu <iulia.tanasescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com, luiz.dentz@gmail.com,
        Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH BlueZ v2 1/1] btio: Allow binding a bcast listener before accept
Date:   Thu, 19 Oct 2023 17:52:26 +0300
Message-Id: <20231019145226.4879-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20231019145226.4879-1-iulia.tanasescu@nxp.com>
References: <20231019145226.4879-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Qpz2JVVOuvFMuNOL6P29PW0bLTXPB6ij7HOgvnHFz+TN63NzUXstFZIHETYa?=
 =?us-ascii?Q?NCx8dyiu9xpACE7fpLcR8s69BmxHC/8NIDckPlUUxD7l3FqjiNCXj+iJ8x/P?=
 =?us-ascii?Q?jQG2pzhTdol7vUtDNuLe544FuDtAD52chnn/hzL3qoptugh7Kml8+PTQOlIH?=
 =?us-ascii?Q?3dxgCOvPWHaUOPGashi8ND2y+3uZEG6VTCtxAT7Ykf6qdklvj2f3cHkOM8NO?=
 =?us-ascii?Q?cS1l06eJRgej58F/YQQHvMjKENr2SerDvb8vjNquaQMZqPmbuHtI20FuUPjW?=
 =?us-ascii?Q?H7vs4SzGj46eItsQ7BFaMlgv7MQpLxJYpF0z1dtEhLDlX+yoipVX/Cr0WI8l?=
 =?us-ascii?Q?HhNg3Oa7ZT0SpjcNbS73nY2GdEIITbYWV2pr3u7gJeS3+Ck5S4EUxqkpc1LT?=
 =?us-ascii?Q?36QJPUkzQrH4edHy5uj19AISW5YCvGufutaAPHYymTMM5oIqov4kTAt/oUev?=
 =?us-ascii?Q?nn9Gm6D+k+JXzvJBYzCFuHYrDw0WNQOnae/ThRc7M5gtazsG90d6ryNgyf0y?=
 =?us-ascii?Q?3Mb57t5/xEJOgT6naGj69FdlGTknDcCRg2jKXkUJMrInxsh3PU8XrcJGeYVn?=
 =?us-ascii?Q?tTWWEoFbjSwM7MQ2Eep4JffZl0xZGYt8gOFn6IvcUmc+Tf9KI5Sc6d5mtp1p?=
 =?us-ascii?Q?yH0v1yT5ords8G1ubJPYu6vGNbf8ThMgigwl02uwEqPBHi539Gx6fAKJ9IqB?=
 =?us-ascii?Q?9h7L8od/0snSEbEly2WZluno9kHV/ydOH8RZjj55lixaQw/PLpSntGCtCPEz?=
 =?us-ascii?Q?MfED0I2aPZZDmkzIET/3DlnubpOizSD+r7KkbAmkkqAjRURqyWOp/X0fE96m?=
 =?us-ascii?Q?Q1Zufy2wUjm37yWbGwteTJ0vnbTJybPYOb7ifo6+8nTAZMnY3d7RF9FkSmSt?=
 =?us-ascii?Q?nGbvL9ehCFGKoqwBUZMzw69gG9eZWTn7p6KGX7ElRDh5yP6WzpbOTtU3TiJ/?=
 =?us-ascii?Q?g44KLCme6E/CbOrqSb7TYXowiom2uDHFcKkSduNoh95LWQmwObFyn4BX4lG6?=
 =?us-ascii?Q?gUqolGncsBZImGx8Gtap71sXCdLMdkjSEe5POwidOxj7Qi8Tcj2MALkFOneI?=
 =?us-ascii?Q?9hiPU6UJl002NaPF6l72+JmTYBWb5D7U+Ibyus9miXsfZahDrz02UQ3MlO3a?=
 =?us-ascii?Q?xmWdhmFZzqljP/Wsq6F7va4CjkDJOpKIDCEake3ChiF+O9Wn/j4mVXagLla4?=
 =?us-ascii?Q?drGo4tRdh+VhwQI4GaJ38HM0wsePkNLJ2HqICU94XPDbE57OlEXjesnrRAVz?=
 =?us-ascii?Q?+N0bq8QYDYatn6NdVwwX3mr3/o0Nh/gpcSvhgqLUsYoWkkYH2CRAJ0Lc8NvP?=
 =?us-ascii?Q?XF7IQ4dVMYFjONhsf7stM9PbwzrLOO0biYzMd955WsedBkfuL3Dv48+EsihA?=
 =?us-ascii?Q?RuN1P8njOPJlgXcXDbWtOnMe75h5OnYbFlqtcNu4VM77AU6GkYHjOLGBpZpq?=
 =?us-ascii?Q?AOisA4hVZz8fq8Mi3gjUmkpB1OQ3QeeRVpRa+/BLcGDddIthGKwzIRznocdv?=
 =?us-ascii?Q?czrUJxGRS5lhGj0FnrCeVQr09POua2gFc113rDQDQmO7UywdPlWkOC1pkAlz?=
 =?us-ascii?Q?uWN62oKjgHjfHj76lCv6Xs4HotNzWBXTcVr9EMD6755U2Od8wUcFpv569lkc?=
 =?us-ascii?Q?pA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a223acae-b967-47ce-48f3-08dbd0b307bb
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 14:52:35.1469
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: EMmJf0rc1jt4LH+nGOd1Y+tmDH8S8gnR3mTSVDjr9PfimJwFJgk2Gn61puJaJePeWAlGd4pthIC6XWj4HQmaLQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8724
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 19 Oct 2023 07:52:41 -0700 (PDT)

This adds btio support for binding a PA sync io to a number of BISes,
before proceeding with BIG Create Sync.
---
 btio/btio.c          | 55 +++++++++++++++++++++++++++++++++++++++++++-
 btio/btio.h          |  2 +-
 profiles/audio/bap.c |  2 +-
 src/shared/bass.c    |  9 ++++----
 4 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/btio/btio.c b/btio/btio.c
index d45b8240d..d30cfcac7 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -1796,14 +1796,67 @@ gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, gpointer user_data,
 
 gboolean bt_io_bcast_accept(GIOChannel *io, BtIOConnect connect,
 				gpointer user_data, GDestroyNotify destroy,
-				GError * *err)
+				GError * *err, BtIOOption opt1, ...)
 {
 	int sock;
 	char c;
 	struct pollfd pfd;
+	va_list args;
+	struct sockaddr_iso *addr = NULL;
+	uint8_t bc_num_bis = 0;
+	uint8_t bc_bis[ISO_MAX_NUM_BIS] = {0};
+	BtIOOption opt = opt1;
+
+	va_start(args, opt1);
+
+	while (opt != BT_IO_OPT_INVALID) {
+		if (opt == BT_IO_OPT_ISO_BC_NUM_BIS)  {
+			bc_num_bis = va_arg(args, int);
+		} else if (opt == BT_IO_OPT_ISO_BC_BIS) {
+			memcpy(bc_bis, va_arg(args, uint8_t *),
+					bc_num_bis);
+		} else {
+			g_set_error(err, BT_IO_ERROR, EINVAL,
+					"Invalid option %d", opt);
+			break;
+		}
+
+		opt = va_arg(args, int);
+	}
+
+	va_end(args);
+
+	if (*err)
+		return FALSE;
 
 	sock = g_io_channel_unix_get_fd(io);
 
+	if (bc_num_bis) {
+		addr = malloc(sizeof(*addr) + sizeof(*addr->iso_bc));
+
+		if (!addr) {
+			ERROR_FAILED(err, "poll", ENOMEM);
+			return FALSE;
+		}
+
+		memset(addr, 0, sizeof(*addr) + sizeof(*addr->iso_bc));
+		addr->iso_family = AF_BLUETOOTH;
+
+		addr->iso_bc->bc_num_bis = bc_num_bis;
+		memcpy(addr->iso_bc->bc_bis, bc_bis,
+			addr->iso_bc->bc_num_bis);
+
+		if (bind(sock, (struct sockaddr *)addr,
+			sizeof(*addr) + sizeof(*addr->iso_bc)) < 0) {
+			ERROR_FAILED(err, "bind", errno);
+		}
+
+		free(addr);
+
+		if (*err)
+			return FALSE;
+	}
+
 	memset(&pfd, 0, sizeof(pfd));
 	pfd.fd = sock;
 	pfd.events = POLLOUT;
diff --git a/btio/btio.h b/btio/btio.h
index 3169bebf3..3e69092b1 100644
--- a/btio/btio.h
+++ b/btio/btio.h
@@ -77,7 +77,7 @@ gboolean bt_io_accept(GIOChannel *io, BtIOConnect connect, gpointer user_data,
 
 gboolean bt_io_bcast_accept(GIOChannel *io, BtIOConnect connect,
 				gpointer user_data, GDestroyNotify destroy,
-				GError **err);
+				GError **err, BtIOOption opt1, ...);
 
 gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...);
 
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index fa5cf1f54..b74498c4c 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -981,7 +981,7 @@ static void iso_pa_sync_confirm_cb(GIOChannel *io, void *user_data)
 	GError *err = NULL;
 
 	if (!bt_io_bcast_accept(io, iso_bcast_confirm_cb,
-				user_data, NULL, &err)) {
+				user_data, NULL, &err, BT_IO_OPT_INVALID)) {
 		error("bt_io_bcast_accept: %s", err->message);
 		g_error_free(err);
 		g_io_channel_shutdown(io, TRUE, NULL);
diff --git a/src/shared/bass.c b/src/shared/bass.c
index 0ee3187d1..ce8b239f3 100644
--- a/src/shared/bass.c
+++ b/src/shared/bass.c
@@ -743,8 +743,9 @@ static void confirm_cb(GIOChannel *io, gpointer user_data)
 
 		if (bass_trigger_big_sync(bcast_src)) {
 			if (!bt_io_bcast_accept(bcast_src->pa_sync_io,
-				connect_cb, bcast_src, NULL, &gerr)) {
-				DBG(bcast_src->bass, "bt_io_accept: %s",
+				connect_cb, bcast_src, NULL, &gerr,
+				BT_IO_OPT_INVALID)) {
+				DBG(bcast_src->bass, "bt_io_bcast_accept: %s",
 				gerr->message);
 				g_error_free(gerr);
 			}
@@ -1129,8 +1130,8 @@ static void bass_handle_set_bcast_code_op(struct bt_bass *bass,
 	}
 
 	if (!bt_io_bcast_accept(bcast_src->pa_sync_io, connect_cb,
-		bcast_src, NULL, &gerr)) {
-		DBG(bcast_src->bass, "bt_io_accept: %s", gerr->message);
+		bcast_src, NULL, &gerr,  BT_IO_OPT_INVALID)) {
+		DBG(bcast_src->bass, "bt_io_bcast_accept: %s", gerr->message);
 		g_error_free(gerr);
 	}
 }
-- 
2.39.2