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

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2016-11-17 22:51:32 +00:00
parent 55cb674303
commit 332bafd852

View File

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