summaryrefslogtreecommitdiff
path: root/pimd/pim_rpf.c
diff options
context:
space:
mode:
Diffstat (limited to 'pimd/pim_rpf.c')
-rw-r--r--pimd/pim_rpf.c91
1 files changed, 36 insertions, 55 deletions
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index d971cef24b..cee542aa13 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -67,21 +67,19 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
* 255.255.255.255 address, since
* it will never work
*/
- if (addr.s_addr == INADDR_NONE)
+ if (pim_addr_is_any(addr))
return false;
#endif
- if (!pim_addr_cmp(nexthop->last_lookup, addr)
- && (nexthop->last_lookup_time > pim->last_route_change_time)) {
- if (PIM_DEBUG_PIM_NHT) {
- char nexthop_str[PREFIX_STRLEN];
- pim_addr_dump("<nexthop?>", &nexthop->mrib_nexthop_addr,
- nexthop_str, sizeof(nexthop_str));
+ if ((!pim_addr_cmp(nexthop->last_lookup, addr)) &&
+ (nexthop->last_lookup_time > pim->last_route_change_time)) {
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: Using last lookup for %pPAs at %lld, %" PRId64" addr %s",
+ "%s: Using last lookup for %pPAs at %lld, %" PRId64
+ " addr %pFX",
__func__, &addr, nexthop->last_lookup_time,
- pim->last_route_change_time, nexthop_str);
- }
+ pim->last_route_change_time,
+ &nexthop->mrib_nexthop_addr);
pim->nexthop_lookups_avoided++;
return true;
} else {
@@ -140,18 +138,13 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
}
if (found) {
- if (PIM_DEBUG_ZEBRA) {
- char nexthop_str[PREFIX_STRLEN];
- pim_addr_dump("<nexthop?>",
- &nexthop_tab[i].nexthop_addr, nexthop_str,
- sizeof(nexthop_str));
+ if (PIM_DEBUG_ZEBRA)
zlog_debug(
- "%s %s: found nexthop %s for address %pPAs: interface %s ifindex=%d metric=%d pref=%d",
- __FILE__, __func__, nexthop_str, &addr,
- ifp->name, first_ifindex,
- nexthop_tab[i].route_metric,
+ "%s %s: found nexthop %pFX for address %pPAs: interface %s ifindex=%d metric=%d pref=%d",
+ __FILE__, __func__,
+ &nexthop_tab[i].nexthop_addr, &addr, ifp->name,
+ first_ifindex, nexthop_tab[i].route_metric,
nexthop_tab[i].protocol_distance);
- }
/* update nexthop data */
nexthop->interface = ifp;
nexthop->mrib_nexthop_addr = nexthop_tab[i].nexthop_addr;
@@ -169,11 +162,13 @@ bool pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
static int nexthop_mismatch(const struct pim_nexthop *nh1,
const struct pim_nexthop *nh2)
{
- return (nh1->interface != nh2->interface)
- || (nh1->mrib_nexthop_addr.u.prefix4.s_addr
- != nh2->mrib_nexthop_addr.u.prefix4.s_addr)
- || (nh1->mrib_metric_preference != nh2->mrib_metric_preference)
- || (nh1->mrib_route_metric != nh2->mrib_route_metric);
+ pim_addr nh_addr1 = pim_addr_from_prefix(&nh1->mrib_nexthop_addr);
+ pim_addr nh_addr2 = pim_addr_from_prefix(&nh2->mrib_nexthop_addr);
+
+ return (nh1->interface != nh2->interface) ||
+ (pim_addr_cmp(nh_addr1, nh_addr2)) ||
+ (nh1->mrib_metric_preference != nh2->mrib_metric_preference) ||
+ (nh1->mrib_route_metric != nh2->mrib_route_metric);
}
static void pim_rpf_cost_change(struct pim_instance *pim,
@@ -261,19 +256,14 @@ enum pim_rpf_result pim_rpf_update(struct pim_instance *pim,
/* detect change in pim_nexthop */
if (nexthop_mismatch(&rpf->source_nexthop, &saved.source_nexthop)) {
- if (PIM_DEBUG_ZEBRA) {
- char nhaddr_str[PREFIX_STRLEN];
- pim_addr_dump("<addr?>",
- &rpf->source_nexthop.mrib_nexthop_addr,
- nhaddr_str, sizeof(nhaddr_str));
- zlog_debug("%s(%s): (S,G)=%s source nexthop now is: interface=%s address=%s pref=%d metric=%d",
+ if (PIM_DEBUG_ZEBRA)
+ zlog_debug("%s(%s): (S,G)=%s source nexthop now is: interface=%s address=%pFX pref=%d metric=%d",
__func__, caller,
up->sg_str,
rpf->source_nexthop.interface ? rpf->source_nexthop.interface->name : "<ifname?>",
- nhaddr_str,
+ &rpf->source_nexthop.mrib_nexthop_addr,
rpf->source_nexthop.mrib_metric_preference,
rpf->source_nexthop.mrib_route_metric);
- }
pim_upstream_update_join_desired(pim, up);
pim_upstream_update_could_assert(up);
@@ -297,9 +287,8 @@ enum pim_rpf_result pim_rpf_update(struct pim_instance *pim,
}
/* detect change in RPF'(S,G) */
- if (saved.rpf_addr.u.prefix4.s_addr != rpf->rpf_addr.u.prefix4.s_addr
- || saved.source_nexthop
- .interface != rpf->source_nexthop.interface) {
+ if (!prefix_same(&saved.rpf_addr, &rpf->rpf_addr) ||
+ saved.source_nexthop.interface != rpf->source_nexthop.interface) {
pim_rpf_cost_change(pim, up, saved_mrib_route_metric);
return PIM_RPF_CHANGED;
}
@@ -327,13 +316,13 @@ void pim_upstream_rpf_clear(struct pim_instance *pim,
if (up->rpf.source_nexthop.interface) {
pim_upstream_switch(pim, up, PIM_UPSTREAM_NOTJOINED);
up->rpf.source_nexthop.interface = NULL;
- up->rpf.source_nexthop.mrib_nexthop_addr.u.prefix4.s_addr =
- PIM_NET_INADDR_ANY;
+ pim_addr_to_prefix(&up->rpf.source_nexthop.mrib_nexthop_addr,
+ PIMADDR_ANY);
up->rpf.source_nexthop.mrib_metric_preference =
router->infinite_assert_metric.metric_preference;
up->rpf.source_nexthop.mrib_route_metric =
router->infinite_assert_metric.route_metric;
- up->rpf.rpf_addr.u.prefix4.s_addr = PIM_NET_INADDR_ANY;
+ pim_addr_to_prefix(&up->rpf.rpf_addr, PIMADDR_ANY);
pim_upstream_mroute_iif_update(up->channel_oil, __func__);
}
}
@@ -388,27 +377,14 @@ static pim_addr pim_rpf_find_rpf_addr(struct pim_upstream *up)
return rpf_addr;
}
-int pim_rpf_addr_is_inaddr_none(struct pim_rpf *rpf)
-{
- switch (rpf->rpf_addr.family) {
- case AF_INET:
- return rpf->rpf_addr.u.prefix4.s_addr == INADDR_NONE;
- case AF_INET6:
- zlog_warn("%s: v6 Unimplmeneted", __func__);
- return 1;
- default:
- return 0;
- }
-}
-
int pim_rpf_addr_is_inaddr_any(struct pim_rpf *rpf)
{
+ pim_addr rpf_addr = pim_addr_from_prefix(&rpf->rpf_addr);
+
switch (rpf->rpf_addr.family) {
case AF_INET:
- return rpf->rpf_addr.u.prefix4.s_addr == INADDR_ANY;
case AF_INET6:
- zlog_warn("%s: v6 Unimplmented", __func__);
- return 1;
+ return pim_addr_is_any(rpf_addr);
default:
return 0;
}
@@ -426,7 +402,12 @@ unsigned int pim_rpf_hash_key(const void *arg)
{
const struct pim_nexthop_cache *r = arg;
+#if PIM_IPV == 4
return jhash_1word(r->rpf.rpf_addr.u.prefix4.s_addr, 0);
+#else
+ return jhash2(r->rpf.rpf_addr.u.prefix6.s6_addr32,
+ array_size(r->rpf.rpf_addr.u.prefix6.s6_addr32), 0);
+#endif
}
bool pim_rpf_equal(const void *arg1, const void *arg2)
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-10 03:22:52 +0000