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

quagga errors parsing a valid config

Browse Source 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Daniel Walton 2015-10-16 20:51:38 +00:00
parent 9229d914dd
commit fd715b78d9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/command.c
View File

@ -2805,26 +2805,30 @@ command_config_read_one_line (struct vty *vty, struct cmd_element **cmd, int use
// Climb the tree and try the command again at each node // Climb the tree and try the command again at each node
if (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && if (!(use_daemon && ret == CMD_SUCCESS_DAEMON) &&
ret != CMD_SUCCESS && ret != CMD_WARNING && !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) &&
ret != CMD_ERR_NOTHING_TODO && vty->node != CONFIG_NODE) { ret != CMD_SUCCESS &&
ret != CMD_WARNING &&
vty->node != CONFIG_NODE) {
saved_node = vty->node; saved_node = vty->node;
while (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && while (!(use_daemon && ret == CMD_SUCCESS_DAEMON) &&
ret != CMD_SUCCESS && ret != CMD_WARNING && !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) &&
ret != CMD_ERR_NOTHING_TODO && vty->node != CONFIG_NODE) { ret != CMD_SUCCESS &&
ret != CMD_WARNING &&
vty->node != CONFIG_NODE) {
vty->node = node_parent(vty->node); vty->node = node_parent(vty->node);
ret = cmd_execute_command_strict (vline, vty, NULL); ret = cmd_execute_command_strict (vline, vty, cmd);
} }
// If climbing the tree did not work then ignore the command and // If climbing the tree did not work then ignore the command and
// stay at the same node // stay at the same node
if (!(use_daemon && ret == CMD_SUCCESS_DAEMON) && if (!(use_daemon && ret == CMD_SUCCESS_DAEMON) &&
ret != CMD_SUCCESS && ret != CMD_WARNING && !(!use_daemon && ret == CMD_ERR_NOTHING_TODO) &&
ret != CMD_ERR_NOTHING_TODO) ret != CMD_SUCCESS &&
ret != CMD_WARNING)
{ {
vty->node = saved_node; vty->node = saved_node;
memcpy(vty->error_buf, vty->buf, VTY_BUFSIZ); memcpy(vty->error_buf, vty->buf, VTY_BUFSIZ);
} }
} }