From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Thu, 17 Nov 2016 22:51:32 +0000 (+0000)
Subject: bgpd: Fix `ip as-path access-list ...` breakage
X-Git-Tag: frr-3.0-branchpoint~129^2~20
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=332bafd852bbca6ceb1d644ac4665df13019b72a;p=matthieu%2Ffrr.git

bgpd: Fix `ip as-path access-list ...` breakage

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

diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index 6755335535..2244e959b6 100644
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -437,34 +437,28 @@ DEFUN (ip_as_path,
        "Specify packets to forward\n"
        "A regular-expression to match the BGP AS paths\n")
 {
-  int idx_word = 3;
-  int idx_permit_deny = 4;
+  int idx = 0;
   enum as_filter_type type;
   struct as_filter *asfilter;
   struct as_list *aslist;
   regex_t *regex;
   char *regstr;
 
+  /* Retrieve access list name */
+  char *alname = argv_find (argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL;
+
   /* Check the filter type. */
-  if (strncmp (argv[idx_permit_deny]->arg, "p", 1) == 0)
-    type = AS_FILTER_PERMIT;
-  else if (strncmp (argv[idx_permit_deny]->arg, "d", 1) == 0)
-    type = AS_FILTER_DENY;
-  else
-    {
-      vty_out (vty, "filter type must be [permit|deny]%s", VTY_NEWLINE);
-      return CMD_WARNING;
-    }
+  type = argv_find (argv, argc, "deny", &idx) ? AS_FILTER_DENY : AS_FILTER_PERMIT;
 
   /* Check AS path regex. */
-  regstr = argv_concat(argv, argc, idx_permit_deny);
+  argv_find (argv, argc, "LINE", &idx);
+  regstr = argv_concat(argv, argc, idx);
 
   regex = bgp_regcomp (regstr);
   if (!regex)
     {
       XFREE (MTYPE_TMP, regstr);
-      vty_out (vty, "can't compile regexp %s%s", argv[idx_word]->arg,
-	       VTY_NEWLINE);
+      vty_out (vty, "can't compile regexp %s%s", regstr, VTY_NEWLINE);
       return CMD_WARNING;
     }
 
@@ -473,7 +467,7 @@ DEFUN (ip_as_path,
   XFREE (MTYPE_TMP, regstr);
 
   /* Install new filter to the access_list. */
-  aslist = as_list_get (argv[idx_word]->arg);
+  aslist = as_list_get (alname);
 
   /* Duplicate insertion check. */;
   if (as_list_dup_check (aslist, asfilter))