X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=blob.h;h=a092f5dabca6ac3bc3c9a6bc579ae58240dcaa6a;hp=80ad7d0ebb5281c66fda5721d0187d3f91d2b3a3;hb=6a7fb7d8df308d18167051447fa489de389588df;hpb=b1c320132e5adac3c3ba5545c66123b0618f8cd0 diff --git a/blob.h b/blob.h index 80ad7d0..a092f5d 100644 --- a/blob.h +++ b/blob.h @@ -3,14 +3,17 @@ * * Copyright (C) 2010 Felix Fietkau * - * 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. */ #ifndef _BLOB_H__ @@ -23,59 +26,9 @@ #include #include -#if __BYTE_ORDER == __LITTLE_ENDIAN - -#if defined(__linux__) || defined(__CYGWIN__) -#include -#include - -#elif defined(__APPLE__) -#include -#include -#define bswap_16(x) OSSwapInt16(x) -#define bswap_32(x) OSSwapInt32(x) -#define bswap_64(x) OSSwapInt64(x) -#elif defined(__FreeBSD__) -#include -#define bswap_16(x) bswap16(x) -#define bswap_32(x) bswap32(x) -#define bswap_64(x) bswap64(x) -#else -#include -#define bswap_16(x) swap16(x) -#define bswap_32(x) swap32(x) -#define bswap_64(x) swap64(x) -#endif - -#ifndef __BYTE_ORDER -#define __BYTE_ORDER BYTE_ORDER -#endif -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN BIG_ENDIAN -#endif -#ifndef __LITTLE_ENDIAN -#define __LITTLE_ENDIAN LITTLE_ENDIAN -#endif +#include "utils.h" -#define cpu_to_be64(x) bswap_64(x) -#define cpu_to_be32(x) bswap_32(x) -#define cpu_to_be16(x) bswap_16(x) - -#define be64_to_cpu(x) bswap_64(x) -#define be32_to_cpu(x) bswap_32(x) -#define be16_to_cpu(x) bswap_16(x) - -#else - -#define cpu_to_be64(x) (x) -#define cpu_to_be32(x) (x) -#define cpu_to_be16(x) (x) - -#define be64_to_cpu(x) (x) -#define be32_to_cpu(x) (x) -#define be16_to_cpu(x) (x) - -#endif +#define BLOB_COOKIE 0x01234567 enum { BLOB_ATTR_UNSPEC, @@ -86,17 +39,15 @@ enum { BLOB_ATTR_INT16, BLOB_ATTR_INT32, BLOB_ATTR_INT64, + BLOB_ATTR_DOUBLE, BLOB_ATTR_LAST }; -#define BLOB_ATTR_ID_MASK 0xff000000 +#define BLOB_ATTR_ID_MASK 0x7f000000 #define BLOB_ATTR_ID_SHIFT 24 #define BLOB_ATTR_LEN_MASK 0x00ffffff #define BLOB_ATTR_ALIGN 4 - -#ifndef __packed -#define __packed __attribute__((packed)) -#endif +#define BLOB_ATTR_EXTENDED 0x80000000 struct blob_attr { uint32_t id_len; @@ -136,6 +87,12 @@ blob_id(const struct blob_attr *attr) return id; } +static inline bool +blob_is_extended(const struct blob_attr *attr) +{ + return !!(attr->id_len & cpu_to_be32(BLOB_ATTR_EXTENDED)); +} + /* * blob_len: returns the length of the attribute's payload */ @@ -146,7 +103,7 @@ blob_len(const struct blob_attr *attr) } /* - * blob_pad_len: returns the complete length of an attribute (including the header) + * blob_raw_len: returns the complete length of an attribute (including the header) */ static inline unsigned int blob_raw_len(const struct blob_attr *attr) @@ -160,20 +117,11 @@ blob_raw_len(const struct blob_attr *attr) static inline unsigned int blob_pad_len(const struct blob_attr *attr) { - int len = blob_raw_len(attr); + unsigned int len = blob_raw_len(attr); len = (len + BLOB_ATTR_ALIGN - 1) & ~(BLOB_ATTR_ALIGN - 1); return len; } -static inline void -blob_set_raw_len(struct blob_attr *attr, unsigned int len) -{ - int id = blob_id(attr); - len &= BLOB_ATTR_LEN_MASK; - len |= (id << BLOB_ATTR_ID_SHIFT) & BLOB_ATTR_ID_MASK; - attr->id_len = cpu_to_be32(len); -} - static inline uint8_t blob_get_u8(const struct blob_attr *attr) { @@ -197,8 +145,34 @@ blob_get_u32(const struct blob_attr *attr) static inline uint64_t blob_get_u64(const struct blob_attr *attr) { - uint64_t *tmp = (uint64_t*)attr->data; - return be64_to_cpu(*tmp); + uint32_t *ptr = (uint32_t *) blob_data(attr); + uint64_t tmp = ((uint64_t) be32_to_cpu(ptr[0])) << 32; + tmp |= be32_to_cpu(ptr[1]); + return tmp; +} + +static inline int8_t +blob_get_int8(const struct blob_attr *attr) +{ + return blob_get_u8(attr); +} + +static inline int16_t +blob_get_int16(const struct blob_attr *attr) +{ + return blob_get_u16(attr); +} + +static inline int32_t +blob_get_int32(const struct blob_attr *attr) +{ + return blob_get_u32(attr); +} + +static inline int64_t +blob_get_int64(const struct blob_attr *attr) +{ + return blob_get_u64(attr); } static inline const char * @@ -213,23 +187,20 @@ blob_next(const struct blob_attr *attr) return (struct blob_attr *) ((char *) attr + blob_pad_len(attr)); } -static inline bool -blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2) -{ - if (blob_pad_len(a1) != blob_pad_len(a2)) - return false; - - return !memcmp(a1, a2, blob_pad_len(a1)); -} - +extern void blob_fill_pad(struct blob_attr *attr); +extern void blob_set_raw_len(struct blob_attr *attr, unsigned int len); +extern bool blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2); extern int blob_buf_init(struct blob_buf *buf, int id); extern void blob_buf_free(struct blob_buf *buf); +extern bool blob_buf_grow(struct blob_buf *buf, int required); extern struct blob_attr *blob_new(struct blob_buf *buf, int id, int payload); extern void *blob_nest_start(struct blob_buf *buf, int id); extern void blob_nest_end(struct blob_buf *buf, void *cookie); -extern struct blob_attr *blob_put(struct blob_buf *buf, int id, const void *ptr, int len); -extern bool blob_check_type(const void *ptr, int len, int type); +extern struct blob_attr *blob_put(struct blob_buf *buf, int id, const void *ptr, unsigned int len); +extern bool blob_check_type(const void *ptr, unsigned int len, int type); extern int blob_parse(struct blob_attr *attr, struct blob_attr **data, const struct blob_attr_info *info, int max); +extern struct blob_attr *blob_memdup(struct blob_attr *attr); +extern struct blob_attr *blob_put_raw(struct blob_buf *buf, const void *ptr, unsigned int len); static inline struct blob_attr * blob_put_string(struct blob_buf *buf, int id, const char *str) @@ -238,44 +209,50 @@ blob_put_string(struct blob_buf *buf, int id, const char *str) } static inline struct blob_attr * -blob_put_int8(struct blob_buf *buf, int id, uint8_t val) +blob_put_u8(struct blob_buf *buf, int id, uint8_t val) { return blob_put(buf, id, &val, sizeof(val)); } static inline struct blob_attr * -blob_put_int16(struct blob_buf *buf, int id, uint16_t val) +blob_put_u16(struct blob_buf *buf, int id, uint16_t val) { val = cpu_to_be16(val); return blob_put(buf, id, &val, sizeof(val)); } static inline struct blob_attr * -blob_put_int32(struct blob_buf *buf, int id, uint32_t val) +blob_put_u32(struct blob_buf *buf, int id, uint32_t val) { val = cpu_to_be32(val); return blob_put(buf, id, &val, sizeof(val)); } static inline struct blob_attr * -blob_put_int64(struct blob_buf *buf, int id, uint64_t val) +blob_put_u64(struct blob_buf *buf, int id, uint64_t val) { val = cpu_to_be64(val); return blob_put(buf, id, &val, sizeof(val)); } +#define blob_put_int8 blob_put_u8 +#define blob_put_int16 blob_put_u16 +#define blob_put_int32 blob_put_u32 +#define blob_put_int64 blob_put_u64 + #define __blob_for_each_attr(pos, attr, rem) \ - for (pos = (void *) attr; \ - (blob_pad_len(pos) <= rem) && \ - (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ - rem -= blob_pad_len(pos), pos = blob_next(pos)) + for (pos = (struct blob_attr *) attr; \ + rem > 0 && (blob_pad_len(pos) <= rem) && \ + (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ + rem -= blob_pad_len(pos), pos = blob_next(pos)) #define blob_for_each_attr(pos, attr, rem) \ - for (rem = blob_len(attr), pos = blob_data(attr); \ - (blob_pad_len(pos) <= rem) && \ - (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ - rem -= blob_pad_len(pos), pos = blob_next(pos)) + for (rem = attr ? blob_len(attr) : 0, \ + pos = (struct blob_attr *) (attr ? blob_data(attr) : NULL); \ + rem > 0 && (blob_pad_len(pos) <= rem) && \ + (blob_pad_len(pos) >= sizeof(struct blob_attr)); \ + rem -= blob_pad_len(pos), pos = blob_next(pos)) #endif