lib: Fix `ipv6 access-list...` and `ipv6 prefix-list...`

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/filter.c b/lib/filter.c
index 501b28f2da6f54cd2c12844c10e338579fd96e32..072d3ddc2ede0d391000d381961596e6dce3c832 100644 (file)
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -1539,12 +1539,12 @@ DEFUN (ipv6_access_list,
        "IPv6 zebra access-list\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n")
+       "IPv6 prefix\n")
 {
-  int idx_word = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv6_prefixlen = 4;
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP6, argv[idx_ipv6_prefixlen]->arg, 0, 1);
+  int idx = 0;
+  char *alname = argv_find (argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL;
+  char *prefix = argv_find (argv, argc, "X:X::X:X/M", &idx) ? argv[idx]->arg : NULL;
+  return filter_set_zebra (vty, alname, argv[3]->text, AFI_IP6, prefix, 0, 1);
 }
 
 DEFUN (ipv6_access_list_exact,
@@ -1555,13 +1555,13 @@ DEFUN (ipv6_access_list_exact,
        "IPv6 zebra access-list\n"
        "Specify packets to reject\n"
        "Specify packets to forward\n"
-       "Prefix to match. e.g. 3ffe:506::/32\n"
+       "IPv6 prefix\n"
        "Exact match of the prefixes\n")
 {
-  int idx_word = 2;
-  int idx_permit_deny = 3;
-  int idx_ipv6_prefixlen = 4;
-  return filter_set_zebra (vty, argv[idx_word]->arg, argv[idx_permit_deny]->arg, AFI_IP6, argv[idx_ipv6_prefixlen]->arg, 1, 1);
+  int idx = 0;
+  char *alname = argv_find (argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL;
+  char *prefix = argv_find (argv, argc, "X:X::X:X/M", &idx) ? argv[idx]->arg : NULL;
+  return filter_set_zebra (vty, alname, argv[3]->text, AFI_IP6, prefix, 1, 1);
 }
 
 DEFUN (ipv6_access_list_any,

diff --git a/lib/plist.c b/lib/plist.c
index a854ad52b33afe1fbe77d1e35bcea8af758b0d4f..1f5e595fd8446d8b420d9a3a06554ebeebe9e746 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -2671,7 +2671,7 @@ DEFUN (no_ipv6_prefix_list_description_comment,
        "Prefix-list specific description\n"
        "Up to 80 characters describing this prefix-list\n")
 {
-  return no_ipv6_prefix_list_description_comment (self, vty, argc, argv);
+  return no_ipv6_prefix_list_description (self, vty, argc, argv);
 }