summaryrefslogtreecommitdiff
path: root/ospfd/ospf_vty.c
diff options
context:
space:
mode:
Diffstat (limited to 'ospfd/ospf_vty.c')
-rw-r--r--ospfd/ospf_vty.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 13138914fa..b7261da261 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -2111,7 +2111,7 @@ DEFUN (ospf_abr_type,
DEFUN (no_ospf_abr_type,
no_ospf_abr_type_cmd,
- "no ospf abr-type <cisco|ibm|shortcut|standard>",
+ "no ospf abr-type [<cisco|ibm|shortcut|standard>]",
NO_STR
"OSPF specific commands\n"
"Set OSPF ABR type\n"
@@ -2291,6 +2291,10 @@ static int ospf_timers_spf_set(struct vty *vty, unsigned int delay,
{
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
+ if (ospf->spf_delay != delay || ospf->spf_holdtime != hold ||
+ ospf->spf_max_holdtime != max)
+ ospf->spf_hold_multiplier = 1;
+
ospf->spf_delay = delay;
ospf->spf_holdtime = hold;
ospf->spf_max_holdtime = max;
@@ -8157,7 +8161,7 @@ DEFUN (ip_ospf_dead_interval_minimal,
DEFUN (no_ip_ospf_dead_interval,
no_ip_ospf_dead_interval_cmd,
- "no ip ospf dead-interval [<(1-65535)|minimal hello-multiplier (2-20)> [A.B.C.D]]",
+ "no ip ospf dead-interval [<(1-65535)|minimal hello-multiplier [(2-20)]> [A.B.C.D]]",
NO_STR
"IP Information\n"
"OSPF interface commands\n"
@@ -13184,6 +13188,10 @@ static void ospf_vty_if_init(void)
install_element(INTERFACE_NODE, &ip_ospf_hello_interval_cmd);
install_element(INTERFACE_NODE, &no_ip_ospf_hello_interval_cmd);
+ /* "ip ospf graceful-restart" commands. */
+ install_element(INTERFACE_NODE, &ip_ospf_gr_hdelay_cmd);
+ install_element(INTERFACE_NODE, &no_ip_ospf_gr_hdelay_cmd);
+
/* "ip ospf network" commands. */
install_element(INTERFACE_NODE, &ip_ospf_network_cmd);
install_element(INTERFACE_NODE, &no_ip_ospf_network_cmd);