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

Merge pull request #545 from donaldsharp/ospf_3.0_fixes

Browse Source 
Ospf 3.0 fixes
This commit is contained in:
David Lamparter 2017-05-17 11:15:45 +02:00 committed by GitHub
commit c2b449bfa6
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ospf6d/ospf6_area.c
View File

@ -523,6 +523,7 @@ DEFUN (no_area_range,
"Advertised metric for this range\n") "Advertised metric for this range\n")
{ {
int idx_ipv4 = 2; int idx_ipv4 = 2;
int idx_ipv6 = 4;
int ret; int ret;
struct ospf6_area *oa; struct ospf6_area *oa;
struct prefix prefix; struct prefix prefix;
@ -530,17 +531,17 @@ DEFUN (no_area_range,
OSPF6_CMD_AREA_GET (argv[idx_ipv4]->arg, oa); OSPF6_CMD_AREA_GET (argv[idx_ipv4]->arg, oa);
ret = str2prefix (argv[idx_ipv4]->arg, &prefix); ret = str2prefix (argv[idx_ipv6]->arg, &prefix);
if (ret != 1 || prefix.family != AF_INET6) if (ret != 1 || prefix.family != AF_INET6)
{ {
vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv4]->arg, VNL); vty_out (vty, "Malformed argument: %s%s", argv[idx_ipv6]->arg, VNL);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
range = ospf6_route_lookup (&prefix, oa->range_table); range = ospf6_route_lookup (&prefix, oa->range_table);
if (range == NULL) if (range == NULL)
{ {
vty_out (vty, "Range %s does not exists.%s", argv[idx_ipv4]->arg, VNL); vty_out (vty, "Range %s does not exists.%s", argv[idx_ipv6]->arg, VNL);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -562,9 +563,6 @@ DEFUN (no_area_range,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
void void
ospf6_area_config_write (struct vty *vty) ospf6_area_config_write (struct vty *vty)
{ {

4
ospfd/ospf_vty.c
View File

@ -7160,7 +7160,7 @@ DEFUN (no_ospf_redistribute_source,
DEFUN (ospf_redistribute_instance_source, DEFUN (ospf_redistribute_instance_source,
ospf_redistribute_instance_source_cmd, ospf_redistribute_instance_source_cmd,
"redistribute <ospf|table> (1-65535) {metric (0-16777214)|metric-type (1-2)|route-map WORD}", "redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
REDIST_STR REDIST_STR
"Open Shortest Path First\n" "Open Shortest Path First\n"
"Non-main Kernel Routing Table\n" "Non-main Kernel Routing Table\n"
@ -7231,7 +7231,7 @@ DEFUN (ospf_redistribute_instance_source,
DEFUN (no_ospf_redistribute_instance_source, DEFUN (no_ospf_redistribute_instance_source,
no_ospf_redistribute_instance_source_cmd, no_ospf_redistribute_instance_source_cmd,
"no redistribute <ospf|table> (1-65535) {metric (0-16777214)|metric-type (1-2)|route-map WORD}", "no redistribute <ospf|table> (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]",
NO_STR NO_STR
REDIST_STR REDIST_STR
"Open Shortest Path First\n" "Open Shortest Path First\n"