ustream: prevent recursive calls to the read callback

[project/libubox.git] / blobmsg.h

diff --git a/blobmsg.h b/blobmsg.h
index 1f0634d8d066a54b999ee0368ba589299c50e8fe..f2fc0d0ad107010a982f29d991f10b1a9757b4c8 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -62,7 +62,7 @@ static inline void blobmsg_clear_name(struct blob_attr *attr)
 static inline const char *blobmsg_name(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = (struct blobmsg_hdr *) blob_data(attr);
-       return (const char *) hdr->name;
+       return (const char *)(hdr + 1);
 }
 
 static inline int blobmsg_type(const struct blob_attr *attr)
@@ -178,6 +178,20 @@ int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
 int blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
                       const void *data, unsigned int len);
 
+static inline int
+blobmsg_parse_attr(const struct blobmsg_policy *policy, int policy_len,
+                  struct blob_attr **tb, struct blob_attr *data)
+{
+       return blobmsg_parse(policy, policy_len, tb, blobmsg_data(data), blobmsg_len(data));
+}
+
+static inline int
+blobmsg_parse_array_attr(const struct blobmsg_policy *policy, int policy_len,
+                        struct blob_attr **tb, struct blob_attr *data)
+{
+       return blobmsg_parse_array(policy, policy_len, tb, blobmsg_data(data), blobmsg_len(data));
+}
+
 static inline int
 blobmsg_add_double(struct blob_buf *buf, const char *name, double val)
 {