matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libnetlink: Convert GETADDRLABEL dumps to use rtnl_addrlbldump_req 

Add rtnl_addrlbldump_req for address label dumps using the proper
ifaddrlblmsg as the header. Convert existing RTM_GETADDRALBEL dumps
to use it.

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2018-09-29 10:43:15 -07:00
parent bfb27dfaac
commit 393600231a
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libnetlink.h
View File

@ -49,6 +49,8 @@ void rtnl_close(struct rtnl_handle *rth);
int rtnl_addrdump_req(struct rtnl_handle *rth, int family) int rtnl_addrdump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
int rtnl_addrlbldump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result));
int rtnl_routedump_req(struct rtnl_handle *rth, int family) int rtnl_routedump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));

4
ip/ipaddrlabel.c
View File

@ -118,7 +118,7 @@ static int ipaddrlabel_list(int argc, char **argv)
return -1; return -1;
} }
if (rtnl_wilddump_request(&rth, af, RTM_GETADDRLABEL) < 0) { if (rtnl_addrlbldump_req(&rth, af) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
return 1; return 1;
} }
@ -237,7 +237,7 @@ static int ipaddrlabel_flush(int argc, char **argv)
return -1; return -1;
} }
if (rtnl_wilddump_request(&rth, af, RTM_GETADDRLABEL) < 0) { if (rtnl_addrlbldump_req(&rth, af) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
return -1; return -1;
} }

17
lib/libnetlink.c
View File

@ -22,6 +22,7 @@
#include <errno.h> #include <errno.h>
#include <time.h> #include <time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <linux/if_addrlabel.h>
#include "libnetlink.h" #include "libnetlink.h"
@ -215,6 +216,22 @@ int rtnl_addrdump_req(struct rtnl_handle *rth, int family)
return send(rth->fd, &req, sizeof(req), 0); return send(rth->fd, &req, sizeof(req), 0);
} }
int rtnl_addrlbldump_req(struct rtnl_handle *rth, int family)
{
struct {
struct nlmsghdr nlh;
struct ifaddrlblmsg ifal;
} req = {
.nlh.nlmsg_len = sizeof(req),
.nlh.nlmsg_type = RTM_GETADDRLABEL,
.nlh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
.nlh.nlmsg_seq = rth->dump = ++rth->seq,
.ifal.ifal_family = family,
};
return send(rth->fd, &req, sizeof(req), 0);
}
int rtnl_routedump_req(struct rtnl_handle *rth, int family) int rtnl_routedump_req(struct rtnl_handle *rth, int family)
{ {
struct { struct {