proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 14:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: rename all instances of OSPFv6 to OSPF6 or OSPFv3

Browse Source 
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2016-10-12 21:20:15 -03:00 committed by Quentin Young
parent d2aaa2e556
commit b2d4d0393a
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/route_types.txt
View File

@ -48,7 +48,7 @@ ZEBRA_ROUTE_STATIC, static, zebra, 'S', 1, 1, "static"
ZEBRA_ROUTE_RIP, rip, ripd, 'R', 1, 0, "RIP" ZEBRA_ROUTE_RIP, rip, ripd, 'R', 1, 0, "RIP"
ZEBRA_ROUTE_RIPNG, ripng, ripngd, 'R', 0, 1, "RIPng" ZEBRA_ROUTE_RIPNG, ripng, ripngd, 'R', 0, 1, "RIPng"
ZEBRA_ROUTE_OSPF, ospf, ospfd, 'O', 1, 0, "OSPF" ZEBRA_ROUTE_OSPF, ospf, ospfd, 'O', 1, 0, "OSPF"
ZEBRA_ROUTE_OSPF6, ospf6, ospf6d, 'O', 0, 1, "OSPFv6" ZEBRA_ROUTE_OSPF6, ospf6, ospf6d, 'O', 0, 1, "OSPFv3"
ZEBRA_ROUTE_ISIS, isis, isisd, 'I', 1, 1, "IS-IS" ZEBRA_ROUTE_ISIS, isis, isisd, 'I', 1, 1, "IS-IS"
ZEBRA_ROUTE_BGP, bgp, bgpd, 'B', 1, 1, "BGP" ZEBRA_ROUTE_BGP, bgp, bgpd, 'B', 1, 1, "BGP"
ZEBRA_ROUTE_PIM, pim, pimd, 'P', 1, 0, "PIM" ZEBRA_ROUTE_PIM, pim, pimd, 'P', 1, 0, "PIM"

32
ospf6d/ospf6_area.c
View File

