make the blobmsg format endian agnostic (stick to big-endian)

diff --git a/blobmsg.c b/blobmsg.c
index 3079dcacb24a135e01c3b1bfed7e0d500779cfed..0129640f8d0f27c760af0f0c783bafc5215e6882 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -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);
@@ -82,7 +88,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))
@@ -119,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);
 

diff --git a/blobmsg.h b/blobmsg.h
index f2ab007546d95547709d3e8e46b3e5c180177455..c266855245ab80b69ef77e8faf2ae15d7c731bdf 100644 (file)
--- a/blobmsg.h
+++ b/blobmsg.h
@@ -64,7 +64,7 @@ static inline int blobmsg_type(const struct blob_attr *attr)
 static inline void *blobmsg_data(const struct blob_attr *attr)
 {
        struct blobmsg_hdr *hdr = blob_data(attr);
-       return (char *) hdr + blobmsg_hdrlen(hdr->namelen);
+       return (char *) hdr + blobmsg_hdrlen(be16_to_cpu(hdr->namelen));
 }
 
 static inline int blobmsg_data_len(const struct blob_attr *attr)