proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-04 10:07:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OSPF silently ignores 'no ip ospf hello-interval X' and 'no ip ospf hello-interval X'

Browse Source 
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Dinesh G Dutt <ddutt@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2015-05-19 18:03:48 -07:00
parent b05a1c8b75
commit f9dfba8dcb
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ospfd/ospf_vty.c
View File

@ -5733,11 +5733,12 @@ ALIAS (ip_ospf_dead_interval_minimal,
DEFUN (no_ip_ospf_dead_interval,
no_ip_ospf_dead_interval_addr_cmd,
"no ip ospf dead-interval A.B.C.D",
"no ip ospf dead-interval <1-65535> A.B.C.D",
NO_STR
"IP Information\n"
"OSPF interface commands\n"
"Interval after which a neighbor is declared dead\n"
"Seconds\n"
"Address of interface")
{
struct interface *ifp = vty->index;
@ -5750,9 +5751,9 @@ DEFUN (no_ip_ospf_dead_interval,
ifp = vty->index;
params = IF_DEF_PARAMS (ifp);
if (argc == 1)
if (argc == 2)
{
ret = inet_aton(argv[0], &addr);
ret = inet_aton(argv[1], &addr);
if (!ret)
{
vty_out (vty, "Please specify interface address by A.B.C.D%s",
@ -5799,6 +5800,15 @@ DEFUN (no_ip_ospf_dead_interval,
return CMD_SUCCESS;
}
ALIAS (no_ip_ospf_dead_interval,
no_ip_ospf_dead_interval_seconds_cmd,
"no ip ospf dead-interval <1-65535>",
NO_STR
"IP Information\n"
"OSPF interface commands\n"
"Interval after which a neighbor is declared dead\n"
"Seconds\n")
ALIAS (no_ip_ospf_dead_interval,
no_ip_ospf_dead_interval_cmd,
"no ip ospf dead-interval",
@ -5877,11 +5887,12 @@ ALIAS (ip_ospf_hello_interval,
DEFUN (no_ip_ospf_hello_interval,
no_ip_ospf_hello_interval_addr_cmd,
"no ip ospf hello-interval A.B.C.D",
"no ip ospf hello-interval <1-65535> A.B.C.D",
NO_STR
"IP Information\n"
"OSPF interface commands\n"
"Time between HELLO packets\n"
"Seconds\n"
"Address of interface")
{
struct interface *ifp = vty->index;
@ -5892,9 +5903,9 @@ DEFUN (no_ip_ospf_hello_interval,
ifp = vty->index;
params = IF_DEF_PARAMS (ifp);
if (argc == 1)
if (argc == 2)
{
ret = inet_aton(argv[0], &addr);
ret = inet_aton(argv[1], &addr);
if (!ret)
{
vty_out (vty, "Please specify interface address by A.B.C.D%s",
@ -5919,6 +5930,15 @@ DEFUN (no_ip_ospf_hello_interval,
return CMD_SUCCESS;
}
ALIAS (no_ip_ospf_hello_interval,
no_ip_ospf_hello_interval_seconds_cmd,
"no ip ospf hello-interval <1-65535>",
NO_STR
"IP Information\n"
"OSPF interface commands\n"
"Time between HELLO packets\n"
"Seconds\n")
ALIAS (no_ip_ospf_hello_interval,
no_ip_ospf_hello_interval_cmd,
"no ip ospf hello-interval",
@ -8589,12 +8609,14 @@ ospf_vty_if_init (void)
install_element (INTERFACE_NODE, &ip_ospf_dead_interval_minimal_cmd);
install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_addr_cmd);
install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_cmd);
install_element (INTERFACE_NODE, &no_ip_ospf_dead_interval_seconds_cmd);
/* "ip ospf hello-interval" commands. */
install_element (INTERFACE_NODE, &ip_ospf_hello_interval_addr_cmd);
install_element (INTERFACE_NODE, &ip_ospf_hello_interval_cmd);
install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_addr_cmd);
install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_cmd);
install_element (INTERFACE_NODE, &no_ip_ospf_hello_interval_seconds_cmd);
/* "ip ospf network" commands. */
install_element (INTERFACE_NODE, &ip_ospf_network_cmd);