summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorsarita patra <saritap@vmware.com>2022-04-27 10:24:42 +0200
committerSarita Patra <saritap@vmware.com>2022-07-06 11:41:47 +0200
commit6b362f9fb15df308e17fc232bdc5a4e93b028b2a (patch)
treed7b2c43eaf98fefeb3814fcbeb6c1c010b2e0658 /pimd
parentpim6d: Adjust rpf_addr in pim_vxlan_orig_mr_up_add (diff)
downloadfrr-6b362f9fb15df308e17fc232bdc5a4e93b028b2a.tar.xz
frr-6b362f9fb15df308e17fc232bdc5a4e93b028b2a.zip
pim6d: Adjust rpf_addr in pim_tib code
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>
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_tib.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/pimd/pim_tib.c b/pimd/pim_tib.c
index a69177a6e..81dcfc926 100644
--- a/pimd/pim_tib.c
+++ b/pimd/pim_tib.c
@@ -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;
int input_iface_vif_index = 0;
pim_addr vif_source;
- struct prefix src, grp;
+ struct prefix grp;
struct pim_nexthop nexthop;
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__);
}
- pim_addr_to_prefix(&src, vif_source); // RP or Src addr
pim_addr_to_prefix(&grp, sg.grp);
up = pim_upstream_find(pim, &sg);
if (up) {
memcpy(&nexthop, &up->rpf.source_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)
input_iface_vif_index = pim_if_find_vifindex_by_ifindex(
pim, nexthop.interface->ifindex);
} else
- input_iface_vif_index =
- pim_ecmp_fib_lookup_if_vif_index(pim, &src, &grp);
+ input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index(
+ pim, &vif_source, &grp);
if (PIM_DEBUG_ZEBRA)
zlog_debug("%s: NHT %pSG vif_source %pPAs vif_index:%d",