proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-25 23:17:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ip neigh: Convert do_show_or_flush to use rtnl_neighdump_req

Browse Source 
Add ipneigh_dump_filter to add filter attributes to the neighbor
dump request and update do_show_or_flush to use rtnl_neighdump_req.

Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
David Ahern 2018-12-31 09:55:45 -08:00
parent f255ab1225
commit 101ec10a76
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ip/ipneigh.c
View File

@ -41,6 +41,7 @@ static struct
int flushe; int flushe;
int master; int master;
int protocol; int protocol;
__u8 ndm_flags;
} filter; } filter;
static void usage(void) __attribute__((noreturn)); static void usage(void) __attribute__((noreturn));
@ -408,16 +409,29 @@ void ipneigh_reset_filter(int ifindex)
filter.index = ifindex; filter.index = ifindex;
} }
static int ipneigh_dump_filter(struct nlmsghdr *nlh, int reqlen)
{
struct ndmsg *ndm = NLMSG_DATA(nlh);
int err;
ndm->ndm_flags = filter.ndm_flags;
if (filter.index) {
err = addattr32(nlh, reqlen, NDA_IFINDEX, filter.index);
if (err)
return err;
}
if (filter.master) {
err = addattr32(nlh, reqlen, NDA_MASTER, filter.master);
if (err)
return err;
}
return 0;
}
static int do_show_or_flush(int argc, char **argv, int flush) static int do_show_or_flush(int argc, char **argv, int flush)
{ {
struct {
struct nlmsghdr n;
struct ndmsg ndm;
char buf[256];
} req = {
.n.nlmsg_type = RTM_GETNEIGH,
.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)),
};
char *filter_dev = NULL; char *filter_dev = NULL;
int state_given = 0; int state_given = 0;
@ -448,7 +462,6 @@ static int do_show_or_flush(int argc, char **argv, int flush)
ifindex = ll_name_to_index(*argv); ifindex = ll_name_to_index(*argv);
if (!ifindex) if (!ifindex)
invarg("Device does not exist\n", *argv); invarg("Device does not exist\n", *argv);
addattr32(&req.n, sizeof(req), NDA_MASTER, ifindex);
filter.master = ifindex; filter.master = ifindex;
} else if (strcmp(*argv, "vrf") == 0) { } else if (strcmp(*argv, "vrf") == 0) {
int ifindex; int ifindex;
@ -459,7 +472,6 @@ static int do_show_or_flush(int argc, char **argv, int flush)
invarg("Not a valid VRF name\n", *argv); invarg("Not a valid VRF name\n", *argv);
if (!name_is_vrf(*argv)) if (!name_is_vrf(*argv))
invarg("Not a valid VRF name\n", *argv); invarg("Not a valid VRF name\n", *argv);
addattr32(&req.n, sizeof(req), NDA_MASTER, ifindex);
filter.master = ifindex; filter.master = ifindex;
} else if (strcmp(*argv, "unused") == 0) { } else if (strcmp(*argv, "unused") == 0) {
filter.unused_only = 1; filter.unused_only = 1;
@ -482,7 +494,7 @@ static int do_show_or_flush(int argc, char **argv, int flush)
state = 0x100; state = 0x100;
filter.state |= state; filter.state |= state;
} else if (strcmp(*argv, "proxy") == 0) { } else if (strcmp(*argv, "proxy") == 0) {
req.ndm.ndm_flags = NTF_PROXY; filter.ndm_flags = NTF_PROXY;
} else if (matches(*argv, "protocol") == 0) { } else if (matches(*argv, "protocol") == 0) {
__u32 prot; __u32 prot;
@ -513,11 +525,8 @@ static int do_show_or_flush(int argc, char **argv, int flush)
filter.index = ll_name_to_index(filter_dev); filter.index = ll_name_to_index(filter_dev);
if (!filter.index) if (!filter.index)
return nodev(filter_dev); return nodev(filter_dev);
addattr32(&req.n, sizeof(req), NDA_IFINDEX, filter.index);
} }
req.ndm.ndm_family = filter.family;
if (flush) { if (flush) {
int round = 0; int round = 0;
char flushb[4096-512]; char flushb[4096-512];
@ -527,7 +536,8 @@ static int do_show_or_flush(int argc, char **argv, int flush)
filter.flushe = sizeof(flushb); filter.flushe = sizeof(flushb);
while (round < MAX_ROUNDS) { while (round < MAX_ROUNDS) {
if (rtnl_dump_request_n(&rth, &req.n) < 0) { if (rtnl_neighdump_req(&rth, filter.family,
ipneigh_dump_filter) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
exit(1); exit(1);
} }
@ -560,7 +570,7 @@ static int do_show_or_flush(int argc, char **argv, int flush)
return 1; return 1;
} }
if (rtnl_dump_request_n(&rth, &req.n) < 0) { if (rtnl_neighdump_req(&rth, filter.family, ipneigh_dump_filter) < 0) {
perror("Cannot send dump request"); perror("Cannot send dump request");
exit(1); exit(1);
} }