proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 13:51:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: deprecate timers lsa arrival ...

Browse Source 
Don't need two of these that do the exact same thing.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-08-07 16:11:10 -04:00
parent 68b39ad41b
commit 0e88de35b9
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F
1 changed files with 30 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
ospfd/ospf_vty.c
View File

@ -2185,48 +2185,6 @@ DEFUN (no_ospf_timers_min_ls_interval,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (ospf_timers_min_ls_arrival,
ospf_timers_min_ls_arrival_cmd,
"timers lsa arrival (0-1000)",
"Adjust routing timers\n"
"Throttling link state advertisement delays\n"
"OSPF minimum arrival interval delay\n"
"Delay (msec) between accepted LSAs\n")
{
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
int idx_number = 3;
unsigned int arrival;
if (argc < 4) {
vty_out(vty, "Insufficient arguments\n");
return CMD_WARNING_CONFIG_FAILED;
}
arrival = strtoul(argv[idx_number]->arg, NULL, 10);
ospf->min_ls_arrival = arrival;
return CMD_SUCCESS;
}
DEFUN (no_ospf_timers_min_ls_arrival,
no_ospf_timers_min_ls_arrival_cmd,
"no timers lsa arrival [(0-1000)]",
NO_STR
"Adjust routing timers\n"
"Throttling link state advertisement delays\n"
"OSPF minimum arrival interval delay\n"
"Delay (msec) between accepted LSAs\n")
{
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
ospf->min_ls_arrival = OSPF_MIN_LS_ARRIVAL;
return CMD_SUCCESS;
}
DEFUN (ospf_timers_throttle_spf, DEFUN (ospf_timers_throttle_spf,
ospf_timers_throttle_spf_cmd, ospf_timers_throttle_spf_cmd,
"timers throttle spf (0-600000) (0-600000) (0-600000)", "timers throttle spf (0-600000) (0-600000) (0-600000)",
@ -2271,8 +2229,8 @@ DEFUN (no_ospf_timers_throttle_spf,
} }
DEFUN (ospf_timers_lsa, DEFUN (ospf_timers_lsa_min_arrival,
ospf_timers_lsa_cmd, ospf_timers_lsa_min_arrival_cmd,
"timers lsa min-arrival (0-600000)", "timers lsa min-arrival (0-600000)",
"Adjust routing timers\n" "Adjust routing timers\n"
"OSPF LSA timers\n" "OSPF LSA timers\n"
@ -2280,23 +2238,12 @@ DEFUN (ospf_timers_lsa,
"Delay in milliseconds\n") "Delay in milliseconds\n")
{ {
VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf); VTY_DECLVAR_INSTANCE_CONTEXT(ospf, ospf);
int idx_number = 3; ospf->min_ls_arrival = strtoul(argv[argc - 1]->arg, NULL, 10);
unsigned int minarrival;
if (argc < 4) {
vty_out(vty, "Insufficient number of arguments\n");
return CMD_WARNING_CONFIG_FAILED;
}
minarrival = strtoul(argv[idx_number]->arg, NULL, 10);
ospf->min_ls_arrival = minarrival;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (no_ospf_timers_lsa, DEFUN (no_ospf_timers_lsa_min_arrival,
no_ospf_timers_lsa_cmd, no_ospf_timers_lsa_min_arrival_cmd,
"no timers lsa min-arrival [(0-600000)]", "no timers lsa min-arrival [(0-600000)]",
NO_STR NO_STR
"Adjust routing timers\n" "Adjust routing timers\n"
@ -2308,7 +2255,7 @@ DEFUN (no_ospf_timers_lsa,
unsigned int minarrival; unsigned int minarrival;
if (argc > 4) { if (argc > 4) {
minarrival = strtoul(argv[4]->arg, NULL, 10); minarrival = strtoul(argv[argc - 1]->arg, NULL, 10);
if (ospf->min_ls_arrival != minarrival if (ospf->min_ls_arrival != minarrival
|| minarrival == OSPF_MIN_LS_ARRIVAL) || minarrival == OSPF_MIN_LS_ARRIVAL)
@ -2320,6 +2267,26 @@ DEFUN (no_ospf_timers_lsa,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* Deprecated: 08/07/2017 */
ALIAS_HIDDEN (ospf_timers_lsa_min_arrival,
ospf_timers_lsa_arrival_cmd,
"timers lsa arrival (0-1000)",
"adjust routing timers\n"
"throttling link state advertisement delays\n"
"ospf minimum arrival interval delay\n"
"delay (msec) between accepted lsas\n");
/* Deprecated: 08/07/2017 */
ALIAS_HIDDEN (no_ospf_timers_lsa_min_arrival,
no_ospf_timers_lsa_arrival_cmd,
"no timers lsa arrival (0-1000)",
NO_STR
"adjust routing timers\n"
"throttling link state advertisement delays\n"
"ospf minimum arrival interval delay\n"
"delay (msec) between accepted lsas\n");
DEFUN (ospf_neighbor, DEFUN (ospf_neighbor,
ospf_neighbor_cmd, ospf_neighbor_cmd,
"neighbor A.B.C.D [priority (0-255) [poll-interval (1-65535)]]", "neighbor A.B.C.D [priority (0-255) [poll-interval (1-65535)]]",
@ -9185,10 +9152,10 @@ void ospf_vty_init(void)
/* LSA timers commands */ /* LSA timers commands */
install_element(OSPF_NODE, &ospf_timers_min_ls_interval_cmd); install_element(OSPF_NODE, &ospf_timers_min_ls_interval_cmd);
install_element(OSPF_NODE, &no_ospf_timers_min_ls_interval_cmd); install_element(OSPF_NODE, &no_ospf_timers_min_ls_interval_cmd);
install_element(OSPF_NODE, &ospf_timers_min_ls_arrival_cmd); install_element(OSPF_NODE, &ospf_timers_lsa_min_arrival_cmd);
install_element(OSPF_NODE, &no_ospf_timers_min_ls_arrival_cmd); install_element(OSPF_NODE, &no_ospf_timers_lsa_min_arrival_cmd);
install_element(OSPF_NODE, &ospf_timers_lsa_cmd); install_element(OSPF_NODE, &ospf_timers_lsa_arrival_cmd);
install_element(OSPF_NODE, &no_ospf_timers_lsa_cmd); install_element(OSPF_NODE, &no_ospf_timers_lsa_arrival_cmd);
/* refresh timer commands */ /* refresh timer commands */
install_element(OSPF_NODE, &ospf_refresh_timer_cmd); install_element(OSPF_NODE, &ospf_refresh_timer_cmd);