proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 15:47:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, vtysh: Make archaic "terminal" optional in configure command

Browse Source 
The 'configure terminal' command is a bit redundant, so make
the terminal portion optional.

Signed-off-by: Dinesh Dutt <dd.ps4u@gmail.com>
This commit is contained in:
Dinesh Dutt 2019-05-07 21:00:34 -04:00 committed by Donald Sharp
parent 51844abda2
commit dc1c13c019
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/command.c
View File

@ -1386,7 +1386,7 @@ int config_from_file(struct vty *vty, FILE *fp, unsigned int *line_num)
/* Configuration from terminal */ /* Configuration from terminal */
DEFUN (config_terminal, DEFUN (config_terminal,
config_terminal_cmd, config_terminal_cmd,
"configure terminal", "configure [terminal]",
"Configuration from vty interface\n" "Configuration from vty interface\n"
"Configuration terminal\n") "Configuration terminal\n")
{ {

10
vtysh/vtysh.c
View File

@ -502,7 +502,7 @@ static int vtysh_execute_func(const char *line, int pager)
vtysh_execute("exit"); vtysh_execute("exit");
} else if (tried) { } else if (tried) {
vtysh_execute("end"); vtysh_execute("end");
vtysh_execute("configure terminal"); vtysh_execute("configure");
} }
} }
/* /*
@ -540,7 +540,7 @@ static int vtysh_execute_func(const char *line, int pager)
if (pager && strncmp(line, "exit", 4)) if (pager && strncmp(line, "exit", 4))
vty_open_pager(vty); vty_open_pager(vty);
if (!strcmp(cmd->string, "configure terminal")) { if (!strcmp(cmd->string, "configure")) {
for (i = 0; i < array_size(vtysh_client); i++) { for (i = 0; i < array_size(vtysh_client); i++) {
cmd_stat = vtysh_client_execute( cmd_stat = vtysh_client_execute(
&vtysh_client[i], line); &vtysh_client[i], line);
@ -674,7 +674,7 @@ int vtysh_mark_file(const char *filename)
vty->node = CONFIG_NODE; vty->node = CONFIG_NODE;
vtysh_execute_no_pager("enable"); vtysh_execute_no_pager("enable");
vtysh_execute_no_pager("configure terminal"); vtysh_execute_no_pager("configure");
vty_buf_copy = XCALLOC(MTYPE_VTYSH_CMD, VTY_BUFSIZ); vty_buf_copy = XCALLOC(MTYPE_VTYSH_CMD, VTY_BUFSIZ);
while (fgets(vty->buf, VTY_BUFSIZ, confp)) { while (fgets(vty->buf, VTY_BUFSIZ, confp)) {
@ -1744,7 +1744,7 @@ DEFUNSH(VTYSH_REALLYALL, vtysh_disable, vtysh_disable_cmd, "disable",
} }
DEFUNSH(VTYSH_REALLYALL, vtysh_config_terminal, vtysh_config_terminal_cmd, DEFUNSH(VTYSH_REALLYALL, vtysh_config_terminal, vtysh_config_terminal_cmd,
"configure terminal", "configure [terminal]",
"Configuration from vty interface\n" "Configuration from vty interface\n"
"Configuration terminal\n") "Configuration terminal\n")
{ {
@ -1786,7 +1786,7 @@ static int vtysh_exit(struct vty *vty)
case BFD_NODE: case BFD_NODE:
case RPKI_NODE: case RPKI_NODE:
vtysh_execute("end"); vtysh_execute("end");
vtysh_execute("configure terminal"); vtysh_execute("configure");
vty->node = CONFIG_NODE; vty->node = CONFIG_NODE;
break; break;
case BGP_VPNV4_NODE: case BGP_VPNV4_NODE: