#include "pim_zebra.h"
#include "pim_zlookup.h"
#include "pim_rp.h"
+#include "pim_addr.h"
/**
* pim_sendmsg_zebra_rnh -- Format and send a nexthop register/Unregister
struct pim_nexthop_cache *pnc = NULL;
struct pim_nexthop_cache lookup;
- lookup.rpf.rpf_addr.family = rpf->rpf_addr.family;
- lookup.rpf.rpf_addr.prefixlen = rpf->rpf_addr.prefixlen;
- lookup.rpf.rpf_addr.u.prefix4.s_addr = rpf->rpf_addr.u.prefix4.s_addr;
-
+ lookup.rpf.rpf_addr = rpf->rpf_addr;
pnc = hash_lookup(pim->rpf_hash, &lookup);
return pnc;
pnc = XCALLOC(MTYPE_PIM_NEXTHOP_CACHE,
sizeof(struct pim_nexthop_cache));
- pnc->rpf.rpf_addr.family = rpf_addr->rpf_addr.family;
- pnc->rpf.rpf_addr.prefixlen = rpf_addr->rpf_addr.prefixlen;
- pnc->rpf.rpf_addr.u.prefix4.s_addr =
- rpf_addr->rpf_addr.u.prefix4.s_addr;
+ pnc->rpf.rpf_addr = rpf_addr->rpf_addr;
pnc = hash_get(pim->rpf_hash, pnc, hash_alloc_intern);
zclient = pim_zebra_zclient_get();
memset(&rpf, 0, sizeof(struct pim_rpf));
- rpf.rpf_addr.family = addr->family;
- rpf.rpf_addr.prefixlen = addr->prefixlen;
- rpf.rpf_addr.u.prefix4 = addr->u.prefix4;
+ rpf.rpf_addr = *addr;
pnc = pim_nexthop_cache_find(pim, &rpf);
if (!pnc) {
void pim_rp_nexthop_del(struct rp_info *rp_info)
{
rp_info->rp.source_nexthop.interface = NULL;
- rp_info->rp.source_nexthop.mrib_nexthop_addr.u.prefix4.s_addr =
- PIM_NET_INADDR_ANY;
+ pim_addr_to_prefix(&rp_info->rp.source_nexthop.mrib_nexthop_addr,
+ PIMADDR_ANY);
rp_info->rp.source_nexthop.mrib_metric_preference =
router->infinite_assert_metric.metric_preference;
rp_info->rp.source_nexthop.mrib_route_metric =
uint32_t hash_val = 0, mod_val = 0;
uint8_t nh_iter = 0, found = 0;
uint32_t i, num_nbrs = 0;
+ pim_addr nh_addr = pim_addr_from_prefix(&(nexthop->mrib_nexthop_addr));
+ pim_addr src_addr = pim_addr_from_prefix(src);
+ pim_addr grp_addr = pim_addr_from_prefix(grp);
if (!pnc || !pnc->nexthop_num || !nexthop)
return 0;
memset(&nbrs, 0, sizeof(nbrs));
memset(&ifps, 0, sizeof(ifps));
+
// Current Nexthop is VALID, check to stay on the current path.
- if (nexthop->interface && nexthop->interface->info
- && nexthop->mrib_nexthop_addr.u.prefix4.s_addr
- != PIM_NET_INADDR_ANY) {
+ if (nexthop->interface && nexthop->interface->info &&
+ (!pim_addr_is_any(nh_addr))) {
/* User configured knob to explicitly switch
to new path is disabled or current path
metric is less than nexthop update.
pnc->distance;
nexthop->mrib_route_metric =
pnc->metric;
- if (PIM_DEBUG_PIM_NHT) {
- char src_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>",
- src->u.prefix4,
- src_str,
- sizeof(src_str));
- char grp_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>",
- grp->u.prefix4,
- grp_str,
- sizeof(grp_str));
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: (%s,%s)(%s) current nexthop %s is valid, skipping new path selection",
- __func__, src_str,
- grp_str, pim->vrf->name,
+ "%s: (%pPA,%pPA)(%s) current nexthop %s is valid, skipping new path selection",
+ __func__, &src_addr,
+ &grp_addr,
+ pim->vrf->name,
nexthop->interface->name);
- }
return 1;
}
}
#endif
nbrs[i] = pim_neighbor_find(ifps[i], nhaddr);
if (nbrs[i] ||
- pim_if_connected_to_source(ifps[i], src->u.prefix4))
+ pim_if_connected_to_source(ifps[i], src_addr))
num_nbrs++;
}
}
first_ifindex = nh_node->ifindex;
ifp = ifps[nh_iter];
if (!ifp) {
- if (PIM_DEBUG_PIM_NHT) {
- char addr_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>", src->u.prefix4,
- addr_str, sizeof(addr_str));
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s %s: could not find interface for ifindex %d (address %s(%s))",
+ "%s %s: could not find interface for ifindex %d (address %pPA(%s))",
__FILE__, __func__, first_ifindex,
- addr_str, pim->vrf->name);
- }
+ &src_addr, pim->vrf->name);
if (nh_iter == mod_val)
mod_val++; // Select nexthpath
nh_iter++;
continue;
}
if (!ifp->info) {
- if (PIM_DEBUG_PIM_NHT) {
- char addr_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>", src->u.prefix4,
- addr_str, sizeof(addr_str));
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
+ "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)",
__func__, ifp->name, pim->vrf->name,
- first_ifindex, addr_str);
- }
+ first_ifindex, &src_addr);
if (nh_iter == mod_val)
mod_val++; // Select nexthpath
nh_iter++;
continue;
}
- if (neighbor_needed
- && !pim_if_connected_to_source(ifp, src->u.prefix4)) {
+ if (neighbor_needed &&
+ !pim_if_connected_to_source(ifp, src_addr)) {
nbr = nbrs[nh_iter];
if (!nbr && !if_is_loopback(ifp)) {
if (PIM_DEBUG_PIM_NHT)
if (nh_iter == mod_val) {
nexthop->interface = ifp;
- nexthop->mrib_nexthop_addr.family = AF_INET;
- nexthop->mrib_nexthop_addr.prefixlen = IPV4_MAX_BITLEN;
+ nexthop->mrib_nexthop_addr.family = PIM_AF;
+ nexthop->mrib_nexthop_addr.prefixlen = PIM_MAX_BITLEN;
+#if PIM_IPV == 4
nexthop->mrib_nexthop_addr.u.prefix4 =
nh_node->gate.ipv4;
+#else
+ nexthop->mrib_nexthop_addr.u.prefix6 =
+ nh_node->gate->ipv6;
+#endif
nexthop->mrib_metric_preference = pnc->distance;
nexthop->mrib_route_metric = pnc->metric;
- nexthop->last_lookup = src->u.prefix4;
+ nexthop->last_lookup = src_addr;
nexthop->last_lookup_time = pim_time_monotonic_usec();
nexthop->nbr = nbr;
found = 1;
- if (PIM_DEBUG_PIM_NHT) {
- char buf[INET_ADDRSTRLEN];
- char buf2[INET_ADDRSTRLEN];
- char buf3[INET_ADDRSTRLEN];
- pim_inet4_dump("<src?>", src->u.prefix4, buf2,
- sizeof(buf2));
- pim_inet4_dump("<grp?>", grp->u.prefix4, buf3,
- sizeof(buf3));
- pim_inet4_dump(
- "<rpf?>",
- nexthop->mrib_nexthop_addr.u.prefix4,
- buf, sizeof(buf));
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: (%s,%s)(%s) selected nhop interface %s addr %s mod_val %u iter %d ecmp %d",
- __func__, buf2, buf3, pim->vrf->name,
- ifp->name, buf, mod_val, nh_iter,
- pim->ecmp_enable);
- }
+ "%s: (%pPA,%pPA)(%s) selected nhop interface %s addr %pPAs mod_val %u iter %d ecmp %d",
+ __func__, &src_addr, &grp_addr,
+ pim->vrf->name, ifp->name, &nh_addr,
+ mod_val, nh_iter, pim->ecmp_enable);
}
nh_iter++;
}
* RPF address from nexthop cache (i.e.
* destination) as PIM nexthop.
*/
+#if PIM_IPV == 4
nexthop->type = NEXTHOP_TYPE_IPV4_IFINDEX;
nexthop->gate.ipv4 =
pnc->rpf.rpf_addr.u.prefix4;
+#else
+ nexthop->type = NEXTHOP_TYPE_IPV6_IFINDEX;
+ nexthop->gate.ipv6 =
+ pnc->rpf.rpf_addr.u.prefix6;
+#endif
break;
case NEXTHOP_TYPE_IPV6_IFINDEX:
ifp1 = if_lookup_by_index(nexthop->ifindex,
else {
// Mark nexthop address to 0 until PIM
// Nbr is resolved.
- nexthop->gate.ipv4.s_addr =
- PIM_NET_INADDR_ANY;
+#if PIM_IPV == 4
+ nexthop->gate.ipv4 = PIMADDR_ANY;
+#else
+ nexthop->gate.ipv6 = PIMADDR_ANY;
+#endif
}
break;
uint8_t i = 0;
uint32_t hash_val = 0, mod_val = 0;
uint32_t num_nbrs = 0;
- char addr_str[PREFIX_STRLEN];
+ pim_addr src_addr = pim_addr_from_prefix(src);
- if (PIM_DEBUG_PIM_NHT) {
- pim_inet4_dump("<addr?>", src->u.prefix4, addr_str,
- sizeof(addr_str));
- zlog_debug("%s: Looking up: %s(%s), last lookup time: %lld",
- __func__, addr_str, pim->vrf->name,
+ if (PIM_DEBUG_PIM_NHT)
+ zlog_debug("%s: Looking up: %pPA(%s), last lookup time: %lld",
+ __func__, &src_addr, pim->vrf->name,
nexthop->last_lookup_time);
- }
- memset(&rpf, 0, sizeof(struct pim_rpf));
- rpf.rpf_addr.family = AF_INET;
- rpf.rpf_addr.prefixlen = IPV4_MAX_BITLEN;
- rpf.rpf_addr.u.prefix4 = src->u.prefix4;
+ rpf.rpf_addr = *src;
pnc = pim_nexthop_cache_find(pim, &rpf);
if (pnc) {
memset(nexthop_tab, 0,
sizeof(struct pim_zlookup_nexthop) * MULTIPATH_NUM);
- num_ifindex =
- zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM,
- src->u.prefix4, PIM_NEXTHOP_LOOKUP_MAX);
+ num_ifindex = zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM,
+ src_addr, PIM_NEXTHOP_LOOKUP_MAX);
if (num_ifindex < 1) {
if (PIM_DEBUG_PIM_NHT)
zlog_warn(
- "%s: could not find nexthop ifindex for address %s(%s)",
- __func__, addr_str, pim->vrf->name);
+ "%s: could not find nexthop ifindex for address %pPA(%s)",
+ __func__, &src_addr, pim->vrf->name);
return 0;
}
if (ifps[i]) {
nbrs[i] = pim_neighbor_find_prefix(
ifps[i], &nexthop_tab[i].nexthop_addr);
- if (nbrs[i]
- || pim_if_connected_to_source(ifps[i],
- src->u.prefix4))
+ if (nbrs[i] ||
+ pim_if_connected_to_source(ifps[i], src_addr))
num_nbrs++;
}
}
if (!ifp) {
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s %s: could not find interface for ifindex %d (address %s(%s))",
+ "%s %s: could not find interface for ifindex %d (address %pPA(%s))",
__FILE__, __func__, first_ifindex,
- addr_str, pim->vrf->name);
+ &src_addr, pim->vrf->name);
if (i == mod_val)
mod_val++;
i++;
if (!ifp->info) {
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %s)",
+ "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)",
__func__, ifp->name, pim->vrf->name,
- first_ifindex, addr_str);
+ first_ifindex, &src_addr);
if (i == mod_val)
mod_val++;
i++;
continue;
}
- if (neighbor_needed
- && !pim_if_connected_to_source(ifp, src->u.prefix4)) {
+ if (neighbor_needed &&
+ !pim_if_connected_to_source(ifp, src_addr)) {
nbr = nbrs[i];
if (PIM_DEBUG_PIM_NHT_DETAIL)
zlog_debug("ifp name: %s(%s), pim nbr: %p",
i++;
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: NBR not found on input interface %s(%s) (RPF for source %s)",
+ "%s: NBR not found on input interface %s(%s) (RPF for source %pPA)",
__func__, ifp->name,
- pim->vrf->name, addr_str);
+ pim->vrf->name, &src_addr);
continue;
}
}
&nexthop_tab[i].nexthop_addr,
nexthop_str, sizeof(nexthop_str));
zlog_debug(
- "%s: found nhop %s for addr %s interface %s(%s) metric %d dist %d",
- __func__, nexthop_str, addr_str,
+ "%s: found nhop %s for addr %pPA interface %s(%s) metric %d dist %d",
+ __func__, nexthop_str, &src_addr,
ifp->name, pim->vrf->name,
nexthop_tab[i].route_metric,
nexthop_tab[i].protocol_distance);
nexthop_tab[i].protocol_distance;
nexthop->mrib_route_metric =
nexthop_tab[i].route_metric;
- nexthop->last_lookup = src->u.prefix4;
+ memcpy(&(nexthop->last_lookup), &(src_addr),
+ sizeof(pim_addr));
nexthop->last_lookup_time = pim_time_monotonic_usec();
nexthop->nbr = nbr;
found = 1;
struct pim_nexthop nhop;
int vif_index;
ifindex_t ifindex;
- char addr_str[PREFIX_STRLEN];
+ pim_addr src_addr;
- if (PIM_DEBUG_PIM_NHT)
- pim_inet4_dump("<addr?>", src->u.prefix4, addr_str,
- sizeof(addr_str));
+ if (PIM_DEBUG_PIM_NHT) {
+ src_addr = pim_addr_from_prefix(src);
+ }
memset(&nhop, 0, sizeof(nhop));
if (!pim_ecmp_nexthop_lookup(pim, &nhop, src, grp, 1)) {
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: could not find nexthop ifindex for address %s(%s)",
- __func__, addr_str, pim->vrf->name);
+ "%s: could not find nexthop ifindex for address %pPA(%s)",
+ __func__, &src_addr, pim->vrf->name);
return -1;
}
ifindex = nhop.interface->ifindex;
if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: found nexthop ifindex=%d (interface %s(%s)) for address %s",
+ "%s: found nexthop ifindex=%d (interface %s(%s)) for address %pPA",
__func__, ifindex,
ifindex2ifname(ifindex, pim->vrf->vrf_id),
- pim->vrf->name, addr_str);
+ pim->vrf->name, &src_addr);
vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex);
if (vif_index < 0) {
if (PIM_DEBUG_PIM_NHT) {
zlog_debug(
- "%s: low vif_index=%d(%s) < 1 nexthop for address %s",
- __func__, vif_index, pim->vrf->name, addr_str);
+ "%s: low vif_index=%d(%s) < 1 nexthop for address %pPA",
+ __func__, vif_index, pim->vrf->name, &src_addr);
}
return -2;
}
#include "pim_str.h"
#include "pim_oil.h"
#include "pim_zlookup.h"
+#include "pim_addr.h"
static struct zclient *zlookup = NULL;
struct thread *zlookup_read;
num_ifindex = zclient_lookup_nexthop_once(pim, nexthop_tab,
tab_size, addr);
if (num_ifindex < 1) {
- if (PIM_DEBUG_PIM_NHT) {
- char addr_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>", addr, addr_str,
- sizeof(addr_str));
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: lookup=%d/%d: could not find nexthop ifindex for address %s(%s)",
- __func__, lookup, max_lookup, addr_str,
+ "%s: lookup=%d/%d: could not find nexthop ifindex for address %pPA(%s)",
+ __func__, lookup, max_lookup, &addr,
pim->vrf->name);
- }
return -1;
}
if (lookup > 0) {
/* Report non-recursive success after first
* lookup */
- if (PIM_DEBUG_PIM_NHT) {
- char addr_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>", addr,
- addr_str,
- sizeof(addr_str));
+ if (PIM_DEBUG_PIM_NHT)
zlog_debug(
- "%s: lookup=%d/%d: found non-recursive ifindex=%d for address %s(%s) dist=%d met=%d",
+ "%s: lookup=%d/%d: found non-recursive ifindex=%d for address %pPA(%s) dist=%d met=%d",
__func__, lookup, max_lookup,
- first_ifindex, addr_str,
+ first_ifindex, &addr,
pim->vrf->name,
nexthop_tab[0]
.protocol_distance,
nexthop_tab[0].route_metric);
- }
/* use last address as nexthop address */
- nexthop_tab[0].nexthop_addr.u.prefix4 = addr;
+ pim_addr_to_prefix(
+ &(nexthop_tab[0].nexthop_addr), addr);
/* report original route metric/distance */
nexthop_tab[0].route_metric = route_metric;
pim_addr_dump("<nexthop?>", &nexthop_addr, nexthop_str,
sizeof(nexthop_str));
zlog_debug(
- "%s: lookup=%d/%d: zebra returned recursive nexthop %s for address %s(%s) dist=%d met=%d",
+ "%s: lookup=%d/%d: zebra returned recursive nexthop %s for address %pPA(%s) dist=%d met=%d",
__func__, lookup, max_lookup, nexthop_str,
- addr_str, pim->vrf->name,
+ &addr, pim->vrf->name,
nexthop_tab[0].protocol_distance,
nexthop_tab[0].route_metric);
}
- addr = nexthop_addr.u.prefix4; /* use nexthop addr for
- recursive lookup */
+ addr = pim_addr_from_prefix(&(nexthop_addr)); /* use nexthop
+ addr for recursive lookup */
} /* for (max_lookup) */
- if (PIM_DEBUG_PIM_NHT) {
- char addr_str[INET_ADDRSTRLEN];
- pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str));
+ if (PIM_DEBUG_PIM_NHT)
zlog_warn(
- "%s: lookup=%d/%d: failure searching recursive nexthop ifindex for address %s(%s)",
- __func__, lookup, max_lookup, addr_str, pim->vrf->name);
- }
+ "%s: lookup=%d/%d: failure searching recursive nexthop ifindex for address %pPA(%s)",
+ __func__, lookup, max_lookup, &addr, pim->vrf->name);
return -2;
}
projects / mirror_frr.git / commitdiff