diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2016-07-14 12:59:56 +0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2016-07-14 13:06:31 +0300 |
| commit | 805fa1f536e6bd80c7500ec2ec777ca4f7362dec (patch) | |
| tree | 4c9dc7082978eb3231e34de3d9b17c0f2e154224 | |
| parent | c17747546d0024ef34083377e0645943131b31e4 (diff) | |
| download | bluez-805fa1f536e6bd80c7500ec2ec777ca4f7362dec.tar.gz | |
monitor: Fix using uuid128_to_str
This function always return "Unknown" regardless of the input, instead
uuidstr_to_str shall be used for UUID 128 bit format since it can return
proper friendly names:
> ACL Data RX: Handle 3585 flags 0x02 dlen 26
ATT: Read By Group Type Response (0x11) len 21
Attribute data length: 20
Attribute group list: 1 entry
Handle range: 0x0001-0x0015
UUID: Eddystone Configuration Service (a3c87500-8ed3-4bdf-8a39-a01bebede295)
| -rw-r--r-- | monitor/l2cap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/monitor/l2cap.c b/monitor/l2cap.c index 93a1b20ce..59a320615 100644 --- a/monitor/l2cap.c +++ b/monitor/l2cap.c @@ -1999,6 +1999,7 @@ static void print_hex_field(const char *label, const uint8_t *data, static void print_uuid(const char *label, const void *data, uint16_t size) { const char *str; + char uuidstr[36]; switch (size) { case 2: @@ -2010,12 +2011,12 @@ static void print_uuid(const char *label, const void *data, uint16_t size) print_field("%s: %s (0x%8.8x)", label, str, get_le32(data)); break; case 16: - str = uuid128_to_str(data); - print_field("%s: %s (%8.8x-%4.4x-%4.4x-%4.4x-%8.8x%4.4x)", - label, str, + sprintf(uuidstr, "%8.8x-%4.4x-%4.4x-%4.4x-%8.8x%4.4x", get_le32(data + 12), get_le16(data + 10), get_le16(data + 8), get_le16(data + 6), get_le32(data + 2), get_le16(data + 0)); + str = uuidstr_to_str(uuidstr); + print_field("%s: %s (%s)", label, str, uuidstr); break; default: packet_hexdump(data, size); |