*: rename all instances of OSPFv6 to OSPF6 or OSPFv3

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/lib/route_types.txt b/lib/route_types.txt
index 8fc3092cacc465444bd844c3837e798fb627f44a..42f3b8f3244a291d3ed675effdffcb531d48e64b 100644 (file)
--- a/lib/route_types.txt
+++ b/lib/route_types.txt
@@ -48,7 +48,7 @@ ZEBRA_ROUTE_STATIC,     static,    zebra,  'S', 1, 1, "static"
 ZEBRA_ROUTE_RIP,        rip,       ripd,   'R', 1, 0, "RIP"
 ZEBRA_ROUTE_RIPNG,      ripng,     ripngd, 'R', 0, 1, "RIPng"
 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_BGP,        bgp,       bgpd,   'B', 1, 1, "BGP"
 ZEBRA_ROUTE_PIM,       pim,       pimd,   'P', 1, 0, "PIM"

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

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 3d65afc0353a5ec8ddecceb160a7794d859d76c8..17c701f10f06344158b173a2fe661327a7963584 100644 (file)
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -1685,7 +1685,7 @@ DEFUN (ipv6_ospf6_network,
        IP6_STR
        OSPF6_STR
        "Network Type\n"
-       "Specify OSPFv6 broadcast network\n"
+       "Specify OSPF6 broadcast network\n"
        "Specify OSPF6 point-to-point network\n"
        )
 {

diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index ccffa131a63ee89fd61c24639adc7e7c6d70c7d1..48b6cb949a44e8922dbca9f2b167d40984da2a24 100644 (file)
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -864,7 +864,7 @@ config_write_ospf6 (struct vty *vty)
   struct ospf6_area *oa;
   struct ospf6_interface *oi;
 
-  /* OSPFv6 configuration. */
+  /* OSPFv3 configuration. */
   if (ospf6 == NULL)
     return CMD_SUCCESS;
 

diff --git a/ospfd/ospf_te.h b/ospfd/ospf_te.h
index 8bb77c40c578336f6caf80e95a2a40a5cc90096e..36f2d8241cc753d9d7c848be0b3249f1a09501bc 100644 (file)
--- a/ospfd/ospf_te.h
+++ b/ospfd/ospf_te.h
@@ -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 */
 /* SUBTLV 14-16 (RFC4203) are 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 */
 /* Remote AS Number sub-TLV */