From 439aa9fa39bc14628726a664bce6d163de132b60 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 2 May 2017 22:48:32 -0400 Subject: [PATCH 1/2] ospf6d: Fix 'no area .. range...' command The cli uplift had confused some parameters. Signed-off-by: Donald Sharp --- ospf6d/ospf6_area.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c index 198526a0eb..2b25585e6c 100644 --- a/ospf6d/ospf6_area.c +++ b/ospf6d/ospf6_area.c @@ -523,6 +523,7 @@ DEFUN (no_area_range, "Advertised metric for this range\n") { int idx_ipv4 = 2; + int idx_ipv6 = 4; int ret; struct ospf6_area *oa; struct prefix prefix; @@ -530,17 +531,17 @@ DEFUN (no_area_range, 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) { - 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; } range = ospf6_route_lookup (&prefix, oa->range_table); 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; } @@ -562,9 +563,6 @@ DEFUN (no_area_range, return CMD_SUCCESS; } - - - void ospf6_area_config_write (struct vty *vty) { From 1a5ce38b9f894f81f757da1fba6efa2b3698b31e Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 5 May 2017 07:33:17 -0400 Subject: [PATCH 2/2] ospfd: Actually fix ospf redistribute. This is the final time I swear! Signed-off-by: Donald Sharp --- ospfd/ospf_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index f5880ca9e3..44bf1b8667 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -7160,7 +7160,7 @@ DEFUN (no_ospf_redistribute_source, DEFUN (ospf_redistribute_instance_source, ospf_redistribute_instance_source_cmd, - "redistribute (1-65535) {metric (0-16777214)|metric-type (1-2)|route-map WORD}", + "redistribute (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]", REDIST_STR "Open Shortest Path First\n" "Non-main Kernel Routing Table\n" @@ -7231,7 +7231,7 @@ DEFUN (ospf_redistribute_instance_source, DEFUN (no_ospf_redistribute_instance_source, no_ospf_redistribute_instance_source_cmd, - "no redistribute (1-65535) {metric (0-16777214)|metric-type (1-2)|route-map WORD}", + "no redistribute (1-65535) [{metric (0-16777214)|metric-type (1-2)|route-map WORD}]", NO_STR REDIST_STR "Open Shortest Path First\n"