proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 20:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10940 from opensourcerouting/pim-5549-clarify

Browse Source 
pimd: clarify RFC5549 nexthop handling (& fix for pim6d)
This commit is contained in:
Donald Sharp 2022-04-05 09:43:39 -04:00 committed by GitHub
commit 0e3aad23de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pimd/pim_nht.c
View File

@ -696,9 +696,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
int i; int i;
struct pim_rpf rpf; struct pim_rpf rpf;
struct pim_nexthop_cache *pnc = NULL; struct pim_nexthop_cache *pnc = NULL;
struct pim_neighbor *nbr = NULL;
struct interface *ifp = NULL; struct interface *ifp = NULL;
struct interface *ifp1 = NULL;
struct vrf *vrf = vrf_lookup_by_id(vrf_id); struct vrf *vrf = vrf_lookup_by_id(vrf_id);
struct pim_instance *pim; struct pim_instance *pim;
struct zapi_route nhr; struct zapi_route nhr;
@ -739,11 +737,6 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
for (i = 0; i < nhr.nexthop_num; i++) { for (i = 0; i < nhr.nexthop_num; i++) {
nexthop = nexthop_from_zapi_nexthop(&nhr.nexthops[i]); nexthop = nexthop_from_zapi_nexthop(&nhr.nexthops[i]);
switch (nexthop->type) { switch (nexthop->type) {
case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV4_IFINDEX:
case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_BLACKHOLE:
break;
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
/* /*
* Connected route (i.e. no nexthop), use * Connected route (i.e. no nexthop), use
@ -760,33 +753,46 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
pnc->rpf.rpf_addr.u.prefix6; pnc->rpf.rpf_addr.u.prefix6;
#endif #endif
break; break;
case NEXTHOP_TYPE_IPV6_IFINDEX: #if PIM_IPV == 4
/* RFC5549 IPv4-over-IPv6 nexthop handling:
* if we get an IPv6 nexthop in IPv4 PIM, hunt down a
* PIM neighbor and use that instead.
*/
case NEXTHOP_TYPE_IPV6_IFINDEX: {
struct interface *ifp1 = NULL;
struct pim_neighbor *nbr = NULL;
ifp1 = if_lookup_by_index(nexthop->ifindex, ifp1 = if_lookup_by_index(nexthop->ifindex,
pim->vrf->vrf_id); pim->vrf->vrf_id);
if (!ifp1) if (!ifp1)
nbr = NULL; nbr = NULL;
else else
/* FIXME: should really use nbr's
* secondary address list here
*/
nbr = pim_neighbor_find_if(ifp1); nbr = pim_neighbor_find_if(ifp1);
/* Overwrite with Nbr address as NH addr */ /* Overwrite with Nbr address as NH addr */
if (nbr) if (nbr)
#if PIM_IPV == 4
nexthop->gate.ipv4 = nbr->source_addr; nexthop->gate.ipv4 = nbr->source_addr;
#else else
nexthop->gate.ipv6 = nbr->source_addr;
#endif
else {
// Mark nexthop address to 0 until PIM // Mark nexthop address to 0 until PIM
// Nbr is resolved. // Nbr is resolved.
#if PIM_IPV == 4
nexthop->gate.ipv4 = PIMADDR_ANY; nexthop->gate.ipv4 = PIMADDR_ANY;
#else
nexthop->gate.ipv6 = PIMADDR_ANY;
#endif
}
break; break;
} }
#else
case NEXTHOP_TYPE_IPV6_IFINDEX:
#endif
case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV4_IFINDEX:
case NEXTHOP_TYPE_BLACKHOLE:
/* nothing to do for the other nexthop types */
break;
}
ifp = if_lookup_by_index(nexthop->ifindex, ifp = if_lookup_by_index(nexthop->ifindex,
pim->vrf->vrf_id); pim->vrf->vrf_id);
@ -804,13 +810,18 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
continue; continue;
} }
if (PIM_DEBUG_PIM_NHT) if (PIM_DEBUG_PIM_NHT) {
#if PIM_IPV == 4
pim_addr nhaddr = nexthop->gate.ipv4;
#else
pim_addr nhaddr = nexthop->gate.ipv6;
#endif
zlog_debug( zlog_debug(
"%s: NHT addr %pFX(%s) %d-nhop via %pI4(%s) type %d distance:%u metric:%u ", "%s: NHT addr %pFX(%s) %d-nhop via %pPA(%s) type %d distance:%u metric:%u ",
__func__, &match, pim->vrf->name, i + 1, __func__, &match, pim->vrf->name, i + 1,
&nexthop->gate.ipv4, ifp->name, &nhaddr, ifp->name, nexthop->type,
nexthop->type, nhr.distance, nhr.distance, nhr.metric);
nhr.metric); }
if (!ifp->info) { if (!ifp->info) {
/* /*