proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 08:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: shufflin

Browse Source 
move virtual-link command down to be next to its no form

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-05-31 19:04:53 +00:00
parent f1c2f41143
commit 0c2206de31
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ospfd/ospf_vty.c
View File

@ -1130,51 +1130,6 @@ DEFUN (ospf_area_vlink,
}
DEFUN (ospf_area_vlink_intervals,
ospf_area_vlink_intervals_cmd,
"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)}",
VLINK_HELPSTR_IPADDR
VLINK_HELPSTR_TIME_PARAM)
{
VTY_DECLVAR_CONTEXT(ospf, ospf);
struct ospf_vl_config_data vl_config;
int ret = 0;
ospf_vl_config_data_init(&vl_config, vty);
char *area_id = argv[1]->arg;
char *router_id = argv[3]->arg;
ret = str2area_id (area_id, &vl_config.area_id, &vl_config.area_id_fmt);
if (ret < 0)
{
vty_out (vty, "OSPF area ID is invalid%s", VTY_NEWLINE);
return CMD_WARNING;
}
ret = inet_aton (router_id, &vl_config.vl_peer);
if (! ret)
{
vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTY_NEWLINE);
return CMD_WARNING;
}
for (int idx = 4; idx < argc; idx++)
{
if (strmatch (argv[idx]->text, "hello-interval"))
vl_config.hello_interval = strtol(argv[++idx]->arg, NULL, 10);
else if (strmatch (argv[idx]->text, "retransmit-interval"))
vl_config.retransmit_interval = strtol(argv[++idx]->arg, NULL, 10);
else if (strmatch (argv[idx]->text, "transmit-delay"))
vl_config.transmit_delay = strtol(argv[++idx]->arg, NULL, 10);
else if (strmatch (argv[idx]->text, "dead-interval"))
vl_config.dead_interval = strtol(argv[++idx]->arg, NULL, 10);
}
/* Action configuration */
return ospf_vl_set (ospf, &vl_config);
}
DEFUN (no_ospf_area_vlink,
no_ospf_area_vlink_cmd,
"no area <A.B.C.D|(0-4294967295)> virtual-link A.B.C.D [authentication] [<message-digest|null>] [<message-digest-key (1-255) md5 KEY|authentication-key AUTH_KEY>]",
@ -1285,6 +1240,51 @@ DEFUN (no_ospf_area_vlink,
return ospf_vl_set (ospf, &vl_config);
}
DEFUN (ospf_area_vlink_intervals,
ospf_area_vlink_intervals_cmd,
"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)}",
VLINK_HELPSTR_IPADDR
VLINK_HELPSTR_TIME_PARAM)
{
VTY_DECLVAR_CONTEXT(ospf, ospf);
struct ospf_vl_config_data vl_config;
int ret = 0;
ospf_vl_config_data_init(&vl_config, vty);
char *area_id = argv[1]->arg;
char *router_id = argv[3]->arg;
ret = str2area_id (area_id, &vl_config.area_id, &vl_config.area_id_fmt);
if (ret < 0)
{
vty_out (vty, "OSPF area ID is invalid%s", VTY_NEWLINE);
return CMD_WARNING;
}
ret = inet_aton (router_id, &vl_config.vl_peer);
if (! ret)
{
vty_out (vty, "Please specify valid Router ID as a.b.c.d%s", VTY_NEWLINE);
return CMD_WARNING;
}
for (int idx = 4; idx < argc; idx++)
{
if (strmatch (argv[idx]->text, "hello-interval"))
vl_config.hello_interval = strtol(argv[++idx]->arg, NULL, 10);
else if (strmatch (argv[idx]->text, "retransmit-interval"))
vl_config.retransmit_interval = strtol(argv[++idx]->arg, NULL, 10);
else if (strmatch (argv[idx]->text, "transmit-delay"))
vl_config.transmit_delay = strtol(argv[++idx]->arg, NULL, 10);
else if (strmatch (argv[idx]->text, "dead-interval"))
vl_config.dead_interval = strtol(argv[++idx]->arg, NULL, 10);
}
/* Action configuration */
return ospf_vl_set (ospf, &vl_config);
}
DEFUN (no_ospf_area_vlink_intervals,
no_ospf_area_vlink_intervals_cmd,
"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)}",