diff options
| author | Chris Caputo <ccaputo@alt.net> | 2009-06-23 05:55:57 +0000 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2009-06-23 14:23:26 +0100 |
| commit | 6e79f8bba438823d84b7464a9acc1e6fc9126a27 (patch) | |
| tree | 5f9e004a78b0fddc59baf4e2666728837328fb52 | |
| parent | 2b35ae41c2c5d39801c943fa740c72fc15613141 (diff) | |
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>
| -rw-r--r-- | vtysh/vtysh.c | 4 | ||||
| -rw-r--r-- | vtysh/vtysh_config.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index bff06323..3f189adb 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1722,8 +1722,6 @@ DEFUN (vtysh_write_terminal, vtysh_config_dump (fp); - vty_out (vty, "end%s", VTY_NEWLINE); - if (vtysh_pager_name && fp) { fflush (fp); @@ -1735,6 +1733,8 @@ DEFUN (vtysh_write_terminal, fp = NULL; } + vty_out (vty, "end%s", VTY_NEWLINE); + return CMD_SUCCESS; } diff --git a/vtysh/vtysh_config.c b/vtysh/vtysh_config.c index 70c37462..fb8a1269 100644 --- a/vtysh/vtysh_config.c +++ b/vtysh/vtysh_config.c @@ -244,6 +244,8 @@ vtysh_config_parse_line (const char *line) || strncmp (line, "enable password", strlen ("enable password")) == 0) config = config_get (AAA_NODE, line); + else if (strncmp (line, "ip protocol", strlen ("ip protocol")) == 0) + config = config_get (PROTOCOL_NODE, line); else { if (strncmp (line, "log", strlen ("log")) == 0 |