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

Merge pull request #3037 from patrasar/2851

Browse Source 
bgpd: remove ip prefix from as-path, <large,ext>community-list
This commit is contained in:
Quentin Young 2018-10-09 11:56:26 -04:00 committed by GitHub
commit 22bca40d60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 683 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
bgpd/bgp_filter.c
View File

@ -77,7 +77,7 @@ struct as_list {
struct as_filter *tail; struct as_filter *tail;
}; };
/* ip as-path access-list 10 permit AS1. */ /* as-path access-list 10 permit AS1. */
static struct as_list_master as_list_master = {{NULL, NULL}, static struct as_list_master as_list_master = {{NULL, NULL},
{NULL, NULL}, {NULL, NULL},
@ -401,9 +401,9 @@ static int config_bgp_aspath_validate(const char *regstr)
return 0; return 0;
} }
DEFUN(ip_as_path, ip_as_path_cmd, DEFUN(as_path, bgp_as_path_cmd,
"ip as-path access-list WORD <deny|permit> LINE...", "bgp as-path access-list WORD <deny|permit> LINE...",
IP_STR BGP_STR
"BGP autonomous system path filter\n" "BGP autonomous system path filter\n"
"Specify an access list name\n" "Specify an access list name\n"
"Regular expression access list name\n" "Regular expression access list name\n"
@ -418,6 +418,13 @@ DEFUN(ip_as_path, ip_as_path_cmd,
regex_t *regex; regex_t *regex;
char *regstr; char *regstr;
if (argv_find(argv, argc, "ip", &idx)) {
vty_out(vty, "This config option is deprecated and is scheduled for removal.\n");
vty_out(vty, "if you are using this please migrate to the below command\n");
vty_out(vty, "'bgp as-path access-list WORD <deny|permit> LINE'\n");
zlog_warn("Deprecated option: 'ip as-path access-list WORD <deny|permit> LINE' being used");
}
/* Retrieve access list name */ /* Retrieve access list name */
argv_find(argv, argc, "WORD", &idx); argv_find(argv, argc, "WORD", &idx);
char *alname = argv[idx]->arg; char *alname = argv[idx]->arg;
@ -459,9 +466,23 @@ DEFUN(ip_as_path, ip_as_path_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(no_ip_as_path, no_ip_as_path_cmd, #if CONFDATE > 20191005
"no ip as-path access-list WORD <deny|permit> LINE...", CPP_NOTICE("bgpd: remove deprecated 'ip as-path access-list WORD <deny|permit> LINE' command")
NO_STR IP_STR #endif
ALIAS(as_path, ip_as_path_cmd,
"ip as-path access-list WORD <deny|permit> LINE...",
IP_STR
"BGP autonomous system path filter\n"
"Specify an access list name\n"
"Regular expression access list name\n"
"Specify packets to reject\n"
"Specify packets to forward\n"
"A regular-expression (1234567890_(^|[,{}() ]|$)) to match the BGP AS paths\n")
DEFUN(no_as_path, no_bgp_as_path_cmd,
"no bgp as-path access-list WORD <deny|permit> LINE...",
NO_STR
BGP_STR
"BGP autonomous system path filter\n" "BGP autonomous system path filter\n"
"Specify an access list name\n" "Specify an access list name\n"
"Regular expression access list name\n" "Regular expression access list name\n"
@ -476,13 +497,19 @@ DEFUN(no_ip_as_path, no_ip_as_path_cmd,
char *regstr; char *regstr;
regex_t *regex; regex_t *regex;
if (argv_find(argv, argc, "ip", &idx)) {
vty_out(vty, "This config option is deprecated, and is scheduled for removal.\n");
vty_out(vty, "if you are using this please migrate to the below command\n");
vty_out(vty, "'no bgp as-path access-list WORD <deny|permit> LINE'\n");
zlog_warn("Deprecated option: 'no ip as-path access-list WORD <deny|permit> LINE' being used");
}
char *aslistname = char *aslistname =
argv_find(argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL; argv_find(argv, argc, "WORD", &idx) ? argv[idx]->arg : NULL;
/* Lookup AS list from AS path list. */ /* Lookup AS list from AS path list. */
aslist = as_list_lookup(aslistname); aslist = as_list_lookup(aslistname);
if (aslist == NULL) { if (aslist == NULL) {
vty_out(vty, "ip as-path access-list %s doesn't exist\n", vty_out(vty, "bgp as-path access-list %s doesn't exist\n",
aslistname); aslistname);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -530,21 +557,39 @@ DEFUN(no_ip_as_path, no_ip_as_path_cmd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (no_ip_as_path_all, ALIAS(no_as_path, no_ip_as_path_cmd,
no_ip_as_path_all_cmd, "no ip as-path access-list WORD <deny|permit> LINE...",
"no ip as-path access-list WORD", NO_STR IP_STR
"BGP autonomous system path filter\n"
"Specify an access list name\n"
"Regular expression access list name\n"
"Specify packets to reject\n"
"Specify packets to forward\n"
"A regular-expression (1234567890_(^|[,{}() ]|$)) to match the BGP AS paths\n")
DEFUN (no_as_path_all,
no_bgp_as_path_all_cmd,
"no bgp as-path access-list WORD",
NO_STR NO_STR
IP_STR BGP_STR
"BGP autonomous system path filter\n" "BGP autonomous system path filter\n"
"Specify an access list name\n" "Specify an access list name\n"
"Regular expression access list name\n") "Regular expression access list name\n")
{ {
int idx_word = 4; int idx_word = 4;
struct as_list *aslist; struct as_list *aslist;
int idx = 0;
if (argv_find(argv, argc, "ip", &idx)) {
vty_out(vty, "This config option is deprecated, and is scheduled for removal.\n");
vty_out(vty, "if you are using this please migrate to the below command\n");
vty_out(vty, "'no bgp as-path access-list WORD'\n");
zlog_warn("Deprecated option: `no ip as-path access-list WORD` being used");
}
aslist = as_list_lookup(argv[idx_word]->arg); aslist = as_list_lookup(argv[idx_word]->arg);
if (aslist == NULL) { if (aslist == NULL) {
vty_out(vty, "ip as-path access-list %s doesn't exist\n", vty_out(vty, "bgp as-path access-list %s doesn't exist\n",
argv[idx_word]->arg); argv[idx_word]->arg);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} }
@ -558,6 +603,15 @@ DEFUN (no_ip_as_path_all,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS (no_as_path_all,
no_ip_as_path_all_cmd,
"no ip as-path access-list WORD",
NO_STR
IP_STR
"BGP autonomous system path filter\n"
"Specify an access list name\n"
"Regular expression access list name\n")
static void as_list_show(struct vty *vty, struct as_list *aslist) static void as_list_show(struct vty *vty, struct as_list *aslist)
{ {
struct as_filter *asfilter; struct as_filter *asfilter;
@ -598,17 +652,24 @@ static void as_list_show_all(struct vty *vty)
} }
} }
DEFUN (show_ip_as_path_access_list, DEFUN (show_as_path_access_list,
show_ip_as_path_access_list_cmd, show_bgp_as_path_access_list_cmd,
"show ip as-path-access-list WORD", "show bgp as-path-access-list WORD",
SHOW_STR SHOW_STR
IP_STR BGP_STR
"List AS path access lists\n" "List AS path access lists\n"
"AS path access list name\n") "AS path access list name\n")
{ {
int idx_word = 3; int idx_word = 3;
struct as_list *aslist; struct as_list *aslist;
int idx = 0;
if (argv_find(argv, argc, "ip", &idx)) {
vty_out(vty, "This config option is deprecated, and is scheduled for removal.\n");
vty_out(vty, "if you are using this please migrate to the below command\n");
vty_out(vty, "'show bgp as-path-access-list WORD'\n");
zlog_warn("Deprecated option: 'show ip as-path-access-list WORD' being used");
}
aslist = as_list_lookup(argv[idx_word]->arg); aslist = as_list_lookup(argv[idx_word]->arg);
if (aslist) if (aslist)
as_list_show(vty, aslist); as_list_show(vty, aslist);
@ -616,16 +677,39 @@ DEFUN (show_ip_as_path_access_list,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_ip_as_path_access_list_all, ALIAS (show_as_path_access_list,
show_ip_as_path_access_list_cmd,
"show ip as-path-access-list WORD",
SHOW_STR
IP_STR
"List AS path access lists\n"
"AS path access list name\n")
DEFUN (show_as_path_access_list_all,
show_bgp_as_path_access_list_all_cmd,
"show bgp as-path-access-list",
SHOW_STR
BGP_STR
"List AS path access lists\n")
{
int idx = 0;
if (argv_find(argv, argc, "ip", &idx)) {
vty_out(vty, "This config option is deprecated, and is scheduled for removal.\n");
vty_out(vty, "if you are using this please migrate to the below command\n");
vty_out(vty, "'show bgp as-path-access-list'\n");
zlog_warn("Deprecated option: 'show ip as-path-access-list' being used");
}
as_list_show_all(vty);
return CMD_SUCCESS;
}
ALIAS (show_as_path_access_list_all,
show_ip_as_path_access_list_all_cmd, show_ip_as_path_access_list_all_cmd,
"show ip as-path-access-list", "show ip as-path-access-list",
SHOW_STR SHOW_STR
IP_STR IP_STR
"List AS path access lists\n") "List AS path access lists\n")
{
as_list_show_all(vty);
return CMD_SUCCESS;
}
static int config_write_as_list(struct vty *vty) static int config_write_as_list(struct vty *vty)
{ {
@ -636,7 +720,7 @@ static int config_write_as_list(struct vty *vty)
for (aslist = as_list_master.num.head; aslist; aslist = aslist->next) for (aslist = as_list_master.num.head; aslist; aslist = aslist->next)
for (asfilter = aslist->head; asfilter; for (asfilter = aslist->head; asfilter;
asfilter = asfilter->next) { asfilter = asfilter->next) {
vty_out(vty, "ip as-path access-list %s %s %s\n", vty_out(vty, "bgp as-path access-list %s %s %s\n",
aslist->name, filter_type_str(asfilter->type), aslist->name, filter_type_str(asfilter->type),
asfilter->reg_str); asfilter->reg_str);
write++; write++;
@ -645,7 +729,7 @@ static int config_write_as_list(struct vty *vty)
for (aslist = as_list_master.str.head; aslist; aslist = aslist->next) for (aslist = as_list_master.str.head; aslist; aslist = aslist->next)
for (asfilter = aslist->head; asfilter; for (asfilter = aslist->head; asfilter;
asfilter = asfilter->next) { asfilter = asfilter->next) {
vty_out(vty, "ip as-path access-list %s %s %s\n", vty_out(vty, "bgp as-path access-list %s %s %s\n",
aslist->name, filter_type_str(asfilter->type), aslist->name, filter_type_str(asfilter->type),
asfilter->reg_str); asfilter->reg_str);
write++; write++;
@ -660,11 +744,16 @@ void bgp_filter_init(void)
{ {
install_node(&as_list_node, config_write_as_list); install_node(&as_list_node, config_write_as_list);
install_element(CONFIG_NODE, &bgp_as_path_cmd);
install_element(CONFIG_NODE, &ip_as_path_cmd); install_element(CONFIG_NODE, &ip_as_path_cmd);
install_element(CONFIG_NODE, &no_bgp_as_path_cmd);
install_element(CONFIG_NODE, &no_ip_as_path_cmd); install_element(CONFIG_NODE, &no_ip_as_path_cmd);
install_element(CONFIG_NODE, &no_bgp_as_path_all_cmd);
install_element(CONFIG_NODE, &no_ip_as_path_all_cmd); install_element(CONFIG_NODE, &no_ip_as_path_all_cmd);
install_element(VIEW_NODE, &show_bgp_as_path_access_list_cmd);
install_element(VIEW_NODE, &show_ip_as_path_access_list_cmd); install_element(VIEW_NODE, &show_ip_as_path_access_list_cmd);
install_element(VIEW_NODE, &show_bgp_as_path_access_list_all_cmd);
install_element(VIEW_NODE, &show_ip_as_path_access_list_all_cmd); install_element(VIEW_NODE, &show_ip_as_path_access_list_all_cmd);
} }

706
bgpd/bgp_vty.c
View File

File diff suppressed because it is too large Load Diff

16
vtysh/vtysh_config.c
View File

@ -271,18 +271,18 @@ void vtysh_config_parse_line(void *arg, const char *line)
strlen("ipv6 prefix-list")) strlen("ipv6 prefix-list"))
== 0) == 0)
config = config_get(PREFIX_IPV6_NODE, line); config = config_get(PREFIX_IPV6_NODE, line);
else if (strncmp(line, "ip as-path access-list", else if (strncmp(line, "bgp as-path access-list",
strlen("ip as-path access-list")) strlen("bgp as-path access-list"))
== 0) == 0)
config = config_get(AS_LIST_NODE, line); config = config_get(AS_LIST_NODE, line);
else if (strncmp(line, "ip community-list", else if (strncmp(line, "bgp community-list",
strlen("ip community-list")) strlen("bgp community-list"))
== 0 == 0
|| strncmp(line, "ip extcommunity-list", || strncmp(line, "bgp extcommunity-list",
strlen("ip extcommunity-list")) strlen("bgp extcommunity-list"))
== 0 == 0
|| strncmp(line, "ip large-community-list", || strncmp(line, "bgp large-community-list",
strlen("ip large-community-list")) strlen("bgp large-community-list"))
== 0) == 0)
config = config_get(COMMUNITY_LIST_NODE, line); config = config_get(COMMUNITY_LIST_NODE, line);
else if (strncmp(line, "ip route", strlen("ip route")) == 0) else if (strncmp(line, "ip route", strlen("ip route")) == 0)