linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH BlueZ 1/1] Pattern match on service- and manufacturer data
@ 2023-11-27 19:56 sebastif@axis.com
  2023-11-27 21:20 ` [BlueZ,1/1] " bluez.test.bot
  0 siblings, 1 reply; 4+ messages in thread
From: sebastif@axis.com @ 2023-11-27 19:56 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Sebastian Forslund

From: Sebastian Forslund <sebastif@axis.com>

When advertisement monitoring, manufacturer data and service data was
not being matched against. This made it so that advertisement monitoring
with or_patterns did not work that type of data.

We must start matching against the data in the manufacturer_data and
service_data queues. Run a different match-function depending on the
type of monitor that is being matched against.

Fixes: https://github.com/bluez/bluez/issues/652
---
 src/shared/ad.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/shared/ad.c b/src/shared/ad.c
index 951c56c60..7cfe47291 100644
--- a/src/shared/ad.c
+++ b/src/shared/ad.c
@@ -1324,6 +1324,70 @@ struct bt_ad_pattern *bt_ad_pattern_new(uint8_t type, size_t offset, size_t len,
 	return pattern;
 }
 
+static void pattern_manufacturer_data_match(void *data, void *user_data) {
+	struct bt_ad_manufacturer_data *manufacturer_data = data;
+	struct pattern_match_info *info = user_data;
+	struct bt_ad_pattern *pattern;
+	uint8_t all_data[BT_AD_MAX_DATA_LEN];
+
+	if (!manufacturer_data || !info)
+		return;
+
+	if (info->matched_pattern)
+		return;
+
+	pattern = info->current_pattern;
+
+	if (!pattern || pattern->type != BT_AD_MANUFACTURER_DATA)
+		return;
+
+	/* Take the manufacturer ID into account */
+	if (manufacturer_data->len + 2 < pattern->offset + pattern->len)
+		return;
+
+	memcpy(&all_data[0], &manufacturer_data->manufacturer_id, 2);
+	memcpy(&all_data[2], manufacturer_data->data, manufacturer_data->len);
+
+	if (!memcmp(all_data + pattern->offset, pattern->data,
+							pattern->len)) {
+		info->matched_pattern = pattern;
+	}
+}
+
+static void pattern_service_data_match(void *data, void *user_data) {
+  struct bt_ad_service_data *service_data = data;
+  struct pattern_match_info *info = user_data;
+  struct bt_ad_pattern *pattern;
+
+  if (!service_data || !info)
+    return;
+
+  if (info->matched_pattern)
+    return;
+
+  pattern = info->current_pattern;
+
+  if (!pattern)
+    return;
+
+  switch (pattern->type) {
+  case BT_AD_SERVICE_DATA16:
+  case BT_AD_SERVICE_DATA32:
+  case BT_AD_SERVICE_DATA128:
+    break;
+  default:
+    return;
+  }
+
+  if (service_data->len < pattern->offset + pattern->len)
+    return;
+
+  if (!memcmp(service_data->data + pattern->offset, pattern->data,
+              pattern->len)) {
+    info->matched_pattern = pattern;
+  }
+}
+
 static void pattern_ad_data_match(void *data, void *user_data)
 {
 	struct bt_ad_data *ad_data = data;
@@ -1363,7 +1427,19 @@ static void pattern_match(void *data, void *user_data)
 
 	info->current_pattern = pattern;
 
-	bt_ad_foreach_data(info->ad, pattern_ad_data_match, info);
+	switch (pattern->type) {
+	case BT_AD_MANUFACTURER_DATA:
+		queue_foreach(info->ad->manufacturer_data, pattern_manufacturer_data_match, info);
+		break;
+	case BT_AD_SERVICE_DATA16:
+	case BT_AD_SERVICE_DATA32:
+	case BT_AD_SERVICE_DATA128:
+		queue_foreach(info->ad->service_data, pattern_service_data_match, info);
+		break;
+	default:
+		bt_ad_foreach_data(info->ad, pattern_ad_data_match, info);
+		break;
+	}
 }
 
 struct bt_ad_pattern *bt_ad_pattern_match(struct bt_ad *ad,
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH BlueZ 1/1] Pattern match on service- and manufacturer data
@ 2023-11-30 19:57 sebastif@axis.com
  2023-12-04 22:12 ` Luiz Augusto von Dentz
  0 siblings, 1 reply; 4+ messages in thread
