#include "blobmsg.h"
+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,
return -1;
if (tb[i])
- return -1;
+ continue;
if (strcmp(policy[i].name, (char *) hdr->name) != 0)
continue;
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 (!name)
+ name = "";
- 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;
- }
+ 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;
+}
- return NULL;
+void *
+blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
+{
+ struct blob_attr *attr;
+ void *data_dest;
+
+ attr = blobmsg_new(buf, BLOBMSG_TYPE_STRING, name, maxlen, &data_dest);
+ if (!attr)
+ return NULL;
+
+ data_dest = blobmsg_data(attr);
+ blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blob_pad_len(attr));
+ blob_set_raw_len(attr, blob_raw_len(attr) - maxlen);
+
+ return data_dest;
+}
+
+void
+blobmsg_add_string_buffer(struct blob_buf *buf)
+{
+ struct blob_attr *attr;
+ int len, attrlen;
+
+ attr = blob_next(buf->head);
+ len = strlen(blobmsg_data(attr)) + 1;
+
+ attrlen = blob_raw_len(attr) + len;
+ blob_set_raw_len(attr, attrlen);
+ blob_set_raw_len(buf->head, blob_raw_len(buf->head) + blob_pad_len(attr));
}
int
struct blob_attr *attr;
void *data_dest;
- if (type == BLOBMSG_TYPE_ARRAY ||
- type == BLOBMSG_TYPE_TABLE)
- return -1;
-
attr = blobmsg_new(buf, type, name, len, &data_dest);
if (!attr)
return -1;