diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-12-20 18:31:42 +0100 | 
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-12-20 18:34:29 +0100 | 
| commit | ab0181eed3d118fc46e693c68e5bbc0248c7bfe5 (patch) | |
| tree | 8abda85a1e96d03cf3eefb2274562cfe38e71d88 /zebra | |
| parent | ae435b1972ab95b647e816da6a2dbb9951628218 (diff) | |
build: rename (2 of ?): route_types macros
All of the autogenerated macros in lib/route_types.pl are now called
FRR_* instead of QUAGGA_*.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/zebra_routemap.c | 48 | ||||
| -rw-r--r-- | zebra/zebra_vty.c | 24 | 
2 files changed, 36 insertions, 36 deletions
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 3075a61c4a..041f67826b 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -730,10 +730,10 @@ ALIAS (no_zebra_route_map_timer,  DEFUN (ip_protocol,         ip_protocol_cmd, -       "ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA         "Route map name\n")  {    int i; @@ -767,11 +767,11 @@ DEFUN (ip_protocol,  DEFUN (no_ip_protocol,         no_ip_protocol_cmd, -       "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA, +       "no ip protocol " FRR_IP_PROTOCOL_MAP_STR_ZEBRA,         NO_STR         IP_STR         "Stop filtering routing info between zebra and protocol\n" -       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA         "Protocol from which to stop filtering routes\n")  {    int i; @@ -805,11 +805,11 @@ DEFUN (no_ip_protocol,  ALIAS (no_ip_protocol,         no_ip_protocol_val_cmd, -       "no ip protocol " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA         "route map name")  DEFUN (show_ip_protocol, @@ -843,10 +843,10 @@ DEFUN (show_ip_protocol,  DEFUN (ipv6_protocol,         ipv6_protocol_cmd, -       "ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA         "Route map name\n")  {    int i; @@ -880,11 +880,11 @@ DEFUN (ipv6_protocol,  DEFUN (no_ipv6_protocol,         no_ipv6_protocol_cmd, -       "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA, +       "no ipv6 protocol " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA,         NO_STR         IP6_STR         "Stop filtering IPv6 routing info between zebra and protocol\n" -       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA         "Protocol from which to stop filtering routes\n")  {    int i; @@ -919,11 +919,11 @@ DEFUN (no_ipv6_protocol,  ALIAS (no_ipv6_protocol,         no_ipv6_protocol_val_cmd, -       "no ipv6 protocol " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA         "route map name")  DEFUN (show_ipv6_protocol, @@ -957,10 +957,10 @@ DEFUN (show_ipv6_protocol,  DEFUN (ip_protocol_nht_rmap,         ip_protocol_nht_rmap_cmd, -       "ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA         "Route map name\n")  {    int i; @@ -991,11 +991,11 @@ DEFUN (ip_protocol_nht_rmap,  DEFUN (no_ip_protocol_nht_rmap,         no_ip_protocol_nht_rmap_cmd, -       "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA, +       "no ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA,         NO_STR         IP_STR         "Filter Next Hop tracking route resolution\n" -       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA) +       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA)  {    int i; @@ -1024,10 +1024,10 @@ DEFUN (no_ip_protocol_nht_rmap,  ALIAS (no_ip_protocol_nht_rmap,         no_ip_protocol_nht_rmap_val_cmd, -       "no ip nht " QUAGGA_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP", +       "no ip nht " FRR_IP_PROTOCOL_MAP_STR_ZEBRA " route-map ROUTE-MAP",         IP_STR         "Filter Next Hop tracking route resolution\n" -       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA         "Route map name\n")  DEFUN (show_ip_protocol_nht, @@ -1061,10 +1061,10 @@ DEFUN (show_ip_protocol_nht,  DEFUN (ipv6_protocol_nht_rmap,         ipv6_protocol_nht_rmap_cmd, -       "ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA         "Route map name\n")  {    int i; @@ -1089,11 +1089,11 @@ DEFUN (ipv6_protocol_nht_rmap,  DEFUN (no_ipv6_protocol_nht_rmap,         no_ipv6_protocol_nht_rmap_cmd, -       "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA, +       "no ipv6 nht " FRR_IP6_PROTOCOL_MAP_STR_ZEBRA,         NO_STR         IP6_STR         "Filter Next Hop tracking route resolution\n" -       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA) +       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA)  {    int i; @@ -1127,11 +1127,11 @@ DEFUN (no_ipv6_protocol_nht_rmap,  ALIAS (no_ipv6_protocol_nht_rmap,         no_ipv6_protocol_nht_rmap_val_cmd, -       "no ipv6 nht " QUAGGA_IP6_PROTOCOL_MAP_STR_ZEBRA " 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" -       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA +       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA         "Route map name\n")  DEFUN (show_ipv6_protocol_nht, diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 84106e7ff9..98c20270c3 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -2858,11 +2858,11 @@ ALIAS (show_ip_route_supernets,  DEFUN (show_ip_route_protocol,         show_ip_route_protocol_cmd, -       "show ip route " QUAGGA_IP_REDIST_STR_ZEBRA, +       "show ip route " FRR_IP_REDIST_STR_ZEBRA,         SHOW_STR         IP_STR         "IP routing table\n" -       QUAGGA_IP_REDIST_HELP_STR_ZEBRA) +       FRR_IP_REDIST_HELP_STR_ZEBRA)  {    int type;    struct route_table *table; @@ -2906,12 +2906,12 @@ DEFUN (show_ip_route_protocol,  ALIAS (show_ip_route_protocol,         show_ip_route_vrf_protocol_cmd, -       "show ip route " VRF_CMD_STR "  " QUAGGA_IP_REDIST_STR_ZEBRA, +       "show ip route " VRF_CMD_STR "  " FRR_IP_REDIST_STR_ZEBRA,         SHOW_STR         IP_STR         "IP routing table\n"         VRF_CMD_HELP_STR -       QUAGGA_IP_REDIST_HELP_STR_ZEBRA) +       FRR_IP_REDIST_HELP_STR_ZEBRA)  DEFUN (show_ip_route_ospf_instance,         show_ip_route_ospf_instance_cmd, @@ -3487,12 +3487,12 @@ 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_CMD_STR "  " QUAGGA_IP_REDIST_STR_ZEBRA, +       "show ip route " VRF_ALL_CMD_STR "  " FRR_IP_REDIST_STR_ZEBRA,         SHOW_STR         IP_STR         "IP routing table\n"         VRF_ALL_CMD_HELP_STR -       QUAGGA_IP_REDIST_HELP_STR_ZEBRA"\n") +       FRR_IP_REDIST_HELP_STR_ZEBRA"\n")  {    int type;    struct route_table *table; @@ -5124,11 +5124,11 @@ ALIAS (show_ipv6_route_prefix_longer,  DEFUN (show_ipv6_route_protocol,         show_ipv6_route_protocol_cmd, -       "show ipv6 route " QUAGGA_IP6_REDIST_STR_ZEBRA, +       "show ipv6 route " FRR_IP6_REDIST_STR_ZEBRA,         SHOW_STR         IP_STR         "IP routing table\n" -	QUAGGA_IP6_REDIST_HELP_STR_ZEBRA) +	FRR_IP6_REDIST_HELP_STR_ZEBRA)  {    int type;    struct route_table *table; @@ -5172,12 +5172,12 @@ DEFUN (show_ipv6_route_protocol,  ALIAS (show_ipv6_route_protocol,         show_ipv6_route_vrf_protocol_cmd, -       "show ipv6 route "  VRF_CMD_STR "  " QUAGGA_IP6_REDIST_STR_ZEBRA, +       "show ipv6 route "  VRF_CMD_STR "  " FRR_IP6_REDIST_STR_ZEBRA,         SHOW_STR         IP_STR         "IP routing table\n"         VRF_CMD_HELP_STR -       QUAGGA_IP6_REDIST_HELP_STR_ZEBRA) +       FRR_IP6_REDIST_HELP_STR_ZEBRA)  DEFUN (show_ipv6_route_addr,         show_ipv6_route_addr_cmd, @@ -5562,12 +5562,12 @@ 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_CMD_STR " " QUAGGA_IP6_REDIST_STR_ZEBRA, +       "show ipv6 route " VRF_ALL_CMD_STR " " FRR_IP6_REDIST_STR_ZEBRA,         SHOW_STR         IP_STR         "IP routing table\n"         VRF_ALL_CMD_HELP_STR -       QUAGGA_IP6_REDIST_HELP_STR_ZEBRA) +       FRR_IP6_REDIST_HELP_STR_ZEBRA)  {    int type;    struct route_table *table;  | 
