summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhasso <hasso>2004-12-22 11:53:09 +0000
committerhasso <hasso>2004-12-22 11:53:09 +0000
commitdfbb91241850117729f9ebcc37207260dc50146b (patch)
treeec4169cf07a06b95b0011380d87d018232e2e929
parent1d8062884fb47475c91fdcade912281ef0ac81b3 (diff)
More cosmetical vtysh fixes.
-rw-r--r--vtysh/ChangeLog4
-rw-r--r--vtysh/vtysh_config.c8
2 files changed, 9 insertions, 3 deletions
diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 45c5246a..de0b1a80 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,7 +1,9 @@
2004-12-22 Hasso Tepper <hasso at quagga.net>
* vtysh_config.c: No delimiter between "ip forwarding" and "ipv6
- forwarding".
+ forwarding". Show common router-id before router nodes. Fix router
+ bgp node parsing. Move debug commands into debug node and no
+ delimiter between lines there.
2004-12-09 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c
index 971d2cc4..c7be8d26 100644
--- a/vtysh/vtysh_config.c
+++ b/vtysh/vtysh_config.c
@@ -188,6 +188,8 @@ vtysh_config_parse_line (const char *line)
default:
if (strncmp (line, "interface", strlen ("interface")) == 0)
config = config_get (INTERFACE_NODE, line);
+ else if (strncmp (line, "router-id", strlen ("router-id")) == 0)
+ config = config_get (ZEBRA_NODE, line);
else if (strncmp (line, "router rip", strlen ("router rip")) == 0)
config = config_get (RIP_NODE, line);
else if (strncmp (line, "router ripng", strlen ("router ripng")) == 0)
@@ -200,7 +202,7 @@ vtysh_config_parse_line (const char *line)
config = config_get (BGP_NODE, line);
else if (strncmp (line, "router isis", strlen ("router isis")) == 0)
config = config_get (ISIS_NODE, line);
- else if (strncmp (line, "router", strlen ("router")) == 0)
+ else if (strncmp (line, "router bgp", strlen ("router bgp")) == 0)
config = config_get (BGP_NODE, line);
else if (strncmp (line, "route-map", strlen ("route-map")) == 0)
config = config_get (RMAP_NODE, line);
@@ -236,6 +238,8 @@ vtysh_config_parse_line (const char *line)
config = config_get (FORWARDING_NODE, line);
else if (strncmp (line, "service", strlen ("service")) == 0)
config = config_get (SERVICE_NODE, line);
+ else if (strncmp (line, "debug", strlen ("debug")) == 0)
+ config = config_get (DEBUG_NODE, line);
else
{
if (strncmp (line, "log", strlen ("log")) == 0
@@ -283,7 +287,7 @@ vtysh_config_parse (char *line)
((I) == ACCESS_NODE || (I) == PREFIX_NODE || (I) == IP_NODE \
|| (I) == AS_LIST_NODE || (I) == COMMUNITY_LIST_NODE || \
(I) == ACCESS_IPV6_NODE || (I) == PREFIX_IPV6_NODE \
- || (I) == SERVICE_NODE || (I) == FORWARDING_NODE)
+ || (I) == SERVICE_NODE || (I) == FORWARDING_NODE || (I) == DEBUG_NODE)
/* Display configuration to file pointer. */
void