X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Frtnl-message.c;h=5a719003ac354fc83cc968e0c5e0b0e4e65aa6b9;hb=0964dcd77213a9e229efcc2f00084e1f63fc00ca;hp=36eb9f5b395d5837367b89a8400097061bf58de0;hpb=09773ef4462657bffadc568d08c962041fea9944;p=elogind.git diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index 36eb9f5b3..5a719003a 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -20,7 +20,6 @@ ***/ #include -#include #include #include @@ -43,7 +42,7 @@ static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) { assert_return(ret, -EINVAL); - /* Note that 'rtnl' is curretly unused, if we start using it internally + /* Note that 'rtnl' is currently unused, if we start using it internally we must take care to avoid problems due to mutual references between busses and their queued messages. See sd-bus. */ @@ -71,8 +70,6 @@ int message_new(sd_rtnl *rtnl, sd_rtnl_message **ret, uint16_t type) { if (r < 0) return r; - assert(nl_type->type == NLA_NESTED); - r = message_new_empty(rtnl, &m); if (r < 0) return r; @@ -586,7 +583,7 @@ sd_rtnl_message *sd_rtnl_message_ref(sd_rtnl_message *m) { } sd_rtnl_message *sd_rtnl_message_unref(sd_rtnl_message *m) { - if (m && REFCNT_DEC(m->n_ref) <= 0) { + if (m && REFCNT_DEC(m->n_ref) == 0) { unsigned i; free(m->hdr); @@ -611,10 +608,53 @@ int sd_rtnl_message_get_type(sd_rtnl_message *m, uint16_t *type) { return 0; } +int sd_rtnl_message_get_family(sd_rtnl_message *m, int *family) { + assert_return(m, -EINVAL); + assert_return(family, -EINVAL); + + assert(m->hdr); + + if (rtnl_message_type_is_link(m->hdr->nlmsg_type)) { + struct ifinfomsg *ifi; + + ifi = NLMSG_DATA(m->hdr); + + *family = ifi->ifi_family; + + return 0; + } else if (rtnl_message_type_is_route(m->hdr->nlmsg_type)) { + struct rtmsg *rtm; + + rtm = NLMSG_DATA(m->hdr); + + *family = rtm->rtm_family; + + return 0; + } else if (rtnl_message_type_is_neigh(m->hdr->nlmsg_type)) { + struct ndmsg *ndm; + + ndm = NLMSG_DATA(m->hdr); + + *family = ndm->ndm_family; + + return 0; + } else if (rtnl_message_type_is_addr(m->hdr->nlmsg_type)) { + struct ifaddrmsg *ifa; + + ifa = NLMSG_DATA(m->hdr); + + *family = ifa->ifa_family; + + return 0; + } + + return -EOPNOTSUPP; +} + int sd_rtnl_message_is_broadcast(sd_rtnl_message *m) { assert_return(m, -EINVAL); - return !m->hdr->nlmsg_pid; + return m->broadcast; } int sd_rtnl_message_link_get_ifindex(sd_rtnl_message *m, int *ifindex) { @@ -900,16 +940,37 @@ int sd_rtnl_message_open_container(sd_rtnl_message *m, unsigned short type) { assert_return(m->n_containers < RTNL_CONTAINER_DEPTH, -ERANGE); r = message_attribute_has_type(m, type, NLA_NESTED); - if (r < 0) - return r; - else + if (r < 0) { + const NLTypeSystemUnion *type_system_union; + int family; + + r = message_attribute_has_type(m, type, NLA_UNION); + if (r < 0) + return r; + size = (size_t) r; + + r = sd_rtnl_message_get_family(m, &family); + if (r < 0) + return r; + + 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->container_type_system[m->n_containers + 1], + family); + 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); - if (r < 0) - return r; + 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; + } r = add_rtattr(m, type | NLA_F_NESTED, NULL, size); if (r < 0) @@ -1183,7 +1244,6 @@ int sd_rtnl_message_enter_container(sd_rtnl_message *m, unsigned short type) { return r; } else if (nl_type->type == NLA_UNION) { const NLTypeSystemUnion *type_system_union; - const char *key; r = type_system_get_type_system_union(m->container_type_system[m->n_containers], &type_system_union, @@ -1191,15 +1251,42 @@ int sd_rtnl_message_enter_container(sd_rtnl_message *m, unsigned short type) { if (r < 0) return r; - r = sd_rtnl_message_read_string(m, type_system_union->match, &key); - if (r < 0) - return r; + switch (type_system_union->match_type) { + case NL_MATCH_SIBLING: + { + const char *key; - r = type_system_union_get_type_system(type_system_union, - &type_system, - key); - if (r < 0) - return r; + r = sd_rtnl_message_read_string(m, type_system_union->match, &key); + if (r < 0) + return r; + + r = type_system_union_get_type_system(type_system_union, + &type_system, + key); + if (r < 0) + return r; + + break; + } + case NL_MATCH_PROTOCOL: + { + int family; + + r = sd_rtnl_message_get_family(m, &family); + if (r < 0) + return r; + + r = type_system_union_protocol_get_type_system(type_system_union, + &type_system, + family); + if (r < 0) + return r; + + break; + } + default: + assert_not_reached("sd-rtnl: invalid type system union type"); + } } else return -EINVAL; @@ -1352,9 +1439,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool log_debug("rtnl: no data in socket"); return (errno == EAGAIN || errno == EINTR) ? 0 : -errno; - } else if (r == 0) - /* connection was closed by the kernel */ - return -ECONNRESET; + } for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_level == SOL_SOCKET && @@ -1366,7 +1451,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool if (ucred->pid == 0) auth = true; else - log_debug("rtnl: ignoring message from pid %u", ucred->pid); + log_debug("rtnl: ignoring message from PID "PID_FMT, ucred->pid); } else if (cmsg->cmsg_level == SOL_NETLINK && cmsg->cmsg_type == NETLINK_PKTINFO && cmsg->cmsg_len == CMSG_LEN(sizeof(struct nl_pktinfo))) { @@ -1389,7 +1474,7 @@ static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool return 0; } - if (group) + if (_group) *_group = group; return r; @@ -1415,7 +1500,7 @@ int socket_read_message(sd_rtnl *rtnl) { assert(rtnl->rbuffer_allocated >= sizeof(struct nlmsghdr)); /* read nothing, just get the pending message size */ - r = socket_recv_message(rtnl->fd, &iov, &group, true); + r = socket_recv_message(rtnl->fd, &iov, NULL, true); if (r <= 0) return r; else @@ -1475,8 +1560,8 @@ int socket_read_message(sd_rtnl *rtnl) { /* check that we support this message type */ r = type_system_get_type(NULL, &nl_type, new_msg->nlmsg_type); if (r < 0) { - if (r == -ENOTSUP) - log_debug("sd-rtnl: ignored message with unknown type: %u", + if (r == -EOPNOTSUPP) + log_debug("sd-rtnl: ignored message with unknown type: %i", new_msg->nlmsg_type); continue; @@ -1492,6 +1577,8 @@ int socket_read_message(sd_rtnl *rtnl) { if (r < 0) return r; + m->broadcast = !!group; + m->hdr = memdup(new_msg, new_msg->nlmsg_len); if (!m->hdr) return -ENOMEM;