Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Claudia Draghicescu <claudia.rosu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     iulia.tanasescu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com,
        Claudia Draghicescu <claudia.rosu@nxp.com>
Subject: [PATCH BlueZ v5 4/7] profile: Add probe_on_discover flag
Date:   Tue,  8 Aug 2023 14:50:37 +0300
Message-Id: <20230808115040.4403-5-claudia.rosu@nxp.com>
In-Reply-To: <20230808115040.4403-1-claudia.rosu@nxp.com>
References: <20230808115040.4403-1-claudia.rosu@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?TcIIuuM+b/KuhPNT+OsjmICwKz6CQkXxqVqb428GHK7WC4qRst5DOIaue1Fp?=
 =?us-ascii?Q?P9LGtz19cSQjkT8fTAKOZvde6Ll/sZpDKrWnPjGN/91dXaPqt7gvy6agbgLu?=
 =?us-ascii?Q?5lcV1GPOZOYWnLxmIP6JdyN8+hLc7mKIgZtSHBwxRNhF4uLYe1U9crA4T9QS?=
 =?us-ascii?Q?2g3POQfpdNE0xdStJJ2uxvYGIZqVBKf44Mtgcq5i7IKta/ubiOkKKmzw1Ags?=
 =?us-ascii?Q?OxaFzzl3mpSshhIfNWiA3Ya3DdXXJrtzC/owJL5jhOX5zU9lzDOncDuKz8yv?=
 =?us-ascii?Q?cBfJhW+T7hrvpVMywZPScOS6bacs4pBWm+iW2KKHG5buNK+pm+Hw+kNegE8G?=
 =?us-ascii?Q?1Uk2/1yCdvaelfWlP2VCl3B7kQlgLrmjqkl2xm+zs2ALLwW86LOKsTNElq+7?=
 =?us-ascii?Q?X8GcJwW0HqSKX0SjfcHi9p2ApfWOcYnU7d8bs85VqClq3rSV9lRZKj1nUYph?=
 =?us-ascii?Q?6cDleebNOxDJZUH0BBhtqwlxcEghW0V3rmkGtCsnAVrH3L+qqoBIS9nRl6u1?=
 =?us-ascii?Q?GQ87PSahpvI8dpUeRs2fDQfyCWO94ViaLdG46U6zFaJlKsjgOQOV4NTL+Op/?=
 =?us-ascii?Q?anbtMkrLNi5Sycsi6ovucpFRJCBteMTIDNgZ1iUQp3WRgxqDpdUga/WVyMNW?=
 =?us-ascii?Q?q6F88Xxtc7RZ2aQGgGHHbzASmcfijlyXmto1GOiR21wVqrfqo616PjOX0FLv?=
 =?us-ascii?Q?ngqZPMcTLGDpbvYzcqzO8ZyoxF2spQuhz6Pu+2M8ncAl3psq5D16FM4zBg/3?=
 =?us-ascii?Q?aIpKGXXxpkVF/EVij8as5SPkVznJW4ixA1sOtzNI7UJaofJO+bmRlnWN8PHg?=
 =?us-ascii?Q?nv1B/l/ybG1oniUBBymF5ZKc++VByrE1mmem1n8WpP9tNWfijIVlfvKTnKXv?=
 =?us-ascii?Q?r2ou9ljE+5wEkLHoQ4WrrYg4FdGhqgCl5pRgv4yFOghGxKhbt3d3wAFjKqRq?=
 =?us-ascii?Q?88/Mq50948BA+nAFh8JdoCajLNBFGijKUi3J0U2wQkMgb7nnhnt0huO5vfR0?=
 =?us-ascii?Q?R0ojCEak4uRF2UPu+cNcFKmg8TMqKS2nEqzD2L2Ci4zj/L0VXETX0P1eKv54?=
 =?us-ascii?Q?hrvfqxviFFGtndj+JxIacQ1n9A+12vkSm6Q+J4g2zSVTxTmJ57EX+lYHCMys?=
 =?us-ascii?Q?0rN4+zMos+j0y8QextwADLCiTEOo2fEqQhN4cqiXYYjeqw0i/oDL5PUSD/jW?=
 =?us-ascii?Q?AlImvvDlluglkLZRpgTrbF5jH4TYTMvYtRyRcwp9Afl1VgQ2LHzy4vy6zWe+?=
 =?us-ascii?Q?Bq01rwgl6qqHDa8sk2qO+rQyqOBg5H58cKc5tUBWb0cBlxuZclf7SNRy/D/F?=
 =?us-ascii?Q?nAaL6PNKVaZarzDWUR0OeTppQtL9C07m/Z6XHZFHAUmM/CRg1+DYkqJosYSF?=
 =?us-ascii?Q?IYNGtQaBWb/sGj4sZqqA3XYY4UgKSQH6QC0Foc+le0806Wu+bdCJ6iKq/1FT?=
 =?us-ascii?Q?pcvwf8HJHaN/QmSrG6ImwMDzOlEF9tw/A6cDFw2/GK+YvTGIMHqpjTSPN9gX?=
 =?us-ascii?Q?FOyhEIf46njFzoDUy6pJMdnIeHlEFkNUWBSTx8d9DGkHXyMBAh4/56lWWFjh?=
 =?us-ascii?Q?9UPOT5X6rNg9aPEuewRmpMxBgAnmw1c9vVCNke0T7N0T8Sl8ud2SHiFBs8+X?=
 =?us-ascii?Q?hg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3e91332c-1d61-41ab-1dba-08db980608bb
