X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.h;h=c47f46973ee68975b7ec22979f77a84280031dd8;hp=554bed8c1add427af1c94b44e698a17b29e97b8e;hb=97ed91fa77e3e2926bab3e70955a0e2b511db86e;hpb=ff585b97c0b061d3ef7a026a331fa0079e0a7d94

diff --git a/blobmsg.h b/blobmsg.h
index 554bed8..c47f469 100644
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -31,7 +31,8 @@ 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 {
@@ -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 (char *) hdr + blobmsg_hdrlen(hdr->namelen);
+	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);
 }
@@ -87,18 +93,21 @@ blobmsg_add_u8(struct blob_buf *buf, const char *name, uint8_t val)
 static inline int
 blobmsg_add_u16(struct blob_buf *buf, const char *name, uint16_t val)
 {
+	val = cpu_to_be16(val);
 	return blobmsg_add_field(buf, BLOBMSG_TYPE_INT16, name, &val, 2);
 }
 
 static inline int
 blobmsg_add_u32(struct blob_buf *buf, const char *name, uint32_t val)
 {
+	val = cpu_to_be32(val);
 	return blobmsg_add_field(buf, BLOBMSG_TYPE_INT32, name, &val, 4);
 }
 
 static inline int
 blobmsg_add_u64(struct blob_buf *buf, const char *name, uint64_t val)
 {
+	val = cpu_to_be64(val);
 	return blobmsg_add_field(buf, BLOBMSG_TYPE_INT64, name, &val, 8);
 }
 
@@ -108,6 +117,13 @@ blobmsg_add_string(struct blob_buf *buf, const char *name, const char *string)
 	return blobmsg_add_field(buf, BLOBMSG_TYPE_STRING, name, string, strlen(string) + 1);
 }
 
+static inline int
+blobmsg_add_blob(struct blob_buf *buf, struct blob_attr *attr)
+{
+	return blobmsg_add_field(buf, blobmsg_type(attr), blobmsg_name(attr),
+				 blobmsg_data(attr), blobmsg_data_len(attr));
+}
+
 void *blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array);
 
 static inline void *
@@ -139,11 +155,39 @@ 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, bool named);
+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 be16_to_cpu(*(uint16_t *) blobmsg_data(attr));
+}
+
+static inline uint32_t blobmsg_get_u32(struct blob_attr *attr)
+{
+	return be32_to_cpu(*(uint32_t *) blobmsg_data(attr));
+}
+
+static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
+{
+	return be64_to_cpu(*(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) && \
+		 rem > 0 && (blob_pad_len(pos) <= rem) && \
 		 (blob_pad_len(pos) >= sizeof(struct blob_attr)); \
 		 rem -= blob_pad_len(pos), pos = blob_next(pos))