From patchwork Thu Jan 3 04:38:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 1020172 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="b7vw7/C3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43VZtZ6vRwz9s2P for ; Thu, 3 Jan 2019 15:38:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729271AbfACEif (ORCPT ); Wed, 2 Jan 2019 23:38:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:34038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726129AbfACEif (ORCPT ); Wed, 2 Jan 2019 23:38:35 -0500 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1EEF21019; Thu, 3 Jan 2019 04:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546490315; bh=QWp2nnxxIabB0nWbfpI4sgez/1n+H9gtkQeWCxLcXW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b7vw7/C32cjPaxK0KfaziuGkQFtwAFgfH5d9l2YiUQ3HnMlcfMk1/NXf0Euz3E0u3 kTXnEVAWeXRAPabmEuwk6rr/yoUSDkGC9EzqWN3jbCF2V4tPZzL2E0Ocx0hM0HwQt0 +04XxItqCY2FZ/ziNW7SRrDRljWSxdGq2UukLMqk= From: David Ahern To: netdev@vger.kernel.org Cc: idosch@mellanox.com, stephen@networkplumber.org, David Ahern Subject: [PATCH iproute2-next 3/5] bridge: Update fdb show to use rtnl_neighdump_req Date: Wed, 2 Jan 2019 20:38:30 -0800 Message-Id: <20190103043832.3748-4-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190103043832.3748-1-dsahern@kernel.org> References: <20190103043832.3748-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern 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 --- 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); }