X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.c;h=80b984a133cd52f0d3a5fefe33de4e9739d99e71;hp=307662051d9ae66b84f6f2304feb38e2465c3e9a;hb=a8e70c6d361967a23977417fb7d6cf56234f8b81;hpb=458c3937bca9db8402e898227bdac07d36959fee

diff --git a/blobmsg.c b/blobmsg.c
index 3076620..80b984a 100644
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -62,11 +62,12 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 	return blob_check_type(data, len, blob_type[id]);
 }
 
-bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
+int blobmsg_check_array(const struct blob_attr *attr, int type)
 {
 	struct blob_attr *cur;
 	bool name;
 	int rem;
+	int size = 0;
 
 	switch (blobmsg_type(attr)) {
 	case BLOBMSG_TYPE_TABLE:
@@ -76,22 +77,29 @@ bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
 		name = false;
 		break;
 	default:
-		return false;
+		return -1;
 	}
 
 	blobmsg_for_each_attr(cur, attr, rem) {
-		if (blobmsg_type(cur) != type)
-			return false;
+		if (type != BLOBMSG_TYPE_UNSPEC && blobmsg_type(cur) != type)
+			return -1;
 
 		if (!blobmsg_check_attr(cur, name))
-			return false;
+			return -1;
+
+		size++;
 	}
 
-	return true;
+	return size;
+}
+
+bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
+{
+	return blobmsg_check_array(attr, type) >= 0;
 }
 
 int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
-			struct blob_attr **tb, void *data, int len)
+			struct blob_attr **tb, void *data, unsigned int len)
 {
 	struct blob_attr *attr;
 	int i = 0;
@@ -118,7 +126,7 @@ int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
 
 
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
-                  struct blob_attr **tb, void *data, int len)
+                  struct blob_attr **tb, void *data, unsigned int len)
 {
 	struct blobmsg_hdr *hdr;
 	struct blob_attr *attr;
@@ -181,6 +189,7 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
 	if (!attr)
 		return NULL;
 
+	attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED);
 	hdr = blob_data(attr);
 	hdr->namelen = cpu_to_be16(namelen);
 	strcpy((char *) hdr->name, (const char *)name);
@@ -202,7 +211,7 @@ attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
 void *
 blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
 {
-	struct blob_attr *head = buf->head;
+	struct blob_attr *head;
 	int type = array ? BLOBMSG_TYPE_ARRAY : BLOBMSG_TYPE_TABLE;
 	unsigned long offset = attr_to_offset(buf, buf->head);
 	void *data;
@@ -211,6 +220,8 @@ blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
 		name = "";
 
 	head = blobmsg_new(buf, type, name, 0, &data);
+	if (!head)
+		return NULL;
 	blob_set_raw_len(buf->head, blob_pad_len(buf->head) - blobmsg_hdrlen(strlen(name)));
 	buf->head = head;
 	return (void *)offset;
@@ -242,7 +253,7 @@ blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
 }
 
 void *
-blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
+blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, unsigned int maxlen)
 {
 	struct blob_attr *attr;
 	void *data_dest;
@@ -251,7 +262,6 @@ blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
 	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);
 
@@ -259,7 +269,7 @@ blobmsg_alloc_string_buffer(struct blob_buf *buf, const char *name, int maxlen)
 }
 
 void *
-blobmsg_realloc_string_buffer(struct blob_buf *buf, int maxlen)
+blobmsg_realloc_string_buffer(struct blob_buf *buf, unsigned int maxlen)
 {
 	struct blob_attr *attr = blob_next(buf->head);
 	int offset = attr_to_offset(buf, blob_next(buf->head)) + blob_pad_len(attr) - BLOB_COOKIE;
@@ -293,7 +303,7 @@ blobmsg_add_string_buffer(struct blob_buf *buf)
 
 int
 blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
-                  const void *data, int len)
+                  const void *data, unsigned int len)
 {
 	struct blob_attr *attr;
 	void *data_dest;