Merge svn revision 981 from Zebra cvs.

1 files changed, 0 insertions, 440 deletions

diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index 78d70a2bd..de28cb9b2 100644
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -428,211 +428,6 @@ ospf6_area_config_write (struct vty *vty)
     }
 }
 
-DEFUN (show_ipv6_ospf6_area_route_intra,
-       show_ipv6_ospf6_area_route_intra_cmd,
-       "show ipv6 ospf6 area A.B.C.D route intra-area",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       )
-{
-  struct ospf6_area *oa;
-  OSPF6_CMD_AREA_LOOKUP (argv[0], oa);
-  argc--;
-  argv++;
-  return ospf6_route_table_show (vty, argc, argv, oa->route_table);
-}
-
-ALIAS (show_ipv6_ospf6_area_route_intra,
-       show_ipv6_ospf6_area_route_intra_detail_cmd,
-       "show ipv6 ospf6 area A.B.C.D route intra-area (X::X|X::X/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       "Specify IPv6 address\n"
-       "Specify IPv6 prefix\n"
-       "Detailed information\n"
-       );
-
-DEFUN (show_ipv6_ospf6_area_route_intra_match,
-       show_ipv6_ospf6_area_route_intra_match_cmd,
-       "show ipv6 ospf6 area A.B.C.D route intra-area X::X/M match",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       "Specify IPv6 prefix\n"
-       "Display routes which match the specified route\n"
-       )
-{
-  char *sargv[CMD_ARGC_MAX];
-  int i, sargc;
-  struct ospf6_area *oa;
-
-  OSPF6_CMD_AREA_LOOKUP (argv[0], oa);
-  argc--;
-  argv++;
-
-  /* copy argv to sargv and then append "match" */
-  for (i = 0; i < argc; i++)
-    sargv[i] = argv[i];
-  sargc = argc;
-  sargv[sargc++] = "match";
-  sargv[sargc] = NULL;
-
-  return ospf6_route_table_show (vty, sargc, sargv, oa->route_table);
-}
-
-DEFUN (show_ipv6_ospf6_area_route_intra_match_detail,
-       show_ipv6_ospf6_area_route_intra_match_detail_cmd,
-       "show ipv6 ospf6 area A.B.C.D route intra-area X::X/M match detail",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       "Specify IPv6 prefix\n"
-       "Display routes which match the specified route\n"
-       "Detailed information\n"
-       )
-{
-  char *sargv[CMD_ARGC_MAX];
-  int i, sargc;
-  struct ospf6_area *oa;
-
-  OSPF6_CMD_AREA_LOOKUP (argv[0], oa);
-  argc--;
-  argv++;
-
-  /* copy argv to sargv and then append "match" and "detail" */
-  for (i = 0; i < argc; i++)
-    sargv[i] = argv[i];
-  sargc = argc;
-  sargv[sargc++] = "match";
-  sargv[sargc++] = "detail";
-  sargv[sargc] = NULL;
-
-  return ospf6_route_table_show (vty, sargc, sargv, oa->route_table);
-}
-
-DEFUN (show_ipv6_ospf6_route_intra,
-       show_ipv6_ospf6_route_intra_cmd,
-       "show ipv6 ospf6 route intra-area",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       )
-{
-  listnode node;
-  struct ospf6_area *oa;
-
-  for (node = listhead (ospf6->area_list); node; nextnode (node))
-    {
-      oa = (struct ospf6_area *) getdata (node);
-      vty_out (vty, "Area %s%s", oa->name, VNL);
-      ospf6_route_table_show (vty, argc, argv, oa->route_table);
-    }
-
-  return CMD_SUCCESS;
-}
-
-ALIAS (show_ipv6_ospf6_route_intra,
-       show_ipv6_ospf6_route_intra_detail_cmd,
-       "show ipv6 ospf6 route intra-area (X::X|X::X/M|detail|summary)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       "Specify IPv6 address\n"
-       "Specify IPv6 prefix\n"
-       "Detailed information\n"
-       "Summary of route table\n"
-       );
-
-DEFUN (show_ipv6_ospf6_route_intra_match,
-       show_ipv6_ospf6_route_intra_match_cmd,
-       "show ipv6 ospf6 route intra-area X::X/M match",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       "Specify IPv6 prefix\n"
-       "Display routes which match the specified route\n"
-       )
-{
-  char *sargv[CMD_ARGC_MAX];
-  int i, sargc;
-  listnode node;
-  struct ospf6_area *oa;
-
-  /* copy argv to sargv and then append "match" */
-  for (i = 0; i < argc; i++)
-    sargv[i] = argv[i];
-  sargc = argc;
-  sargv[sargc++] = "match";
-  sargv[sargc] = NULL;
-
-  for (node = listhead (ospf6->area_list); node; nextnode (node))
-    {
-      oa = (struct ospf6_area *) getdata (node);
-      ospf6_route_table_show (vty, sargc, sargv, oa->route_table);
-    }
-
-  return CMD_SUCCESS;
-}
-
-DEFUN (show_ipv6_ospf6_route_intra_match_detail,
-       show_ipv6_ospf6_route_intra_match_detail_cmd,
-       "show ipv6 ospf6 route intra-area X::X/M match detail",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       ROUTE_STR
-       "Display Intra-Area routes\n"
-       "Specify IPv6 prefix\n"
-       "Display routes which match the specified route\n"
-       "Detailed information\n"
-       )
-{
-  char *sargv[CMD_ARGC_MAX];
-  int i, sargc;
-  listnode node;
-  struct ospf6_area *oa;
-
-  /* copy argv to sargv and then append "match" and "detail" */
-  for (i = 0; i < argc; i++)
-    sargv[i] = argv[i];
-  sargc = argc;
-  sargv[sargc++] = "match";
-  sargv[sargc++] = "detail";
-  sargv[sargc] = NULL;
-
-  for (node = listhead (ospf6->area_list); node; nextnode (node))
-    {
-      oa = (struct ospf6_area *) getdata (node);
-      ospf6_route_table_show (vty, sargc, sargv, oa->route_table);
-    }
-
-  return CMD_SUCCESS;
-}
-
 DEFUN (show_ipv6_ospf6_spf_tree,
        show_ipv6_ospf6_spf_tree_cmd,
        "show ipv6 ospf6 spf tree",
@@ -710,205 +505,6 @@ DEFUN (show_ipv6_ospf6_area_spf_tree,
   return CMD_SUCCESS;
 }
 
-DEFUN (show_ipv6_ospf6_area_spf_table,
-       show_ipv6_ospf6_area_spf_table_cmd,
-       "show ipv6 ospf6 area A.B.C.D spf table",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       )
-{
-  u_int32_t area_id;
-  struct ospf6_area *oa;
-
-  if (inet_pton (AF_INET, argv[0], &area_id) != 1)
-    {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[0], VNL);
-      return CMD_SUCCESS;
-    }
-  oa = ospf6_area_lookup (area_id, ospf6);
-  if (oa == NULL)
-    {
-      vty_out (vty, "No such Area: %s%s", argv[0], VNL);
-      return CMD_SUCCESS;
-    }
-
-  argc--;
-  argv++;
-
-  ospf6_lsentry_table_show (vty, argc, argv, oa->spf_table);
-  return CMD_SUCCESS;
-}
-
-ALIAS (show_ipv6_ospf6_area_spf_table,
-       show_ipv6_ospf6_area_spf_table_1_cmd,
-       "show ipv6 ospf6 area A.B.C.D spf table (A.B.C.D|A.B.C.D/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       "Specify Router-ID\n"
-       "Display multiple entry by specifying match-prefix of Router-ID\n"
-       "Display Detail\n"
-       );
-
-ALIAS (show_ipv6_ospf6_area_spf_table,
-       show_ipv6_ospf6_area_spf_table_2_cmd,
-       "show ipv6 ospf6 area A.B.C.D spf table (A.B.C.D|*) (A.B.C.D|A.B.C.D/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       "Specify Router-ID\n"
-       "Wildcard Router-ID\n"
-       "Specify Link State ID\n"
-       "Display multiple entry by specifying match-prefix of Link State ID\n"
-       "Display Detail\n"
-       );
-
-DEFUN (show_ipv6_ospf6_area_spf_table_3,
-       show_ipv6_ospf6_area_spf_table_3_cmd,
-       "show ipv6 ospf6 area A.B.C.D spf table (A.B.C.D|*) A.B.C.D/M detail",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       OSPF6_AREA_STR
-       OSPF6_AREA_ID_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       "Specify Router-ID\n"
-       "Wildcard Router-ID\n"
-       "Display multiple entry by specifying match-prefix of Link State ID\n"
-       "Display Detail\n"
-       )
-{
-  u_int32_t area_id;
-  struct ospf6_area *oa;
-  char *sargv[CMD_ARGC_MAX];
-  int i, sargc;
-
-  if (inet_pton (AF_INET, argv[0], &area_id) != 1)
-    {
-      vty_out (vty, "Malformed Area-ID: %s%s", argv[0], VNL);
-      return CMD_SUCCESS;
-    }
-  oa = ospf6_area_lookup (area_id, ospf6);
-  if (oa == NULL)
-    {
-      vty_out (vty, "No such Area: %s%s", argv[0], VNL);
-      return CMD_SUCCESS;
-    }
-
-  argc--;
-  argv++;
-
-  /* copy argv to sargv and then append "detail" */
-  for (i = 0; i < argc; i++)
-    sargv[i] = argv[i];
-  sargc = argc;
-  sargv[sargc++] = "detail";
-  sargv[sargc] = NULL;
-
-  ospf6_lsentry_table_show (vty, sargc, sargv, oa->spf_table);
-  return CMD_SUCCESS;
-}
-
-DEFUN (show_ipv6_ospf6_spf_table,
-       show_ipv6_ospf6_spf_table_cmd,
-       "show ipv6 ospf6 spf table",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       )
-{
-  listnode node;
-  struct ospf6_area *oa;
-
-  for (node = listhead (ospf6->area_list); node; nextnode (node))
-    {
-      oa = (struct ospf6_area *) getdata (node);
-      ospf6_lsentry_table_show (vty, argc, argv, oa->spf_table);
-    }
-
-  return CMD_SUCCESS;
-}
-
-ALIAS (show_ipv6_ospf6_spf_table,
-       show_ipv6_ospf6_spf_table_1_cmd,
-       "show ipv6 ospf6 spf table (A.B.C.D|A.B.C.D/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       "Specify Router-ID\n"
-       "Display multiple entry by specifying match-prefix of Router-ID\n"
-       "Display Detail\n"
-       );
-
-ALIAS (show_ipv6_ospf6_spf_table,
-       show_ipv6_ospf6_spf_table_2_cmd,
-       "show ipv6 ospf6 spf table (A.B.C.D|A.B.C.D/M|*) (A.B.C.D|A.B.C.D/M|detail)",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       "Specify Router-ID\n"
-       "Display multiple entry by specifying match-prefix of Router-ID\n"
-       "Wildcard Router-ID\n"
-       "Specify Link State ID\n"
-       "Display multiple entry by specifying match-prefix of Link State ID\n"
-       "Display Detail\n"
-       );
-
-DEFUN (show_ipv6_ospf6_spf_table_3,
-       show_ipv6_ospf6_spf_table_3_cmd,
-       "show ipv6 ospf6 spf table (A.B.C.D|*) A.B.C.D/M detail",
-       SHOW_STR
-       IP6_STR
-       OSPF6_STR
-       "Shortest Path First caculation\n"
-       "Show table contains SPF result\n"
-       "Specify Router-ID\n"
-       "Wildcard Router-ID\n"
-       "Display multiple entry by specifying match-prefix of Link State ID\n"
-       "Display Detail\n"
-       )
-{
-  listnode node;
-  struct ospf6_area *oa;
-  char *sargv[CMD_ARGC_MAX];
-  int i, sargc;
-
-  /* copy argv to sargv and then append "detail" */
-  for (i = 0; i < argc; i++)
-    sargv[i] = argv[i];
-  sargc = argc;
-  sargv[sargc++] = "detail";
-  sargv[sargc] = NULL;
-
-  for (node = listhead (ospf6->area_list); node; nextnode (node))
-    {
-      oa = (struct ospf6_area *) getdata (node);
-      ospf6_lsentry_table_show (vty, sargc, sargv, oa->spf_table);
-    }
-
-  return CMD_SUCCESS;
-}
-
 DEFUN (show_ipv6_ospf6_simulate_spf_tree_root,
        show_ipv6_ospf6_simulate_spf_tree_root_cmd,
        "show ipv6 ospf6 simulate spf-tree A.B.C.D area A.B.C.D",
@@ -971,47 +567,11 @@ void
 ospf6_area_init ()
 {
   install_element (VIEW_NODE, &show_ipv6_ospf6_spf_tree_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_spf_table_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_spf_table_1_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_spf_table_2_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_spf_table_3_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_tree_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_table_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_table_1_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_table_2_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_spf_table_3_cmd);
-
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_intra_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_intra_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_intra_match_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_route_intra_match_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_intra_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_intra_detail_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_intra_match_cmd);
-  install_element (VIEW_NODE, &show_ipv6_ospf6_area_route_intra_match_detail_cmd);
-
   install_element (VIEW_NODE, &show_ipv6_ospf6_simulate_spf_tree_root_cmd);
 
   install_element (ENABLE_NODE, &show_ipv6_ospf6_spf_tree_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_spf_table_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_spf_table_1_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_spf_table_2_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_spf_table_3_cmd);
   install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_tree_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_table_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_table_1_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_table_2_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_spf_table_3_cmd);
-
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_intra_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_intra_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_intra_match_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_route_intra_match_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_intra_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_intra_detail_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_intra_match_cmd);
-  install_element (ENABLE_NODE, &show_ipv6_ospf6_area_route_intra_match_detail_cmd);
-
   install_element (ENABLE_NODE, &show_ipv6_ospf6_simulate_spf_tree_root_cmd);
 
   install_element (OSPF6_NODE, &area_range_cmd);