#include "netlink-internal.h"
#include "netlink-types.h"
-#define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->containers[i].offset) : NULL)
+#define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->container_offsets[i]) : NULL)
#define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers ++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr;
#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK)
-#define RTA_FLAGS(rta) ((rta)->rta_type & ~NLA_TYPE_MASK)
int message_new_empty(sd_netlink *rtnl, sd_netlink_message **ret) {
sd_netlink_message *m;
m->hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK;
- type_get_type_system(nl_type, &m->containers[0].type_system);
+ type_get_type_system(nl_type, &m->container_type_system[0]);
m->hdr->nlmsg_len = size;
m->hdr->nlmsg_type = type;
free(m->hdr);
for (i = 0; i <= m->n_containers; i++)
- free(m->containers[i].attributes);
+ free(m->rta_offset_tb[i]);
sd_netlink_message_unref(m->next);
assert(m);
- r = type_system_get_type(m->containers[m->n_containers].type_system, &type, attribute_type);
+ r = type_system_get_type(m->container_type_system[m->n_containers], &type, attribute_type);
if (r < 0)
return r;
return 0;
}
+int sd_netlink_message_append_flag(sd_netlink_message *m, unsigned short type) {
+ size_t size;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(!m->sealed, -EPERM);
+
+ r = message_attribute_has_type(m, &size, type, NETLINK_TYPE_FLAG);
+ if (r < 0)
+ return r;
+
+ r = add_rtattr(m, type, NULL, 0);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
int sd_netlink_message_append_u8(sd_netlink_message *m, unsigned short type, uint8_t data) {
int r;
if (r < 0)
return r;
- r = type_system_get_type_system_union(m->containers[m->n_containers].type_system, &type_system_union, type);
+ r = type_system_get_type_system_union(m->container_type_system[m->n_containers], &type_system_union, type);
if (r < 0)
return r;
r = type_system_union_protocol_get_type_system(type_system_union,
- &m->containers[m->n_containers + 1].type_system,
+ &m->container_type_system[m->n_containers + 1],
family);
if (r < 0)
return r;
} else {
- r = type_system_get_type_system(m->containers[m->n_containers].type_system,
- &m->containers[m->n_containers + 1].type_system,
+ r = type_system_get_type_system(m->container_type_system[m->n_containers],
+ &m->container_type_system[m->n_containers + 1],
type);
if (r < 0)
return r;
if (r < 0)
return r;
- m->containers[m->n_containers ++].offset = r;
+ m->container_offsets[m->n_containers ++] = r;
return 0;
}
assert_return(m, -EINVAL);
assert_return(!m->sealed, -EPERM);
- r = type_system_get_type_system_union(m->containers[m->n_containers].type_system, &type_system_union, type);
+ r = type_system_get_type_system_union(m->container_type_system[m->n_containers], &type_system_union, type);
if (r < 0)
return r;
r = type_system_union_get_type_system(type_system_union,
- &m->containers[m->n_containers + 1].type_system,
+ &m->container_type_system[m->n_containers + 1],
key);
if (r < 0)
return r;
if (r < 0)
return r;
- m->containers[m->n_containers ++].offset = r;
+ m->container_offsets[m->n_containers ++] = r;
return 0;
}
assert_return(!m->sealed, -EPERM);
assert_return(m->n_containers > 0, -EINVAL);
- m->containers[m->n_containers].type_system = NULL;
+ m->container_type_system[m->n_containers] = NULL;
m->n_containers --;
return 0;
}
-static int netlink_message_read_internal(sd_netlink_message *m, unsigned short type, void **data, bool *net_byteorder) {
- struct netlink_attribute *attribute;
+static int netlink_message_read_internal(sd_netlink_message *m, unsigned short type, void **data) {
struct rtattr *rta;
assert_return(m, -EINVAL);
assert_return(m->sealed, -EPERM);
assert_return(data, -EINVAL);
assert(m->n_containers <= RTNL_CONTAINER_DEPTH);
- assert(m->containers[m->n_containers].attributes);
- assert(type < m->containers[m->n_containers].n_attributes);
-
- attribute = &m->containers[m->n_containers].attributes[type];
+ assert(m->rta_offset_tb[m->n_containers]);
+ assert(type < m->rta_tb_size[m->n_containers]);
- if(!attribute->offset)
+ if(!m->rta_offset_tb[m->n_containers][type])
return -ENODATA;
- rta = (struct rtattr*)((uint8_t *) m->hdr + attribute->offset);
+ rta = (struct rtattr*)((uint8_t *) m->hdr + m->rta_offset_tb[m->n_containers][type]);
*data = RTA_DATA(rta);
- if (net_byteorder)
- *net_byteorder = attribute->net_byteorder;
-
return RTA_PAYLOAD(rta);
}
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, NULL);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if (strnlen(attr_data, r) >= (size_t) r)
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, NULL);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t) r < sizeof(uint8_t))
}
int sd_netlink_message_read_u16(sd_netlink_message *m, unsigned short type, uint16_t *data) {
- void *attr_data;
- bool net_byteorder;
int r;
+ void *attr_data;
assert_return(m, -EINVAL);
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, &net_byteorder);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t) r < sizeof(uint16_t))
return -EIO;
- if (data) {
- if (net_byteorder)
- *data = be16toh(*(uint16_t *) attr_data);
- else
- *data = *(uint16_t *) attr_data;
- }
+ if (data)
+ *data = *(uint16_t *) attr_data;
return 0;
}
int sd_netlink_message_read_u32(sd_netlink_message *m, unsigned short type, uint32_t *data) {
- void *attr_data;
- bool net_byteorder;
int r;
+ void *attr_data;
assert_return(m, -EINVAL);
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, &net_byteorder);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t)r < sizeof(uint32_t))
return -EIO;
- if (data) {
- if (net_byteorder)
- *data = be32toh(*(uint32_t *) attr_data);
- else
- *data = *(uint32_t *) attr_data;
- }
+ if (data)
+ *data = *(uint32_t *) attr_data;
return 0;
}
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, NULL);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t)r < sizeof(struct ether_addr))
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, NULL);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t)r < sizeof(struct ifa_cacheinfo))
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, NULL);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t)r < sizeof(struct in_addr))
if (r < 0)
return r;
- r = netlink_message_read_internal(m, type, &attr_data, NULL);
+ r = netlink_message_read_internal(m, type, &attr_data);
if (r < 0)
return r;
else if ((size_t)r < sizeof(struct in6_addr))
return 0;
}
-static int netlink_container_parse(sd_netlink_message *m,
- struct netlink_container *container,
- int count,
- struct rtattr *rta,
- unsigned int rt_len) {
- _cleanup_free_ struct netlink_attribute *attributes = NULL;
+static int netlink_message_parse(sd_netlink_message *m,
+ size_t **rta_offset_tb,
+ unsigned short *rta_tb_size,
+ int count,
+ struct rtattr *rta,
+ unsigned int rt_len) {
+ unsigned short type;
+ size_t *tb;
- attributes = new0(struct netlink_attribute, count);
- if(!attributes)
+ tb = new0(size_t, count);
+ if(!tb)
return -ENOMEM;
- for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) {
- unsigned short type;
+ *rta_tb_size = count;
+ for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) {
type = RTA_TYPE(rta);
/* if the kernel is newer than the headers we used
- when building, we ignore out-of-range attributes */
+ when building, we ignore out-of-range attributes
+ */
if (type >= count)
continue;
- if (attributes[type].offset)
+ if (tb[type])
log_debug("rtnl: message parse - overwriting repeated attribute");
- attributes[type].offset = (uint8_t *) rta - (uint8_t *) m->hdr;
- attributes[type].nested = RTA_FLAGS(rta) & NLA_F_NESTED;
- attributes[type].net_byteorder = RTA_FLAGS(rta) & NLA_F_NET_BYTEORDER;
+ tb[type] = (uint8_t *) rta - (uint8_t *) m->hdr;
}
- container->attributes = attributes;
- attributes = NULL;
- container->n_attributes = count;
+ *rta_offset_tb = tb;
return 0;
}
assert_return(m, -EINVAL);
assert_return(m->n_containers < RTNL_CONTAINER_DEPTH, -EINVAL);
- r = type_system_get_type(m->containers[m->n_containers].type_system,
+ r = type_system_get_type(m->container_type_system[m->n_containers],
&nl_type,
type_id);
if (r < 0)
type = type_get_type(nl_type);
if (type == NETLINK_TYPE_NESTED) {
- r = type_system_get_type_system(m->containers[m->n_containers].type_system,
+ r = type_system_get_type_system(m->container_type_system[m->n_containers],
&type_system,
type_id);
if (r < 0)
} else if (type == NETLINK_TYPE_UNION) {
const NLTypeSystemUnion *type_system_union;
- r = type_system_get_type_system_union(m->containers[m->n_containers].type_system,
+ r = type_system_get_type_system_union(m->container_type_system[m->n_containers],
&type_system_union,
type_id);
if (r < 0)
} else
return -EINVAL;
- r = netlink_message_read_internal(m, type_id, &container, NULL);
+ r = netlink_message_read_internal(m, type_id, &container);
if (r < 0)
return r;
else
m->n_containers ++;
- r = netlink_container_parse(m,
- &m->containers[m->n_containers],
- type_system_get_count(type_system),
- container,
- size);
+ r = netlink_message_parse(m,
+ &m->rta_offset_tb[m->n_containers],
+ &m->rta_tb_size[m->n_containers],
+ type_system_get_count(type_system),
+ container,
+ size);
if (r < 0) {
m->n_containers --;
return r;
}
- m->containers[m->n_containers].type_system = type_system;
+ m->container_type_system[m->n_containers] = type_system;
return 0;
}
assert_return(m->sealed, -EINVAL);
assert_return(m->n_containers > 0, -EINVAL);
- free(m->containers[m->n_containers].attributes);
- m->containers[m->n_containers].attributes = NULL;
- m->containers[m->n_containers].type_system = NULL;
+ free(m->rta_offset_tb[m->n_containers]);
+ m->rta_offset_tb[m->n_containers] = NULL;
+ m->container_type_system[m->n_containers] = NULL;
m->n_containers --;
rtnl_message_seal(m);
for (i = 1; i <= m->n_containers; i++) {
- free(m->containers[i].attributes);
- m->containers[i].attributes = NULL;
+ free(m->rta_offset_tb[i]);
+ m->rta_offset_tb[i] = NULL;
+ m->rta_tb_size[i] = 0;
+ m->container_type_system[i] = NULL;
}
m->n_containers = 0;
- if (m->containers[0].attributes) {
+ if (m->rta_offset_tb[0]) {
/* top-level attributes have already been parsed */
return 0;
}
type_get_type_system(nl_type, &type_system);
- m->containers[0].type_system = type_system;
+ m->container_type_system[0] = type_system;
- r = netlink_container_parse(m,
- &m->containers[m->n_containers],
- type_system_get_count(type_system),
- (struct rtattr*)((uint8_t*)NLMSG_DATA(m->hdr) + NLMSG_ALIGN(size)),
- NLMSG_PAYLOAD(m->hdr, size));
+ r = netlink_message_parse(m,
+ &m->rta_offset_tb[m->n_containers],
+ &m->rta_tb_size[m->n_containers],
+ type_system_get_count(type_system),
+ (struct rtattr*)((uint8_t*)NLMSG_DATA(m->hdr) + NLMSG_ALIGN(size)),
+ NLMSG_PAYLOAD(m->hdr, size));
if (r < 0)
return r;
}