"ip protocol" is missing ospf as an option

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-10849

We were incorrectly listing protocols that supported ipv6 for "ip
protocol" instead of listing the protocols that supported ipv4.

With the fix

superm-redxp-05(config)# ip protocol ?
  any        Any of the above protocols
  bgp        Border Gateway Protocol (BGP)
  connected  Connected routes (directly attached subnet or host)
  isis       Intermediate System to Intermediate System (IS-IS)
  kernel     Kernel routes (not installed via the zebra RIB)
  ospf       Open Shortest Path First (OSPFv2)
  rip        Routing Information Protocol (RIP)
  static     Statically configured routes
  table      Non-main Kernel Routing Table
superm-redxp-05(config)#
superm-redxp-05(config)#
superm-redxp-05(config)# ipv6 protocol ?
  any        Any of the above protocols
  bgp        Border Gateway Protocol (BGP)
  connected  Connected routes (directly attached subnet or host)
  isis       Intermediate System to Intermediate System (IS-IS)
  kernel     Kernel routes (not installed via the zebra RIB)
  ospf6      Open Shortest Path First (IPv6) (OSPFv3)
  ripng      Routing Information Protocol next-generation (IPv6) (RIPng)
  static     Statically configured routes
  table      Non-main Kernel Routing Table
superm-redxp-05(config)#
superm-redxp-05(config)#

diff --git a/lib/route_types.pl b/lib/route_types.pl
old mode 100644 (file)
new mode 100755 (executable)
index 1e2f20c..d44cb12
--- a/lib/route_types.pl
+++ b/lib/route_types.pl
@@ -156,16 +156,21 @@ for my $daemon (sort keys %daemons) {
                my ($names, $help) = collect($daemon, 1, 1, 0);
                printf "#define QUAGGA_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
                printf "#define QUAGGA_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+
                ($names, $help) = collect($daemon, 1, 0, 0);
                printf "#define QUAGGA_IP_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
                printf "#define QUAGGA_IP_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+
                ($names, $help) = collect($daemon, 0, 1, 0);
                printf "#define QUAGGA_IP6_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
                printf "#define QUAGGA_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
-               ($names, $help) = collect($daemon, 0, 1, 1);
+
                if ($daemon eq "zebra") {
+                       ($names, $help) = collect($daemon, 1, 0, 1);
                        printf "#define QUAGGA_IP_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
                        printf "#define QUAGGA_IP_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+
+                       ($names, $help) = collect($daemon, 0, 1, 1);
                        printf "#define QUAGGA_IP6_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
                        printf "#define QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
                }