X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.c;h=80b984a133cd52f0d3a5fefe33de4e9739d99e71;hp=26604b1be6d9c0c6fb5bef34cb5bc5ce6c13826c;hb=004be15be4f3a8fb0cb781769338f91d0347dafc;hpb=01ad5162b27b29fd0bfe5b862a1a719ba4870e0a

diff --git a/blobmsg.c b/blobmsg.c
index 26604b1..80b984a 100644
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -1,203 +1,35 @@
 /*
- * 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"
 
-struct strbuf {
-	int len;
-	int pos;
-	char *buf;
-
-	blobmsg_json_format_t custom_format;
-	void *priv;
-};
-
-static bool blobmsg_puts(struct strbuf *s, const char *c, int len)
-{
-	if (len <= 0)
-		return true;
-
-	if (s->pos + len >= s->len) {
-		s->len += 16;
-		s->buf = realloc(s->buf, s->len);
-		if (!s->buf)
-			return false;
-	}
-	memcpy(s->buf + s->pos, c, len);
-	s->pos += len;
-	return true;
-}
-
-static void blobmsg_format_string(struct strbuf *s, const char *str)
-{
-	const char *p, *last = str, *end = str + strlen(str);
-	char buf[8] = "\\u00";
-
-	blobmsg_puts(s, "\"", 1);
-	for (p = str; *p; p++) {
-		char escape = '\0';
-		int len;
-
-		switch(*p) {
-		case '\b':
-			escape = 'b';
-			break;
-		case '\n':
-			escape = 'n';
-			break;
-		case '\t':
-			escape = 't';
-			break;
-		case '\r':
-			escape = 'r';
-			break;
-		case '"':
-		case '\\':
-		case '/':
-			escape = *p;
-			break;
-		default:
-			if (*p < ' ')
-				escape = 'u';
-			break;
-		}
-
-		if (!escape)
-			continue;
-
-		if (p > last)
-			blobmsg_puts(s, last, p - last);
-		last = p + 1;
-		buf[1] = escape;
-
-		if (escape == 'u') {
-			sprintf(buf + 4, "%02x", (unsigned char) *p);
-			len = 4;
-		} else {
-			len = 2;
-		}
-		blobmsg_puts(s, buf, len);
-	}
-
-	blobmsg_puts(s, last, end - last);
-	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, bool head)
-{
-	const char *data_str;
-	char buf[32];
-	void *data;
-	int len;
-
-	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 (s->custom_format) {
-			data_str = s->custom_format(s->priv, attr);
-			if (data_str)
-				goto out;
-		}
-	}
-
-	data_str = buf;
-	switch(blob_id(attr)) {
-	case BLOBMSG_TYPE_INT8:
-		sprintf(buf, "%d", *(uint8_t *)data);
-		break;
-	case BLOBMSG_TYPE_INT16:
-		sprintf(buf, "%d", *(uint16_t *)data);
-		break;
-	case BLOBMSG_TYPE_INT32:
-		sprintf(buf, "%d", *(uint32_t *)data);
-		break;
-	case BLOBMSG_TYPE_INT64:
-		sprintf(buf, "%lld", *(uint64_t *)data);
-		break;
-	case BLOBMSG_TYPE_STRING:
-		blobmsg_format_string(s, data);
-		return;
-	case BLOBMSG_TYPE_ARRAY:
-		blobmsg_format_json_list(s, data, len, true);
-		return;
-	case BLOBMSG_TYPE_TABLE:
-		blobmsg_format_json_list(s, data, len, false);
-		return;
-	}
-
-out:
-	blobmsg_puts(s, data_str, strlen(data_str));
-}
-
-static void blobmsg_format_json_list(struct strbuf *s, struct blob_attr *attr, int len, bool array)
-{
-	struct blob_attr *pos;
-	bool first = true;
-	int rem = len;
-
-	blobmsg_puts(s, (array ? "[ " : "{ "), 2);
-	__blob_for_each_attr(pos, attr, rem) {
-		if (!first)
-			blobmsg_puts(s, ", ", 2);
-
-		blobmsg_format_element(s, pos, array, false);
-		first = false;
-	}
-	blobmsg_puts(s, (array ? " ]" : " }"), 2);
-}
-
-char *blobmsg_format_json_with_cb(struct blob_attr *attr, bool list, blobmsg_json_format_t cb, void *priv)
-{
-	struct strbuf s;
-
-	s.len = blob_len(attr);
-	s.buf = malloc(s.len);
-	s.pos = 0;
-	s.custom_format = cb;
-	s.priv = priv;
-
-	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;
-
-	s.buf = realloc(s.buf, s.pos + 1);
-	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,
+	[BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
 };
 
+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;
@@ -211,17 +43,17 @@ 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);
 	len = blobmsg_data_len(attr);
 	data = blobmsg_data(attr);
 
-	if (!id || id > BLOBMSG_TYPE_LAST)
+	if (id > BLOBMSG_TYPE_LAST)
 		return false;
 
 	if (!blob_type[id])
@@ -230,8 +62,71 @@ bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 	return blob_check_type(data, len, blob_type[id]);
 }
 
+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:
+		name = true;
+		break;
+	case BLOBMSG_TYPE_ARRAY:
+		name = false;
+		break;
+	default:
+		return -1;
+	}
+
+	blobmsg_for_each_attr(cur, attr, rem) {
+		if (type != BLOBMSG_TYPE_UNSPEC && blobmsg_type(cur) != type)
+			return -1;
+
+		if (!blobmsg_check_attr(cur, name))
+			return -1;
+
+		size++;
+	}
+
+	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, unsigned int len)
+{
+	struct blob_attr *attr;
+	int i = 0;
+
+	memset(tb, 0, policy_len * sizeof(*tb));
+	__blob_for_each_attr(attr, data, len) {
+		if (policy[i].type != BLOBMSG_TYPE_UNSPEC &&
+		    blob_id(attr) != policy[i].type)
+			continue;
+
+		if (!blobmsg_check_attr(attr, false))
+			return -1;
+
+		if (tb[i])
+			continue;
+
+		tb[i++] = attr;
+		if (i == policy_len)
+			break;
+	}
+
+	return 0;
+}
+
+
 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;
@@ -257,14 +152,14 @@ 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))
 				return -1;
 
 			if (tb[i])
-				return -1;
+				continue;
 
 			if (strcmp(policy[i].name, (char *) hdr->name) != 0)
 				continue;
@@ -283,6 +178,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 = "";
@@ -293,10 +189,14 @@ 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 = 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;
 }
@@ -304,14 +204,14 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
 static inline int
 attr_to_offset(struct blob_buf *buf, struct blob_attr *attr)
 {
-	return (char *)attr - (char *) buf->buf;
+	return (char *)attr - (char *) buf->buf + BLOB_COOKIE;
 }
 
 
 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;
@@ -320,13 +220,40 @@ 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;
 }
 
+void
+blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
+{
+	va_list arg2;
+	char cbuf;
+	int len;
+
+	va_copy(arg2, arg);
+	len = vsnprintf(&cbuf, sizeof(cbuf), format, arg2);
+	va_end(arg2);
+
+	vsprintf(blobmsg_alloc_string_buffer(buf, name, len + 1), format, arg);
+	blobmsg_add_string_buffer(buf);
+}
+
+void
+blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+{
+	va_list ap;
+
+	va_start(ap, format);
+	blobmsg_vprintf(buf, name, format, ap);
+	va_end(ap);
+}
+
 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;
@@ -335,13 +262,29 @@ 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);
 
 	return data_dest;
 }
 
+void *
+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;
+	int required = maxlen - (buf->buflen - offset);
+
+	if (required <= 0)
+		goto out;
+
+	blob_buf_grow(buf, required);
+	attr = blob_next(buf->head);
+
+out:
+	return blobmsg_data(attr);
+}
+
 void
 blobmsg_add_string_buffer(struct blob_buf *buf)
 {
@@ -353,20 +296,18 @@ 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));
 }
 
 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;
 
-	if (type == BLOBMSG_TYPE_ARRAY ||
-	    type == BLOBMSG_TYPE_TABLE)
-		return -1;
-
 	attr = blobmsg_new(buf, type, name, len, &data_dest);
 	if (!attr)
 		return -1;