along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include <linux/rtnetlink.h>
#include <netinet/in.h>
#include <netinet/ether.h>
#include <stdbool.h>
return 0;
}
+int sd_rtnl_message_route_new(uint16_t nlmsg_type, unsigned char rtm_family,
+ unsigned char rtm_dst_len, unsigned char rtm_src_len,
+ unsigned char rtm_tos, unsigned char rtm_table,
+ unsigned char rtm_scope, unsigned char rtm_protocol,
+ unsigned char rtm_type, unsigned rtm_flags, sd_rtnl_message **ret) {
+ struct rtmsg *rtm;
+ int r;
+
+ assert_return(nlmsg_type == RTM_NEWROUTE || nlmsg_type == RTM_DELROUTE ||
+ nlmsg_type == RTM_GETROUTE, -EINVAL);
+ assert_return(ret, -EINVAL);
+
+ r = message_new(ret, NLMSG_SPACE(sizeof(struct rtmsg)));
+ if (r < 0)
+ return r;
+
+ (*ret)->hdr->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
+ (*ret)->hdr->nlmsg_type = nlmsg_type;
+ if (nlmsg_type == RTM_NEWROUTE)
+ (*ret)->hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_EXCL;
+
+ rtm = NLMSG_DATA((*ret)->hdr);
+
+ rtm->rtm_family = rtm_family;
+ rtm->rtm_dst_len = rtm_dst_len;
+ rtm->rtm_src_len = rtm_src_len;
+ rtm->rtm_tos = rtm_tos;
+ rtm->rtm_table = rtm_table;
+ rtm->rtm_protocol = rtm_protocol;
+ rtm->rtm_scope = rtm_scope;
+ rtm->rtm_type = rtm_type;
+ rtm->rtm_flags = rtm_flags;
+
+ return 0;
+}
+
int sd_rtnl_message_link_new(uint16_t nlmsg_type, int index, unsigned int type, unsigned int flags, sd_rtnl_message **ret) {
struct ifinfomsg *ifi;
int r;
uint32_t rta_length, message_length;
struct nlmsghdr *new_hdr;
struct rtattr *rta;
+ char *padding;
assert_return(m, -EINVAL);
assert_return(m->hdr, -EINVAL);
assert_return(data, -EINVAL);
assert_return(data_length > 0, -EINVAL);
- /* get the size of the new rta attribute (without padding at the end) */
+ /* get the size of the new rta attribute (with padding at the end) */
rta_length = RTA_LENGTH(data_length);
- /* get the new message size (with padding between the old message and the new attrib,
- * but no padding after)
+ /* get the new message size (with padding at the end)
*/
message_length = m->hdr->nlmsg_len + RTA_ALIGN(rta_length);
/* we don't deal with the case where the user lies about the type and gives us
* too little data (so don't do that)
*/
- memcpy(RTA_DATA(rta), data, data_length);
+ padding = mempcpy(RTA_DATA(rta), data, data_length);
+ /* make sure also the padding at the end of the message is initialized */
+ memset(padding, '\0', (unsigned char *) m->hdr + m->hdr->nlmsg_len - (unsigned char *) padding);
return 0;
}
int sd_rtnl_message_append(sd_rtnl_message *m, unsigned short type, const void *data) {
uint16_t rtm_type;
struct ifaddrmsg *ifa;
+ struct rtmsg *rtm;
assert_return(m, -EINVAL);
assert_return(data, -EINVAL);
case IFLA_QDISC:
return add_rtattr(m, type, data, strlen(data) + 1);
case IFLA_MTU:
- return add_rtattr(m, type, data, sizeof(unsigned int));
+ return add_rtattr(m, type, data, sizeof(uint32_t));
case IFLA_LINK:
- return add_rtattr(m, type, data, sizeof(int));
+ return add_rtattr(m, type, data, sizeof(uint32_t));
case IFLA_STATS:
return add_rtattr(m, type, data, sizeof(struct rtnl_link_stats));
case IFLA_ADDRESS:
default:
return -ENOTSUP;
}
+ case RTM_NEWROUTE:
+ case RTM_DELROUTE:
+ case RTM_GETROUTE:
+ switch (type) {
+ case RTA_DST:
+ case RTA_SRC:
+ case RTA_GATEWAY:
+ rtm = NLMSG_DATA(m->hdr);
+ switch (rtm->rtm_family) {
+ case AF_INET:
+ return add_rtattr(m, type, data, sizeof(struct in_addr));
+ case AF_INET6:
+ return add_rtattr(m, type, data, sizeof(struct in6_addr));
+ default:
+ return -EINVAL;
+ }
+ case RTA_TABLE:
+ case RTA_PRIORITY:
+ case RTA_IIF:
+ case RTA_OIF:
+ return add_rtattr(m, type, data, sizeof(uint32_t));
+ default:
+ return -ENOTSUP;
+ }
default:
return -ENOTSUP;
}
m->next_rta = IFLA_RTA(ifi);
m->remaining_size = IFLA_PAYLOAD(m->hdr);
}
- break;;
+ break;
case RTM_NEWADDR:
case RTM_DELADDR:
case RTM_GETADDR:
struct ifaddrmsg *ifa = NLMSG_DATA(m->hdr);
m->next_rta = IFA_RTA(ifa);
- m->remaining_size = IFLA_PAYLOAD(m->hdr);
+ m->remaining_size = IFA_PAYLOAD(m->hdr);
}
- break;;
+ break;
+ case RTM_NEWROUTE:
+ case RTM_DELROUTE:
+ case RTM_GETROUTE:
+ if (!m->next_rta) {
+ struct rtmesg *rtm = NLMSG_DATA(m->hdr);
+
+ m->next_rta = RTM_RTA(rtm);
+ m->remaining_size = RTM_PAYLOAD(m->hdr);
+ }
+ break;
default:
return -ENOTSUP;
}
/* returns the number of bytes sent, or a negative error code */
int socket_write_message(sd_rtnl *nl, sd_rtnl_message *m) {
+ union {
+ struct sockaddr sa;
+ struct sockaddr_nl nl;
+ } addr = {
+ .nl.nl_family = AF_NETLINK,
+ };
ssize_t k;
assert_return(nl, -EINVAL);
assert_return(m, -EINVAL);
k = sendto(nl->fd, m->hdr, m->hdr->nlmsg_len,
- 0, &nl->sockaddr.sa, sizeof(nl->sockaddr));
+ 0, &addr.sa, sizeof(addr));
if (k < 0)
return (errno == EAGAIN) ? 0 : -errno;
*/
int socket_read_message(sd_rtnl *nl, sd_rtnl_message **ret) {
sd_rtnl_message *m;
- socklen_t addr_len = sizeof(nl->sockaddr);
+ union {
+ struct sockaddr sa;
+ struct sockaddr_nl nl;
+ } addr;
+ socklen_t addr_len;
int r;
ssize_t k;
size_t need;
if (r < 0)
return r;
+ addr_len = sizeof(addr);
+
k = recvfrom(nl->fd, m->hdr, need,
- 0, &nl->sockaddr.sa, &addr_len);
+ 0, &addr.sa, &addr_len);
if (k < 0)
k = (errno == EAGAIN) ? 0 : -errno; /* no data */
else if (k == 0)
k = -ECONNRESET; /* connection was closed by the kernel */
- else if (addr_len != sizeof(nl->sockaddr.nl) ||
- nl->sockaddr.nl.nl_family != AF_NETLINK)
+ else if (addr_len != sizeof(addr.nl) ||
+ addr.nl.nl_family != AF_NETLINK)
k = -EIO; /* not a netlink message */
- else if (nl->sockaddr.nl.nl_pid != 0)
+ else if (addr.nl.nl_pid != 0)
k = 0; /* not from the kernel */
else if ((size_t) k < sizeof(struct nlmsghdr) ||
(size_t) k < m->hdr->nlmsg_len)
k = -EIO; /* too small (we do accept too big though) */
- else if ((pid_t) m->hdr->nlmsg_pid != getpid())
+ else if (m->hdr->nlmsg_pid != nl->sockaddr.nl.nl_pid)
k = 0; /* not for us */
if (k > 0)
case NLMSG_ERROR:
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
k = -EIO;
- break;;
+ break;
case RTM_NEWLINK:
case RTM_DELLINK:
case RTM_GETLINK:
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifinfomsg)))
k = -EIO;
- break;;
+ break;
case RTM_NEWADDR:
case RTM_DELADDR:
case RTM_GETADDR:
if (m->hdr->nlmsg_len < NLMSG_LENGTH(sizeof(struct ifaddrmsg)))
k = -EIO;
- break;;
+ break;
case NLMSG_NOOP:
k = 0;
- break;;
+ break;
default:
k = 0; /* ignoring message of unknown type */
}
~ianmdlvl / elogind.git / blobdiff