From: sebastif@axis.com @ 2023-11-30 19:57 UTC (permalink / raw)
  To: sebastian.david.forslund, linux-bluetooth; +Cc: Sebastian Forslund

From: Sebastian Forslund <sebastif@axis.com>

When advertisement monitoring, manufacturer data and service data was
not being matched against. This made it so that advertisement monitoring
with or_patterns did not work that type of data.

We must start matching against the data in the manufacturer_data and
service_data queues. Run a different match-function depending on the
type of monitor that is being matched against.

Fixes: https://github.com/bluez/bluez/issues/652
---
 src/shared/ad.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/shared/ad.c

diff --git a/src/shared/ad.c b/src/shared/ad.c
old mode 100644
new mode 100755
index 951c56c60..a95079dc1
--- a/src/shared/ad.c
+++ b/src/shared/ad.c
@@ -1324,6 +1324,72 @@ struct bt_ad_pattern *bt_ad_pattern_new(uint8_t type, size_t offset, size_t len,
 	return pattern;
 }
 
+static void pattern_manufacturer_data_match(void *data, void *user_data)
+{
+	struct bt_ad_manufacturer_data *manufacturer_data = data;
+	struct pattern_match_info *info = user_data;
+	struct bt_ad_pattern *pattern;
+	uint8_t all_data[BT_AD_MAX_DATA_LEN];
+
+	if (!manufacturer_data || !info)
+		return;
+
+	if (info->matched_pattern)
+		return;
+
+	pattern = info->current_pattern;
+
+	if (!pattern || pattern->type != BT_AD_MANUFACTURER_DATA)
+		return;
+
+	/* Take the manufacturer ID into account */
+	if (manufacturer_data->len + 2 < pattern->offset + pattern->len)
+		return;
+
+	memcpy(&all_data[0], &manufacturer_data->manufacturer_id, 2);
+	memcpy(&all_data[2], manufacturer_data->data, manufacturer_data->len);
+
+	if (!memcmp(all_data + pattern->offset, pattern->data,
+							pattern->len)) {
+		info->matched_pattern = pattern;
+	}
+}
+
+static void pattern_service_data_match(void *data, void *user_data)
+{
+	struct bt_ad_service_data *service_data = data;
+	struct pattern_match_info *info = user_data;
+	struct bt_ad_pattern *pattern;
+
+	if (!service_data || !info)
+		return;
+
+	if (info->matched_pattern)
+		return;
+
+	pattern = info->current_pattern;
+
+	if (!pattern)
+		return;
+
+	switch (pattern->type) {
+	case BT_AD_SERVICE_DATA16:
+	case BT_AD_SERVICE_DATA32:
+	case BT_AD_SERVICE_DATA128:
+		break;
+	default:
+		return;
+	}
+
+	if (service_data->len < pattern->offset + pattern->len)
+		return;
+
+	if (!memcmp(service_data->data + pattern->offset, pattern->data,
+							pattern->len)) {
+		info->matched_pattern = pattern;
+	}
+}
+
 static void pattern_ad_data_match(void *data, void *user_data)
 {
 	struct bt_ad_data *ad_data = data;
@@ -1363,7 +1429,20 @@ static void pattern_match(void *data, void *user_data)
 
 	info->current_pattern = pattern;
 
-	bt_ad_foreach_data(info->ad, pattern_ad_data_match, info);
+	switch (pattern->type) {
+	case BT_AD_MANUFACTURER_DATA:
+		queue_foreach(info->ad->manufacturer_data, pattern_manufacturer_data_match,
+							info);
+		break;
+	case BT_AD_SERVICE_DATA16:
+	case BT_AD_SERVICE_DATA32:
+	case BT_AD_SERVICE_DATA128:
+		queue_foreach(info->ad->service_data, pattern_service_data_match, info);
+		break;
+	default:
+		bt_ad_foreach_data(info->ad, pattern_ad_data_match, info);
+		break;
+	}
 }
 
 struct bt_ad_pattern *bt_ad_pattern_match(struct bt_ad *ad,
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-04 22:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-27 19:56 [PATCH BlueZ 1/1] Pattern match on service- and manufacturer data sebastif@axis.com
2023-11-27 21:20 ` [BlueZ,1/1] " bluez.test.bot
  -- strict thread matches above, loose matches on Subject: below --
2023-11-30 19:57 [PATCH BlueZ 1/1] " sebastif@axis.com
2023-12-04 22:12 ` Luiz Augusto von Dentz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).