#ifndef __BLOBMSG_H
#define __BLOBMSG_H
+#include <stdarg.h>
#include "blob.h"
#define BLOBMSG_ALIGN 2
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));
+ char *data = blob_data(attr);
+
+ if (blob_is_extended(attr))
+ data += blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
+
+ return data;
}
static inline int blobmsg_data_len(const struct blob_attr *attr)
return blob_len(attr) - (end - start);
}
+static inline int blobmsg_len(const struct blob_attr *attr)
+{
+ return blobmsg_data_len(attr);
+}
+
bool blobmsg_check_attr(const struct blob_attr *attr, bool name);
-bool blobmsg_check_attr_list(const struct blob_attr *attr, int type, bool name);
+bool blobmsg_check_attr_list(const struct blob_attr *attr, int type);
int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
struct blob_attr **tb, void *data, int len);
+int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
+ struct blob_attr **tb, void *data, int len);
int blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
const void *data, int len);
static inline uint64_t blobmsg_get_u64(struct blob_attr *attr)
{
- return be64_to_cpu(*(uint64_t *) blobmsg_data(attr));
+ uint32_t *ptr = blobmsg_data(attr);
+ uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32;
+ tmp |= be32_to_cpu(ptr[1]);
+ return tmp;
+}
+
+static inline char *blobmsg_get_string(struct blob_attr *attr)
+{
+ return blobmsg_data(attr);
}
void *blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen);
+void *blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen);
void blobmsg_add_string_buffer(struct blob_buf *buf);
+void blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg);
+void blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+ __attribute__((format(printf, 3, 4)));
+
+
/* 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))
+ for (rem = attr ? blobmsg_data_len(attr) : 0, \
+ pos = attr ? blobmsg_data(attr) : 0; \
+ 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