1303 files changed, 32187 insertions, 57138 deletions
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index 7c80072..a1a9fc1 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -68,26 +68,32 @@ int FAST_FUNC rtnl_send(struct rtnl_handle *rth, char *buf, int len) int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len) { - struct nlmsghdr nlh; - struct sockaddr_nl nladdr; - struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } }; - struct msghdr msg = { - (void*)&nladdr, sizeof(nladdr), - iov, 2, - NULL, 0, - 0 - }; - - memset(&nladdr, 0, sizeof(nladdr)); - nladdr.nl_family = AF_NETLINK; - - nlh.nlmsg_len = NLMSG_LENGTH(len); - nlh.nlmsg_type = type; - nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; - nlh.nlmsg_pid = 0; - nlh.nlmsg_seq = rth->dump = ++rth->seq; - - return sendmsg(rth->fd, &msg, 0); + struct { + struct nlmsghdr nlh; + struct msghdr msg; + struct sockaddr_nl nladdr; + } s; + struct iovec iov[2] = { { &s.nlh, sizeof(s.nlh) }, { req, len } }; + + memset(&s, 0, sizeof(s)); + + s.msg.msg_name = (void*)&s.nladdr; + s.msg.msg_namelen = sizeof(s.nladdr); + s.msg.msg_iov = iov; + s.msg.msg_iovlen = 2; + /*s.msg.msg_control = NULL; - already is */ + /*s.msg.msg_controllen = 0; - already is */ + /*s.msg.msg_flags = 0; - already is */ + + s.nladdr.nl_family = AF_NETLINK; + + s.nlh.nlmsg_len = NLMSG_LENGTH(len); + s.nlh.nlmsg_type = type; + s.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST; + /*s.nlh.nlmsg_pid = 0; - already is */ + s.nlh.nlmsg_seq = rth->dump = ++rth->seq; + + return sendmsg(rth->fd, &s.msg, 0); } static int rtnl_dump_filter(struct rtnl_handle *rth, @@ -104,12 +110,15 @@ static int rtnl_dump_filter(struct rtnl_handle *rth, while (1) { int status; struct nlmsghdr *h; - + /* Use designated initializers, struct layout is non-portable */ struct msghdr msg = { - (void*)&nladdr, sizeof(nladdr), - &iov, 1, - NULL, 0, - 0 + .msg_name = (void*)&nladdr, + .msg_namelen = sizeof(nladdr), + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + .msg_flags = 0 }; status = recvmsg(rth->fd, &msg, 0); @@ -211,11 +220,15 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, struct sockaddr_nl nladdr; struct iovec iov = { (void*)n, n->nlmsg_len }; char *buf = xmalloc(8*1024); /* avoid big stack buffer */ + /* Use designated initializers, struct layout is non-portable */ struct msghdr msg = { - (void*)&nladdr, sizeof(nladdr), - &iov, 1, - NULL, 0, - 0 + .msg_name = (void*)&nladdr, + .msg_namelen = sizeof(nladdr), + .msg_iov = &iov, + .msg_iovlen = 1, + .msg_control = NULL, + .msg_controllen = 0, + .msg_flags = 0 }; memset(&nladdr, 0, sizeof(nladdr)); @@ -327,14 +340,14 @@ int FAST_FUNC addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data) int len = RTA_LENGTH(4); struct rtattr *rta; - if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) { + if ((int)(NLMSG_ALIGN(n->nlmsg_len + len)) > maxlen) { return -1; } rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); rta->rta_type = type; rta->rta_len = len; move_to_unaligned32(RTA_DATA(rta), data); - n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + len; + n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len + len); return 0; } @@ -343,14 +356,14 @@ int FAST_FUNC addattr_l(struct nlmsghdr *n, int maxlen, int type, void *data, in int len = RTA_LENGTH(alen); struct rtattr *rta; - if ((int)(NLMSG_ALIGN(n->nlmsg_len) + len) > maxlen) { + if ((int)(NLMSG_ALIGN(n->nlmsg_len + len)) > maxlen) { return -1; } rta = (struct rtattr*)(((char*)n) + NLMSG_ALIGN(n->nlmsg_len)); rta->rta_type = type; rta->rta_len = len; memcpy(RTA_DATA(rta), data, alen); - n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + len; + n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len + len); return 0; } @@ -359,14 +372,14 @@ int FAST_FUNC rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t d int len = RTA_LENGTH(4); struct rtattr *subrta; - if (RTA_ALIGN(rta->rta_len) + len > maxlen) { + if (RTA_ALIGN(rta->rta_len + len) > maxlen) { return -1; } subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len)); subrta->rta_type = type; subrta->rta_len = len; move_to_unaligned32(RTA_DATA(subrta), data); - rta->rta_len = NLMSG_ALIGN(rta->rta_len) + len; + rta->rta_len = NLMSG_ALIGN(rta->rta_len + len); return 0; } @@ -375,14 +388,14 @@ int FAST_FUNC rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data struct rtattr *subrta; int len = RTA_LENGTH(alen); - if (RTA_ALIGN(rta->rta_len) + len > maxlen) { + if (RTA_ALIGN(rta->rta_len + len) > maxlen) { return -1; } subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len)); subrta->rta_type = type; subrta->rta_len = len; memcpy(RTA_DATA(subrta), data, alen); - rta->rta_len = NLMSG_ALIGN(rta->rta_len) + len; + rta->rta_len = NLMSG_ALIGN(rta->rta_len + len); return 0; } |