summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_vty.c80
-rw-r--r--isisd/isis_redist.c8
-rw-r--r--lib/log.c2
-rwxr-xr-xlib/route_types.pl34
-rw-r--r--ospf6d/ospf6_asbr.c16
-rw-r--r--ospfd/ospf_vty.c16
-rw-r--r--ripd/rip_zebra.c32
-rw-r--r--ripngd/ripng_zebra.c32
-rw-r--r--zebra/zebra_routemap.c48
-rw-r--r--zebra/zebra_vty.c24
10 files changed, 146 insertions, 146 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 5dafac1e0..8ccc4e2a9 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -13813,9 +13813,9 @@ DEFUN (show_ip_bgp_instance_peer_group,
DEFUN (bgp_redistribute_ipv4,
bgp_redistribute_ipv4_cmd,
- "redistribute " QUAGGA_IP_REDIST_STR_BGPD,
+ "redistribute " FRR_IP_REDIST_STR_BGPD,
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD)
+ FRR_IP_REDIST_HELP_STR_BGPD)
{
int type;
@@ -13831,9 +13831,9 @@ DEFUN (bgp_redistribute_ipv4,
DEFUN (bgp_redistribute_ipv4_rmap,
bgp_redistribute_ipv4_rmap_cmd,
- "redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD",
+ "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -13854,9 +13854,9 @@ DEFUN (bgp_redistribute_ipv4_rmap,
DEFUN (bgp_redistribute_ipv4_metric,
bgp_redistribute_ipv4_metric_cmd,
- "redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>",
+ "redistribute " FRR_IP_REDIST_STR_BGPD " metric <0-4294967295>",
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n")
{
@@ -13879,9 +13879,9 @@ DEFUN (bgp_redistribute_ipv4_metric,
DEFUN (bgp_redistribute_ipv4_rmap_metric,
bgp_redistribute_ipv4_rmap_metric_cmd,
- "redistribute " QUAGGA_IP_REDIST_STR_BGPD " 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"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -13907,9 +13907,9 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
DEFUN (bgp_redistribute_ipv4_metric_rmap,
bgp_redistribute_ipv4_metric_rmap_cmd,
- "redistribute " QUAGGA_IP_REDIST_STR_BGPD " 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"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -14141,10 +14141,10 @@ ALIAS (no_bgp_redistribute_ipv4_ospf,
DEFUN (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_cmd,
- "no redistribute " QUAGGA_IP_REDIST_STR_BGPD,
+ "no redistribute " FRR_IP_REDIST_STR_BGPD,
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD)
+ FRR_IP_REDIST_HELP_STR_BGPD)
{
int type;
@@ -14159,28 +14159,28 @@ DEFUN (no_bgp_redistribute_ipv4,
ALIAS (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_rmap_cmd,
- "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD",
+ "no redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n")
ALIAS (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_metric_cmd,
- "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " metric <0-4294967295>",
+ "no redistribute " FRR_IP_REDIST_STR_BGPD " metric <0-4294967295>",
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n")
ALIAS (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_rmap_metric_cmd,
- "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
+ "no redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -14188,10 +14188,10 @@ ALIAS (no_bgp_redistribute_ipv4,
ALIAS (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_metric_rmap_cmd,
- "no redistribute " QUAGGA_IP_REDIST_STR_BGPD " 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"
- QUAGGA_IP_REDIST_HELP_STR_BGPD
+ FRR_IP_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -14200,9 +14200,9 @@ ALIAS (no_bgp_redistribute_ipv4,
#ifdef HAVE_IPV6
DEFUN (bgp_redistribute_ipv6,
bgp_redistribute_ipv6_cmd,
- "redistribute " QUAGGA_IP6_REDIST_STR_BGPD,
+ "redistribute " FRR_IP6_REDIST_STR_BGPD,
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD)
+ FRR_IP6_REDIST_HELP_STR_BGPD)
{
int type;
@@ -14219,9 +14219,9 @@ DEFUN (bgp_redistribute_ipv6,
DEFUN (bgp_redistribute_ipv6_rmap,
bgp_redistribute_ipv6_rmap_cmd,
- "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD",
+ "redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD",
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -14242,9 +14242,9 @@ DEFUN (bgp_redistribute_ipv6_rmap,
DEFUN (bgp_redistribute_ipv6_metric,
bgp_redistribute_ipv6_metric_cmd,
- "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
+ "redistribute " FRR_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n")
{
@@ -14267,9 +14267,9 @@ DEFUN (bgp_redistribute_ipv6_metric,
DEFUN (bgp_redistribute_ipv6_rmap_metric,
bgp_redistribute_ipv6_rmap_metric_cmd,
- "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " 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"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -14295,9 +14295,9 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric,
DEFUN (bgp_redistribute_ipv6_metric_rmap,
bgp_redistribute_ipv6_metric_rmap_cmd,
- "redistribute " QUAGGA_IP6_REDIST_STR_BGPD " 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"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -14323,10 +14323,10 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
DEFUN (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_cmd,
- "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD,
+ "no redistribute " FRR_IP6_REDIST_STR_BGPD,
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD)
+ FRR_IP6_REDIST_HELP_STR_BGPD)
{
int type;
@@ -14342,28 +14342,28 @@ DEFUN (no_bgp_redistribute_ipv6,
ALIAS (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_rmap_cmd,
- "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD",
+ "no redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD",
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n")
ALIAS (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_metric_cmd,
- "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
+ "no redistribute " FRR_IP6_REDIST_STR_BGPD " metric <0-4294967295>",
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n")
ALIAS (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_rmap_metric_cmd,
- "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
+ "no redistribute " FRR_IP6_REDIST_STR_BGPD " route-map WORD metric <0-4294967295>",
NO_STR
"Redistribute information from another routing protocol\n"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -14371,10 +14371,10 @@ ALIAS (no_bgp_redistribute_ipv6,
ALIAS (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_metric_rmap_cmd,
- "no redistribute " QUAGGA_IP6_REDIST_STR_BGPD " 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"
- QUAGGA_IP6_REDIST_HELP_STR_BGPD
+ FRR_IP6_REDIST_HELP_STR_BGPD
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index 21daaa779..8282591a4 100644
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -540,12 +540,12 @@ isis_redist_area_finish(struct isis_area *area)
DEFUN (isis_redistribute,
isis_redistribute_cmd,
- "redistribute (ipv4|ipv6) " QUAGGA_REDIST_STR_ISISD
+ "redistribute (ipv4|ipv6) " FRR_REDIST_STR_ISISD
" (level-1|level-2) {metric <0-16777215>|route-map WORD}",
REDIST_STR
"Redistribute IPv4 routes\n"
"Redistribute IPv6 routes\n"
- QUAGGA_REDIST_HELP_STR_ISISD
+ FRR_REDIST_HELP_STR_ISISD
"Redistribute into level-1\n"
"Redistribute into level-2\n"
"Metric for redistributed routes\n"
@@ -609,13 +609,13 @@ DEFUN (isis_redistribute,
DEFUN (no_isis_redistribute,
no_isis_redistribute_cmd,
- "no redistribute (ipv4|ipv6) " QUAGGA_REDIST_STR_ISISD
+ "no redistribute (ipv4|ipv6) " FRR_REDIST_STR_ISISD
" (level-1|level-2)",
NO_STR
REDIST_STR
"Redistribute IPv4 routes\n"
"Redistribute IPv6 routes\n"
- QUAGGA_REDIST_HELP_STR_ISISD
+ FRR_REDIST_HELP_STR_ISISD
"Redistribute into level-1\n"
"Redistribute into level-2\n")
{
diff --git a/lib/log.c b/lib/log.c
index f9877300b..fb9d02a30 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -20,7 +20,7 @@
* 02111-1307, USA.
*/
-#define QUAGGA_DEFINE_DESC_TABLE
+#define FRR_DEFINE_DESC_TABLE
#include <zebra.h>
diff --git a/lib/route_types.pl b/lib/route_types.pl
index d44cb12b2..ffe9bec04 100755
--- a/lib/route_types.pl
+++ b/lib/route_types.pl
@@ -86,8 +86,8 @@ printf <<EOF, $ARGV[0];
/* Auto-generated from route_types.txt by %s. */
/* Do not edit! */
-#ifndef _QUAGGA_ROUTE_TYPES_H
-#define _QUAGGA_ROUTE_TYPES_H
+#ifndef _FRR_ROUTE_TYPES_H
+#define _FRR_ROUTE_TYPES_H
/* Zebra route's' types. */
EOF
@@ -154,38 +154,38 @@ for my $daemon (sort keys %daemons) {
printf "/* %s */\n", $daemon;
if ($daemons{$daemon}->{"ipv4"} && $daemons{$daemon}->{"ipv6"}) {
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;
+ printf "#define FRR_REDIST_STR_%s \\\n %s\n", uc $daemon, $names;
+ printf "#define FRR_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;
+ printf "#define FRR_IP_REDIST_STR_%s \\\n %s\n", uc $daemon, $names;
+ printf "#define FRR_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;
+ printf "#define FRR_IP6_REDIST_STR_%s \\\n %s\n", uc $daemon, $names;
+ printf "#define FRR_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
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;
+ printf "#define FRR_IP_PROTOCOL_MAP_STR_%s \\\n %s\n", uc $daemon, $names;
+ printf "#define FRR_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;
+ printf "#define FRR_IP6_PROTOCOL_MAP_STR_%s \\\n %s\n", uc $daemon, $names;
+ printf "#define FRR_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
}
} else {
my ($names, $help) = collect($daemon,
$daemons{$daemon}->{"ipv4"}, $daemons{$daemon}->{"ipv6"}, 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;
+ printf "#define FRR_REDIST_STR_%s \\\n %s\n", uc $daemon, $names;
+ printf "#define FRR_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
}
print "\n";
}
print <<EOF;
-#ifdef QUAGGA_DEFINE_DESC_TABLE
+#ifdef FRR_DEFINE_DESC_TABLE
struct zebra_desc_table
{
@@ -208,8 +208,8 @@ print <<EOF;
};
#undef DESC_ENTRY
-#endif /* QUAGGA_DEFINE_DESC_TABLE */
+#endif /* FRR_DEFINE_DESC_TABLE */
-#endif /* _QUAGGA_ROUTE_TYPES_H */
+#endif /* _FRR_ROUTE_TYPES_H */
EOF
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index 46ea46305..7c59dece7 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -686,9 +686,9 @@ ospf6_asbr_redistribute_remove (int type, ifindex_t ifindex,
DEFUN (ospf6_redistribute,
ospf6_redistribute_cmd,
- "redistribute " QUAGGA_REDIST_STR_OSPF6D,
+ "redistribute " FRR_REDIST_STR_OSPF6D,
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_OSPF6D
+ FRR_REDIST_HELP_STR_OSPF6D
)
{
int type;
@@ -704,9 +704,9 @@ DEFUN (ospf6_redistribute,
DEFUN (ospf6_redistribute_routemap,
ospf6_redistribute_routemap_cmd,
- "redistribute " QUAGGA_REDIST_STR_OSPF6D " route-map WORD",
+ "redistribute " FRR_REDIST_STR_OSPF6D " route-map WORD",
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_OSPF6D
+ FRR_REDIST_HELP_STR_OSPF6D
"Route map reference\n"
"Route map name\n"
)
@@ -725,10 +725,10 @@ DEFUN (ospf6_redistribute_routemap,
DEFUN (no_ospf6_redistribute,
no_ospf6_redistribute_cmd,
- "no redistribute " QUAGGA_REDIST_STR_OSPF6D,
+ "no redistribute " FRR_REDIST_STR_OSPF6D,
NO_STR
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_OSPF6D
+ FRR_REDIST_HELP_STR_OSPF6D
)
{
int type;
@@ -744,10 +744,10 @@ DEFUN (no_ospf6_redistribute,
ALIAS (no_ospf6_redistribute,
no_ospf6_redistribute_route_map_cmd,
- "no redistribute " QUAGGA_REDIST_STR_OSPF6D " route-map WORD",
+ "no redistribute " FRR_REDIST_STR_OSPF6D " route-map WORD",
NO_STR
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_OSPF6D
+ FRR_REDIST_HELP_STR_OSPF6D
"Route map reference\n"
"Route map name\n")
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 4eeb5c15d..1b7c43147 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -8063,10 +8063,10 @@ ALIAS (no_ip_ospf_instance_area,
DEFUN (ospf_redistribute_source,
ospf_redistribute_source_cmd,
- "redistribute " QUAGGA_REDIST_STR_OSPFD
+ "redistribute " FRR_REDIST_STR_OSPFD
" {metric <0-16777214>|metric-type (1|2)|route-map WORD}",
REDIST_STR
- QUAGGA_REDIST_HELP_STR_OSPFD
+ FRR_REDIST_HELP_STR_OSPFD
"Metric for redistributed routes\n"
"OSPF default metric\n"
"OSPF exterior metric type for redistributed routes\n"
@@ -8117,11 +8117,11 @@ DEFUN (ospf_redistribute_source,
DEFUN (no_ospf_redistribute_source,
no_ospf_redistribute_source_cmd,
- "no redistribute " QUAGGA_REDIST_STR_OSPFD
+ "no redistribute " FRR_REDIST_STR_OSPFD
" {metric <0-16777214>|metric-type (1|2)|route-map WORD}",
NO_STR
REDIST_STR
- QUAGGA_REDIST_HELP_STR_OSPFD
+ FRR_REDIST_HELP_STR_OSPFD
"Metric for redistributed routes\n"
"OSPF default metric\n"
"OSPF exterior metric type for redistributed routes\n"
@@ -8273,11 +8273,11 @@ DEFUN (no_ospf_redistribute_instance_source,
DEFUN (ospf_distribute_list_out,
ospf_distribute_list_out_cmd,
- "distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD,
+ "distribute-list WORD out " FRR_REDIST_STR_OSPFD,
"Filter networks in routing updates\n"
"Access-list name\n"
OUT_STR
- QUAGGA_REDIST_HELP_STR_OSPFD)
+ FRR_REDIST_HELP_STR_OSPFD)
{
struct ospf *ospf = vty->index;
int source;
@@ -8295,12 +8295,12 @@ DEFUN (ospf_distribute_list_out,
DEFUN (no_ospf_distribute_list_out,
no_ospf_distribute_list_out_cmd,
- "no distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD,
+ "no distribute-list WORD out " FRR_REDIST_STR_OSPFD,
NO_STR
"Filter networks in routing updates\n"
"Access-list name\n"
OUT_STR
- QUAGGA_REDIST_HELP_STR_OSPFD)
+ FRR_REDIST_HELP_STR_OSPFD)
{
struct ospf *ospf = vty->index;
int source;
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 3f7c7a3e4..44fc1cd8f 100644
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -371,9 +371,9 @@ DEFUN (no_rip_redistribute_rip,
DEFUN (rip_redistribute_type,
rip_redistribute_type_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPD,
+ "redistribute " FRR_REDIST_STR_RIPD,
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD)
+ FRR_REDIST_HELP_STR_RIPD)
{
int i;
@@ -396,10 +396,10 @@ DEFUN (rip_redistribute_type,
DEFUN (no_rip_redistribute_type,
no_rip_redistribute_type_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPD,
+ "no redistribute " FRR_REDIST_STR_RIPD,
NO_STR
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD)
+ FRR_REDIST_HELP_STR_RIPD)
{
int i;
@@ -423,9 +423,9 @@ DEFUN (no_rip_redistribute_type,
DEFUN (rip_redistribute_type_routemap,
rip_redistribute_type_routemap_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPD " route-map WORD",
+ "redistribute " FRR_REDIST_STR_RIPD " route-map WORD",
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD
+ FRR_REDIST_HELP_STR_RIPD
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -450,10 +450,10 @@ DEFUN (rip_redistribute_type_routemap,
DEFUN (no_rip_redistribute_type_routemap,
no_rip_redistribute_type_routemap_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPD " route-map WORD",
+ "no redistribute " FRR_REDIST_STR_RIPD " route-map WORD",
NO_STR
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD
+ FRR_REDIST_HELP_STR_RIPD
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -479,9 +479,9 @@ DEFUN (no_rip_redistribute_type_routemap,
DEFUN (rip_redistribute_type_metric,
rip_redistribute_type_metric_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16>",
+ "redistribute " FRR_REDIST_STR_RIPD " metric <0-16>",
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD
+ FRR_REDIST_HELP_STR_RIPD
"Metric\n"
"Metric value\n")
{
@@ -509,10 +509,10 @@ DEFUN (rip_redistribute_type_metric,
DEFUN (no_rip_redistribute_type_metric,
no_rip_redistribute_type_metric_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16>",
+ "no redistribute " FRR_REDIST_STR_RIPD " metric <0-16>",
NO_STR
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD
+ FRR_REDIST_HELP_STR_RIPD
"Metric\n"
"Metric value\n")
{
@@ -538,9 +538,9 @@ DEFUN (no_rip_redistribute_type_metric,
DEFUN (rip_redistribute_type_metric_routemap,
rip_redistribute_type_metric_routemap_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPD " metric <0-16> route-map WORD",
+ "redistribute " FRR_REDIST_STR_RIPD " metric <0-16> route-map WORD",
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD
+ FRR_REDIST_HELP_STR_RIPD
"Metric\n"
"Metric value\n"
"Route map reference\n"
@@ -572,11 +572,11 @@ DEFUN (rip_redistribute_type_metric_routemap,
DEFUN (no_rip_redistribute_type_metric_routemap,
no_rip_redistribute_type_metric_routemap_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPD
+ "no redistribute " FRR_REDIST_STR_RIPD
" metric <0-16> route-map WORD",
NO_STR
REDIST_STR
- QUAGGA_REDIST_HELP_STR_RIPD
+ FRR_REDIST_HELP_STR_RIPD
"Metric\n"
"Metric value\n"
"Route map reference\n"
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index d05b5dbad..67337caf2 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -339,9 +339,9 @@ DEFUN (no_ripng_redistribute_ripng,
DEFUN (ripng_redistribute_type,
ripng_redistribute_type_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPNGD,
+ "redistribute " FRR_REDIST_STR_RIPNGD,
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD)
+ FRR_REDIST_HELP_STR_RIPNGD)
{
int type;
@@ -359,10 +359,10 @@ DEFUN (ripng_redistribute_type,
DEFUN (no_ripng_redistribute_type,
no_ripng_redistribute_type_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPNGD,
+ "no redistribute " FRR_REDIST_STR_RIPNGD,
NO_STR
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD)
+ FRR_REDIST_HELP_STR_RIPNGD)
{
int type;
@@ -382,9 +382,9 @@ DEFUN (no_ripng_redistribute_type,
DEFUN (ripng_redistribute_type_metric,
ripng_redistribute_type_metric_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>",
+ "redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16>",
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD
+ FRR_REDIST_HELP_STR_RIPNGD
"Metric\n"
"Metric value\n")
{
@@ -408,18 +408,18 @@ DEFUN (ripng_redistribute_type_metric,
ALIAS (no_ripng_redistribute_type,
no_ripng_redistribute_type_metric_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16>",
+ "no redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16>",
NO_STR
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD
+ FRR_REDIST_HELP_STR_RIPNGD
"Metric\n"
"Metric value\n")
DEFUN (ripng_redistribute_type_routemap,
ripng_redistribute_type_routemap_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD",
+ "redistribute " FRR_REDIST_STR_RIPNGD " route-map WORD",
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD
+ FRR_REDIST_HELP_STR_RIPNGD
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -441,18 +441,18 @@ DEFUN (ripng_redistribute_type_routemap,
ALIAS (no_ripng_redistribute_type,
no_ripng_redistribute_type_routemap_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPNGD " route-map WORD",
+ "no redistribute " FRR_REDIST_STR_RIPNGD " route-map WORD",
NO_STR
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD
+ FRR_REDIST_HELP_STR_RIPNGD
"Route map reference\n"
"Pointer to route-map entries\n")
DEFUN (ripng_redistribute_type_metric_routemap,
ripng_redistribute_type_metric_routemap_cmd,
- "redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
+ "redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD
+ FRR_REDIST_HELP_STR_RIPNGD
"Metric\n"
"Metric value\n"
"Route map reference\n"
@@ -478,10 +478,10 @@ DEFUN (ripng_redistribute_type_metric_routemap,
ALIAS (no_ripng_redistribute_type,
no_ripng_redistribute_type_metric_routemap_cmd,
- "no redistribute " QUAGGA_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
+ "no redistribute " FRR_REDIST_STR_RIPNGD " metric <0-16> route-map WORD",
NO_STR
"Redistribute\n"
- QUAGGA_REDIST_HELP_STR_RIPNGD
+ FRR_REDIST_HELP_STR_RIPNGD
"Route map reference\n"
"Pointer to route-map entries\n")
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 3075a61c4..041f67826 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 84106e7ff..98c20270c 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;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 05:23:49 +0100