From: Renato Westphal <renato@opensourcerouting.org>
Date: Wed, 13 Sep 2017 18:25:39 +0000 (-0300)
Subject: zebra: 'show ip route' with multiple options at the same time
X-Git-Tag: frr-4.0-dev~187^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a3e13ef37f188386c2bda3e311f98b52ef651764;p=matthieu%2Ffrr.git

zebra: 'show ip route' with multiple options at the same time

Now it's possible to specify multiple options when viewing the RIB or
FIB.

Example: 'show ip route 192.168.0.0/16 longer-prefixes tag 10 ospf'

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index dbfb491db1..889cdcfa99 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1202,19 +1202,21 @@ DEFPY (show_route,
        "show\
          <\
 	  ip$ipv4 <fib$fib|route> [vrf <NAME$vrf_name|all$vrf_all>]\
-	   [\
+	   [{\
 	    tag (1-4294967295)\
 	    |A.B.C.D/M$prefix longer-prefixes\
 	    |supernets-only$supernets_only\
-	    |" FRR_IP_REDIST_STR_ZEBRA "$type_str\
+	   }]\
+	   [<\
+	    " FRR_IP_REDIST_STR_ZEBRA "$type_str\
 	    |ospf$type_str (1-65535)$ospf_instance_id\
-	   ]\
+	   >]\
           |ipv6$ipv6 <fib$fib|route> [vrf <NAME$vrf_name|all$vrf_all>]\
-	   [\
+	   [{\
 	    tag (1-4294967295)\
 	    |X:X::X:X/M$prefix longer-prefixes\
-	    |" FRR_IP6_REDIST_STR_ZEBRA "$type_str\
-	   ]\
+	   }]\
+	   [" FRR_IP6_REDIST_STR_ZEBRA "$type_str]\
 	 >\
         [json$json]",
        SHOW_STR