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

pimd: Remove duplicate parameter to functions

Browse Source 
Both pim_ecmp_nexthop_lookup and pim_ecmp_fib_lookup_if_vif_index
pass the address in 2 times.  Make function calls consistent
and just pass in the src once.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-07-07 09:52:28 -04:00
parent 8a5134aaa6
commit b938537bdb
5 changed files with 39 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim_cmd.c
View File

@ -4320,8 +4320,8 @@ DEFUN (show_ip_pim_nexthop_lookup,
result = pim_ecmp_nexthop_search(vrf->info, pnc, &nexthop, result = pim_ecmp_nexthop_search(vrf->info, pnc, &nexthop,
&nht_p, &grp, 0); &nht_p, &grp, 0);
else else
result = pim_ecmp_nexthop_lookup(vrf->info, &nexthop, result = pim_ecmp_nexthop_lookup(vrf->info, &nexthop, &nht_p,
vif_source, &nht_p, &grp, 0); &grp, 0);
if (!result) { if (!result) {
vty_out(vty, vty_out(vty,

77
pimd/pim_nht.c
View File

@ -805,9 +805,8 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
} }
int pim_ecmp_nexthop_lookup(struct pim_instance *pim, int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
struct pim_nexthop *nexthop, struct in_addr addr, struct pim_nexthop *nexthop, struct prefix *src,
struct prefix *src, struct prefix *grp, struct prefix *grp, int neighbor_needed)
int neighbor_needed)
{ {
struct pim_zlookup_nexthop nexthop_tab[MULTIPATH_NUM]; struct pim_zlookup_nexthop nexthop_tab[MULTIPATH_NUM];
struct pim_neighbor *nbrs[MULTIPATH_NUM], *nbr = NULL; struct pim_neighbor *nbrs[MULTIPATH_NUM], *nbr = NULL;
@ -818,10 +817,11 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
uint8_t i = 0; uint8_t i = 0;
uint32_t hash_val = 0, mod_val = 0; uint32_t hash_val = 0, mod_val = 0;
uint32_t num_nbrs = 0; uint32_t num_nbrs = 0;
char addr_str[PREFIX_STRLEN];
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT) {
char addr_str[INET_ADDRSTRLEN]; pim_inet4_dump("<addr?>", src->u.prefix4, addr_str,
pim_inet4_dump("<addr?>", addr, addr_str, sizeof(addr_str)); sizeof(addr_str));
zlog_debug("%s: Looking up: %s(%s), last lookup time: %lld", zlog_debug("%s: Looking up: %s(%s), last lookup time: %lld",
__PRETTY_FUNCTION__, addr_str, pim->vrf->name, __PRETTY_FUNCTION__, addr_str, pim->vrf->name,
nexthop->last_lookup_time); nexthop->last_lookup_time);
@ -829,17 +829,14 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
memset(nexthop_tab, 0, memset(nexthop_tab, 0,
sizeof(struct pim_zlookup_nexthop) * MULTIPATH_NUM); sizeof(struct pim_zlookup_nexthop) * MULTIPATH_NUM);
num_ifindex = zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM, num_ifindex =
addr, PIM_NEXTHOP_LOOKUP_MAX); zclient_lookup_nexthop(pim, nexthop_tab, MULTIPATH_NUM,
src->u.prefix4, PIM_NEXTHOP_LOOKUP_MAX);
if (num_ifindex < 1) { if (num_ifindex < 1) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT)
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<addr?>", addr, addr_str,
sizeof(addr_str));
zlog_warn( zlog_warn(
"%s: could not find nexthop ifindex for address %s(%s)", "%s: could not find nexthop ifindex for address %s(%s)",
__PRETTY_FUNCTION__, addr_str, pim->vrf->name); __PRETTY_FUNCTION__, addr_str, pim->vrf->name);
}
return 0; return 0;
} }
@ -853,8 +850,9 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
if (ifps[i]) { if (ifps[i]) {
nbrs[i] = pim_neighbor_find( nbrs[i] = pim_neighbor_find(
ifps[i], nexthop_tab[i].nexthop_addr.u.prefix4); ifps[i], nexthop_tab[i].nexthop_addr.u.prefix4);
if (nbrs[i] || pim_if_connected_to_source(ifps[i], if (nbrs[i]
addr)) || pim_if_connected_to_source(ifps[i],
src->u.prefix4))
num_nbrs++; num_nbrs++;
} }
} }
@ -882,16 +880,12 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
ifp = ifps[i]; ifp = ifps[i];
if (!ifp) { if (!ifp) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT)
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<addr?>", addr, addr_str,
sizeof(addr_str));
zlog_debug( zlog_debug(
"%s %s: could not find interface for ifindex %d (address %s(%s))", "%s %s: could not find interface for ifindex %d (address %s(%s))",
__FILE__, __PRETTY_FUNCTION__, __FILE__, __PRETTY_FUNCTION__,
first_ifindex, addr_str, first_ifindex, addr_str,
pim->vrf->name); pim->vrf->name);
}
if (i == mod_val) if (i == mod_val)
mod_val++; mod_val++;
i++; i++;
@ -899,22 +893,19 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
} }
if (!ifp->info) { if (!ifp->info) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT)
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<addr?>", addr, addr_str,
sizeof(addr_str));
zlog_debug( 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 %s)",
__PRETTY_FUNCTION__, ifp->name, __PRETTY_FUNCTION__, ifp->name,
pim->vrf->name, first_ifindex, pim->vrf->name, first_ifindex,
addr_str); addr_str);
}
if (i == mod_val) if (i == mod_val)
mod_val++; mod_val++;
i++; i++;
continue; continue;
} }
if (neighbor_needed && !pim_if_connected_to_source(ifp, addr)) { if (neighbor_needed
&& !pim_if_connected_to_source(ifp, src->u.prefix4)) {
nbr = nbrs[i]; nbr = nbrs[i];
if (PIM_DEBUG_PIM_NHT_DETAIL) if (PIM_DEBUG_PIM_NHT_DETAIL)
zlog_debug("ifp name: %s(%s), pim nbr: %p", zlog_debug("ifp name: %s(%s), pim nbr: %p",
@ -923,16 +914,11 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
if (i == mod_val) if (i == mod_val)
mod_val++; mod_val++;
i++; i++;
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT)
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<addr?>", addr,
addr_str,
sizeof(addr_str));
zlog_debug( 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 %s)",
__PRETTY_FUNCTION__, ifp->name, __PRETTY_FUNCTION__, ifp->name,
pim->vrf->name, addr_str); pim->vrf->name, addr_str);
}
continue; continue;
} }
} }
@ -940,12 +926,10 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
if (i == mod_val) { if (i == mod_val) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT) {
char nexthop_str[PREFIX_STRLEN]; char nexthop_str[PREFIX_STRLEN];
char addr_str[INET_ADDRSTRLEN];
pim_addr_dump("<nexthop?>", pim_addr_dump("<nexthop?>",
&nexthop_tab[i].nexthop_addr, &nexthop_tab[i].nexthop_addr,
nexthop_str, sizeof(nexthop_str)); nexthop_str, sizeof(nexthop_str));
pim_inet4_dump("<addr?>", addr, addr_str,
sizeof(addr_str));
zlog_debug( zlog_debug(
"%s: found nhop %s for addr %s interface %s(%s) metric %d dist %d", "%s: found nhop %s for addr %s interface %s(%s) metric %d dist %d",
__PRETTY_FUNCTION__, nexthop_str, __PRETTY_FUNCTION__, nexthop_str,
@ -961,7 +945,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
nexthop_tab[i].protocol_distance; nexthop_tab[i].protocol_distance;
nexthop->mrib_route_metric = nexthop->mrib_route_metric =
nexthop_tab[i].route_metric; nexthop_tab[i].route_metric;
nexthop->last_lookup = addr; nexthop->last_lookup = src->u.prefix4;
nexthop->last_lookup_time = pim_time_monotonic_usec(); nexthop->last_lookup_time = pim_time_monotonic_usec();
nexthop->nbr = nbr; nexthop->nbr = nbr;
found = 1; found = 1;
@ -976,43 +960,36 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
} }
int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
struct in_addr addr, struct prefix *src, struct prefix *src, struct prefix *grp)
struct prefix *grp)
{ {
struct pim_nexthop nhop; struct pim_nexthop nhop;
int vif_index; int vif_index;
ifindex_t ifindex; ifindex_t ifindex;
char addr_str[PREFIX_STRLEN];
if (!pim_ecmp_nexthop_lookup(pim, &nhop, addr, src, grp, 0)) { if (PIM_DEBUG_PIM_NHT)
if (PIM_DEBUG_PIM_NHT) { pim_inet4_dump("<addr?>", src->u.prefix4, addr_str,
char addr_str[INET_ADDRSTRLEN]; sizeof(addr_str));
pim_inet4_dump("<addr?>", addr, addr_str, if (!pim_ecmp_nexthop_lookup(pim, &nhop, src, grp, 0)) {
sizeof(addr_str)); if (PIM_DEBUG_PIM_NHT)
zlog_debug( zlog_debug(
"%s: could not find nexthop ifindex for address %s(%s)", "%s: could not find nexthop ifindex for address %s(%s)",
__PRETTY_FUNCTION__, addr_str, pim->vrf->name); __PRETTY_FUNCTION__, addr_str, pim->vrf->name);
}
return -1; return -1;
} }
ifindex = nhop.interface->ifindex; ifindex = nhop.interface->ifindex;
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT)
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<ifaddr?>", addr, addr_str, sizeof(addr_str));
zlog_debug( zlog_debug(
"%s: found nexthop ifindex=%d (interface %s(%s)) for address %s", "%s: found nexthop ifindex=%d (interface %s(%s)) for address %s",
__PRETTY_FUNCTION__, ifindex, __PRETTY_FUNCTION__, ifindex,
ifindex2ifname(ifindex, pim->vrf_id), ifindex2ifname(ifindex, pim->vrf_id),
pim->vrf->name, addr_str); pim->vrf->name, addr_str);
}
vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex); vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex);
if (vif_index < 0) { if (vif_index < 0) {
if (PIM_DEBUG_PIM_NHT) { if (PIM_DEBUG_PIM_NHT) {
char addr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<addr?>", addr, addr_str,
sizeof(addr_str));
zlog_debug( zlog_debug(
"%s: low vif_index=%d(%s) < 1 nexthop for address %s", "%s: low vif_index=%d(%s) < 1 nexthop for address %s",
__PRETTY_FUNCTION__, vif_index, pim->vrf->name, __PRETTY_FUNCTION__, vif_index, pim->vrf->name,

8
pimd/pim_nht.h
View File

@ -61,13 +61,11 @@ int pim_ecmp_nexthop_search(struct pim_instance *pim,
struct pim_nexthop *nexthop, struct prefix *src, struct pim_nexthop *nexthop, struct prefix *src,
struct prefix *grp, int neighbor_needed); struct prefix *grp, int neighbor_needed);
int pim_ecmp_nexthop_lookup(struct pim_instance *pim, int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
struct pim_nexthop *nexthop, struct in_addr addr, struct pim_nexthop *nexthop, struct prefix *src,
struct prefix *src, struct prefix *grp, struct prefix *grp, int neighbor_needed);
int neighbor_needed);
void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient, void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient,
struct pim_nexthop_cache *pnc, int command); struct pim_nexthop_cache *pnc, int command);
void pim_resolve_upstream_nh(struct pim_instance *pim, struct prefix *nht_p); void pim_resolve_upstream_nh(struct pim_instance *pim, struct prefix *nht_p);
int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim,
struct in_addr addr, struct prefix *src, struct prefix *src, struct prefix *grp);
struct prefix *grp);
#endif #endif

