X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=797729870fbd449b057315dedf54b07032fe4fca;hp=94b145c2d47a5ac0b62a6569ef838ae99ebb4451;hb=bb0c830b2a259b7c5ffa7c309ce9d3004f3c41a1;hpb=bbdc3bdb0505437782f83d8d0480e759cbe7ea57

diff --git a/blobmsg.h b/blobmsg.h
index 94b145c..7977298 100644
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -16,6 +16,7 @@
 #ifndef __BLOBMSG_H
 #define __BLOBMSG_H
 
+#include <stdarg.h>
 #include "blob.h"
 
 #define BLOBMSG_ALIGN	2
@@ -30,6 +31,7 @@ enum blobmsg_type {
 	BLOBMSG_TYPE_INT32,
 	BLOBMSG_TYPE_INT16,
 	BLOBMSG_TYPE_INT8,
+	BLOBMSG_TYPE_DOUBLE,
 	__BLOBMSG_TYPE_LAST,
 	BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1,
 	BLOBMSG_TYPE_BOOL = BLOBMSG_TYPE_INT8,
@@ -45,11 +47,17 @@ struct blobmsg_policy {
 	enum blobmsg_type type;
 };
 
-static inline int blobmsg_hdrlen(int namelen)
+static inline int blobmsg_hdrlen(unsigned int namelen)
 {
 	return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
+static inline void blobmsg_clear_name(struct blob_attr *attr)
+{
+	struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
+	hdr->name[0] = 0;
+}
+
 static inline const char *blobmsg_name(const struct blob_attr *attr)
 {
 	struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
@@ -64,7 +72,12 @@ static inline int blobmsg_type(const struct blob_attr *attr)
 static inline void *blobmsg_data(const struct blob_attr *attr)
 {
 	struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
-	return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+	char *data = (char *) blob_data(attr);
+
+	if (blob_is_extended(attr))
+		data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+
+	return data;
 }
 
 static inline int blobmsg_data_len(const struct blob_attr *attr)
@@ -77,13 +90,41 @@ static inline int blobmsg_data_len(const struct blob_attr *attr)
 	return blob_len(attr) - (end - start);
 }
 
+static inline int blobmsg_len(const struct blob_attr *attr)
+{
+	return blobmsg_data_len(attr);
+}
+
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name);
 bool blobmsg_check_attr_list(const struct blob_attr *attr, int type);
+
+/*
+ * blobmsg_check_array: validate array/table and return size
+ *
+ * Checks if all elements of an array or table are valid and have
+ * the specified type. Returns the number of elements in the array
+ */
+int blobmsg_check_array(const struct blob_attr *attr, int type);
+
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
-                  struct blob_attr **tb, void *data, int len);
+                  struct blob_attr **tb, void *data, unsigned int len);
+int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
+			struct blob_attr **tb, void *data, unsigned int len);
 
 int blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
-                      const void *data, int len);
+                      const void *data, unsigned int len);
+
+static inline int
+blobmsg_add_double(struct blob_buf *buf, const char *name, double val)
+{
+	union {
+		double d;
+		uint64_t u64;
+	} v;
+	v.d = val;
+	v.u64 = cpu_to_be64(v.u64);
+	return blobmsg_add_field(buf, BLOBMSG_TYPE_DOUBLE, name, &v.u64, 8);
+}
 
 static inline int
 blobmsg_add_u8(struct blob_buf *buf, const char *name, uint8_t val)
@@ -178,18 +219,46 @@ static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
 
 static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
 {
-	return be64_to_cpu(*(uint64_t *) blobmsg_data(attr));
+	uint32_t *ptr = (uint32_t *) blobmsg_data(attr);
+	uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32;
+	tmp |= be32_to_cpu(ptr[1]);
+	return tmp;
+}
+
+static inline double blobmsg_get_double(struct blob_attr *attr)
+{
+	union {
+		double d;
+		uint64_t u64;
+	} v;
+	v.u64 = blobmsg_get_u64(attr);
+	return v.d;
 }
 
-void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);
+static inline char *blobmsg_get_string(struct blob_attr *attr)
+{
+	if (!attr)
+		return NULL;
+
+	return (char *) blobmsg_data(attr);
+}
+
+void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsigned int maxlen);
+void *blobmsg_realloc_string_buffer(struct blob_buf *buf, unsigned int maxlen);
 void blobmsg_add_string_buffer(struct blob_buf *buf);
 
+int blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg);
+int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+     __attribute__((format(printf, 3, 4)));
+
+
 /* blobmsg to json formatting */
 
 #define blobmsg_for_each_attr(pos, attr, rem) \
-	for (rem = blobmsg_data_len(attr), pos = blobmsg_data(attr); \
-		 rem > 0 && (blob_pad_len(pos) <= rem) && \
-		 (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
-		 rem -= blob_pad_len(pos), pos = blob_next(pos))
+	for (rem = attr ? blobmsg_data_len(attr) : 0, \
+	     pos = (struct blob_attr *) (attr ? blobmsg_data(attr) : NULL); \
+	     rem > 0 && (blob_pad_len(pos) <= rem) && \
+	     (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+	     rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 #endif