From 40d1cbfbb3c30688f96e6982dc56ec313a708333 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 27 Jan 2017 15:33:00 -0500 Subject: [PATCH] *: Fix redistribute issue Somewhere in the past we switched from using the auto-generated redistribute statements to a non-generated version. This caused us to loose new protocols to redistribute as they are added. Put it back. Signed-off-by: Donald Sharp --- bgpd/bgp_vty.c | 24 ++++++++++++------------ isisd/isis_redist.c | 4 ++-- ospf6d/ospf6_asbr.c | 6 +++--- ospfd/ospf_vty.c | 8 ++++---- ripd/rip_zebra.c | 16 ++++++++-------- ripngd/ripng_zebra.c | 10 +++++----- zebra/zebra_routemap.c | 16 ++++++++-------- zebra/zebra_vty.c | 8 ++++---- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 94809d69f5..e32f10634e 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -9345,7 +9345,7 @@ DEFUN (show_ip_bgp_peer_groups, DEFUN (bgp_redistribute_ipv4, bgp_redistribute_ipv4_cmd, - "redistribute ", + "redistribute " FRR_IP_REDIST_STR_BGPD, "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD) { @@ -9365,7 +9365,7 @@ DEFUN (bgp_redistribute_ipv4, DEFUN (bgp_redistribute_ipv4_rmap, bgp_redistribute_ipv4_rmap_cmd, - "redistribute route-map WORD", + "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9391,7 +9391,7 @@ DEFUN (bgp_redistribute_ipv4_rmap, DEFUN (bgp_redistribute_ipv4_metric, bgp_redistribute_ipv4_metric_cmd, - "redistribute metric (0-4294967295)", + "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9419,7 +9419,7 @@ DEFUN (bgp_redistribute_ipv4_metric, DEFUN (bgp_redistribute_ipv4_rmap_metric, bgp_redistribute_ipv4_rmap_metric_cmd, - "redistribute route-map WORD metric (0-4294967295)", + "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9451,7 +9451,7 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric, DEFUN (bgp_redistribute_ipv4_metric_rmap, bgp_redistribute_ipv4_metric_rmap_cmd, - "redistribute metric (0-4294967295) route-map WORD", + "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9669,7 +9669,7 @@ DEFUN (no_bgp_redistribute_ipv4_ospf, DEFUN (no_bgp_redistribute_ipv4, no_bgp_redistribute_ipv4_cmd, - "no redistribute [metric (0-4294967295)] [route-map WORD]", + "no redistribute " FRR_IP_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]", NO_STR "Redistribute information from another routing protocol\n" FRR_IP_REDIST_HELP_STR_BGPD @@ -9693,7 +9693,7 @@ DEFUN (no_bgp_redistribute_ipv4, DEFUN (bgp_redistribute_ipv6, bgp_redistribute_ipv6_cmd, - "redistribute ", + "redistribute " FRR_IP6_REDIST_STR_BGPD, "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD) { @@ -9714,7 +9714,7 @@ DEFUN (bgp_redistribute_ipv6, DEFUN (bgp_redistribute_ipv6_rmap, bgp_redistribute_ipv6_rmap_cmd, - "redistribute route-map WORD", + "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9740,7 +9740,7 @@ DEFUN (bgp_redistribute_ipv6_rmap, DEFUN (bgp_redistribute_ipv6_metric, bgp_redistribute_ipv6_metric_cmd, - "redistribute metric (0-4294967295)", + "redistribute " FRR_IP6_REDIST_STR_BGPD " metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9768,7 +9768,7 @@ DEFUN (bgp_redistribute_ipv6_metric, DEFUN (bgp_redistribute_ipv6_rmap_metric, bgp_redistribute_ipv6_rmap_metric_cmd, - "redistribute route-map WORD metric (0-4294967295)", + "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Route map reference\n" @@ -9800,7 +9800,7 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric, DEFUN (bgp_redistribute_ipv6_metric_rmap, bgp_redistribute_ipv6_metric_rmap_cmd, - "redistribute metric (0-4294967295) route-map WORD", + "redistribute " FRR_IP6_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD", "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD "Metric for redistributed routes\n" @@ -9832,7 +9832,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap, DEFUN (no_bgp_redistribute_ipv6, no_bgp_redistribute_ipv6_cmd, - "no redistribute [metric (0-4294967295)] [route-map WORD]", + "no redistribute " FRR_IP6_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]", NO_STR "Redistribute information from another routing protocol\n" FRR_IP6_REDIST_HELP_STR_BGPD diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c index e368180699..bdf90aaa1e 100644 --- a/isisd/isis_redist.c +++ b/isisd/isis_redist.c @@ -540,7 +540,7 @@ isis_redist_area_finish(struct isis_area *area) DEFUN (isis_redistribute, isis_redistribute_cmd, - "redistribute []", + "redistribute " FRR_REDIST_STR_ISISD " []", REDIST_STR "Redistribute IPv4 routes\n" "Redistribute IPv6 routes\n" @@ -610,7 +610,7 @@ DEFUN (isis_redistribute, DEFUN (no_isis_redistribute, no_isis_redistribute_cmd, - "no redistribute ", + "no redistribute " FRR_REDIST_STR_ISISD " ", NO_STR REDIST_STR "Redistribute IPv4 routes\n" diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c index 74c4802f2e..88cc07e1af 100644 --- a/ospf6d/ospf6_asbr.c +++ b/ospf6d/ospf6_asbr.c @@ -686,7 +686,7 @@ ospf6_asbr_redistribute_remove (int type, ifindex_t ifindex, DEFUN (ospf6_redistribute, ospf6_redistribute_cmd, - "redistribute ", + "redistribute " FRR_REDIST_STR_OSPF6D, "Redistribute\n" FRR_REDIST_HELP_STR_OSPF6D) { @@ -704,7 +704,7 @@ DEFUN (ospf6_redistribute, DEFUN (ospf6_redistribute_routemap, ospf6_redistribute_routemap_cmd, - "redistribute route-map WORD", + "redistribute " FRR_REDIST_STR_OSPF6D " route-map WORD", "Redistribute\n" FRR_REDIST_HELP_STR_OSPF6D "Route map reference\n" @@ -727,7 +727,7 @@ DEFUN (ospf6_redistribute_routemap, DEFUN (no_ospf6_redistribute, no_ospf6_redistribute_cmd, - "no redistribute [route-map WORD]", + "no redistribute " FRR_REDIST_STR_OSPF6D " [route-map WORD]", NO_STR "Redistribute\n" FRR_REDIST_HELP_STR_OSPF6D diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 2a627f9221..62498f4c82 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -7091,7 +7091,7 @@ DEFUN (no_ip_ospf_area, DEFUN (ospf_redistribute_source, ospf_redistribute_source_cmd, - "redistribute []", + "redistribute " FRR_REDIST_STR_OSPFD " []", REDIST_STR FRR_REDIST_HELP_STR_OSPFD "Metric for redistributed routes\n" @@ -7142,7 +7142,7 @@ DEFUN (ospf_redistribute_source, DEFUN (no_ospf_redistribute_source, no_ospf_redistribute_source_cmd, - "no redistribute []", + "no redistribute " FRR_REDIST_STR_OSPFD " []", NO_STR REDIST_STR FRR_REDIST_HELP_STR_OSPFD @@ -7294,7 +7294,7 @@ DEFUN (no_ospf_redistribute_instance_source, DEFUN (ospf_distribute_list_out, ospf_distribute_list_out_cmd, - "distribute-list WORD out ", + "distribute-list WORD out " FRR_REDIST_STR_OSPFD, "Filter networks in routing updates\n" "Access-list name\n" OUT_STR @@ -7316,7 +7316,7 @@ DEFUN (ospf_distribute_list_out, DEFUN (no_ospf_distribute_list_out, no_ospf_distribute_list_out_cmd, - "no distribute-list WORD out ", + "no distribute-list WORD out " FRR_REDIST_STR_OSPFD, NO_STR "Filter networks in routing updates\n" "Access-list name\n" diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c index 043f1c631e..7fa3baea7e 100644 --- a/ripd/rip_zebra.c +++ b/ripd/rip_zebra.c @@ -331,7 +331,7 @@ DEFUN (no_rip_redistribute_rip, DEFUN (rip_redistribute_type, rip_redistribute_type_cmd, - "redistribute ", + "redistribute " FRR_REDIST_STR_RIPD, REDIST_STR FRR_REDIST_HELP_STR_RIPD) { @@ -356,7 +356,7 @@ DEFUN (rip_redistribute_type, DEFUN (no_rip_redistribute_type, no_rip_redistribute_type_cmd, - "no redistribute ", + "no redistribute " FRR_REDIST_STR_RIPD, NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD) @@ -383,7 +383,7 @@ DEFUN (no_rip_redistribute_type, DEFUN (rip_redistribute_type_routemap, rip_redistribute_type_routemap_cmd, - "redistribute route-map WORD", + "redistribute " FRR_REDIST_STR_RIPD " route-map WORD", REDIST_STR FRR_REDIST_HELP_STR_RIPD "Route map reference\n" @@ -410,7 +410,7 @@ DEFUN (rip_redistribute_type_routemap, DEFUN (no_rip_redistribute_type_routemap, no_rip_redistribute_type_routemap_cmd, - "no redistribute route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPD " route-map WORD", NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD @@ -438,7 +438,7 @@ DEFUN (no_rip_redistribute_type_routemap, DEFUN (rip_redistribute_type_metric, rip_redistribute_type_metric_cmd, - "redistribute metric (0-16)", + "redistribute " FRR_REDIST_STR_RIPD " metric (0-16)", REDIST_STR FRR_REDIST_HELP_STR_RIPD "Metric\n" @@ -468,7 +468,7 @@ DEFUN (rip_redistribute_type_metric, DEFUN (no_rip_redistribute_type_metric, no_rip_redistribute_type_metric_cmd, - "no redistribute metric (0-16)", + "no redistribute " FRR_REDIST_STR_RIPD " metric (0-16)", NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD @@ -496,7 +496,7 @@ DEFUN (no_rip_redistribute_type_metric, DEFUN (rip_redistribute_type_metric_routemap, rip_redistribute_type_metric_routemap_cmd, - "redistribute metric (0-16) route-map WORD", + "redistribute " FRR_REDIST_STR_RIPD " metric (0-16) route-map WORD", REDIST_STR FRR_REDIST_HELP_STR_RIPD "Metric\n" @@ -531,7 +531,7 @@ DEFUN (rip_redistribute_type_metric_routemap, DEFUN (no_rip_redistribute_type_metric_routemap, no_rip_redistribute_type_metric_routemap_cmd, - "no redistribute metric (0-16) route-map WORD", + "no redistribute " FRR_REDIST_STR_RIPD " metric (0-16) route-map WORD", NO_STR REDIST_STR FRR_REDIST_HELP_STR_RIPD diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c index bb8fed3e93..5de785a6b8 100644 --- a/ripngd/ripng_zebra.c +++ b/ripngd/ripng_zebra.c @@ -315,7 +315,7 @@ DEFUN (no_ripng_redistribute_ripng, DEFUN (ripng_redistribute_type, ripng_redistribute_type_cmd, - "redistribute ", + "redistribute " FRR_REDIST_STR_RIPNGD, "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD) { @@ -336,7 +336,7 @@ DEFUN (ripng_redistribute_type, DEFUN (no_ripng_redistribute_type, no_ripng_redistribute_type_cmd, - "no redistribute [metric (0-16)] [route-map WORD]", + "no redistribute " FRR_REDIST_STR_RIPNGD " [metric (0-16)] [route-map WORD]", NO_STR "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD @@ -364,7 +364,7 @@ DEFUN (no_ripng_redistribute_type, DEFUN (ripng_redistribute_type_metric, ripng_redistribute_type_metric_cmd, - "redistribute metric (0-16)", + "redistribute " FRR_REDIST_STR_RIPNGD " metric (0-16)", "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD "Metric\n" @@ -392,7 +392,7 @@ DEFUN (ripng_redistribute_type_metric, DEFUN (ripng_redistribute_type_routemap, ripng_redistribute_type_routemap_cmd, - "redistribute route-map WORD", + "redistribute " FRR_REDIST_STR_RIPNGD " route-map WORD", "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD "Route map reference\n" @@ -418,7 +418,7 @@ DEFUN (ripng_redistribute_type_routemap, DEFUN (ripng_redistribute_type_metric_routemap, ripng_redistribute_type_metric_routemap_cmd, - "redistribute metric (0-16) route-map WORD", + "redistribute " FRR_REDIST_STR_RIPNGD " metric (0-16) route-map WORD", "Redistribute\n" FRR_REDIST_HELP_STR_RIPNGD "Metric\n" diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index f8f3c4318d..5fe4a7ab9d 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -443,7 +443,7 @@ DEFUN (no_zebra_route_map_timer, DEFUN (ip_protocol, ip_protocol_cmd, - "ip protocol route-map ROUTE-MAP", + "ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter routing info exchanged between zebra and protocol\n" FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -482,7 +482,7 @@ DEFUN (ip_protocol, DEFUN (no_ip_protocol, no_ip_protocol_cmd, - "no ip protocol [route-map ROUTE-MAP]", + "no ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP_STR "Stop filtering routing info between zebra and protocol\n" @@ -552,7 +552,7 @@ DEFUN (show_ip_protocol, DEFUN (ipv6_protocol, ipv6_protocol_cmd, - "ipv6 protocol route-map ROUTE-MAP", + "ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP6_STR "Filter IPv6 routing info exchanged between zebra and protocol\n" FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -591,7 +591,7 @@ DEFUN (ipv6_protocol, DEFUN (no_ipv6_protocol, no_ipv6_protocol_cmd, - "no ipv6 protocol [route-map ROUTE-MAP]", + "no ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP6_STR "Stop filtering IPv6 routing info between zebra and protocol\n" @@ -660,7 +660,7 @@ DEFUN (show_ipv6_protocol, DEFUN (ip_protocol_nht_rmap, ip_protocol_nht_rmap_cmd, - "ip nht route-map ROUTE-MAP", + "ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP_STR "Filter Next Hop tracking route resolution\n" FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -696,7 +696,7 @@ DEFUN (ip_protocol_nht_rmap, DEFUN (no_ip_protocol_nht_rmap, no_ip_protocol_nht_rmap_cmd, - "no ip nht [route-map ROUTE-MAP]", + "no ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP_STR "Filter Next Hop tracking route resolution\n" @@ -760,7 +760,7 @@ DEFUN (show_ip_protocol_nht, DEFUN (ipv6_protocol_nht_rmap, ipv6_protocol_nht_rmap_cmd, - "ipv6 nht route-map ROUTE-MAP", + "ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", IP6_STR "Filter Next Hop tracking route resolution\n" FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA @@ -790,7 +790,7 @@ DEFUN (ipv6_protocol_nht_rmap, DEFUN (no_ipv6_protocol_nht_rmap, no_ipv6_protocol_nht_rmap_cmd, - "no ipv6 nht [route-map ROUTE-MAP]", + "no ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA " [route-map ROUTE-MAP]", NO_STR IP6_STR "Filter Next Hop tracking route resolution\n" diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 113b063913..f075677575 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -1468,7 +1468,7 @@ DEFUN (show_ip_route_supernets, DEFUN (show_ip_route_protocol, show_ip_route_protocol_cmd, - "show ip route [vrf NAME] ", + "show ip route [vrf NAME] " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" @@ -2064,7 +2064,7 @@ DEFUN (show_ip_route_vrf_all_supernets, DEFUN (show_ip_route_vrf_all_protocol, show_ip_route_vrf_all_protocol_cmd, - "show ip route vrf all ", + "show ip route vrf all " FRR_IP_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" @@ -2958,7 +2958,7 @@ DEFUN (show_ipv6_route_prefix_longer, DEFUN (show_ipv6_route_protocol, show_ipv6_route_protocol_cmd, - "show ipv6 route [vrf NAME] ", + "show ipv6 route [vrf NAME] " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" @@ -3354,7 +3354,7 @@ DEFUN (show_ipv6_route_vrf_all_prefix_longer, DEFUN (show_ipv6_route_vrf_all_protocol, show_ipv6_route_vrf_all_protocol_cmd, - "show ipv6 route vrf all ", + "show ipv6 route vrf all " FRR_IP6_REDIST_STR_ZEBRA, SHOW_STR IP_STR "IP routing table\n" -- 2.39.5