From: Hasso Tepper <hasso@estpak.ee>

Subject: [zebra 19093] [PATCH] Two more fixes

1) From 6Wind patch - show router and interface nodes from ospf6d when
using vtysh and don't show defaults in interface node. Fixes bugzilla
#14.

diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index e04d658b8488c21f3a613da79455bcb0533d9828..63052c7c274b9b31f625118af27802cb578fc5d9 100644 (file)
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-18 Hasso Tepper <hasso@estpak.ee>
+
+       * ospf6_{dump,interface,zebra}.c,ospf6d.c: show router and interface
+       nodes from ospf6d when using vtysh,  and don't show defaults in
+       interface node (from ^WIND patch).
+
 2003-04-23 Hasso Tepper <hasso@estpak.ee>
           
         * {ospf6_damp,ospf6d}.c: fix "router xxx" node commands in vtysh

diff --git a/ospf6d/ospf6_dump.c b/ospf6d/ospf6_dump.c
index e950ec8cb48b683bcfbe59cd0902da4c8310b261..1e3c0c42ac4c2ca039451540146030f8c2995871 100644 (file)
--- a/ospf6d/ospf6_dump.c
+++ b/ospf6d/ospf6_dump.c
@@ -224,7 +224,8 @@ DEFUN (no_debug_ospf6_all,
 struct cmd_node debug_node =
 {
   DEBUG_NODE,
-  ""
+  "",
+  vtysh: 1
 };
 
 int

diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c
index d394f21bc3c875ee138a8e17e1554f8c5b2ec04d..4d632b227886b7816b76cb7fb88153cfefb49d88 100644 (file)
--- a/ospf6d/ospf6_interface.c
+++ b/ospf6d/ospf6_interface.c
@@ -961,18 +961,25 @@ ospf6_interface_config_write (struct vty *vty)
 
       vty_out (vty, "interface %s%s",
                o6i->interface->name, VTY_NEWLINE);
+      if (o6i->cost != 1)
       vty_out (vty, " ipv6 ospf6 cost %d%s",
                o6i->cost, VTY_NEWLINE);
+      if (o6i->hello_interval != 10)
       vty_out (vty, " ipv6 ospf6 hello-interval %d%s",
                o6i->hello_interval, VTY_NEWLINE);
+      if (o6i->dead_interval != 40)
       vty_out (vty, " ipv6 ospf6 dead-interval %d%s",
                o6i->dead_interval, VTY_NEWLINE);
+      if (o6i->rxmt_interval != 5)
       vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s",
                o6i->rxmt_interval, VTY_NEWLINE);
+      if (o6i->priority != 1)
       vty_out (vty, " ipv6 ospf6 priority %d%s",
                o6i->priority, VTY_NEWLINE);
+      if (o6i->transdelay != 1)
       vty_out (vty, " ipv6 ospf6 transmit-delay %d%s",
                o6i->transdelay, VTY_NEWLINE);
+      if (o6i->instance_id != 0)
       vty_out (vty, " ipv6 ospf6 instance-id %d%s",
                o6i->instance_id, VTY_NEWLINE);
 
@@ -994,6 +1001,7 @@ struct cmd_node interface_node =
 {
   INTERFACE_NODE,
   "%s(config-if)# ",
+  vtysh: 1
 };
 
 void

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index 7b8a8dcfb69a5eacf2f40a64f5ed00dec646affb..347ba1cf08f02140d704d9e7418f8961eb35225e 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -348,6 +348,7 @@ struct cmd_node zebra_node =
 {
   ZEBRA_NODE,
   "%s(config-zebra)# ",
+  vtysh: 0
 };
 
 #define ADD    0

diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index d7b1aa3486eeed221809de325144b13d6b25cd87..8b50b5ab74e9c4b7ec26843a521fcce19c26fd65 100644 (file)
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -712,6 +712,7 @@ struct cmd_node ospf6_node =
 {
   OSPF6_NODE,
   "%s(config-ospf6)# ",
+  vtysh: 1
 };
 
 /* Install ospf related commands. */