From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <netdev-owner@vger.kernel.org>
Received: from mail-pg0-f41.google.com ([74.125.83.41]:36090 "EHLO
        mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751367AbeBZVfj (ORCPT
        <rfc822;netdev@vger.kernel.org>); Mon, 26 Feb 2018 16:35:39 -0500
Received: by mail-pg0-f41.google.com with SMTP id i14so1778921pgv.3
        for <netdev@vger.kernel.org>; Mon, 26 Feb 2018 13:35:39 -0800 (PST)
Subject: Re: [PATCH v3 iproute2-next 2/3] ip: Display ip rule protocol used
To: Donald Sharp <sharpd@cumulusnetworks.com>, netdev@vger.kernel.org
References: <20180221015348.32646-1-sharpd@cumulusnetworks.com>
 <20180223193248.16744-3-sharpd@cumulusnetworks.com>
From: David Ahern <dsahern@gmail.com>
Message-ID: <50977260-dc10-4ce3-dc57-ffb5af7aae43@gmail.com>
Date: Mon, 26 Feb 2018 14:35:36 -0700
MIME-Version: 1.0
In-Reply-To: <20180223193248.16744-3-sharpd@cumulusnetworks.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On 2/23/18 12:32 PM, Donald Sharp wrote:
> @@ -391,6 +404,10 @@ static int flush_rule(const struct sockaddr_nl *who, struct nlmsghdr *n,
>  
>  	parse_rtattr(tb, FRA_MAX, RTM_RTA(frh), len);
>  
> +	if (tb[FRA_PROTOCOL] &&
> +	    (filter.protocol^rta_getattr_u8(tb[FRA_PROTOCOL]))&filter.protocolmask)
> +		return 0;
> +

Please use an intermediate variable for rta conversion and put
whitespace around '^' and '&'; existing code that does the above is a
poor example to follow. ;-)


>  	if (tb[FRA_PRIORITY]) {
>  		n->nlmsg_type = RTM_DELRULE;
>  		n->nlmsg_flags = NLM_F_REQUEST;
> @@ -415,12 +432,6 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action)
>  	if (af == AF_UNSPEC)
>  		af = AF_INET;
>  
> -	if (action != IPRULE_LIST && argc > 0) {
> -		fprintf(stderr, "\"ip rule %s\" does not take any arguments.\n",
> -				action == IPRULE_SAVE ? "save" : "flush");

You need to keep this for IPRULE_SAVE; only IPRULE_FLUSH is allowing
arguments with this patch.

> -		return -1;
> -	}
> -
>  	switch (action) {
>  	case IPRULE_SAVE:
>  		if (save_rule_prep())
> @@ -508,7 +519,18 @@ static int iprule_list_flush_or_save(int argc, char **argv, int action)
>  			NEXT_ARG();
>  			if (get_prefix(&filter.src, *argv, af))
>  				invarg("from value is invalid\n", *argv);
> -		} else {
> +		} else if (matches(*argv, "protocol") == 0) {
> +			__u32 prot;
> +			NEXT_ARG();
> +			filter.protocolmask = -1;
> +			if (rtnl_rtprot_a2n(&prot, *argv)) {
> +				if (strcmp(*argv, "all") != 0)
> +					invarg("invalid \"protocol\"\n", *argv);
> +				prot = 0;
> +				filter.protocolmask = 0;
> +			}
> +			filter.protocol = prot;
> +		} else{
>  			if (matches(*argv, "dst") == 0 ||
>  			    matches(*argv, "to") == 0) {
>  				NEXT_ARG();
> diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8
> index a5c47981..f4070542 100644
> --- a/man/man8/ip-rule.8
> +++ b/man/man8/ip-rule.8
> @@ -50,6 +50,8 @@ ip-rule \- routing policy database management
>  .IR ACTION " := [ "
>  .B  table
>  .IR TABLE_ID " ] [ "
> +.B  protocol
> +.IR PROTO " ] [ "
>  .B  nat
>  .IR ADDRESS " ] [ "
>  .B realms
> @@ -240,6 +242,10 @@ The options preference and order are synonyms with priority.
>  the routing table identifier to lookup if the rule selector matches.
>  It is also possible to use lookup instead of table.
>  
> +.TP
> +.BI protocol " PROTO"
> +the protocol who installed the rule in question.

"protocol" is getting a bit vague. Make it clearer by using something
like 'routing protocol' as the description and given an example (e.g.,
zebra for RTPROT_ZEBRA)

> +
>  .TP
>  .BI suppress_prefixlength " NUMBER"
>  reject routing decisions that have a prefix length of NUMBER or less.
> @@ -275,7 +281,11 @@ updates, it flushes the routing cache with
>  .RE
>  .TP
>  .B ip rule flush - also dumps all the deleted rules.
> -This command has no arguments.
> +.RS
> +.TP
> +.BI protocol " PROTO"
> +Select the originating protocol.
> +.RE
>  .TP
>  .B ip rule show - list rules
>  This command has no arguments.
> @@ -283,6 +293,12 @@ The options list or lst are synonyms with show.
>  
>  .TP
>  .B ip rule save
> +.RS
> +.TP
> +.BI protocl " PROTO"

missing an 'o' between 'c' and 'l'

> +Select the originating protocol.
> +.RE
> +.TP
>  save rules table information to stdout
>  .RS
>  This command behaves like
>