X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blob.c;h=03d5e9c27ee73ec52bd30514a0cd6044cb7c6cf1;hp=4bc67a8d5407f594f139e7908b081b340a854bf1;hb=bb0c830b2a259b7c5ffa7c309ce9d3004f3c41a1;hpb=f24324c27fe8299b22e983171285eb93d4a74721

diff --git a/blob.c b/blob.c
index 4bc67a8..03d5e9c 100644
--- a/blob.c
+++ b/blob.c
@@ -3,14 +3,17 @@
  *
  * Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
  *
- * 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
+ * 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 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 "blob.h"
@@ -18,12 +21,15 @@
 static bool
 blob_buffer_grow(struct blob_buf *buf, int minlen)
 {
+	struct blob_buf *new;
 	int delta = ((minlen / 256) + 1) * 256;
-	buf->buflen += delta;
-	buf->buf = realloc(buf->buf, buf->buflen);
-	if (buf->buf)
-		memset(buf->buf + buf->buflen - delta, 0, delta);
-	return !!buf->buf;
+	new = realloc(buf->buf, buf->buflen + delta);
+	if (new) {
+		buf->buf = new;
+		memset(buf->buf + buf->buflen, 0, delta);
+		buf->buflen += delta;
+	}
+	return !!new;
 }
 
 static void
@@ -37,36 +43,45 @@ blob_init(struct blob_attr *attr, int id, unsigned int len)
 static inline struct blob_attr *
 offset_to_attr(struct blob_buf *buf, int offset)
 {
-	void *ptr = (char *)buf->buf + offset;
+	void *ptr = (char *)buf->buf + offset - BLOB_COOKIE;
 	return ptr;
 }
 
 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;
+}
+
+bool
+blob_buf_grow(struct blob_buf *buf, int required)
+{
+	int offset_head = attr_to_offset(buf, buf->head);
+
+	if (!buf->grow || !buf->grow(buf, required))
+		return false;
+
+	buf->head = offset_to_attr(buf, offset_head);
+	return true;
 }
 
 static struct blob_attr *
 blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
 {
 	int offset = attr_to_offset(buf, pos);
-	int required = (offset + sizeof(struct blob_attr) + payload) - buf->buflen;
+	int required = (offset - BLOB_COOKIE + sizeof(struct blob_attr) + payload) - buf->buflen;
 	struct blob_attr *attr;
 
 	if (required > 0) {
-		int offset_head = attr_to_offset(buf, buf->head);
-
-		if (!buf->grow || !buf->grow(buf, required))
+		if (!blob_buf_grow(buf, required))
 			return NULL;
-
-		buf->head = offset_to_attr(buf, offset_head);
 		attr = offset_to_attr(buf, offset);
 	} else {
 		attr = pos;
 	}
 
 	blob_init(attr, id, payload + sizeof(struct blob_attr));
+	blob_fill_pad(attr);
 	return attr;
 }
 
@@ -91,6 +106,25 @@ blob_buf_free(struct blob_buf *buf)
 	buf->buflen = 0;
 }
 
+void
+blob_fill_pad(struct blob_attr *attr)
+{
+	char *buf = (char *) attr;
+	int len = blob_pad_len(attr);
+	int delta = len - blob_raw_len(attr);
+
+	if (delta > 0)
+		memset(buf + len - delta, 0, delta);
+}
+
+void
+blob_set_raw_len(struct blob_attr *attr, unsigned int len)
+{
+	len &= BLOB_ATTR_LEN_MASK;
+	attr->id_len &= ~cpu_to_be32(BLOB_ATTR_LEN_MASK);
+	attr->id_len |= cpu_to_be32(len);
+}
+
 struct blob_attr *
 blob_new(struct blob_buf *buf, int id, int payload)
 {
@@ -105,7 +139,23 @@ blob_new(struct blob_buf *buf, int id, int payload)
 }
 
 struct blob_attr *
-blob_put(struct blob_buf *buf, int id, const void *ptr, int len)
+blob_put_raw(struct blob_buf *buf, const void *ptr, unsigned int len)
+{
+	struct blob_attr *attr;
+
+	if (len < sizeof(struct blob_attr) || !ptr)
+		return NULL;
+
+	attr = blob_add(buf, blob_next(buf->head), 0, len - sizeof(struct blob_attr));
+	if (!attr)
+		return NULL;
+	blob_set_raw_len(buf->head, blob_pad_len(buf->head) + len);
+	memcpy(attr, ptr, len);
+	return attr;
+}
+
+struct blob_attr *
+blob_put(struct blob_buf *buf, int id, const void *ptr, unsigned int len)
 {
 	struct blob_attr *attr;
 
@@ -123,6 +173,8 @@ blob_nest_start(struct blob_buf *buf, int id)
 {
 	unsigned long offset = attr_to_offset(buf, buf->head);
 	buf->head = blob_new(buf, id, 0);
+	if (!buf->head)
+		return NULL;
 	return (void *) offset;
 }
 
@@ -140,10 +192,11 @@ static const int blob_type_minlen[BLOB_ATTR_LAST] = {
 	[BLOB_ATTR_INT16] = sizeof(uint16_t),
 	[BLOB_ATTR_INT32] = sizeof(uint32_t),
 	[BLOB_ATTR_INT64] = sizeof(uint64_t),
+	[BLOB_ATTR_DOUBLE] = sizeof(double),
 };
 
 bool
-blob_check_type(const void *ptr, int len, int type)
+blob_check_type(const void *ptr, unsigned int len, int type)
 {
 	const char *data = ptr;
 
@@ -193,7 +246,7 @@ blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_at
 			if (info[id].maxlen && len > info[id].maxlen)
 				continue;
 
-			if (info[id].validate && !info[id].validate(&info[id], attr))
+			if (info[id].validate && !info[id].validate(&info[id], pos))
 				continue;
 		}
 
@@ -219,3 +272,17 @@ blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2)
 
 	return !memcmp(a1, a2, blob_pad_len(a1));
 }
+
+struct blob_attr *
+blob_memdup(struct blob_attr *attr)
+{
+	struct blob_attr *ret;
+	int size = blob_pad_len(attr);
+
+	ret = malloc(size);
+	if (!ret)
+		return NULL;
+
+	memcpy(ret, attr, size);
+	return ret;
+}