[ospfd] Replace redistribution strings with new route_types.h defines.

2006-05-23 Paul Jakma <paul.jakma@sun.com>

	* ospf_vty.c: (general) Replace in-place route redistribution
	  command and help strings with the new auto-generated defines
	  from lib/route_types.h
This commit is contained in:
Paul Jakma 2006-06-27 08:01:43 +00:00
parent 9c42a6ebbc
commit d1c65c211c
2 changed files with 49 additions and 89 deletions

View File

@ -57,6 +57,12 @@
received on unenabled interfaces should be conditional on received on unenabled interfaces should be conditional on
debug being set. debug being set.
2006-05-23 Paul Jakma <paul.jakma@sun.com>
* ospf_vty.c: (general) Replace in-place route redistribution
command and help strings with the new auto-generated defines
from lib/route_types.h
2006-05-13 Paul Jakma <paul.jakma@sun.com> 2006-05-13 Paul Jakma <paul.jakma@sun.com>
* ospf_lsa.c: (ospf_translated_nssa_refresh) fix the sanity * ospf_lsa.c: (ospf_translated_nssa_refresh) fix the sanity

View File

@ -5562,13 +5562,10 @@ ALIAS (no_ip_ospf_transmit_delay,
DEFUN (ospf_redistribute_source_metric_type, DEFUN (ospf_redistribute_source_metric_type,
ospf_redistribute_source_metric_type_routemap_cmd, ospf_redistribute_source_metric_type_routemap_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> metric-type (1|2) route-map WORD", "redistribute " QUAGGA_REDIST_STR_OSPFD
"Redistribute information from another routing protocol\n" " metric <0-16777214> metric-type (1|2) route-map WORD",
"Kernel routes\n" REDIST_STR
"Connected\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"Metric for redistributed routes\n" "Metric for redistributed routes\n"
"OSPF default metric\n" "OSPF default metric\n"
"OSPF exterior metric type for redistributed routes\n" "OSPF exterior metric type for redistributed routes\n"
@ -5606,13 +5603,10 @@ DEFUN (ospf_redistribute_source_metric_type,
ALIAS (ospf_redistribute_source_metric_type, ALIAS (ospf_redistribute_source_metric_type,
ospf_redistribute_source_metric_type_cmd, ospf_redistribute_source_metric_type_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> metric-type (1|2)", "redistribute " QUAGGA_REDIST_STR_OSPFD
"Redistribute information from another routing protocol\n" " metric <0-16777214> metric-type (1|2)",
"Kernel routes\n" REDIST_STR
"Connected\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"Metric for redistributed routes\n" "Metric for redistributed routes\n"
"OSPF default metric\n" "OSPF default metric\n"
"OSPF exterior metric type for redistributed routes\n" "OSPF exterior metric type for redistributed routes\n"
@ -5621,25 +5615,18 @@ ALIAS (ospf_redistribute_source_metric_type,
ALIAS (ospf_redistribute_source_metric_type, ALIAS (ospf_redistribute_source_metric_type,
ospf_redistribute_source_metric_cmd, ospf_redistribute_source_metric_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric <0-16777214>", "redistribute " QUAGGA_REDIST_STR_OSPFD " metric <0-16777214>",
"Redistribute information from another routing protocol\n" REDIST_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"Metric for redistributed routes\n" "Metric for redistributed routes\n"
"OSPF default metric\n") "OSPF default metric\n")
DEFUN (ospf_redistribute_source_type_metric, DEFUN (ospf_redistribute_source_type_metric,
ospf_redistribute_source_type_metric_routemap_cmd, ospf_redistribute_source_type_metric_routemap_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) metric <0-16777214> route-map WORD", "redistribute " QUAGGA_REDIST_STR_OSPFD
"Redistribute information from another routing protocol\n" " metric-type (1|2) metric <0-16777214> route-map WORD",
"Kernel routes\n" REDIST_STR
"Connected\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"OSPF exterior metric type for redistributed routes\n" "OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n" "Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n" "Set OSPF External Type 2 metrics\n"
@ -5677,13 +5664,10 @@ DEFUN (ospf_redistribute_source_type_metric,
ALIAS (ospf_redistribute_source_type_metric, ALIAS (ospf_redistribute_source_type_metric,
ospf_redistribute_source_type_metric_cmd, ospf_redistribute_source_type_metric_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) metric <0-16777214>", "redistribute " QUAGGA_REDIST_STR_OSPFD
"Redistribute information from another routing protocol\n" " metric-type (1|2) metric <0-16777214>",
"Kernel routes\n" REDIST_STR
"Connected\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"OSPF exterior metric type for redistributed routes\n" "OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n" "Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n" "Set OSPF External Type 2 metrics\n"
@ -5692,36 +5676,25 @@ ALIAS (ospf_redistribute_source_type_metric,
ALIAS (ospf_redistribute_source_type_metric, ALIAS (ospf_redistribute_source_type_metric,
ospf_redistribute_source_type_cmd, ospf_redistribute_source_type_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric-type (1|2)", "redistribute " QUAGGA_REDIST_STR_OSPFD " metric-type (1|2)",
"Redistribute information from another routing protocol\n" REDIST_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"OSPF exterior metric type for redistributed routes\n" "OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n" "Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n") "Set OSPF External Type 2 metrics\n")
ALIAS (ospf_redistribute_source_type_metric, ALIAS (ospf_redistribute_source_type_metric,
ospf_redistribute_source_cmd, ospf_redistribute_source_cmd,
"redistribute (kernel|connected|static|rip|bgp)", "redistribute " QUAGGA_REDIST_STR_OSPFD,
"Redistribute information from another routing protocol\n" REDIST_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD)
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n")
DEFUN (ospf_redistribute_source_metric_routemap, DEFUN (ospf_redistribute_source_metric_routemap,
ospf_redistribute_source_metric_routemap_cmd, ospf_redistribute_source_metric_routemap_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric <0-16777214> route-map WORD", "redistribute " QUAGGA_REDIST_STR_OSPFD
"Redistribute information from another routing protocol\n" " metric <0-16777214> route-map WORD",
"Kernel routes\n" REDIST_STR
"Connected\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"Metric for redistributed routes\n" "Metric for redistributed routes\n"
"OSPF default metric\n" "OSPF default metric\n"
"Route map reference\n" "Route map reference\n"
@ -5750,13 +5723,10 @@ DEFUN (ospf_redistribute_source_metric_routemap,
DEFUN (ospf_redistribute_source_type_routemap, DEFUN (ospf_redistribute_source_type_routemap,
ospf_redistribute_source_type_routemap_cmd, ospf_redistribute_source_type_routemap_cmd,
"redistribute (kernel|connected|static|rip|bgp) metric-type (1|2) route-map WORD", "redistribute " QUAGGA_REDIST_STR_OSPFD
"Redistribute information from another routing protocol\n" " metric-type (1|2) route-map WORD",
"Kernel routes\n" REDIST_STR
"Connected\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"OSPF exterior metric type for redistributed routes\n" "OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n" "Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n" "Set OSPF External Type 2 metrics\n"
@ -5786,13 +5756,9 @@ DEFUN (ospf_redistribute_source_type_routemap,
DEFUN (ospf_redistribute_source_routemap, DEFUN (ospf_redistribute_source_routemap,
ospf_redistribute_source_routemap_cmd, ospf_redistribute_source_routemap_cmd,
"redistribute (kernel|connected|static|rip|bgp) route-map WORD", "redistribute " QUAGGA_REDIST_STR_OSPFD " route-map WORD",
"Redistribute information from another routing protocol\n" REDIST_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"Route map reference\n" "Route map reference\n"
"Pointer to route-map entries\n") "Pointer to route-map entries\n")
{ {
@ -5813,14 +5779,10 @@ DEFUN (ospf_redistribute_source_routemap,
DEFUN (no_ospf_redistribute_source, DEFUN (no_ospf_redistribute_source,
no_ospf_redistribute_source_cmd, no_ospf_redistribute_source_cmd,
"no redistribute (kernel|connected|static|rip|bgp)", "no redistribute " QUAGGA_REDIST_STR_OSPFD,
NO_STR NO_STR
"Redistribute information from another routing protocol\n" REDIST_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD)
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n")
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
int source; int source;
@ -5834,15 +5796,11 @@ DEFUN (no_ospf_redistribute_source,
DEFUN (ospf_distribute_list_out, DEFUN (ospf_distribute_list_out,
ospf_distribute_list_out_cmd, ospf_distribute_list_out_cmd,
"distribute-list WORD out (kernel|connected|static|rip|bgp)", "distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD,
"Filter networks in routing updates\n" "Filter networks in routing updates\n"
"Access-list name\n" "Access-list name\n"
OUT_STR OUT_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD)
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n")
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
int source; int source;
@ -5856,16 +5814,12 @@ DEFUN (ospf_distribute_list_out,
DEFUN (no_ospf_distribute_list_out, DEFUN (no_ospf_distribute_list_out,
no_ospf_distribute_list_out_cmd, no_ospf_distribute_list_out_cmd,
"no distribute-list WORD out (kernel|connected|static|rip|bgp)", "no distribute-list WORD out " QUAGGA_REDIST_STR_OSPFD,
NO_STR NO_STR
"Filter networks in routing updates\n" "Filter networks in routing updates\n"
"Access-list name\n" "Access-list name\n"
OUT_STR OUT_STR
"Kernel routes\n" QUAGGA_REDIST_HELP_STR_OSPFD)
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n")
{ {
struct ospf *ospf = vty->index; struct ospf *ospf = vty->index;
int source; int source;