X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.c;h=2d584a110294708758987135d618d74c9f349fef;hp=3079dcacb24a135e01c3b1bfed7e0d500779cfed;hb=e16fa068a57318fff073da4a0f8f0535a97fe208;hpb=1d3e4ccb6ae544dfc75227434c42b1ee74b86d4f

diff --git a/blobmsg.c b/blobmsg.c
index 3079dca..2d584a1 100644
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -1,18 +1,18 @@
 /*
- * blobmsg - library for generating/parsing structured blob messages
+ * Copyright (C) 2010-2012 Felix Fietkau <nbd@openwrt.org>
  *
- * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
 #include "blobmsg.h"
 
 static const int blob_type[__BLOBMSG_TYPE_LAST] = {
@@ -23,6 +23,12 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
 	[BLOBMSG_TYPE_STRING] = BLOB_ATTR_STRING,
 };
 
+static uint16_t
+blobmsg_namelen(const struct blobmsg_hdr *hdr)
+{
+	return be16_to_cpu(hdr->namelen);
+}
+
 bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 {
 	const struct blobmsg_hdr *hdr;
@@ -36,10 +42,10 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 	if (!hdr->namelen && name)
 		return false;
 
-	if (hdr->namelen > blob_len(attr) - sizeof(struct blobmsg_hdr))
+	if (blobmsg_namelen(hdr) > blob_len(attr) - sizeof(struct blobmsg_hdr))
 		return false;
 
-	if (hdr->name[hdr->namelen] != 0)
+	if (hdr->name[blobmsg_namelen(hdr)] != 0)
 		return false;
 
 	id = blob_id(attr);
@@ -55,6 +61,34 @@ 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)
+{
+	struct blob_attr *cur;
+	bool name;
+	int rem;
+
+	switch (blobmsg_type(attr)) {
+	case BLOBMSG_TYPE_TABLE:
+		name = true;
+		break;
+	case BLOBMSG_TYPE_ARRAY:
+		name = false;
+		break;
+	default:
+		return false;
+	}
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (blobmsg_type(cur) != type)
+			return false;
+
+		if (!blobmsg_check_attr(cur, name))
+			return false;
+	}
+
+	return true;
+}
+
 int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
                   struct blob_attr **tb, void *data, int len)
 {
@@ -82,7 +116,7 @@ int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
 			    blob_id(attr) != policy[i].type)
 				continue;
 
-			if (hdr->namelen != pslen[i])
+			if (blobmsg_namelen(hdr) != pslen[i])
 				continue;
 
 			if (!blobmsg_check_attr(attr, true))
@@ -108,6 +142,7 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
 	struct blob_attr *attr;
 	struct blobmsg_hdr *hdr;
 	int attrlen, namelen;
+	char *pad_start, *pad_end;
 
 	if (!name)
 		name = "";
@@ -119,9 +154,12 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
 		return NULL;
 
 	hdr = blob_data(attr);
-	hdr->namelen = namelen;
+	hdr->namelen = cpu_to_be16(namelen);
 	strcpy((char *) hdr->name, (const char *)name);
-	*data = blobmsg_data(attr);
+	pad_end = *data = blobmsg_data(attr);
+	pad_start = (char *) &hdr->name[namelen];
+	if (pad_start < pad_end)
+		memset(pad_start, 0, pad_end - pad_start);
 
 	return attr;
 }
@@ -178,6 +216,8 @@ blobmsg_add_string_buffer(struct blob_buf *buf)
 
 	attrlen = blob_raw_len(attr) + len;
 	blob_set_raw_len(attr, attrlen);
+	blob_fill_pad(attr);
+
 	blob_set_raw_len(buf->head, blob_raw_len(buf->head) + blob_pad_len(attr));
 }