return offset;
}
-static int message_attribute_has_type(sd_netlink_message *m, uint16_t attribute_type, uint16_t data_type) {
+static int message_attribute_has_type(sd_netlink_message *m, size_t *out_size, uint16_t attribute_type, uint16_t data_type) {
const NLType *type;
int r;
+ assert(m);
+
r = type_system_get_type(m->container_type_system[m->n_containers], &type, attribute_type);
if (r < 0)
return r;
if (type_get_type(type) != data_type)
return -EINVAL;
- return type_get_size(type);
+ if (out_size)
+ *out_size = type_get_size(type);
+ return 0;
}
int sd_netlink_message_append_string(sd_netlink_message *m, unsigned short type, const char *data) {
assert_return(!m->sealed, -EPERM);
assert_return(data, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_STRING);
+ r = message_attribute_has_type(m, &size, type, NETLINK_TYPE_STRING);
if (r < 0)
return r;
- else
- size = (size_t)r;
if (size) {
length = strnlen(data, size+1);
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_U8);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_U8);
if (r < 0)
return r;
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_U16);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_U16);
if (r < 0)
return r;
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_U32);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_U32);
if (r < 0)
return r;
assert_return(!m->sealed, -EPERM);
assert_return(data, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_IN_ADDR);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_IN_ADDR);
if (r < 0)
return r;
assert_return(!m->sealed, -EPERM);
assert_return(data, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_IN_ADDR);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_IN_ADDR);
if (r < 0)
return r;
assert_return(!m->sealed, -EPERM);
assert_return(data, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_ETHER_ADDR);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_ETHER_ADDR);
if (r < 0)
return r;
assert_return(!m->sealed, -EPERM);
assert_return(info, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_CACHE_INFO);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_CACHE_INFO);
if (r < 0)
return r;
assert_return(!m->sealed, -EPERM);
assert_return(m->n_containers < RTNL_CONTAINER_DEPTH, -ERANGE);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_NESTED);
+ r = message_attribute_has_type(m, &size, type, NETLINK_TYPE_NESTED);
if (r < 0) {
const NLTypeSystemUnion *type_system_union;
int family;
- r = message_attribute_has_type(m, type, NETLINK_TYPE_UNION);
+ r = message_attribute_has_type(m, &size, type, NETLINK_TYPE_UNION);
if (r < 0)
return r;
- size = (size_t) r;
r = sd_rtnl_message_get_family(m, &family);
if (r < 0)
if (r < 0)
return r;
} else {
- size = (size_t)r;
-
r = type_system_get_type_system(m->container_type_system[m->n_containers],
&m->container_type_system[m->n_containers + 1],
type);
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_STRING);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_STRING);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_U8);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_U8);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_U16);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_U16);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_U32);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_U32);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_ETHER_ADDR);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_ETHER_ADDR);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_CACHE_INFO);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_CACHE_INFO);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_IN_ADDR);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_IN_ADDR);
if (r < 0)
return r;
assert_return(m, -EINVAL);
- r = message_attribute_has_type(m, type, NETLINK_TYPE_IN_ADDR);
+ r = message_attribute_has_type(m, NULL, type, NETLINK_TYPE_IN_ADDR);
if (r < 0)
return r;