Fix vtysh based "write term" output.

* vtysh/vtysh.c: "end" should be printed at the bottom, not the top.
* vtysh/vtysh_config.c: PROTOCOL_NODE was not being handled, and thus was
  being displayed at the top of a config, rather than in its rightful
  place near the bottom.

Signed-off-by: Chris Caputo <ccaputo@alt.net>
This commit is contained in:
Chris Caputo 2009-06-23 05:55:57 +00:00 committed by Paul Jakma
parent 2b35ae41c2
commit 6e79f8bba4
2 changed files with 4 additions and 2 deletions

View File

@ -1722,8 +1722,6 @@ DEFUN (vtysh_write_terminal,
vtysh_config_dump (fp); vtysh_config_dump (fp);
vty_out (vty, "end%s", VTY_NEWLINE);
if (vtysh_pager_name && fp) if (vtysh_pager_name && fp)
{ {
fflush (fp); fflush (fp);
@ -1735,6 +1733,8 @@ DEFUN (vtysh_write_terminal,
fp = NULL; fp = NULL;
} }
vty_out (vty, "end%s", VTY_NEWLINE);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

View File

@ -244,6 +244,8 @@ vtysh_config_parse_line (const char *line)
|| strncmp (line, "enable password", || strncmp (line, "enable password",
strlen ("enable password")) == 0) strlen ("enable password")) == 0)
config = config_get (AAA_NODE, line); config = config_get (AAA_NODE, line);
else if (strncmp (line, "ip protocol", strlen ("ip protocol")) == 0)
config = config_get (PROTOCOL_NODE, line);
else else
{ {
if (strncmp (line, "log", strlen ("log")) == 0 if (strncmp (line, "log", strlen ("log")) == 0