From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH iproute2-next 08/11] libnetlink: Convert GETNEIGHTBL dumps to use rtnl_neightbldump_req Date: Sat, 29 Sep 2018 10:59:28 -0700 Message-ID: <20180929175931.18448-9-dsahern@kernel.org> References: <20180929175931.18448-1-dsahern@kernel.org> Cc: stephen@networkplumber.org, christian@brauner.io, David Ahern To: netdev@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:40630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728548AbeI3A2z (ORCPT ); Sat, 29 Sep 2018 20:28:55 -0400 In-Reply-To: <20180929175931.18448-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: From: David Ahern Add rtnl_neightbldump_req for neighbor table dumps using the proper ndtmsg as the header. Convert existing RTM_GETNEIGHTBL dumps to use it. Signed-off-by: David Ahern --- include/libnetlink.h | 2 ++ ip/ipntable.c | 2 +- lib/libnetlink.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/libnetlink.h b/include/libnetlink.h index e22ccbb82ce2..5ccc421b4b0e 100644 --- a/include/libnetlink.h +++ b/include/libnetlink.h @@ -57,6 +57,8 @@ int rtnl_ruledump_req(struct rtnl_handle *rth, int family) __attribute__((warn_unused_result)); int rtnl_neighdump_req(struct rtnl_handle *rth, int family) __attribute__((warn_unused_result)); +int rtnl_neightbldump_req(struct rtnl_handle *rth, int family) + __attribute__((warn_unused_result)); int rtnl_mdbdump_req(struct rtnl_handle *rth, int family) __attribute__((warn_unused_result)); int rtnl_netconfdump_req(struct rtnl_handle *rth, int family) diff --git a/ip/ipntable.c b/ip/ipntable.c index dd4f7c2ee6d9..ce3f4614e32b 100644 --- a/ip/ipntable.c +++ b/ip/ipntable.c @@ -658,7 +658,7 @@ static int ipntable_show(int argc, char **argv) argc--; argv++; } - if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETNEIGHTBL) < 0) { + if (rtnl_neightbldump_req(&rth, preferred_family) < 0) { perror("Cannot send dump request"); exit(1); } diff --git a/lib/libnetlink.c b/lib/libnetlink.c index fd0f95a24194..c28047e4b055 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -282,6 +282,22 @@ int rtnl_neighdump_req(struct rtnl_handle *rth, int family) return send(rth->fd, &req, sizeof(req), 0); } +int rtnl_neightbldump_req(struct rtnl_handle *rth, int family) +{ + struct { + struct nlmsghdr nlh; + struct ndtmsg ndtmsg; + } req = { + .nlh.nlmsg_len = sizeof(req), + .nlh.nlmsg_type = RTM_GETNEIGHTBL, + .nlh.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST, + .nlh.nlmsg_seq = rth->dump = ++rth->seq, + .ndtmsg.ndtm_family = family, + }; + + return send(rth->fd, &req, sizeof(req), 0); +} + int rtnl_mdbdump_req(struct rtnl_handle *rth, int family) { struct { -- 2.11.0