diff mbox series

[BlueZ,1/4] btmon: Add proper decoding to Service Data UUID

Message ID 20220426230347.857783-1-luiz.dentz@gmail.com
State New
Headers show
Series [BlueZ,1/4] btmon: Add proper decoding to Service Data UUID | expand

Commit Message

Luiz Augusto von Dentz April 26, 2022, 11:03 p.m. UTC 
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds proper decoding for Service Data UUID:

        Service Data: Apple, Inc. (0xfd6f)
          Data: e6b07e19815e902100b8b2f4a55255fd18f0c6be
---
 monitor/packet.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

bluez.test.bot@gmail.com April 27, 2022, 2:18 a.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=635945

---Test result---

Test Summary:
CheckPatch                    FAIL      6.08 seconds
GitLint                       PASS      4.09 seconds
Prep - Setup ELL              PASS      49.83 seconds
Build - Prep                  PASS      0.77 seconds
Build - Configure             PASS      10.00 seconds
Build - Make                  PASS      1440.82 seconds
Make Check                    PASS      12.56 seconds
Make Check w/Valgrind         PASS      517.26 seconds
Make Distcheck                PASS      269.46 seconds
Build w/ext ELL - Configure   PASS      10.86 seconds
Build w/ext ELL - Make        PASS      1541.46 seconds
Incremental Build with patchesPASS      6355.82 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[BlueZ,3/4] btmon: Add support for decoding Basic Audio Annoucements
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#123: FILE: monitor/bt.h:3524:
+} __attribute__ ((packed));

WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#128: FILE: monitor/bt.h:3529:
+} __attribute__ ((packed));

WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#133: FILE: monitor/bt.h:3534:
+} __attribute__ ((packed));

WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#139: FILE: monitor/bt.h:3540:
+} __attribute__ ((packed));

WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#145: FILE: monitor/bt.h:3546:
+} __attribute__ ((packed));

/github/workspace/src/12828051.patch total: 0 errors, 5 warnings, 152 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/12828051.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
patchwork-bot+bluetooth@kernel.org April 28, 2022, 10:30 p.m. UTC | #2 
Hello:

This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Tue, 26 Apr 2022 16:03:44 -0700 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> This adds proper decoding for Service Data UUID:
> 
>         Service Data: Apple, Inc. (0xfd6f)
>           Data: e6b07e19815e902100b8b2f4a55255fd18f0c6be
> 
> [...]

Here is the summary with links:
  - [BlueZ,1/4] btmon: Add proper decoding to Service Data UUID
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=640d6b5c662d
  - [BlueZ,2/4] btmon: Add support for decoding Broadcast Audio Annoucements
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=6da642225f5a
  - [BlueZ,3/4] btmon: Add support for decoding Basic Audio Annoucements
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=80cd36cd2a0c
  - [BlueZ,4/4] btmon: Fix not decoding LC3 id
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=f65a9c9d21f6

You are awesome, thank you!
diff mbox series

Patch

diff --git a/monitor/packet.c b/monitor/packet.c
index 6ef2fba3b..471b0dd4d 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -3301,6 +3301,14 @@  static void print_uuid128_list(const char *label, const void *data,
 	}
 }
 
+static void print_service_data(const uint8_t *data, uint8_t data_len)
+{
+	uint16_t uuid = get_le16(&data[0]);
+
+	print_field("Service Data: %s (0x%4.4x)", bt_uuid16_to_str(uuid), uuid);
+	print_hex_field("  Data", &data[2], data_len - 2);
+}
+
 static const struct bitfield_data eir_flags_table[] = {
 	{ 0, "LE Limited Discoverable Mode"		},
 	{ 1, "LE General Discoverable Mode"		},
@@ -3703,9 +3711,7 @@  static void print_eir(const uint8_t *eir, uint8_t eir_len, bool le)
 		case BT_EIR_SERVICE_DATA:
 			if (data_len < 2)
 				break;
-			sprintf(label, "Service Data (UUID 0x%4.4x)",
-							get_le16(&data[0]));
-			print_hex_field(label, &data[2], data_len - 2);
+			print_service_data(data, data_len);
 			break;
 
 		case BT_EIR_RANDOM_ADDRESS: