UUID128 string values are given in network order and needs to be
converted to host order to keep the consistency.
---
src/glib-helper.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/glib-helper.c b/src/glib-helper.c
index 2b7e1b3..84f3380 100644
--- a/src/glib-helper.c
+++ b/src/glib-helper.c
@@ -515,7 +515,7 @@ int bt_string2uuid(uuid_t *uuid, const char *string)
if (is_uuid128(string) &&
sscanf(string, "%08x-%04hx-%04hx-%04hx-%08x%04hx",
&data0, &data1, &data2, &data3, &data4, &data5) == 6) {
- uint8_t val[16];
+ uint128_t n128, h128;
data0 = g_htonl(data0);
data1 = g_htons(data1);
@@ -524,14 +524,15 @@ int bt_string2uuid(uuid_t *uuid, const char *string)
data4 = g_htonl(data4);
data5 = g_htons(data5);
- memcpy(&val[0], &data0, 4);
- memcpy(&val[4], &data1, 2);
- memcpy(&val[6], &data2, 2);
- memcpy(&val[8], &data3, 2);
- memcpy(&val[10], &data4, 4);
- memcpy(&val[14], &data5, 2);
+ memcpy(&n128.data[0], &data0, 4);
+ memcpy(&n128.data[4], &data1, 2);
+ memcpy(&n128.data[6], &data2, 2);
+ memcpy(&n128.data[8], &data3, 2);
+ memcpy(&n128.data[10], &data4, 4);
+ memcpy(&n128.data[14], &data5, 2);
- sdp_uuid128_create(uuid, val);
+ ntoh128(&n128, &h128);
+ sdp_uuid128_create(uuid, &h128);
return 0;
} else {
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
