Loading system/btcore/Android.mk +1 −0 Original line number Diff line number Diff line Loading @@ -51,6 +51,7 @@ LOCAL_C_INCLUDES := \ LOCAL_SRC_FILES := \ ./test/bdaddr_test.cpp \ ./test/counter_test.cpp \ ./test/uuid_test.cpp \ ../osi/test/AllocationTestHarness.cpp LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable Loading system/btcore/include/uuid.h +51 −0 Original line number Diff line number Diff line Loading @@ -21,4 +21,55 @@ #include <hardware/bluetooth.h> #include <stdbool.h> typedef struct uuid_string_t uuid_string_t; // Creates uuid string structure to hold a well formed UUID // string. Must release resources with |uuid_string_free|. // Returns NULL if no memory. uuid_string_t *uuid_string_new(void); // Frees a uuid string structure created from |uuid_string_new|. // |uuid_string| may be NULL. void uuid_string_free(uuid_string_t *uuid_string); // Returns a string pointer to the well formed UUID string // entry. |uuid_string| must not be NULL. const char *uuid_string_data(const uuid_string_t *uuid_string); // Creates uuid structure from a well formed UUID string // |uuid_string|. The caller takes ownership of the uuid // structure and must release resources with |uuid_free|. // |uuid_string| must not be NULL. // // Returns NULL if |uuid_string| is malformed or no memory. // // A well formed UUID string is structured like this: // "00112233-4455-6677-8899-aabbccddeeff" bt_uuid_t *uuid_new(const char *uuid_string); // Frees a uuid structure created from |uuid_new| and friends. // |uuid| may be NULL. void uuid_free(bt_uuid_t *uuid); // Returns true if the UUID is all zeros, false otherwise. // |uuid| may not be NULL. bool uuid_is_empty(const bt_uuid_t *uuid); // Returns true if the two UUIDs are equal, false otherwise. // |first| and |second| may not be NULL. bool uuid_is_equal(const bt_uuid_t *first, const bt_uuid_t *second); // Copies uuid |src| into |dest| and returns a pointer to |dest|. // |src| and |dest| must not be NULL. bt_uuid_t *uuid_copy(bt_uuid_t *dest, const bt_uuid_t *src); // Converts contents of |uuid| to a well formed UUID string // |uuid_string| using numbers and lower case letter. |uuid| // and |uuid_string| must not be NULL. void uuid_to_string(const bt_uuid_t *uuid, uuid_string_t *uuid_string); // Converts contents of |uuid| to a short uuid if possible. Returns // true if conversion is possible, false otherwise. // |uuid|, |uuid16| and |uuid32| must not be NULL. bool uuid_128_to_16(const bt_uuid_t *uuid, uint16_t *uuid16); bool uuid_128_to_32(const bt_uuid_t *uuid, uint32_t *uuid32); system/btcore/src/uuid.c +140 −1 Original line number Diff line number Diff line Loading @@ -16,12 +16,151 @@ * ******************************************************************************/ #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "uuid.h" #include "btcore/include/uuid.h" #include "osi/include/allocator.h" static const size_t UUID_WELL_FORMED_STRING_LEN = 36; static const size_t UUID_WELL_FORMED_STRING_LEN_WITH_NULL = 36 + 1; typedef struct uuid_string_t { char string[0]; } uuid_string_t; static const bt_uuid_t empty_uuid = {{ 0 }}; // The base UUID is used for calculating 128-bit UUIDs from 16 and // 32 bit UUIDs as described in the SDP specification. static const bt_uuid_t base_uuid = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb, }}; static bool uuid_is_base(const bt_uuid_t *uuid); uuid_string_t *uuid_string_new(void) { return osi_calloc(UUID_WELL_FORMED_STRING_LEN_WITH_NULL); } void uuid_string_free(uuid_string_t *uuid_string) { osi_free(uuid_string); } const char *uuid_string_data(const uuid_string_t *uuid_string) { assert(uuid_string != NULL); return (const char *)uuid_string->string; } bt_uuid_t *uuid_new(const char *uuid_string) { assert(uuid_string != NULL); if (strlen(uuid_string) < UUID_WELL_FORMED_STRING_LEN) return NULL; if (uuid_string[8] != '-' || uuid_string[13] != '-' || uuid_string[18] != '-' || uuid_string[23] != '-') return NULL; bt_uuid_t *uuid = osi_calloc(sizeof(bt_uuid_t)); if (uuid == NULL) return NULL; const char *s = uuid_string; for (size_t i = 0; i < sizeof(bt_uuid_t); ++i, s+=2) { char buf[2]; buf[0] = s[0]; buf[1] = s[1]; uuid->uu[i] = strtoul(buf, NULL, 16); // Adjust by skipping the dashes switch(i) { case 3: case 5: case 7: case 9: s++; break; } } return uuid; } void uuid_free(bt_uuid_t *uuid) { osi_free(uuid); } bool uuid_is_empty(const bt_uuid_t *uuid) { return !uuid || !memcmp(uuid, &empty_uuid, sizeof(bt_uuid_t)); } bool uuid_is_equal(const bt_uuid_t *first, const bt_uuid_t *second) { assert(first != NULL); assert(second != NULL); return !memcmp(first, second, sizeof(bt_uuid_t)); } bt_uuid_t *uuid_copy(bt_uuid_t *dest, const bt_uuid_t *src) { assert(dest != NULL); assert(src != NULL); return (bt_uuid_t *)memcpy(dest, src, sizeof(bt_uuid_t)); } bool uuid_128_to_16(const bt_uuid_t *uuid, uint16_t *uuid16) { assert(uuid != NULL); assert(uuid16 != NULL); if (!uuid_is_base(uuid)) return false; *uuid16 = (uuid->uu[2] << 8) + uuid->uu[3]; return true; } bool uuid_128_to_32(const bt_uuid_t *uuid, uint32_t *uuid32) { assert(uuid != NULL); assert(uuid32 != NULL); if (!uuid_is_base(uuid)) return false; *uuid32 = (uuid->uu[0] << 24) + (uuid->uu[1] << 16) + (uuid->uu[2] << 8) + uuid->uu[3]; return true; } void uuid_to_string(const bt_uuid_t *uuid, uuid_string_t *uuid_string) { assert(uuid != NULL); assert(uuid_string != NULL); char *string = uuid_string->string; for (int i = 0; i < 4; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 4; i < 6; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 6; i < 8; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 8; i < 10; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 10; i < 16; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } } static bool uuid_is_base(const bt_uuid_t *uuid) { if (!uuid) return false; for (int i = 4; i < 16; i++) { if (uuid->uu[i] != base_uuid.uu[i]) return false; } return true; } Loading
system/btcore/Android.mk +1 −0 Original line number Diff line number Diff line Loading @@ -51,6 +51,7 @@ LOCAL_C_INCLUDES := \ LOCAL_SRC_FILES := \ ./test/bdaddr_test.cpp \ ./test/counter_test.cpp \ ./test/uuid_test.cpp \ ../osi/test/AllocationTestHarness.cpp LOCAL_CFLAGS := -Wall -Werror -Werror=unused-variable Loading
system/btcore/include/uuid.h +51 −0 Original line number Diff line number Diff line Loading @@ -21,4 +21,55 @@ #include <hardware/bluetooth.h> #include <stdbool.h> typedef struct uuid_string_t uuid_string_t; // Creates uuid string structure to hold a well formed UUID // string. Must release resources with |uuid_string_free|. // Returns NULL if no memory. uuid_string_t *uuid_string_new(void); // Frees a uuid string structure created from |uuid_string_new|. // |uuid_string| may be NULL. void uuid_string_free(uuid_string_t *uuid_string); // Returns a string pointer to the well formed UUID string // entry. |uuid_string| must not be NULL. const char *uuid_string_data(const uuid_string_t *uuid_string); // Creates uuid structure from a well formed UUID string // |uuid_string|. The caller takes ownership of the uuid // structure and must release resources with |uuid_free|. // |uuid_string| must not be NULL. // // Returns NULL if |uuid_string| is malformed or no memory. // // A well formed UUID string is structured like this: // "00112233-4455-6677-8899-aabbccddeeff" bt_uuid_t *uuid_new(const char *uuid_string); // Frees a uuid structure created from |uuid_new| and friends. // |uuid| may be NULL. void uuid_free(bt_uuid_t *uuid); // Returns true if the UUID is all zeros, false otherwise. // |uuid| may not be NULL. bool uuid_is_empty(const bt_uuid_t *uuid); // Returns true if the two UUIDs are equal, false otherwise. // |first| and |second| may not be NULL. bool uuid_is_equal(const bt_uuid_t *first, const bt_uuid_t *second); // Copies uuid |src| into |dest| and returns a pointer to |dest|. // |src| and |dest| must not be NULL. bt_uuid_t *uuid_copy(bt_uuid_t *dest, const bt_uuid_t *src); // Converts contents of |uuid| to a well formed UUID string // |uuid_string| using numbers and lower case letter. |uuid| // and |uuid_string| must not be NULL. void uuid_to_string(const bt_uuid_t *uuid, uuid_string_t *uuid_string); // Converts contents of |uuid| to a short uuid if possible. Returns // true if conversion is possible, false otherwise. // |uuid|, |uuid16| and |uuid32| must not be NULL. bool uuid_128_to_16(const bt_uuid_t *uuid, uint16_t *uuid16); bool uuid_128_to_32(const bt_uuid_t *uuid, uint32_t *uuid32);
system/btcore/src/uuid.c +140 −1 Original line number Diff line number Diff line Loading @@ -16,12 +16,151 @@ * ******************************************************************************/ #include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "uuid.h" #include "btcore/include/uuid.h" #include "osi/include/allocator.h" static const size_t UUID_WELL_FORMED_STRING_LEN = 36; static const size_t UUID_WELL_FORMED_STRING_LEN_WITH_NULL = 36 + 1; typedef struct uuid_string_t { char string[0]; } uuid_string_t; static const bt_uuid_t empty_uuid = {{ 0 }}; // The base UUID is used for calculating 128-bit UUIDs from 16 and // 32 bit UUIDs as described in the SDP specification. static const bt_uuid_t base_uuid = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0x80, 0x5f, 0x9b, 0x34, 0xfb, }}; static bool uuid_is_base(const bt_uuid_t *uuid); uuid_string_t *uuid_string_new(void) { return osi_calloc(UUID_WELL_FORMED_STRING_LEN_WITH_NULL); } void uuid_string_free(uuid_string_t *uuid_string) { osi_free(uuid_string); } const char *uuid_string_data(const uuid_string_t *uuid_string) { assert(uuid_string != NULL); return (const char *)uuid_string->string; } bt_uuid_t *uuid_new(const char *uuid_string) { assert(uuid_string != NULL); if (strlen(uuid_string) < UUID_WELL_FORMED_STRING_LEN) return NULL; if (uuid_string[8] != '-' || uuid_string[13] != '-' || uuid_string[18] != '-' || uuid_string[23] != '-') return NULL; bt_uuid_t *uuid = osi_calloc(sizeof(bt_uuid_t)); if (uuid == NULL) return NULL; const char *s = uuid_string; for (size_t i = 0; i < sizeof(bt_uuid_t); ++i, s+=2) { char buf[2]; buf[0] = s[0]; buf[1] = s[1]; uuid->uu[i] = strtoul(buf, NULL, 16); // Adjust by skipping the dashes switch(i) { case 3: case 5: case 7: case 9: s++; break; } } return uuid; } void uuid_free(bt_uuid_t *uuid) { osi_free(uuid); } bool uuid_is_empty(const bt_uuid_t *uuid) { return !uuid || !memcmp(uuid, &empty_uuid, sizeof(bt_uuid_t)); } bool uuid_is_equal(const bt_uuid_t *first, const bt_uuid_t *second) { assert(first != NULL); assert(second != NULL); return !memcmp(first, second, sizeof(bt_uuid_t)); } bt_uuid_t *uuid_copy(bt_uuid_t *dest, const bt_uuid_t *src) { assert(dest != NULL); assert(src != NULL); return (bt_uuid_t *)memcpy(dest, src, sizeof(bt_uuid_t)); } bool uuid_128_to_16(const bt_uuid_t *uuid, uint16_t *uuid16) { assert(uuid != NULL); assert(uuid16 != NULL); if (!uuid_is_base(uuid)) return false; *uuid16 = (uuid->uu[2] << 8) + uuid->uu[3]; return true; } bool uuid_128_to_32(const bt_uuid_t *uuid, uint32_t *uuid32) { assert(uuid != NULL); assert(uuid32 != NULL); if (!uuid_is_base(uuid)) return false; *uuid32 = (uuid->uu[0] << 24) + (uuid->uu[1] << 16) + (uuid->uu[2] << 8) + uuid->uu[3]; return true; } void uuid_to_string(const bt_uuid_t *uuid, uuid_string_t *uuid_string) { assert(uuid != NULL); assert(uuid_string != NULL); char *string = uuid_string->string; for (int i = 0; i < 4; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 4; i < 6; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 6; i < 8; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 8; i < 10; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } string += sprintf(string, "-"); for (int i = 10; i < 16; i++) { string += sprintf(string, "%02x", uuid->uu[i]); } } static bool uuid_is_base(const bt_uuid_t *uuid) { if (!uuid) return false; for (int i = 4; i < 16; i++) { if (uuid->uu[i] != base_uuid.uu[i]) return false; } return true; }