Make the iovec parameter of l_genl_msg_append_attrv() const since it isn't modified by the function. This allows a pointer to a const struct iovec to be passed as an argument without casting away the const. --- ell/genl.c | 3 ++- ell/genl.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ell/genl.c b/ell/genl.c index aa6266f..c04a47f 100644 --- a/ell/genl.c +++ b/ell/genl.c @@ -797,7 +797,8 @@ LIB_EXPORT bool l_genl_msg_append_attr(struct l_genl_msg *msg, uint16_t type, } LIB_EXPORT bool l_genl_msg_append_attrv(struct l_genl_msg *msg, uint16_t type, - struct iovec *iov, size_t iov_len) + const struct iovec *iov, + size_t iov_len) { struct nlattr *nla; size_t len = 0; diff --git a/ell/genl.h b/ell/genl.h index 8597c8f..bddf1d4 100644 --- a/ell/genl.h +++ b/ell/genl.h @@ -72,7 +72,7 @@ int l_genl_msg_get_error(struct l_genl_msg *msg); bool l_genl_msg_append_attr(struct l_genl_msg *msg, uint16_t type, uint16_t len, const void *data); bool l_genl_msg_append_attrv(struct l_genl_msg *msg, uint16_t type, - struct iovec *iov, size_t iov_len); + const struct iovec *iov, size_t iov_len); bool l_genl_msg_enter_nested(struct l_genl_msg *msg, uint16_t type); bool l_genl_msg_leave_nested(struct l_genl_msg *msg); -- 2.11.0

--- unit/test-genl-msg.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/unit/test-genl-msg.c b/unit/test-genl-msg.c index 49de707..50068e9 100644 --- a/unit/test-genl-msg.c +++ b/unit/test-genl-msg.c @@ -366,6 +366,50 @@ static void build_libnl_nested(const void *data) l_genl_msg_unref(msg); } +static void test_append_attrv(const void *data) +{ + static const int num_blocks = 3; + unsigned char * const payload = set_station_request; + const size_t total_len = L_ARRAY_SIZE(set_station_request); + const size_t block_len = total_len / num_blocks; + const struct iovec iov[] = { + { + .iov_base = payload, + .iov_len = block_len + }, + { + .iov_base = payload + block_len, + .iov_len = block_len + }, + { + .iov_base = payload + block_len * 2, + .iov_len = total_len - block_len * 2 + } + }; + + struct l_genl_msg *msg; + const uint16_t type = 2; + struct l_genl_attr attr; + uint16_t attr_type; + uint16_t attr_len; + const void *attr_payload; + + assert(L_ARRAY_SIZE(iov) == num_blocks); + + msg = l_genl_msg_new_sized(1, NLA_HDRLEN + NLA_ALIGN(total_len)); + assert(msg); + + assert(l_genl_msg_append_attrv(msg, type, iov, L_ARRAY_SIZE(iov))); + assert(l_genl_attr_init(&attr, msg)); + assert(l_genl_attr_next(&attr, &attr_type, &attr_len, &attr_payload)); + + assert(type == attr_type); + assert(total_len == attr_len); + assert(memcmp(payload, attr_payload, total_len) == 0); + + l_genl_msg_unref(msg); +} + int main(int argc, char *argv[]) { bool little_endian; @@ -396,6 +440,9 @@ int main(int argc, char *argv[]) l_test_add("Build libnl-generated Example with Nesting", build_libnl_nested, NULL); + l_test_add("Test l_genl_msg_append_attrv", + test_append_attrv, NULL); + done: return l_test_run(); } -- 2.11.0