blobmsg: constify and add more validation

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index b50cca9..e978235 100644 (file)
--- 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,13 +49,19 @@ static inline int blobmsg_hdrlen(int namelen)
        return BLOBMSG_PADDING(sizeof(struct blobmsg_hdr) + namelen + 1);
 }
 
-static inline void *blobmsg_data(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[blobmsg_hdrlen(hdr->namelen) - 1];
+       return (const char *) hdr->name;
 }
 
-static inline int blobmsg_data_len(struct blob_attr *attr)
+static inline void *blobmsg_data(const struct blob_attr *attr)
+{
+       struct blobmsg_hdr *hdr = blob_data(attr);
+       return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
+}
+
+static inline int blobmsg_data_len(const struct blob_attr *attr)
 {
        uint8_t *start, *end;
 
@@ -65,6 +71,7 @@ static inline int blobmsg_data_len(struct blob_attr *attr)
        return blob_len(attr) - (end - start);
 }
 
+bool blobmsg_check_attr(const struct blob_attr *attr, bool name);
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
                   struct blob_attr **tb, void *data, int len);
 
@@ -132,4 +139,12 @@ 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 list);
+
+#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