char *buf;
};
-static bool blobmsg_puts(struct strbuf *s, char *c, int len)
+static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
{
if (len <= 0)
return true;
return true;
}
-static void blobmsg_format_string(struct strbuf *s, char *str)
+static void blobmsg_format_string(struct strbuf *s, const char *str)
{
- char *p, *last = str, *end = str + strlen(str);
+ const char *p, *last = str, *end = str + strlen(str);
char buf[8] = "\\u00";
blobmsg_puts(s, "\"", 1);
static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, int len, bool array);
-static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, bool array)
+static void blobmsg_format_element(struct strbuf *s, struct blob_attr *attr, bool array, bool head)
{
char buf[32];
void *data;
int len;
- if (array) {
- data = blob_data(attr);
- len = blob_len(attr);
- } else {
+ if (!array && blobmsg_name(attr)[0]) {
blobmsg_format_string(s, blobmsg_name(attr));
blobmsg_puts(s, ":", 1);
+ }
+ if (head) {
+ data = blob_data(attr);
+ len = blob_len(attr);
+ } else {
data = blobmsg_data(attr);
len = blobmsg_data_len(attr);
}
if (!first)
blobmsg_puts(s, ", ", 2);
- blobmsg_format_element(s, pos, array);
+ blobmsg_format_element(s, pos, array, false);
first = false;
}
blobmsg_puts(s, (array ? " ]" : " }"), 2);
}
-char *blobmsg_format_json(struct blob_attr *attr)
+char *blobmsg_format_json(struct blob_attr *attr, bool list)
{
struct strbuf s;
s.buf = malloc(s.len);
s.pos = 0;
- blobmsg_format_element(&s, attr, false);
+ if (list)
+ blobmsg_format_json_list(&s, blob_data(attr), blob_len(attr), false);
+ else
+ blobmsg_format_element(&s, attr, false, false);
if (!s.len)
return NULL;
return s.buf;
}
+static const int blob_type[__BLOBMSG_TYPE_LAST] = {
+ [BLOBMSG_TYPE_INT8] = BLOB_ATTR_INT8,
+ [BLOBMSG_TYPE_INT16] = BLOB_ATTR_INT16,
+ [BLOBMSG_TYPE_INT32] = BLOB_ATTR_INT32,
+ [BLOBMSG_TYPE_INT64] = BLOB_ATTR_INT64,
+ [BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
+};
+
bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
{
const struct blobmsg_hdr *hdr;
+ const char *data;
+ int id, len;
if (blob_len(attr) < sizeof(struct blobmsg_hdr))
return false;
if (hdr->name[hdr->namelen] != 0)
return false;
- return true;
+ id = blob_id(attr);
+ len = blobmsg_data_len(attr);
+ data = blobmsg_data(attr);
+
+ if (!id || id > BLOBMSG_TYPE_LAST)
+ return false;
+
+ if (!blob_type[id])
+ return true;
+
+ return blob_check_type(data, len, blob_type[id]);
}
int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
struct blobmsg_hdr *hdr;
int attrlen, namelen;
- if (blob_id(buf->head) == BLOBMSG_TYPE_ARRAY && !name) {
- attr = blob_new(buf, type, payload_len);
- *data = blob_data(attr);
- return attr;
- }
-
- if (blob_id(buf->head) != BLOBMSG_TYPE_TABLE || !name)
- return NULL;
+ if (!name)
+ name = "";
namelen = strlen(name);
attrlen = blobmsg_hdrlen(namelen) + payload_len;
unsigned long offset = attr_to_offset(buf, buf->head);
void *data;
- if (blob_id(head) == BLOBMSG_TYPE_ARRAY && !name)
- return blob_nest_start(buf, type);
-
- if (blob_id(head) == BLOBMSG_TYPE_TABLE && name) {
- head = blobmsg_new(buf, type, name, 0, &data);
- blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blobmsg_hdrlen(strlen(name)));
- buf->head = head;
- return (void *)offset;
- }
+ if (!name)
+ name = "";
- return NULL;
+ head = blobmsg_new(buf, type, name, 0, &data);
+ blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blobmsg_hdrlen(strlen(name)));
+ buf->head = head;
+ return (void *)offset;
}
int