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

libnetlink: Convert GETROUTE dumps to use rtnl_routedump_req 

Add rtnl_routedump_req for route dumps using the proper rtmsg
as the header. Convert existing RTM_GETROUTE dumps to use it.

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2018-09-29 08:46:31 -07:00
parent 46917d0895
commit bfb27dfaac
4 changed files with 21 additions and 3 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_routedump_req(struct rtnl_handle *rth, int family)
__attribute__((warn_unused_result));
int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type) int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));

2
ip/ipmroute.c
View File

@ -283,7 +283,7 @@ static int mroute_list(int argc, char **argv)
filter.iif = idx; filter.iif = idx;
} }
if (rtnl_wilddump_request(&rth, filter.af, RTM_GETROUTE) < 0) { if (rtnl_routedump_req(&rth, filter.af) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
return 1; return 1;
} }

4
ip/iproute.c
View File

@ -1645,7 +1645,7 @@ static int iproute_flush(int do_ipv6, rtnl_filter_t filter_fn)
filter.flushe = sizeof(flushb); filter.flushe = sizeof(flushb);
for (;;) { for (;;) {
if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) { if (rtnl_routedump_req(&rth, do_ipv6) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
return -2; return -2;
} }
@ -1891,7 +1891,7 @@ static int iproute_list_flush_or_save(int argc, char **argv, int action)
return iproute_flush(do_ipv6, filter_fn); return iproute_flush(do_ipv6, filter_fn);
if (!filter.cloned) { if (!filter.cloned) {
if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) { if (rtnl_routedump_req(&rth, do_ipv6) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
return -2; return -2;
} }

16
lib/libnetlink.c
View File

@ -215,6 +215,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_routedump_req(struct rtnl_handle *rth, int family)
{
struct {
struct nlmsghdr nlh;
struct rtmsg rtm;
} req = {
.nlh.nlmsg_len = sizeof(req),
.nlh.nlmsg_type = RTM_GETROUTE,
.nlh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
.nlh.nlmsg_seq = rth->dump = ++rth->seq,
.rtm.rtm_family = family,
};
return send(rth->fd, &req, sizeof(req), 0);
}
int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type) int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
{ {
return rtnl_wilddump_req_filter(rth, family, type, RTEXT_FILTER_VF); return rtnl_wilddump_req_filter(rth, family, type, RTEXT_FILTER_VF);