DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fill padding bytes when setting raw attribute length

Browse source
This commit is contained in:
Felix Fietkau 2011-10-06 17:14:44 +02:00
parent f24324c27f
commit 309d7d456f
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
blob.c
View file

@ -91,6 +91,27 @@ blob_buf_free(struct blob_buf *buf)
buf->buflen = 0; buf->buflen = 0;
} }
static 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)
{
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);
blob_fill_pad(attr);
}
struct blob_attr * struct blob_attr *
blob_new(struct blob_buf *buf, int id, int payload) blob_new(struct blob_buf *buf, int id, int payload)
{ {

10
blob.h
View file

@ -165,15 +165,6 @@ blob_pad_len(const struct blob_attr *attr)
return len; 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 static inline uint8_t
blob_get_u8(const struct blob_attr *attr) blob_get_u8(const struct blob_attr *attr)
{ {
@ -213,6 +204,7 @@ blob_next(const struct blob_attr *attr)
return (struct blob_attr *) ((char *) attr + blob_pad_len(attr)); return (struct blob_attr *) ((char *) attr + blob_pad_len(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 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 int blob_buf_init(struct blob_buf *buf, int id);
extern void blob_buf_free(struct blob_buf *buf); extern void blob_buf_free(struct blob_buf *buf);