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 dbfb491db18a50720d537cf7e74bb42a0b48b5d2..889cdcfa990b3b6e067306fc70ece99c442697a2 100644 (file)
--- 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