X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Frtnl-message.c;h=56fb68f39d0dd55d730555f37336c8a185a21823;hb=a212d0dadd1e5e7bc0a57b8dfe2feb9111db2678;hp=95dccc2f817775456877d04ffeaa23ba43243e8e;hpb=5c1d3fc93d91384bbac29adf01074fa4375317ea;p=elogind.git diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index 95dccc2f8..56fb68f39 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -166,8 +166,7 @@ int sd_rtnl_message_new_link(sd_rtnl *rtnl, sd_rtnl_message **ret, int r; assert_return(rtnl_message_type_is_link(nlmsg_type), -EINVAL); - assert_return(nlmsg_type == RTM_NEWLINK || - nlmsg_type == RTM_SETLINK || index > 0, -EINVAL); + assert_return(nlmsg_type != RTM_DELLINK || index > 0, -EINVAL); assert_return(ret, -EINVAL); r = message_new(rtnl, ret, NLMSG_SPACE(sizeof(struct ifinfomsg))); @@ -177,7 +176,7 @@ int sd_rtnl_message_new_link(sd_rtnl *rtnl, sd_rtnl_message **ret, (*ret)->hdr->nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)); (*ret)->hdr->nlmsg_type = nlmsg_type; if (nlmsg_type == RTM_NEWLINK) - (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE; + (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_EXCL; ifi = NLMSG_DATA((*ret)->hdr); @@ -280,6 +279,7 @@ sd_rtnl_message *sd_rtnl_message_unref(sd_rtnl_message *m) { if (m && REFCNT_DEC(m->n_ref) <= 0) { sd_rtnl_unref(m->rtnl); free(m->hdr); + free(m->rta_offset_tb); free(m); } @@ -295,6 +295,12 @@ int sd_rtnl_message_get_type(sd_rtnl_message *m, uint16_t *type) { return 0; } +int sd_rtnl_message_is_broadcast(sd_rtnl_message *m) { + assert_return(m, -EINVAL); + + return !m->hdr->nlmsg_pid; +} + int sd_rtnl_message_link_get_ifindex(sd_rtnl_message *m, int *ifindex) { struct ifinfomsg *ifi; @@ -778,7 +784,7 @@ int sd_rtnl_message_read(sd_rtnl_message *m, unsigned short *type, void **data) if (!RTA_OK(NEXT_RTA(m), remaining_size)) return 0; - /* if we read a container, enter it and return its type */ + /* if we read a container, return its type, but do not enter it*/ r = sd_rtnl_message_get_type(m, &rtm_type); if (r < 0) return r; @@ -790,18 +796,136 @@ int sd_rtnl_message_read(sd_rtnl_message *m, unsigned short *type, void **data) NEXT_RTA(m)->rta_type == IFLA_LINKINFO) || (m->n_containers == 1 && GET_CONTAINER(m, 0)->rta_type == IFLA_LINKINFO && - NEXT_RTA(m)->rta_type == IFLA_INFO_DATA))) { + NEXT_RTA(m)->rta_type == IFLA_INFO_DATA))) *data = NULL; - PUSH_CONTAINER(m, NEXT_RTA(m)); - UPDATE_RTA(m, RTA_DATA(NEXT_RTA(m))); - } else { + else *data = RTA_DATA(NEXT_RTA(m)); - UPDATE_RTA(m, RTA_NEXT(NEXT_RTA(m), remaining_size)); - } + + UPDATE_RTA(m, RTA_NEXT(NEXT_RTA(m), remaining_size)); return 1; } +int rtnl_message_read_internal(sd_rtnl_message *m, unsigned short type, void **data) { + assert_return(m, -EINVAL); + assert_return(m->sealed, -EPERM); + assert_return(data, -EINVAL); + assert_return(m->rta_offset_tb, -EINVAL); + assert_return(type < m->rta_tb_size, -EINVAL); + + if(!m->rta_offset_tb[type]) + return -ENODATA; + + *data = RTA_DATA((struct rtattr *)((uint8_t *) m->hdr + m->rta_offset_tb[type])); + + return 0; +} + +int sd_rtnl_message_read_string(sd_rtnl_message *m, unsigned short type, char **data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + *data = (char *) attr_data; + + return 0; +} + +int sd_rtnl_message_read_u8(sd_rtnl_message *m, unsigned short type, uint8_t *data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + *data = *(uint8_t *) attr_data; + + return 0; +} + +int sd_rtnl_message_read_u16(sd_rtnl_message *m, unsigned short type, uint16_t *data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + *data = *(uint16_t *) attr_data; + + return 0; +} + +int sd_rtnl_message_read_u32(sd_rtnl_message *m, unsigned short type, uint32_t *data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + *data = *(uint32_t *) attr_data; + + return 0; +} + +int sd_rtnl_message_read_ether_addr(sd_rtnl_message *m, unsigned short type, struct ether_addr *data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + memcpy(data, attr_data, sizeof(struct ether_addr)); + + return 0; +} + +int sd_rtnl_message_read_in_addr(sd_rtnl_message *m, unsigned short type, struct in_addr *data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + memcpy(data, attr_data, sizeof(struct in_addr)); + + return 0; +} + +int sd_rtnl_message_read_in6_addr(sd_rtnl_message *m, unsigned short type, struct in6_addr *data) { + int r; + void *attr_data; + + assert_return(data, -EINVAL); + + r = rtnl_message_read_internal(m, type, &attr_data); + if(r < 0) + return r; + + memcpy(data, attr_data, sizeof(struct in6_addr)); + + return 0; +} + int sd_rtnl_message_exit_container(sd_rtnl_message *m) { assert_return(m, -EINVAL); assert_return(m->sealed, -EINVAL); @@ -874,6 +998,33 @@ static int message_receive_need(sd_rtnl *rtnl, size_t *need) { return 0; } +int rtnl_message_parse(sd_rtnl_message *m, + size_t **rta_offset_tb, + unsigned short *rta_tb_size, + int max, + struct rtattr *rta, + unsigned int rt_len) { + int type; + size_t *tb; + + tb = (size_t *) new0(size_t *, max); + if(!tb) + return -ENOMEM; + + *rta_tb_size = max; + + for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) { + type = rta->rta_type; + + if (type <= max) + tb[type] = (uint8_t *) rta - (uint8_t *) m->hdr; + } + + *rta_offset_tb = tb; + + return 0; +} + /* returns the number of bytes sent, or a negative error code */ int socket_write_message(sd_rtnl *nl, sd_rtnl_message *m) { union { @@ -963,6 +1114,14 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) { ifi = NLMSG_DATA(m->hdr); UPDATE_RTA(m, IFLA_RTA(ifi)); + + r = rtnl_message_parse(m, + &m->rta_offset_tb, + &m->rta_tb_size, + IFLA_MAX, + IFLA_RTA(ifi), + IFLA_PAYLOAD(m->hdr)); + } break; case RTM_NEWADDR: @@ -975,6 +1134,13 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) { ifa = NLMSG_DATA(m->hdr); UPDATE_RTA(m, IFA_RTA(ifa)); + + r = rtnl_message_parse(m, + &m->rta_offset_tb, + &m->rta_tb_size, + IFA_MAX, + IFA_RTA(ifa), + IFA_PAYLOAD(m->hdr)); } break; case RTM_NEWROUTE: @@ -987,6 +1153,13 @@ int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) { rtm = NLMSG_DATA(m->hdr); UPDATE_RTA(m, RTM_RTA(rtm)); + + r = rtnl_message_parse(m, + &m->rta_offset_tb, + &m->rta_tb_size, + RTA_MAX, + RTM_RTA(rtm), + RTM_PAYLOAD(m->hdr)); } break; case NLMSG_NOOP: