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

ospfd: fix virtual-link timers commands

Browse Source 
Use {} semantics, correct docstrings, switchup parsing.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-05-31 19:00:39 +00:00
parent a1e61a923f
commit a663a38ef8
1 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
ospfd/ospf_vty.c
View File

@ -988,15 +988,15 @@ ospf_vl_set (struct ospf *ospf, struct ospf_vl_config_data *vl_config)
"Use null authentication\n" \ "Use null authentication\n" \
"Use message-digest authentication\n" "Use message-digest authentication\n"
#define VLINK_HELPSTR_TIME_PARAM_NOSECS \
"Time between HELLO packets\n" \
"Time between retransmitting lost link state advertisements\n" \
"Link state transmit delay\n" \
"Interval time after which a neighbor is declared down\n"
#define VLINK_HELPSTR_TIME_PARAM \ #define VLINK_HELPSTR_TIME_PARAM \
VLINK_HELPSTR_TIME_PARAM_NOSECS \ "Time between HELLO packets\n" \
"Seconds\n" "Seconds\n" \
"Time between retransmitting lost link state advertisements\n" \
"Seconds\n" \
"Link state transmit delay\n" \
"Seconds\n" \
"Interval time after which a neighbor is declared down\n" \
"Seconds\n" \
#define VLINK_HELPSTR_AUTH_SIMPLE \ #define VLINK_HELPSTR_AUTH_SIMPLE \
"Authentication password (key)\n" \ "Authentication password (key)\n" \
@ -1131,16 +1131,8 @@ DEFUN (ospf_area_vlink,
DEFUN (ospf_area_vlink_intervals, DEFUN (ospf_area_vlink_intervals,
ospf_area_vlink_intervals_cmd, ospf_area_vlink_intervals_cmd,
"area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D" "area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D {hello-interval (1-65535)|retransmit-interval (1-65535)|transmit-delay (1-65535)|dead-interval (1-65535)}",
"<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"[<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"[<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"[<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"]]]",
VLINK_HELPSTR_IPADDR VLINK_HELPSTR_IPADDR
VLINK_HELPSTR_TIME_PARAM
VLINK_HELPSTR_TIME_PARAM
VLINK_HELPSTR_TIME_PARAM
VLINK_HELPSTR_TIME_PARAM) VLINK_HELPSTR_TIME_PARAM)
{ {
VTY_DECLVAR_CONTEXT(ospf, ospf); VTY_DECLVAR_CONTEXT(ospf, ospf);
@ -1165,17 +1157,17 @@ DEFUN (ospf_area_vlink_intervals,
vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTY_NEWLINE); vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTY_NEWLINE);
return CMD_WARNING; return CMD_WARNING;
} }
for (unsigned int i = 0; i < 4; i++)
for (int idx = 4; idx < argc; idx++)
{ {
int idx = 0; if (strmatch (argv[idx]->text, "hello-interval"))
if (argv_find (argv, argc, "hello-interval", &idx)) vl_config.hello_interval = strtol(argv[++idx]->arg, NULL, 10);
vl_config.hello_interval = strtol(argv[idx+1]->arg, NULL, 10); else if (strmatch (argv[idx]->text, "retransmit-interval"))
else if (argv_find (argv, argc, "retransmit-interval", &idx)) vl_config.retransmit_interval = strtol(argv[++idx]->arg, NULL, 10);
vl_config.retransmit_interval = strtol(argv[idx+1]->arg, NULL, 10); else if (strmatch (argv[idx]->text, "transmit-delay"))
else if (argv_find (argv, argc, "transmit-delay", &idx)) vl_config.transmit_delay = strtol(argv[++idx]->arg, NULL, 10);
vl_config.transmit_delay = strtol(argv[idx+1]->arg, NULL, 10); else if (strmatch (argv[idx]->text, "dead-interval"))
else if (argv_find (argv, argc, "dead-interval", &idx)) vl_config.dead_interval = strtol(argv[++idx]->arg, NULL, 10);
vl_config.dead_interval = strtol(argv[idx+1]->arg, NULL, 10);
} }
/* Action configuration */ /* Action configuration */
@ -1294,17 +1286,9 @@ DEFUN (no_ospf_area_vlink,
DEFUN (no_ospf_area_vlink_intervals, DEFUN (no_ospf_area_vlink_intervals,
no_ospf_area_vlink_intervals_cmd, no_ospf_area_vlink_intervals_cmd,
"no area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D" "no area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D {hello-interval (1-65535)|retransmit-interval (1-65535)|transmit-delay (1-65535)|dead-interval (1-65535)}",
"<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"[<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"[<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"[<hello-interval|retransmit-interval|transmit-delay|dead-interval> (1-65535)"
"]]]",
NO_STR NO_STR
VLINK_HELPSTR_IPADDR VLINK_HELPSTR_IPADDR
VLINK_HELPSTR_TIME_PARAM
VLINK_HELPSTR_TIME_PARAM
VLINK_HELPSTR_TIME_PARAM
VLINK_HELPSTR_TIME_PARAM) VLINK_HELPSTR_TIME_PARAM)
{ {
VTY_DECLVAR_CONTEXT(ospf, ospf); VTY_DECLVAR_CONTEXT(ospf, ospf);
@ -1330,16 +1314,15 @@ DEFUN (no_ospf_area_vlink_intervals,
return CMD_WARNING; return CMD_WARNING;
} }
for (unsigned int i = 0; i < 4; i++) for (int idx = 5; idx < argc; idx++)
{ {
int idx = 0; if (strmatch (argv[idx]->text, "hello-interval"))
if (argv_find (argv, argc, "hello-interval", &idx))
vl_config.hello_interval = OSPF_HELLO_INTERVAL_DEFAULT; vl_config.hello_interval = OSPF_HELLO_INTERVAL_DEFAULT;
else if (argv_find (argv, argc, "retransmit-interval", &idx)) else if (strmatch (argv[idx]->text, "retransmit-interval"))
vl_config.retransmit_interval = OSPF_RETRANSMIT_INTERVAL_DEFAULT; vl_config.retransmit_interval = OSPF_RETRANSMIT_INTERVAL_DEFAULT;
else if (argv_find (argv, argc, "transmit-delay", &idx)) else if (strmatch (argv[idx]->text, "transmit-delay"))
vl_config.transmit_delay = OSPF_TRANSMIT_DELAY_DEFAULT; vl_config.transmit_delay = OSPF_TRANSMIT_DELAY_DEFAULT;
else if (argv_find (argv, argc, "dead-interval", &idx)) else if (strmatch (argv[idx]->text, "dead-interval"))
vl_config.dead_interval = OSPF_ROUTER_DEAD_INTERVAL_DEFAULT; vl_config.dead_interval = OSPF_ROUTER_DEAD_INTERVAL_DEFAULT;
} }