@ -617,10 +617,10 @@ ospf6_area_config_write (struct vty *vty)
DEFUN (area_filter_list, DEFUN (area_filter_list,
area_filter_list_cmd, area_filter_list_cmd,
"area A.B.C.D filter-list prefix WORD <in|out>", "area A.B.C.D filter-list prefix WORD <in|out>",
"OSPFv6 area parameters\n" "OSPF6 area parameters\n"
"OSPFv6 area ID in IP address format\n" "OSPF6 area ID in IP address format\n"
"Filter networks between OSPFv6 areas\n" "Filter networks between OSPF6 areas\n"
"Filter prefixes between OSPFv6 areas\n" "Filter prefixes between OSPF6 areas\n"
"Name of an IPv6 prefix-list\n" "Name of an IPv6 prefix-list\n"
"Filter networks sent to this area\n" "Filter networks sent to this area\n"
"Filter networks sent from this area\n") "Filter networks sent from this area\n")
@ -659,10 +659,10 @@ DEFUN (no_area_filter_list,
no_area_filter_list_cmd, no_area_filter_list_cmd,
"no area A.B.C.D filter-list prefix WORD <in|out>", "no area A.B.C.D filter-list prefix WORD <in|out>",
NO_STR NO_STR
"OSPFv6 area parameters\n" "OSPF6 area parameters\n"
"OSPFv6 area ID in IP address format\n" "OSPF6 area ID in IP address format\n"
"Filter networks between OSPFv6 areas\n" "Filter networks between OSPF6 areas\n"
"Filter prefixes between OSPFv6 areas\n" "Filter prefixes between OSPF6 areas\n"
"Name of an IPv6 prefix-list\n" "Name of an IPv6 prefix-list\n"
"Filter networks sent to this area\n" "Filter networks sent to this area\n"
"Filter networks sent from this area\n") "Filter networks sent from this area\n")
@ -706,8 +706,8 @@ DEFUN (no_area_filter_list,
DEFUN (area_import_list, DEFUN (area_import_list,
area_import_list_cmd, area_import_list_cmd,
"area A.B.C.D import-list NAME", "area A.B.C.D import-list NAME",
"OSPFv6 area parameters\n" "OSPF6 area parameters\n"
"OSPFv6 area ID in IP address format\n" "OSPF6 area ID in IP address format\n"
"Set the filter for networks from other areas announced to the specified one\n" "Set the filter for networks from other areas announced to the specified one\n"
"Name of the acess-list\n") "Name of the acess-list\n")
{ {
@ -734,8 +734,8 @@ DEFUN (area_import_list,
DEFUN (no_area_import_list, DEFUN (no_area_import_list,
no_area_import_list_cmd, no_area_import_list_cmd,
"no area A.B.C.D import-list NAME", "no area A.B.C.D import-list NAME",
"OSPFv6 area parameters\n" "OSPF6 area parameters\n"
"OSPFv6 area ID in IP address format\n" "OSPF6 area ID in IP address format\n"
"Unset the filter for networks announced to other areas\n" "Unset the filter for networks announced to other areas\n"
"NAme of the access-list\n") "NAme of the access-list\n")
{ {
@ -758,8 +758,8 @@ DEFUN (no_area_import_list,
DEFUN (area_export_list, DEFUN (area_export_list,
area_export_list_cmd, area_export_list_cmd,
"area A.B.C.D export-list NAME", "area A.B.C.D export-list NAME",
"OSPFv6 area parameters\n" "OSPF6 area parameters\n"
"OSPFv6 area ID in IP address format\n" "OSPF6 area ID in IP address format\n"
"Set the filter for networks announced to other areas\n" "Set the filter for networks announced to other areas\n"
"Name of the acess-list\n") "Name of the acess-list\n")
{ {
@ -786,8 +786,8 @@ DEFUN (area_export_list,
DEFUN (no_area_export_list, DEFUN (no_area_export_list,
no_area_export_list_cmd, no_area_export_list_cmd,
"no area A.B.C.D export-list NAME", "no area A.B.C.D export-list NAME",
"OSPFv6 area parameters\n" "OSPF6 area parameters\n"
"OSPFv6 area ID in IP address format\n" "OSPF6 area ID in IP address format\n"
"Unset the filter for networks announced to other areas\n" "Unset the filter for networks announced to other areas\n"
"Name of the access-list\n") "Name of the access-list\n")
{ {

2
ospf6d/ospf6_interface.c
View File

@ -1685,7 +1685,7 @@ DEFUN (ipv6_ospf6_network,
IP6_STR IP6_STR
OSPF6_STR OSPF6_STR
"Network Type\n" "Network Type\n"
"Specify OSPFv6 broadcast network\n" "Specify OSPF6 broadcast network\n"
"Specify OSPF6 point-to-point network\n" "Specify OSPF6 point-to-point network\n"
) )
{ {

2
ospf6d/ospf6_top.c
View File

@ -864,7 +864,7 @@ config_write_ospf6 (struct vty *vty)
struct ospf6_area *oa; struct ospf6_area *oa;
struct ospf6_interface *oi; struct ospf6_interface *oi;
/* OSPFv6 configuration. */ /* OSPFv3 configuration. */
if (ospf6 == NULL) if (ospf6 == NULL)
return CMD_SUCCESS; return CMD_SUCCESS;

2
ospfd/ospf_te.h
View File

@ -253,7 +253,7 @@ struct te_link_subtlv_llri
/* Inter-RA Export Upward sub-TLV (12) and Inter-RA Export Downward sub-TLV (13) (RFC6827bis) are not yet supported */ /* Inter-RA Export Upward sub-TLV (12) and Inter-RA Export Downward sub-TLV (13) (RFC6827bis) are not yet supported */
/* SUBTLV 14-16 (RFC4203) are not yet supported */ /* SUBTLV 14-16 (RFC4203) are not yet supported */
/* Bandwidth Constraints sub-TLV (17) (RFC4124) is not yet supported */ /* Bandwidth Constraints sub-TLV (17) (RFC4124) is not yet supported */
/* SUBLV 18-20 are for OSPFv6 TE (RFC5329). see ospf6d */ /* SUBLV 18-20 are for OSPFv3 TE (RFC5329). see ospf6d */
/* For RFC 5392 */ /* For RFC 5392 */
/* Remote AS Number sub-TLV */ /* Remote AS Number sub-TLV */