Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
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:   Tue, 24 Oct 2023 14:04:30 +0300
Message-Id: <20231024110430.3323-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20231024110430.3323-1-iulia.tanasescu@nxp.com>
References: <20231024110430.3323-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?+rSs5+6a/s/VMtAxs0TQn5kLmJdD5DVPSjMp6XbNGmHtLn09u5A8BeFfFuuC?=
 =?us-ascii?Q?M2Djbl4oyUdjS+SpvFf30OwL0oamQ69cX4CcCaKwoEp7pqCNPpaIFg8nmDYO?=
 =?us-ascii?Q?LlYr3M52tGz9MIC6bLEbCHfZZ3Vp0SH7z7pHxT6aKX1ys5GCJ6aNd9KYt5Ma?=
 =?us-ascii?Q?Oo/gQJDbWc5+0LYcpSxzFexiq8xMNF8UewRm/+ikCRxvYokcBIAIOTflwbur?=
 =?us-ascii?Q?6C+Yj+iFE3jSwpZ4a+DRVBahc/6ppa8CLp4hJVgaRYiwnKGh5HUjx99O3irA?=
 =?us-ascii?Q?Ym2Qp5rB9peXo8vMSZvuzN5HZ0kd5L+xdat2HXpC9wSEf/CEfMBGkiRxL+sB?=
 =?us-ascii?Q?A7EhcXZn1Iq36fDvcLPtnDRtdoDtNtZMIDjbgUPrWnpSxnxWVaPTBgaTGm3U?=
 =?us-ascii?Q?zX8TKgfkuubgXXoaUgK11HEdGyKSBdj1T6dFQWA7HZaNNmJckwC1Z1A+/z57?=
 =?us-ascii?Q?affiiWCZ++Onu5hkbHL+UcCQtIjr1odR5986VZ9zi8MPAR0kE4AYvAom/mTu?=
 =?us-ascii?Q?mGGcUmCq1/9/JzRC8l/DeCPBTv7ZvXYtrodio31mOJPhDY87I774S2p1xvL3?=
 =?us-ascii?Q?UglJffsyw6mYFdsEQHZov1vz81xun+iUdnnpB12UhWznGYVILNTJV+5/52h+?=
 =?us-ascii?Q?wL2OxEslITHlfQRGA3ybi+jV7kOfBY59xS+v9exa3h7qsk5Xt6kGwGO+yKyq?=
 =?us-ascii?Q?P1BpvNIVD2vT0Q5G8EWK8KD4rBngxpUOlOxxw7prvawZwYwPuOcDeuneAo1f?=
 =?us-ascii?Q?g9Rfr0tPAoa2duR2iYbksGe9fkLHO3fEB3gVDotcjCv2yFrA3GlGWDbrqZBY?=
 =?us-ascii?Q?8f735Vie2iCSKoeNueZGUpQTpnt9BxSNN4cgpF2X4Jn8JKQYnuC/4rbOVaUt?=
 =?us-ascii?Q?WmKLZ44TMsLWKL3iSZzogknmL5YkSZtvrM5QDj5egsXtNBu7gxdxk2pf/eUn?=
 =?us-ascii?Q?EtVPjiZIcumErfKaIR+56DSsssjn0/wz7pG5JQrD7WswXVSttCxEZpHVsMgw?=
 =?us-ascii?Q?cdWhkOSh4XtdeVjNtpph0QaPhvyq8NXE8k5NY0fox7/gh8ZUxYUJhs2MLYpx?=
 =?us-ascii?Q?GkvToDPfDLMhJyffAoNOtrUyZiHlhi2DGqSTjsOZDs6qqCsHA9Eg2yHhgUIk?=
 =?us-ascii?Q?iLWquzvGXZUYs5jfSOA+pdbVCvtDnpyJX1bszEWWmf97oYFDmcaWh2k/sWgB?=
 =?us-ascii?Q?fdHKwCXt1yPRdsp7pn0bgKQ2AM2OW1pxWNj11pKkoJQUWAL8/xQooy2s79Uf?=
 =?us-ascii?Q?WCea1in2wijH+dIdGzwTzC15yDRW5E/2DCuW13SDsFKd9XtSfNiwI9gNdTwb?=
 =?us-ascii?Q?T/+XcZdPCxZ67AH5D8lYANFuVtCPy1baeVuqklr4GbT6s9hGH8Y2l9AZ4Poe?=
 =?us-ascii?Q?TouFQKjiAPZJiYUKjPn1Ag5+myt/vDaSUT6xGxk3hMDHD9OzJQJhrBWNji4w?=
 =?us-ascii?Q?Y4SLCpfNU6aPIVpdmiwFyXRH/tfbH+8VGsosPxfseniprkCktB5tgf64E0De?=
 =?us-ascii?Q?fCX1FSy38hP+UNrkhzIiRtbCMhqi8fhwsXPpA+t691EI4uuj3VYluiRbrh1/?=
 =?us-ascii?Q?4ejO4Fv4XoX1yeP3JSgEIk+s1Y3E1i7a91pKR8zvps3mkZJRPJfwL9DFi/Ou?=
 =?us-ascii?Q?ZQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3b39b99b-672b-415b-9092-08dbd481053f
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 11:04:40.8063
 (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: XphZKg4Hs4J7cuA+8KcVoXAPsW16zhHyiKtFzNFnRPg8yjX8l8H4YQ4xJdvE7TXxTVLCd61WIadkI0qxNv16gg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8965
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 groat.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 (groat.vger.email [0.0.0.0]); Tue, 24 Oct 2023 04:04:47 -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