make the blobmsg format endian agnostic (stick to big-endian)

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index c64cedb..c266855 100644 (file)
--- 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,19 +50,24 @@ 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 int blobmsg_type(const struct blob_attr *attr)
+{
+       return blob_id(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(be16_to_cpu(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 +145,40 @@ 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 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