From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Ahern Subject: [PATCH iproute2] ip rule: Honor filter arguments on flush Date: Tue, 30 Oct 2018 13:58:56 -0700 Message-ID: <20181030205856.14162-1-dsahern@kernel.org> Cc: stephen@networkplumber.org, David Ahern To: netdev@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:33670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727530AbeJaFyC (ORCPT ); Wed, 31 Oct 2018 01:54:02 -0400 Sender: netdev-owner@vger.kernel.org List-ID: From: David Ahern 'ip ru flush' currently removes all rules with priority > 0 regardless of any other command line arguments passed in. Update flush_rule to call filter_nlmsg to determine if the rule should be flushed or not. This enables rule flushing such as 'ip ru flush table 1001' and 'ip ru flush pref 99'. Signed-off-by: David Ahern --- ip/iprule.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ip/iprule.c b/ip/iprule.c index b465a80785b1..a85a43904e6e 100644 --- a/ip/iprule.c +++ b/ip/iprule.c @@ -461,6 +461,7 @@ static int flush_rule(struct nlmsghdr *n, void *arg) struct fib_rule_hdr *frh = NLMSG_DATA(n); int len = n->nlmsg_len; struct rtattr *tb[FRA_MAX+1]; + int host_len = -1; len -= NLMSG_LENGTH(sizeof(*frh)); if (len < 0) @@ -468,6 +469,10 @@ static int flush_rule(struct nlmsghdr *n, void *arg) parse_rtattr(tb, FRA_MAX, RTM_RTA(frh), len); + host_len = af_bit_len(frh->family); + if (!filter_nlmsg(n, tb, host_len)) + return 0; + if (tb[FRA_PROTOCOL]) { __u8 protocol = rta_getattr_u8(tb[FRA_PROTOCOL]); -- 2.11.0