X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=blobmsg.h;h=e9a0b69307661e12972e2059db9e78c2279248b6;hb=e44dbfb1029829dbd6c5e1ca11e461d9a89027b9;hp=c64cedbf831c5d66e9a45e94ad30ddce7de8fd49;hpb=d28eb7fc2816e5f9b2e8e3455c0c19faf2270b08;p=project%2Flibubox.git

diff --git a/blobmsg.h b/blobmsg.h
index c64cedb..e9a0b69 100644
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -35,7 +35,7 @@ enum blobmsg_type {
 };
 
 struct blobmsg_hdr {
-	uint8_t namelen;
+	uint16_t namelen;
 	uint8_t name[];
 } __packed;
 
@@ -49,19 +49,19 @@ 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;
+	return (const char *) hdr->name;
 }
 
-static inline void *blobmsg_data(struct blob_attr *attr)
+static inline void *blobmsg_data(const struct blob_attr *attr)
 {
 	struct blobmsg_hdr *hdr = blob_data(attr);
-	return &hdr->name[blobmsg_hdrlen(hdr->namelen) - 1];
+	return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
 }
 
-static inline int blobmsg_data_len(struct blob_attr *attr)
+static inline int blobmsg_data_len(const struct blob_attr *attr)
 {
 	uint8_t *start, *end;
 
@@ -139,6 +139,35 @@ static inline int blobmsg_buf_init(struct blob_buf *buf)
 	return blob_buf_init(buf, BLOBMSG_TYPE_TABLE);
 }
 
-char *blobmsg_format_json(struct blob_attr *attr);
+static inline uint8_t blobmsg_get_u8(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); \
+		 (blob_pad_len(pos) <= rem) && \
+		 (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
+		 rem -= blob_pad_len(pos), pos = blob_next(pos))
 
 #endif