Merge remote-tracking branch 'osr_private_quagga/queue/osr/vtysh-generic' into vtysh-grammar

5 files changed, 20 insertions, 25 deletions

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index 8ea4b1695..74c9ac739 100644
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -1845,15 +1845,12 @@ ospf6_interface_init (void)
 {
   /* Install interface node. */
   install_node (&interface_node, config_write_ospf6_interface);
+  if_cmd_init ();
 
   install_element (VIEW_NODE, &show_ipv6_ospf6_interface_prefix_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_interface_ifname_prefix_cmd);
 
-  install_element (CONFIG_NODE, &interface_cmd);
-  install_default (INTERFACE_NODE);
-  install_element (INTERFACE_NODE, &interface_desc_cmd);
-  install_element (INTERFACE_NODE, &no_interface_desc_cmd);
   install_element (INTERFACE_NODE, &ipv6_ospf6_cost_cmd);
   install_element (INTERFACE_NODE, &no_ipv6_ospf6_cost_cmd);
   install_element (INTERFACE_NODE, &ipv6_ospf6_ifmtu_cmd);
diff --git a/ospf6d/ospf6_network.c b/ospf6d/ospf6_network.c
index 2227d0347..0d730c596 100644
--- a/ospf6d/ospf6_network.c
+++ b/ospf6d/ospf6_network.c
@@ -226,9 +226,7 @@ ospf6_sendmsg (struct in6_addr *src, struct in6_addr *dst,
   dst_sin6.sin6_len = sizeof (struct sockaddr_in6);
 #endif /*SIN6_LEN*/
   memcpy (&dst_sin6.sin6_addr, dst, sizeof (struct in6_addr));
-#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID
   dst_sin6.sin6_scope_id = *ifindex;
-#endif
 
   /* send control msg */
   scmsgp->cmsg_level = IPPROTO_IPV6;
diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h
index c7c21a657..8b973d28f 100644
--- a/ospf6d/ospf6_route.h
+++ b/ospf6d/ospf6_route.h
@@ -22,6 +22,8 @@
 #ifndef OSPF6_ROUTE_H
 #define OSPF6_ROUTE_H
 
+#include "command.h"
+
 #define OSPF6_MULTI_PATH_LIMIT    4
 
 /* Debug option */
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index b83433dfc..a63d73f43 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -1192,12 +1192,13 @@ 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
+  /* 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);
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index 88d446172..2aaed5fcb 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -1243,23 +1243,20 @@ ospf6_init (void)
   install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_cmd);
   install_element (VIEW_NODE, &show_ipv6_ospf6_linkstate_detail_cmd);
 
-#define INSTALL(n,c) \
-  install_element (n ## _NODE, &show_ipv6_ospf6_ ## c)
-
-  INSTALL (VIEW, database_cmd);
-  INSTALL (VIEW, database_type_cmd);
-  INSTALL (VIEW, database_id_cmd);
-  INSTALL (VIEW, database_router_cmd);
-  INSTALL (VIEW, database_type_id_cmd);
-  INSTALL (VIEW, database_type_router_cmd);
-  INSTALL (VIEW, database_adv_router_linkstate_id_cmd);
-  INSTALL (VIEW, database_id_router_cmd);
-  INSTALL (VIEW, database_type_id_router_cmd);
-  INSTALL (VIEW, database_type_adv_router_linkstate_id_cmd);
-  INSTALL (VIEW, database_self_originated_cmd);
-  INSTALL (VIEW, database_type_self_originated_cmd);
-  INSTALL (VIEW, database_type_id_self_originated_cmd);
-  INSTALL (VIEW, database_type_self_originated_linkstate_id_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_id_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_router_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_router_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_adv_router_linkstate_id_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_id_router_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_router_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_adv_router_linkstate_id_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_self_originated_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_self_originated_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_id_self_originated_cmd);
+  install_element (VIEW_NODE, &show_ipv6_ospf6_database_type_self_originated_linkstate_id_cmd);
 
   /* Make ospf protocol socket. */
   ospf6_serv_sock ();