X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=b4e6758a4951a8c6a6849844675c039ab4d15453;hp=8594add0322879908eb19f0d9c01cbef694f3724;hb=fc20c7a0314afa07f4f873f1a2f1f0095bf8e519;hpb=fcee2d56bca5ed08c4bfc996064e74e92ceb9137

diff --git a/blobmsg.h b/blobmsg.h
index 8594add..b4e6758 100644
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -31,11 +31,12 @@ enum blobmsg_type {
 	BLOBMSG_TYPE_INT16,
 	BLOBMSG_TYPE_INT8,
 	__BLOBMSG_TYPE_LAST,
-	BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1
+	BLOBMSG_TYPE_LAST = __BLOBMSG_TYPE_LAST - 1,
+	BLOBMSG_TYPE_BOOL = BLOBMSG_TYPE_INT8,
 };
 
 struct blobmsg_hdr {
-	uint8_t namelen;
+	uint16_t namelen;
 	uint8_t name[];
 } __packed;
 
@@ -49,24 +50,29 @@ static inline int blobmsg_hdrlen(int namelen)
 	return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
-static inline void *blobmsg_name(struct blob_attr *attr)
+static inline const char *blobmsg_name(const struct blob_attr *attr)
 {
-	struct blobmsg_hdr *hdr = blob_data(attr);
-	return &hdr->name;
+	struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
+	return (const char *) hdr->name;
 }
 
-static inline void *blobmsg_data(struct blob_attr *attr)
+static inline int blobmsg_type(const struct blob_attr *attr)
 {
-	struct blobmsg_hdr *hdr = blob_data(attr);
-	return &hdr->name[blobmsg_hdrlen(hdr->namelen) - 1];
+	return blob_id(attr);
 }
 
-static inline int blobmsg_data_len(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));
+}
+
+static inline int blobmsg_data_len(const struct blob_attr *attr)
 {
 	uint8_t *start, *end;
 
-	start = blob_data(attr);
-	end = blobmsg_data(attr);
+	start = (uint8_t *) blob_data(attr);
+	end = (uint8_t *) blobmsg_data(attr);
 
 	return blob_len(attr) - (end - start);
 }
@@ -139,4 +145,40 @@ static inline int blobmsg_buf_init(struct blob_buf *buf)
 	return blob_buf_init(buf, BLOBMSG_TYPE_TABLE);
 }
 
+static inline uint8_t blobmsg_get_u8(struct blob_attr *attr)
+{
+	return *(uint8_t *) blobmsg_data(attr);
+}
+
+static inline bool blobmsg_get_bool(struct blob_attr *attr)
+{
+	return *(uint8_t *) blobmsg_data(attr);
+}
+
+static inline uint16_t blobmsg_get_u16(struct blob_attr *attr)
+{
+	return *(uint16_t *) blobmsg_data(attr);
+}
+
+static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
+{
+	return *(uint32_t *) blobmsg_data(attr);
+}
+
+static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
+{
+	return *(uint64_t *) blobmsg_data(attr);
+}
+
+void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);
+void blobmsg_add_string_buffer(struct blob_buf *buf);
+
+/* 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))
+
 #endif