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

pim6d: Adjust rpf_addr in pim_tib code

Browse Source 
In this PR, we are handling the pim_tib code
after rpf_addr modified from prefix to pim_addr.

Signed-off-by: sarita patra <saritap@vmware.com>
This commit is contained in:
sarita patra 2022-04-27 01:24:42 -07:00 committed by Sarita Patra
parent 122c31403e
commit 6b362f9fb1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pimd/pim_tib.c
View File

@ -34,7 +34,7 @@ tib_sg_oil_setup(struct pim_instance *pim, pim_sgaddr sg, struct interface *oif)
struct pim_interface *pim_oif = oif->info; struct pim_interface *pim_oif = oif->info;
int input_iface_vif_index = 0; int input_iface_vif_index = 0;
pim_addr vif_source; pim_addr vif_source;
struct prefix src, grp; struct prefix grp;
struct pim_nexthop nexthop; struct pim_nexthop nexthop;
struct pim_upstream *up = NULL; struct pim_upstream *up = NULL;
@ -43,20 +43,19 @@ tib_sg_oil_setup(struct pim_instance *pim, pim_sgaddr sg, struct interface *oif)
return pim_channel_oil_add(pim, &sg, __func__); return pim_channel_oil_add(pim, &sg, __func__);
} }
pim_addr_to_prefix(&src, vif_source); // RP or Src addr
pim_addr_to_prefix(&grp, sg.grp); pim_addr_to_prefix(&grp, sg.grp);
up = pim_upstream_find(pim, &sg); up = pim_upstream_find(pim, &sg);
if (up) { if (up) {
memcpy(&nexthop, &up->rpf.source_nexthop, memcpy(&nexthop, &up->rpf.source_nexthop,
sizeof(struct pim_nexthop)); sizeof(struct pim_nexthop));
pim_ecmp_nexthop_lookup(pim, &nexthop, &src, &grp, 0); pim_ecmp_nexthop_lookup(pim, &nexthop, &vif_source, &grp, 0);
if (nexthop.interface) if (nexthop.interface)
input_iface_vif_index = pim_if_find_vifindex_by_ifindex( input_iface_vif_index = pim_if_find_vifindex_by_ifindex(
pim, nexthop.interface->ifindex); pim, nexthop.interface->ifindex);
} else } else
input_iface_vif_index = input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index(
pim_ecmp_fib_lookup_if_vif_index(pim, &src, &grp); pim, &vif_source, &grp);
if (PIM_DEBUG_ZEBRA) if (PIM_DEBUG_ZEBRA)
zlog_debug("%s: NHT %pSG vif_source %pPAs vif_index:%d", zlog_debug("%s: NHT %pSG vif_source %pPAs vif_index:%d",