Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #11277 from donaldsharp/pim_prefix_list_bug

Browse source 
pimd: Allow the LPM match work properly with prefix lists and normal …
This commit is contained in:
Russ White 2022-05-26 17:47:21 -04:00 committed by GitHub
parent 7e36aa0830 94dc0c4ed4
commit 0f4d109b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pimd/pim_rp.c
View file

@ -274,10 +274,29 @@ struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,
route_unlock_node(rn);
/*
* rp's with prefix lists have the group as 224.0.0.0/4 which will
* match anything. So if we have a rp_info that should match a prefix
* list then if we do match then best should be the answer( even
* if it is NULL )
*/
if (!rp_info || (rp_info && rp_info->plist))
return best;
/*
* So we have a non plist rp_info found in the lookup and no plists
* at all to be choosen, return it!
*/
if (!best)
return rp_info;
if (rp_info->group.prefixlen < best->group.prefixlen)
/*
* If we have a matching non prefix list and a matching prefix
* list we should return the actual rp_info that has the LPM
* If they are equal, use the prefix-list( but let's hope
* the end-operator doesn't do this )
*/
if (rp_info->group.prefixlen > bp->prefixlen)
best = rp_info;
return best;
@ -423,7 +442,7 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
struct rp_info *tmp_rp_info;
char buffer[BUFSIZ];
struct prefix nht_p;
struct route_node *rn;
struct route_node *rn = NULL;
struct pim_upstream *up;
bool upstream_updated = false;
@ -601,13 +620,16 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
}
listnode_add_sort(pim->rp_list, rp_info);
rn = route_node_get(pim->rp_table, &rp_info->group);
rn->info = rp_info;
if (!rp_info->plist) {
rn = route_node_get(pim->rp_table, &rp_info->group);
rn->info = rp_info;
}
if (PIM_DEBUG_PIM_TRACE)
zlog_debug("Allocated: %p for rp_info: %p(%pFX) Lock: %d", rn,
rp_info, &rp_info->group,
route_node_get_lock_count(rn));
rn ? route_node_get_lock_count(rn) : 0);
frr_each (rb_pim_upstream, &pim->upstream_head, up) {
if (pim_addr_is_any(up->sg.src)) {