X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9151.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 11:53:08.8640
 (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: 1uk66GtBjz/heDjGgQNU0lzA631lHBTwNj1HSljvxUKpvd7KTibolYqo7DlUtaJ2qdlC9GzS/cNB4l0O1beSAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DUZPR04MB10062
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds probe_on_discover flag which indicates if profile needs to be
probed when the remote_uuid is discovered and changes device logic to
attempt to probe driver when a new UUID is discovered and
probe_on_discover is set.
---
 src/device.c  | 22 +++++++++++++++++-----
 src/profile.h |  5 +++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/device.c b/src/device.c
index b43ced8b5..19ae03f7d 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2156,7 +2156,7 @@ done:
 void device_add_eir_uuids(struct btd_device *dev, GSList *uuids)
 {
 	GSList *l;
-	bool added = false;
+	GSList *added = NULL;
 
 	if (dev->bredr_state.svc_resolved || dev->le_state.svc_resolved)
 		return;
@@ -2165,13 +2165,11 @@ void device_add_eir_uuids(struct btd_device *dev, GSList *uuids)
 		const char *str = l->data;
 		if (g_slist_find_custom(dev->eir_uuids, str, bt_uuid_strcmp))
 			continue;
-		added = true;
+		added = g_slist_append(added, (void *)str);
 		dev->eir_uuids = g_slist_append(dev->eir_uuids, g_strdup(str));
 	}
 
-	if (added)
-		g_dbus_emit_property_changed(dbus_conn, dev->path,
-						DEVICE_INTERFACE, "UUIDs");
+	device_probe_profiles(dev, added);
 }
 
 static void add_manufacturer_data(void *data, void *user_data)
@@ -2201,6 +2199,7 @@ static void add_service_data(void *data, void *user_data)
 	struct eir_sd *sd = data;
 	struct btd_device *dev = user_data;
 	bt_uuid_t uuid;
+	GSList *l;
 
 	if (bt_string_to_uuid(&uuid, sd->uuid) < 0)
 		return;
@@ -2208,6 +2207,10 @@ static void add_service_data(void *data, void *user_data)
 	if (!bt_ad_add_service_data(dev->ad, &uuid, sd->data, sd->data_len))
 		return;
 
+	l = g_slist_append(NULL, sd->uuid);
+	device_add_eir_uuids(dev, l);
+	g_slist_free(l);
+
 	g_dbus_emit_property_changed(dbus_conn, dev->path,
 					DEVICE_INTERFACE, "ServiceData");
 }
@@ -3930,6 +3933,12 @@ static bool device_match_profile(struct btd_device *device,
 	if (profile->remote_uuid == NULL)
 		return false;
 
+	/* Don't match if device was just discovered (not connected) and the
+	 * profile don't have probe_on_discover flag set.
+	 */
+	if (!btd_device_is_connected(device) && !profile->probe_on_discover)
+		return false;
+
 	if (g_slist_find_custom(uuids, profile->remote_uuid,
 							bt_uuid_strcmp) == NULL)
 		return false;
@@ -4884,6 +4893,9 @@ void device_probe_profiles(struct btd_device *device, GSList *uuids)
 	struct probe_data d = { device, uuids };
 	char addr[18];
 
+	if (!uuids)
+		return;
+
 	ba2str(&device->bdaddr, addr);
 
 	if (device->blocked) {
diff --git a/src/profile.h b/src/profile.h
index 6871f2f0d..cfc500588 100644
--- a/src/profile.h
+++ b/src/profile.h
@@ -33,6 +33,11 @@ struct btd_profile {
 	 */
 	bool experimental;
 
+	/* Indicates the profile needs to be probed when the remote_uuid is
+	 * discovered.
+	 */
+	bool probe_on_discover;
+
 	int (*device_probe) (struct btd_service *service);
 	void (*device_remove) (struct btd_service *service);
 
-- 
2.34.1