3
pimd/pim_rpf.c
View File

@ -239,8 +239,7 @@ enum pim_rpf_result pim_rpf_update(struct pim_instance *pim,
return PIM_RPF_FAILURE; return PIM_RPF_FAILURE;
} }
} else { } else {
if (!pim_ecmp_nexthop_lookup(pim, &rpf->source_nexthop, if (!pim_ecmp_nexthop_lookup(pim, &rpf->source_nexthop, &src,
up->upstream_addr, &src,
&grp, neigh_needed)) &grp, neigh_needed))
return PIM_RPF_FAILURE; return PIM_RPF_FAILURE;
} }

12
pimd/pim_zebra.c
View File

@ -561,7 +561,7 @@ void pim_scan_individual_oil(struct channel_oil *c_oil, int in_vif_index)
__PRETTY_FUNCTION__, source_str, group_str); __PRETTY_FUNCTION__, source_str, group_str);
} }
input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index( input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index(
c_oil->pim, vif_source, &src, &grp); c_oil->pim, &src, &grp);
} }
if (input_iface_vif_index < 1) { if (input_iface_vif_index < 1) {
@ -953,8 +953,8 @@ void igmp_source_forward_start(struct pim_instance *pim,
} }
} 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,
pim, vif_source, &src, &grp); &grp);
if (PIM_DEBUG_ZEBRA) { if (PIM_DEBUG_ZEBRA) {
char buf2[INET_ADDRSTRLEN]; char buf2[INET_ADDRSTRLEN];
@ -1153,7 +1153,7 @@ void pim_forward_start(struct pim_ifchannel *ch)
/* Register addr with Zebra NHT */ /* Register addr with Zebra NHT */
nht_p.family = AF_INET; nht_p.family = AF_INET;
nht_p.prefixlen = IPV4_MAX_BITLEN; nht_p.prefixlen = IPV4_MAX_BITLEN;
nht_p.u.prefix4.s_addr = up->upstream_addr.s_addr; nht_p.u.prefix4 = up->upstream_addr;
grp.family = AF_INET; grp.family = AF_INET;
grp.prefixlen = IPV4_MAX_BITLEN; grp.prefixlen = IPV4_MAX_BITLEN;
grp.u.prefix4 = up->sg.grp; grp.u.prefix4 = up->sg.grp;
@ -1204,8 +1204,8 @@ void pim_forward_start(struct pim_ifchannel *ch)
} }
} 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,
pim, up->upstream_addr, &src, &grp); &grp);
if (input_iface_vif_index < 1) { if (input_iface_vif_index < 1) {
if (PIM_DEBUG_PIM_TRACE) { if (PIM_DEBUG_PIM_TRACE) {