This adds iovec helper functions for handling le32 and le24 values.
---
src/shared/util.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++
src/shared/util.h | 5 +++++
2 files changed, 58 insertions(+)
diff --git a/src/shared/util.c b/src/shared/util.c
index 9a4a8d77a..f9d8ecbaa 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4,6 +4,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2012-2014 Intel Corporation. All rights reserved.
+ * Copyright 2023 NXP
*
*
*/
@@ -28,6 +29,8 @@
#include <sys/random.h>
#endif
+#include <lib/bluetooth.h>
+
/* define MAX_INPUT for musl */
#ifndef MAX_INPUT
#define MAX_INPUT _POSIX_MAX_INPUT
@@ -274,6 +277,32 @@ void *util_iov_push_mem(struct iovec *iov, size_t len, const void *data)
return p;
}
+void *util_iov_push_le32(struct iovec *iov, uint32_t val)
+{
+ void *p;
+
+ p = util_iov_push(iov, sizeof(uint32_t));
+ if (!p)
+ return NULL;
+
+ put_le32(val, p);
+
+ return p;
+}
+
+void *util_iov_push_le24(struct iovec *iov, uint32_t val)
+{
+ void *p;
+
+ p = util_iov_push(iov, sizeof(uint24_t));
+ if (!p)
+ return NULL;
+
+ put_le24(val, p);
+
+ return p;
+}
+
void *util_iov_pull(struct iovec *iov, size_t len)
{
if (!iov)
@@ -298,6 +327,30 @@ void *util_iov_pull_mem(struct iovec *iov, size_t len)
return NULL;
}
+void *util_iov_pull_le32(struct iovec *iov, uint32_t *val)
+{
+ void *data = iov->iov_base;
+
+ if (util_iov_pull(iov, sizeof(uint32_t))) {
+ *val = get_le32(data);
+ return data;
+ }
+
+ return NULL;
+}
+
+void *util_iov_pull_le24(struct iovec *iov, uint32_t *val)
+{
+ void *data = iov->iov_base;
+
+ if (util_iov_pull(iov, sizeof(uint24_t))) {
+ *val = get_le24(data);
+ return data;
+ }
+
+ return NULL;
+}
+
static const struct {
uint16_t uuid;
const char *str;
diff --git a/src/shared/util.h b/src/shared/util.h
index dc84f9635..b99a959b8 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -4,6 +4,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2012-2014 Intel Corporation. All rights reserved.
+ * Copyright 2023 NXP
*
*
*/
@@ -115,8 +116,12 @@ int util_iov_memcmp(const struct iovec *iov1, const struct iovec *iov2);
void util_iov_memcpy(struct iovec *iov, void *src, size_t len);
void *util_iov_push(struct iovec *iov, size_t len);
void *util_iov_push_mem(struct iovec *iov, size_t len, const void *data);
+void *util_iov_push_le32(struct iovec *iov, uint32_t val);
+void *util_iov_push_le24(struct iovec *iov, uint32_t val);
void *util_iov_pull(struct iovec *iov, size_t len);
void *util_iov_pull_mem(struct iovec *iov, size_t len);
+void *util_iov_pull_le32(struct iovec *iov, uint32_t *val);
+void *util_iov_pull_le24(struct iovec *iov, uint32_t *val);
void util_iov_free(struct iovec *iov, size_t cnt);
const char *bt_uuid16_to_str(uint16_t uuid);
--
2.34.1