matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib, vtysh: Allow watchfrr to receive start/end lines

Browse source 
Watchfrr really should receive notification about start/end
read of configuration.  Let's fix that.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-11-21 12:04:12 -05:00
parent 298748af21
commit e6648f01be
2 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/lib_vty.c
View file

@ -225,10 +225,8 @@ static struct call_back {
} callback;
DEFUN_HIDDEN (start_config,
start_config_cmd,
"XFRR_start_configuration",
"The Beginning of Configuration\n")
DEFUN_NOSH(start_config, start_config_cmd, "XFRR_start_configuration",
"The Beginning of Configuration\n")
{
callback.readin_time = monotime(NULL);
@ -240,10 +238,8 @@ DEFUN_HIDDEN (start_config,
return CMD_SUCCESS;
}
DEFUN_HIDDEN (end_config,
end_config_cmd,
"XFRR_end_configuration",
"The End of Configuration\n")
DEFUN_NOSH(end_config, end_config_cmd, "XFRR_end_configuration",
"The End of Configuration\n")
{
time_t readin_time;
char readin_time_str[MONOTIME_STRLEN];

27
vtysh/vtysh.c
View file

@ -3413,6 +3413,30 @@ int vtysh_write_config_integrated(void)
return CMD_SUCCESS;
}
DEFUN_HIDDEN(start_config, start_config_cmd, "XFRR_start_configuration",
"The Beginning of Configuration\n")
{
unsigned int i;
char line[] = "XFRR_start_configuration";
for (i = 0; i < array_size(vtysh_client); i++)
vtysh_client_execute(&vtysh_client[i], line);
return CMD_SUCCESS;
}
DEFUN_HIDDEN(end_config, end_config_cmd, "XFRR_end_configuration",
"The End of Configuration\n")
{
unsigned int i;
char line[] = "XFRR_end_configuration";
for (i = 0; i < array_size(vtysh_client); i++)
vtysh_client_execute(&vtysh_client[i], line);
return CMD_SUCCESS;
}
static bool want_config_integrated(void)
{
struct stat s;
@ -4870,6 +4894,9 @@ void vtysh_init_vty(void)
/* "write memory" command. */
install_element(ENABLE_NODE, &vtysh_write_memory_cmd);
install_element(CONFIG_NODE, &start_config_cmd);
install_element(CONFIG_NODE, &end_config_cmd);
install_element(CONFIG_NODE, &vtysh_terminal_paginate_cmd);
install_element(VIEW_NODE, &vtysh_terminal_paginate_cmd);
install_element(VIEW_NODE, &vtysh_terminal_length_cmd);