summaryrefslogtreecommitdiffstats
path: root/ospf6d
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2021-01-28 19:34:55 +0100
committerDonald Sharp <sharpd@nvidia.com>2021-01-28 19:34:55 +0100
commit8b365264759bf59b09653eaf89c5dd154c7c41e3 (patch)
tree7927a3f75f522022e379235d11dd233b7fdec743 /ospf6d
parentospfd: Remove #if 0 code (diff)
downloadfrr-8b365264759bf59b09653eaf89c5dd154c7c41e3.tar.xz
frr-8b365264759bf59b09653eaf89c5dd154c7c41e3.zip
ospf6d: Remove #if 0 code that has not been used in a long time
The earliest that some of this code is 2018. There is not much point in keeping this code around. Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ospf6d')
-rw-r--r--ospf6d/ospf6_abr.c13
-rw-r--r--ospf6d/ospf6_flood.c12
-rw-r--r--ospf6d/ospf6_top.c93
3 files changed, 0 insertions, 118 deletions
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index eee98275e..7bd51138b 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -160,35 +160,22 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
&& route->type != OSPF6_DEST_TYPE_RANGE
&& ((route->type != OSPF6_DEST_TYPE_ROUTER)
|| !CHECK_FLAG(route->path.router_bits, OSPF6_ROUTER_BIT_E))) {
-#if 0
- zlog_debug(
- "Route type is none of network, range nor ASBR, ignore");
-#endif
return 0;
}
/* AS External routes are never considered */
if (route->path.type == OSPF6_PATH_TYPE_EXTERNAL1
|| route->path.type == OSPF6_PATH_TYPE_EXTERNAL2) {
-#if 0
- zlog_debug("Path type is external, skip");
-#endif
return 0;
}
/* do not generate if the path's area is the same as target area */
if (route->path.area_id == area->area_id) {
-#if 0
- zlog_debug("The route is in the area itself, ignore");
-#endif
return 0;
}
/* do not generate if the nexthops belongs to the target area */
if (ospf6_abr_nexthops_belong_to_area(route, area)) {
-#if 0
- zlog_debug("The route's nexthop is in the same area, ignore");
-#endif
return 0;
}
diff --git a/ospf6d/ospf6_flood.c b/ospf6d/ospf6_flood.c
index 0662cfd68..2d896546f 100644
--- a/ospf6d/ospf6_flood.c
+++ b/ospf6d/ospf6_flood.c
@@ -452,12 +452,6 @@ void ospf6_flood_area(struct ospf6_neighbor *from, struct ospf6_lsa *lsa,
&& oi != OSPF6_INTERFACE(lsa->lsdb->data))
continue;
-#if 0
- if (OSPF6_LSA_SCOPE (lsa->header->type) == OSPF6_SCOPE_AS &&
- ospf6_is_interface_virtual_link (oi))
- continue;
-#endif /*0*/
-
ospf6_flood_interface(from, lsa, oi);
}
}
@@ -527,12 +521,6 @@ static void ospf6_flood_clear_area(struct ospf6_lsa *lsa, struct ospf6_area *oa)
&& oi != OSPF6_INTERFACE(lsa->lsdb->data))
continue;
-#if 0
- if (OSPF6_LSA_SCOPE (lsa->header->type) == OSPF6_SCOPE_AS &&
- ospf6_is_interface_virtual_link (oi))
- continue;
-#endif /*0*/
-
ospf6_flood_clear_interface(lsa, oi);
}
}
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 7b4ed84d5..4a3697ed3 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -718,39 +718,6 @@ DEFUN (no_ospf6_distance_ospf6,
return CMD_SUCCESS;
}
-#if 0
-DEFUN (ospf6_distance_source,
- ospf6_distance_source_cmd,
- "distance (1-255) X:X::X:X/M [WORD]",
- "Administrative distance\n"
- "Distance value\n"
- "IP source prefix\n"
- "Access list name\n")
-{
- VTY_DECLVAR_CONTEXT(ospf6, o);
- char *alname = (argc == 4) ? argv[3]->arg : NULL;
- ospf6_distance_set (vty, o, argv[1]->arg, argv[2]->arg, alname);
-
- return CMD_SUCCESS;
-}
-
-DEFUN (no_ospf6_distance_source,
- no_ospf6_distance_source_cmd,
- "no distance (1-255) X:X::X:X/M [WORD]",
- NO_STR
- "Administrative distance\n"
- "Distance value\n"
- "IP source prefix\n"
- "Access list name\n")
-{
- VTY_DECLVAR_CONTEXT(ospf6, o);
- char *alname = (argc == 5) ? argv[4]->arg : NULL;
- ospf6_distance_unset (vty, o, argv[2]->arg, argv[3]->arg, alname);
-
- return CMD_SUCCESS;
-}
-#endif
-
DEFUN (ospf6_interface_area,
ospf6_interface_area_cmd,
"interface IFNAME area <A.B.C.D|(0-4294967295)>",
@@ -911,55 +878,6 @@ DEFUN (no_ospf6_stub_router_admin,
return CMD_SUCCESS;
}
-#if 0
-DEFUN (ospf6_stub_router_startup,
- ospf6_stub_router_startup_cmd,
- "stub-router on-startup (5-86400)",
- "Make router a stub router\n"
- "Advertise inability to be a transit router\n"
- "Automatically advertise as stub-router on startup of OSPF6\n"
- "Time (seconds) to advertise self as stub-router\n")
-{
- return CMD_SUCCESS;
-}
-
-DEFUN (no_ospf6_stub_router_startup,
- no_ospf6_stub_router_startup_cmd,
- "no stub-router on-startup",
- NO_STR
- "Make router a stub router\n"
- "Advertise inability to be a transit router\n"
- "Automatically advertise as stub-router on startup of OSPF6\n"
- "Time (seconds) to advertise self as stub-router\n")
-{
- return CMD_SUCCESS;
-}
-
-DEFUN (ospf6_stub_router_shutdown,
- ospf6_stub_router_shutdown_cmd,
- "stub-router on-shutdown (5-86400)",
- "Make router a stub router\n"
- "Advertise inability to be a transit router\n"
- "Automatically advertise as stub-router before shutdown\n"
- "Time (seconds) to advertise self as stub-router\n")
-{
- return CMD_SUCCESS;
-}
-
-DEFUN (no_ospf6_stub_router_shutdown,
- no_ospf6_stub_router_shutdown_cmd,
- "no stub-router on-shutdown",
- NO_STR
- "Make router a stub router\n"
- "Advertise inability to be a transit router\n"
- "Automatically advertise as stub-router before shutdown\n"
- "Time (seconds) to advertise self as stub-router\n")
-{
- return CMD_SUCCESS;
-}
-#endif
-
-
static void ospf6_show(struct vty *vty, struct ospf6 *o, json_object *json,
bool use_json)
{
@@ -1390,20 +1308,9 @@ void ospf6_top_init(void)
install_element(OSPF6_NODE, &no_ospf6_interface_area_cmd);
install_element(OSPF6_NODE, &ospf6_stub_router_admin_cmd);
install_element(OSPF6_NODE, &no_ospf6_stub_router_admin_cmd);
-/* For a later time */
-#if 0
- install_element (OSPF6_NODE, &ospf6_stub_router_startup_cmd);
- install_element (OSPF6_NODE, &no_ospf6_stub_router_startup_cmd);
- install_element (OSPF6_NODE, &ospf6_stub_router_shutdown_cmd);
- install_element (OSPF6_NODE, &no_ospf6_stub_router_shutdown_cmd);
-#endif
install_element(OSPF6_NODE, &ospf6_distance_cmd);
install_element(OSPF6_NODE, &no_ospf6_distance_cmd);
install_element(OSPF6_NODE, &ospf6_distance_ospf6_cmd);
install_element(OSPF6_NODE, &no_ospf6_distance_ospf6_cmd);
-#if 0
- install_element (OSPF6_NODE, &ospf6_distance_source_cmd);
- install_element (OSPF6_NODE, &no_ospf6_distance_source_cmd);
-#endif
}