proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 03:44:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* command.[ch], vty.c: cmd_execute_command() function must not attempt

Browse Source 
to walk up in the node tree if called from vtysh. Different daemons
	  might have commands with same syntax in different nodes (for example
	  "router-id x.x.x.x" commands in zebra/ospfd/ospf6d daemons).

	* vtysh.c: Reflect changes in lib. cmd_execute_command() should know
	  now that it's called from vtysh and must not attempt to walk up in
	  the node tree.

	[pullup candidate]
This commit is contained in:
hasso 2005-01-16 23:31:54 +00:00
parent b854038bd0
commit 87d683b071
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ChangeLog
View File

@ -1,3 +1,10 @@
2005-01-17 Hasso Tepper <hasso at quagga.net>
* command.[ch], vty.c: cmd_execute_command() function must not attempt
to walk up in the node tree if called from vtysh. Different daemons
might have commands with same syntax in different nodes (for example
"router-id x.x.x.x" commands in zebra/ospfd/ospf6d daemons).
2005-01-14 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* command.c (print_version): Do not bother even to examine host.name,

8
lib/command.c
View File

@ -1,5 +1,5 @@
/*
$Id: command.c,v 1.33 2005/01/14 17:09:38 ajs Exp $
$Id: command.c,v 1.34 2005/01/16 23:31:54 hasso Exp $
Command interpreter routine for virtual terminal [aka TeletYpe]
Copyright (C) 1997, 98, 99 Kunihiro Ishiguro
@ -2092,7 +2092,8 @@ cmd_execute_command_real (vector vline, struct vty *vty, struct cmd_element **cm
int
cmd_execute_command (vector vline, struct vty *vty, struct cmd_element **cmd) {
cmd_execute_command (vector vline, struct vty *vty, struct cmd_element **cmd,
int vtysh) {
int ret, saved_ret, tried = 0;
enum node_type onode, try_node;
@ -2123,6 +2124,9 @@ cmd_execute_command (vector vline, struct vty *vty, struct cmd_element **cmd) {
saved_ret = ret = cmd_execute_command_real (vline, vty, cmd);
if (vtysh)
return saved_ret;
/* This assumes all nodes above CONFIG_NODE are childs of CONFIG_NODE */
while ( ret != CMD_SUCCESS && ret != CMD_WARNING
&& vty->node > CONFIG_NODE )

2
lib/command.h
View File

@ -329,7 +329,7 @@ vector cmd_describe_command ();
char **cmd_complete_command ();
const char *cmd_prompt (enum node_type);
int config_from_file (struct vty *, FILE *);
int cmd_execute_command (vector, struct vty *, struct cmd_element **);
int cmd_execute_command (vector, struct vty *, struct cmd_element **, int);
int cmd_execute_command_strict (vector, struct vty *, struct cmd_element **);
void config_replace_string (struct cmd_element *, char *, ...);
void cmd_init (int);

2
lib/vty.c
View File

@ -361,7 +361,7 @@ vty_command (struct vty *vty, char *buf)
if (vline == NULL)
return CMD_SUCCESS;
ret = cmd_execute_command (vline, vty, NULL);
ret = cmd_execute_command (vline, vty, NULL, 0);
if (ret != CMD_SUCCESS)
switch (ret)

6
vtysh/ChangeLog
View File

@ -1,3 +1,9 @@
2005-01-10 Hasso Tepper <hasso at quagga.net>
* vtysh.c: Reflect changes in lib. cmd_execute_command() should know
now that it's called from vtysh and must not attempt to walk up in
the node tree.
2004-12-22 Hasso Tepper <hasso at quagga.net>
* vtysh_config.c: No delimiter between "ip forwarding" and "ipv6

4
vtysh/vtysh.c
View File

@ -262,7 +262,7 @@ vtysh_execute_func (const char *line, int pager)
if (vline == NULL)
return;
ret = cmd_execute_command (vline, vty, &cmd);
ret = cmd_execute_command (vline, vty, &cmd, 1);
cmd_free_strvec (vline);
@ -340,7 +340,7 @@ vtysh_execute_func (const char *line, int pager)
return;
}
ret = cmd_execute_command (vline, vty, &cmd);
ret = cmd_execute_command (vline, vty, &cmd, 1);
cmd_free_strvec (vline);
if (ret != CMD_SUCCESS_DAEMON)
break;