proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-06 09:00:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Only apply prefix's to the same family

Browse Source 
When we have a v4 or v6 prefix list, only
apply it via a match when the address families
are the same.

Fixes: #1339
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-11-07 10:54:03 -05:00
parent 608646688b
commit 4f3749854a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/plist.c
View File

@ -659,6 +659,9 @@ static int prefix_list_entry_match(struct prefix_list_entry *pentry,
{
int ret;
if (pentry->prefix.family != p->family)
return 0;
ret = prefix_match(&pentry->prefix, p);
if (!ret)
return 0;
@ -1226,9 +1229,11 @@ static int vty_show_prefix_list_prefix(struct vty *vty, afi_t afi,
if (prefix_same(&p, &pentry->prefix))
match = 1;
if (type == longer_display)
if (prefix_match(&p, &pentry->prefix))
if (type == longer_display) {
if ((p.family == pentry->prefix.family) &&
(prefix_match(&p, &pentry->prefix)))
match = 1;
}
if (match) {
vty_out(vty, " seq %u %s ", pentry->seq,
@ -1305,7 +1310,8 @@ static int vty_clear_prefix_list(struct vty *vty, afi_t afi, const char *name,
for (pentry = plist->head; pentry; pentry = pentry->next) {
if (prefix) {
if (prefix_match(&pentry->prefix, &p))
if (pentry->prefix.family == p.family &&
prefix_match(&pentry->prefix, &p))
pentry->hitcnt = 0;
} else
pentry->hitcnt = 0;