diff options
| author | emax <emax@FreeBSD.org> | 2005-05-27 19:11:33 +0000 |
|---|---|---|
| committer | emax <emax@FreeBSD.org> | 2005-05-27 19:11:33 +0000 |
| commit | 720e9b2d9fb28b57fcae795d38e68d9396f1fb0c (patch) | |
| tree | 4dbe1e40ae84309636c8070672a81ba7f90e84ca /lib/libsdp/util.c | |
| parent | 9409f5e4f1cae0b940f05349a61181c1a50eda6f (diff) | |
| download | FreeBSD-src-720e9b2d9fb28b57fcae795d38e68d9396f1fb0c.zip FreeBSD-src-720e9b2d9fb28b57fcae795d38e68d9396f1fb0c.tar.gz | |
Do not tread 128-bit UUID as int128. Provide separate macros to get/put
128-bit UUID libsdp(3). Fix 128-bit UUID printing in sdpcontrol(8).
MFC after: 3 days
Diffstat (limited to 'lib/libsdp/util.c')
| -rw-r--r-- | lib/libsdp/util.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/libsdp/util.c b/lib/libsdp/util.c index ae41fb2..7c7330d 100644 --- a/lib/libsdp/util.c +++ b/lib/libsdp/util.c @@ -29,6 +29,7 @@ * $FreeBSD$ */ +#include <netinet/in.h> #include <bluetooth.h> #include <stdio.h> #include <sdp.h> @@ -317,17 +318,25 @@ sdp_print(uint32_t level, uint8_t const *start, uint8_t const *end) case SDP_DATA_UINT128: case SDP_DATA_INT128: - case SDP_DATA_UUID128: SDP_GET128(&value.int128, start); - printf("int128/uuid128 %#8.8x-%4.4x-%4.4x-%4.4x-%4.4x%8.8x\n", + printf("u/int128 %#8.8x%8.8x%8.8x%8.8x\n", *(uint32_t *)&value.int128.b[0], - *(uint16_t *)&value.int128.b[4], - *(uint16_t *)&value.int128.b[6], - *(uint16_t *)&value.int128.b[8], - *(uint16_t *)&value.int128.b[10], + *(uint32_t *)&value.int128.b[4], + *(uint32_t *)&value.int128.b[8], *(uint32_t *)&value.int128.b[12]); break; + case SDP_DATA_UUID128: + SDP_GET_UUID128(&value.int128, start); + printf("uuid128 %#8.8x-%4.4x-%4.4x-%4.4x-%4.4x%8.8x\n", + ntohl(*(uint32_t *)&value.int128.b[0]), + ntohs(*(uint16_t *)&value.int128.b[4]), + ntohs(*(uint16_t *)&value.int128.b[6]), + ntohs(*(uint16_t *)&value.int128.b[8]), + ntohs(*(uint16_t *)&value.int128.b[10]), + ntohl(*(uint32_t *)&value.int128.b[12])); + break; + case SDP_DATA_INT8: SDP_GET8(value.int8, start); printf("int8 %d\n", value.int8); |
