diff mbox series

[BlueZ,1/1] Pattern match on service- and manufacturer data

Message ID 20231130195750.1732-1-sebastif@axis.com (mailing list archive)
State Superseded
Headers show
Series [BlueZ,1/1] Pattern match on service- and manufacturer data | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch fail ERROR:EXECUTE_PERMISSIONS: do not set execute permissions for source files #89: FILE: src/shared/ad.c WARNING:LONG_LINE: line length of 91 exceeds 80 columns #173: FILE: src/shared/ad.c:1434: + queue_foreach(info->ad->manufacturer_data, pattern_manufacturer_data_match, WARNING:LONG_LINE: line length of 88 exceeds 80 columns #179: FILE: src/shared/ad.c:1440: + queue_foreach(info->ad->service_data, pattern_service_data_match, info); /github/workspace/src/src/13474975.patch total: 1 errors, 2 warnings, 93 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. /github/workspace/src/src/13474975.patch has style problems, please review. NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Sebastian Forslund Nov. 30, 2023, 7:57 p.m. UTC 
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

Comments

bluez.test.bot@gmail.com Nov. 30, 2023, 9 p.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=805736

---Test result---

Test Summary:
CheckPatch                    FAIL      0.69 seconds
GitLint                       PASS      0.27 seconds
BuildEll                      PASS      24.02 seconds
BluezMake                     PASS      547.23 seconds
MakeCheck                     PASS      11.02 seconds
MakeDistcheck                 PASS      150.22 seconds
CheckValgrind                 PASS      208.72 seconds
CheckSmatch                   PASS      313.95 seconds
bluezmakeextell               PASS      95.20 seconds
IncrementalBuild              PASS      498.95 seconds
ScanBuild                     PASS      904.14 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,1/1] Pattern match on service- and manufacturer data
ERROR:EXECUTE_PERMISSIONS: do not set execute permissions for source files
#89: FILE: src/shared/ad.c

WARNING:LONG_LINE: line length of 91 exceeds 80 columns
#173: FILE: src/shared/ad.c:1434:
+		queue_foreach(info->ad->manufacturer_data, pattern_manufacturer_data_match,

WARNING:LONG_LINE: line length of 88 exceeds 80 columns
#179: FILE: src/shared/ad.c:1440:
+		queue_foreach(info->ad->service_data, pattern_service_data_match, info);

/github/workspace/src/src/13474975.patch total: 1 errors, 2 warnings, 93 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13474975.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.




---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz Dec. 4, 2023, 10:12 p.m. UTC | #2 
Hi Sebastian,

On Thu, Nov 30, 2023 at 2:58 PM sebastif@axis.com
<sebastian.david.forslund@gmail.com> wrote:
>
> 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);

I'd use queue_find instead so you can stop the lookup earlier if there
is a match, also for the match function you can use something like
match_manufacturer.

> +               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);

Ditto, Id also suggest to use something like match_service.

> +               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
>
>
diff mbox series

Patch

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,