Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
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 2/4] shared/bass: Handle G_IO_HUP on io channels
Date:   Mon, 16 Oct 2023 18:48:58 +0300
Message-Id: <20231016154900.3094-3-iulia.tanasescu@nxp.com>
In-Reply-To: <20231016154900.3094-1-iulia.tanasescu@nxp.com>
References: <20231016154900.3094-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?qtz9R6aDsUq/BLNOf7yC8hv1S9C9/xCjgW8MlTQXYoXhcWJb4puGCV7X8DM7?=
 =?us-ascii?Q?mplKmWSVNDRpvC/rtGA3pDQemJa8Wxry9ajG49rYd7IGA5lydJN5MWp9J5qu?=
 =?us-ascii?Q?ChtJ9hQfPVMHbN7mi2tA7ZyH4iMydQ/8r5J0k3oPxH2NwBeqZON1lLIM961i?=
 =?us-ascii?Q?wJUZTybCFLhPBwH1NFDtTJ5u/w78QoXYgyera1Ya/i0Zh5FL/YGTZZ4N4gjj?=
 =?us-ascii?Q?i01WgZ67ml23e/fxmzpb/v1PnEbWgYnGTNh6VsZtGNWxL64ej9+UNdBS3qH8?=
 =?us-ascii?Q?BoqzDgTi/lqQcqXfPVbbfdnpeOrulP2NHiF4o92bQLgd0fsLZ3AFrfFH+ePY?=
 =?us-ascii?Q?SPooN0dH6fNLyYFte34uryEJ2dQHq4aV7LigOD5ksgyue/svO9n+yDSyb84m?=
 =?us-ascii?Q?+YnmyNsAUeTcL56v3jIHrtOjTkVb0eGX7lOTjm9si1vnon4kMW/+f9pvGUMM?=
 =?us-ascii?Q?83rW/Mixxmon+mYgZgQi78ZnW6YWPoJaDZdgZe2tIojyVIg0evk+KXGQiYkp?=
 =?us-ascii?Q?cupwrpojIXwpWEPDuoCD240ZtllsNnDWCq7mR1UneTj2777xjfBEEQISCs46?=
 =?us-ascii?Q?jT1JYvBMdrwv5FdKQPyOtP7k2gW25pAS+YrbpByjQcBf1sl2MA8PWm9nOExM?=
 =?us-ascii?Q?JWOGJu/ulD2H+Yzlc79/t+PDToCsT74VMCRoSut5jzZstvV85/fKCVcx2emm?=
 =?us-ascii?Q?fv+kaBrMoeCFmjjIGdOA3h5B5SkUwE9hGbSt4pitVdvZ0fcuF6ltErIBF7cU?=
 =?us-ascii?Q?sbgRITnvNMf3CJwxdachgbTNGw0mVCPU5pH4iGBrT9A8aZv3xjSKo9Crbhn8?=
 =?us-ascii?Q?Xq91uztOYHVD3MsLzsGG5+lRMMQ5ZZUk4TD3Hfqy0upsRiLMC38K3p+B940Y?=
 =?us-ascii?Q?62M8utijmasUd8gm4w6/xXyNFS28SSRyjBuLvD9X27zzEgudklhWu3zby/p/?=
 =?us-ascii?Q?IPJKvAhfpwdyxDa1ooc8zl+Lk5kPtfNt0V1R/C/PXE6NnOSmR51wbkIj8N6R?=
 =?us-ascii?Q?BspV5lDF6jPJm2hMAt4JvxrN4P20DwmRLeiArF6vphnmI3r30WDAfVMsvMDp?=
 =?us-ascii?Q?++p1MMRtAw7f+IK6odZlGC3b83gA52cN1fh1sfyrU+SihYVl7B38hfXfENXH?=
 =?us-ascii?Q?EcV65631QIJnqTzm98RAAeFNrUddsV9VUyr/A6QOV0Ln7tib248fEI/AWjWn?=
 =?us-ascii?Q?9xhNM0p4Fvv3z849j4FkJVqQ3P8PMI/i3nLCm+XJf3duytX0cQiHmFDW/r6s?=
 =?us-ascii?Q?9UuBhqy6PKBOBFDDfYmrvTC+Y1IpOWE3jzUOfYKEjops6A8GEOszsvFAYp/N?=
 =?us-ascii?Q?N6sx1O6a4VptxKELr6eLu0LUwuTbGGrXJrHeU9p6cN/B1BtaZU2GcqCkWTM/?=
 =?us-ascii?Q?IrN84vhFgEGnIFi1LHd58lDm68BQ8uBCVaAPN7eq/dlBTTAsHRhY3WeDCFRd?=
 =?us-ascii?Q?ocidUMdyKDE1+PE0r1P3SqCKgp+IqcPhuLtZnn1u1ndu8vtad/utffrWxX1N?=
 =?us-ascii?Q?uw6OLOtuNpJOzJXxhi4yibszitCnx7JWKNAj5B7fJDzenLbhIiSfIaV4JL8S?=
 =?us-ascii?Q?rn7157Ck4Ct+4mg/QNY3a8t6jB9G/WNYjuNetWtYJQo73wj1mAENbHWkpMGF?=
 =?us-ascii?Q?jA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c95b0f5-6277-4c95-0b9d-08dbce5f712b
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 15:49:11.9852
 (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: TTyGm5kpgdBMjpNVGWSgk07SOuqlWTh2y9OLnmQjkp+UsILE33P4L6rs1D0kDnQOh1Rr+cCiLYtPEEAjzlLv6Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7423
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 howler.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 (howler.vger.email [0.0.0.0]); Mon, 16 Oct 2023 08:49:18 -0700 (PDT)

This adds watches to handle closed sockets

---
 src/shared/bass.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 src/shared/bass.h |  2 ++
 2 files changed, 61 insertions(+)

diff --git a/src/shared/bass.c b/src/shared/bass.c
index 0ee3187d1..78103d463 100644
--- a/src/shared/bass.c
+++ b/src/shared/bass.c
@@ -655,6 +655,11 @@ static void connect_cb(GIOChannel *io, GError *gerr,
 		g_io_channel_unref(bcast_src->listen_io);
 		bcast_src->listen_io = NULL;
 
+		if (bcast_src->listen_io_id > 0) {
+			g_source_remove(bcast_src->listen_io_id);
+			bcast_src->listen_io_id  = 0;
+		}
+
 		/* Close pa sync io */
 		if (bcast_src->pa_sync_io) {
 			g_io_channel_shutdown(bcast_src->pa_sync_io,
@@ -663,6 +668,11 @@ static void connect_cb(GIOChannel *io, GError *gerr,
 			bcast_src->pa_sync_io = NULL;
 		}
 
+		if (bcast_src->pa_sync_io_id > 0) {
+			g_source_remove(bcast_src->pa_sync_io_id);
+			bcast_src->pa_sync_io_id  = 0;
+		}
+
 		for (i = 0; i < bcast_src->num_subgroups; i++)
 			bcast_src->subgroup_data[i].bis_sync =
 				BT_BASS_BIG_SYNC_FAILED_BITMASK;
@@ -703,6 +713,18 @@ static bool bass_trigger_big_sync(struct bt_bcast_src *bcast_src)
 	return false;
 }
 
+static gboolean pa_sync_io_disconnect_cb(GIOChannel *io, GIOCondition cond,
+			gpointer data)
+{
+	struct bt_bcast_src *bcast_src = data;
+
+	DBG(bcast_src->bass, "PA sync io has been disconnected");
+
+	bcast_src->pa_sync_io_id = 0;
+	bcast_src->pa_sync_io = NULL;
+
+	return FALSE;
+}
 
 static void confirm_cb(GIOChannel *io, gpointer user_data)
 {
@@ -726,6 +748,15 @@ static void confirm_cb(GIOChannel *io, gpointer user_data)
 	bcast_src->pa_sync_io = io;
 	g_io_channel_ref(bcast_src->pa_sync_io);
 
+	if (bcast_src->pa_sync_io_id > 0) {
+		g_source_remove(bcast_src->pa_sync_io_id);
+		bcast_src->pa_sync_io_id  = 0;
+	}
+
+	bcast_src->pa_sync_io_id = g_io_add_watch(io, G_IO_ERR | G_IO_HUP |
+				G_IO_NVAL, (GIOFunc) pa_sync_io_disconnect_cb,
+				bcast_src);
+
 	len = sizeof(qos);
 	memset(&qos, 0, len);
 
@@ -844,6 +875,19 @@ static bool bass_validate_add_src_params(uint8_t *value, size_t len)
 	return true;
 }
 
+static gboolean listen_io_disconnect_cb(GIOChannel *io, GIOCondition cond,
+			gpointer data)
+{
+	struct bt_bcast_src *bcast_src = data;
+
+	DBG(bcast_src->bass, "Listen io has been disconnected");
+
+	bcast_src->listen_io_id = 0;
+	bcast_src->listen_io = NULL;
+
+	return FALSE;
+}
+
 static void bass_handle_add_src_op(struct bt_bass *bass,
 					struct gatt_db_attribute *attrib,
 					uint8_t opcode,
@@ -1023,6 +1067,11 @@ static void bass_handle_add_src_op(struct bt_bass *bass,
 		bcast_src->listen_io = io;
 		g_io_channel_ref(bcast_src->listen_io);
 
+		bcast_src->listen_io_id = g_io_add_watch(io, G_IO_ERR |
+					G_IO_HUP | G_IO_NVAL,
+					(GIOFunc)listen_io_disconnect_cb,
+					bcast_src);
+
 		if (num_bis > 0 && !bcast_src->bises)
 			bcast_src->bises = queue_new();
 	} else {
@@ -1318,11 +1367,21 @@ static void bass_bcast_src_free(void *data)
 		g_io_channel_unref(bcast_src->listen_io);
 	}
 
+	if (bcast_src->listen_io_id > 0) {
+		g_source_remove(bcast_src->listen_io_id);
+		bcast_src->listen_io_id  = 0;
+	}
+
 	if (bcast_src->pa_sync_io) {
 		g_io_channel_shutdown(bcast_src->pa_sync_io, TRUE, NULL);
 		g_io_channel_unref(bcast_src->pa_sync_io);
 	}
 
+	if (bcast_src->pa_sync_io_id > 0) {
+		g_source_remove(bcast_src->pa_sync_io_id);
+		bcast_src->pa_sync_io_id  = 0;
+	}
+
 	queue_destroy(bcast_src->bises, bass_bis_unref);
 
 	free(bcast_src);
diff --git a/src/shared/bass.h b/src/shared/bass.h
index c4b5b76ba..bd3fe900b 100644
--- a/src/shared/bass.h
+++ b/src/shared/bass.h
@@ -57,7 +57,9 @@ struct bt_bcast_src {
 	uint8_t num_subgroups;
 	struct bt_bass_subgroup_data *subgroup_data;
 	GIOChannel *listen_io;
+	guint listen_io_id;
 	GIOChannel *pa_sync_io;
+	guint pa_sync_io_id;
 	struct queue *bises;
 };
 
-- 
2.39.2