lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 2 Jan 2019 20:38:30 -0800 From: David Ahern <dsahern@...nel.org> To: netdev@...r.kernel.org Cc: idosch@...lanox.com, stephen@...workplumber.org, David Ahern <dsahern@...il.com> Subject: [PATCH iproute2-next 3/5] bridge: Update fdb show to use rtnl_neighdump_req From: David Ahern <dsahern@...il.com> Add fdb_dump_filter to set filter attributes in dump request and convert fdb_show to use rtnl_neighdump_req. Signed-off-by: David Ahern <dsahern@...il.com> --- bridge/fdb.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/bridge/fdb.c b/bridge/fdb.c index a7a0d8052307..676267e15ddc 100644 --- a/bridge/fdb.c +++ b/bridge/fdb.c @@ -30,7 +30,7 @@ #include "rt_names.h" #include "utils.h" -static unsigned int filter_index, filter_vlan, filter_state; +static unsigned int filter_index, filter_vlan, filter_state, filter_master; static void usage(void) { @@ -256,20 +256,29 @@ int print_fdb(struct nlmsghdr *n, void *arg) return 0; } -static int fdb_show(int argc, char **argv) +static int fdb_dump_filter(struct nlmsghdr *nlh, int reqlen) { - struct { - struct nlmsghdr n; - struct ndmsg ndm; - char buf[256]; - } req = { - .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndmsg)), - .ndm.ndm_family = PF_BRIDGE, - }; + int err; + + if (filter_index) { + struct ndmsg *ndm = NLMSG_DATA(nlh); + ndm->ndm_ifindex = filter_index; + } + + if (filter_master) { + err = addattr32(nlh, reqlen, NDA_MASTER, filter_master); + if (err) + return err; + } + + return 0; +} + +static int fdb_show(int argc, char **argv) +{ char *filter_dev = NULL; char *br = NULL; - int msg_size = sizeof(struct ndmsg); while (argc > 0) { if ((strcmp(*argv, "brport") == 0) || strcmp(*argv, "dev") == 0) { @@ -304,8 +313,7 @@ static int fdb_show(int argc, char **argv) fprintf(stderr, "Cannot find bridge device \"%s\"\n", br); return -1; } - addattr32(&req.n, sizeof(req), IFLA_MASTER, br_ifindex); - msg_size += RTA_LENGTH(4); + filter_master = br_ifindex; } /*we'll keep around filter_dev for older kernels */ @@ -313,10 +321,9 @@ static int fdb_show(int argc, char **argv) filter_index = ll_name_to_index(filter_dev); if (!filter_index) return nodev(filter_dev); - req.ndm.ndm_ifindex = filter_index; } - if (rtnl_dump_request(&rth, RTM_GETNEIGH, &req.ndm, msg_size) < 0) { + if (rtnl_neighdump_req(&rth, PF_BRIDGE, fdb_dump_filter) < 0) { perror("Cannot send dump request"); exit(1); } -- 2.11.0
Powered by blists - more mailing lists