X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blobmsg.c;h=0129640f8d0f27c760af0f0c783bafc5215e6882;hp=b16510bcc88cb89d116131f1f4e940bc6ac7ae39;hb=08aada9a932b5abde3f18492568d5b2187b49a32;hpb=d28eb7fc2816e5f9b2e8e3455c0c19faf2270b08

diff --git a/blobmsg.c b/blobmsg.c
index b16510b..0129640 100644
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -15,164 +15,25 @@
 
 #include "blobmsg.h"
 
-struct strbuf {
-	int len;
-	int pos;
-	char *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,
 };
 
-static bool blobmsg_puts(struct strbuf *s, char *c, int len)
+static uint16_t
+blobmsg_namelen(const struct blobmsg_hdr *hdr)
 {
-	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, char *str)
-{
-	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)
-{
-	char buf[32];
-	void *data;
-	int len;
-
-	if (array) {
-		data = blob_data(attr);
-		len  = blob_len(attr);
-	} else {
-		blobmsg_format_string(s, blobmsg_name(attr));
-		blobmsg_puts(s, ":", 1);
-		data = blobmsg_data(attr);
-		len = blobmsg_data_len(attr);
-	}
-
-	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_puts(s, data, strlen(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;
-	}
-	blobmsg_puts(s, buf, strlen(buf));
-}
-
-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);
-		first = false;
-	}
-	blobmsg_puts(s, (array ? " ]" : " }"), 2);
-}
-
-char *blobmsg_format_json(struct blob_attr *attr)
-{
-	struct strbuf s;
-
-	s.len = blob_len(attr);
-	s.buf = malloc(s.len);
-	s.pos = 0;
-
-	blobmsg_format_element(&s, attr, false);
-
-	if (!s.len)
-		return NULL;
-
-	s.buf = realloc(s.buf, s.pos + 1);
-	return s.buf;
+	return be16_to_cpu(hdr->namelen);
 }
 
 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;
@@ -181,13 +42,23 @@ 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[blobmsg_namelen(hdr)] != 0)
 		return false;
 
-	if (hdr->name[hdr->namelen] != 0)
+	id = blob_id(attr);
+	len = blobmsg_data_len(attr);
+	data = blobmsg_data(attr);
+
+	if (!id || id > BLOBMSG_TYPE_LAST)
 		return false;
 
-	return true;
+	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,
@@ -217,14 +88,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;
@@ -244,14 +115,8 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
 	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;
@@ -260,7 +125,7 @@ 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);
 
@@ -282,17 +147,44 @@ blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
 	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;
+}
+
+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 NULL;
+	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
@@ -302,10 +194,6 @@ blobmsg_add_field(struct blob_buf *buf, int type, const char *name,
 	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;