proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-15 21:12:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix nexthop determination when sending towards RP

Browse Source 
When sending a PIM join upwards on the RP-based tree, it may get dropped on
the last hop before the RP if the RP is reachable via a connected route
(i.e. there's no associated nexthop). pimd needs to put the nexthop IP
address into the PIM join payload and fails to do that if that route has a
nexthop of 0.0.0.0. So whenever we look up a route to determine the nexthop
or we receive a nexthop tracking update from Zebra, use the destination
address as the nexthop address for connected routes.

Fixes #2326.

Signed-off-by: Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
This commit is contained in:
Martin Buck 2018-06-04 15:52:14 +02:00
parent ebb46153b0
commit 66f5152f98
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pimd/pim_nht.c
View File

@ -657,11 +657,20 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
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:
case NEXTHOP_TYPE_IFINDEX:
case NEXTHOP_TYPE_IPV4_IFINDEX: case NEXTHOP_TYPE_IPV4_IFINDEX:
case NEXTHOP_TYPE_IPV6: case NEXTHOP_TYPE_IPV6:
case NEXTHOP_TYPE_BLACKHOLE: case NEXTHOP_TYPE_BLACKHOLE:
break; break;
case NEXTHOP_TYPE_IFINDEX:
/*
* Connected route (i.e. no nexthop), use
* RPF address from nexthop cache (i.e.
* destination) as PIM nexthop.
*/
nexthop->type = NEXTHOP_TYPE_IPV4;
nexthop->gate.ipv4 =
pnc->rpf.rpf_addr.u.prefix4;
break;
case NEXTHOP_TYPE_IPV6_IFINDEX: case NEXTHOP_TYPE_IPV6_IFINDEX:
ifp1 = if_lookup_by_index(nexthop->ifindex, ifp1 = if_lookup_by_index(nexthop->ifindex,
pim->vrf_id); pim->vrf_id);

44
pimd/pim_zlookup.c
View File

@ -217,22 +217,26 @@ static int zclient_read_nexthop(struct pim_instance *pim,
} }
switch (nexthop_type) { switch (nexthop_type) {
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
nexthop_tab[num_ifindex].ifindex = stream_getl(s);
/*
* Connected route (i.e. no nexthop), use
* address passed in as PIM nexthop. This will
* allow us to work in cases where we are
* trying to find a route for this box.
*/
nexthop_tab[num_ifindex].nexthop_addr.family = AF_INET;
nexthop_tab[num_ifindex].nexthop_addr.prefixlen =
IPV4_MAX_BITLEN;
nexthop_tab[num_ifindex].nexthop_addr.u.prefix4 =
addr;
++num_ifindex;
break;
case NEXTHOP_TYPE_IPV4_IFINDEX: case NEXTHOP_TYPE_IPV4_IFINDEX:
case NEXTHOP_TYPE_IPV4: case NEXTHOP_TYPE_IPV4:
nexthop_tab[num_ifindex].nexthop_addr.family = AF_INET; nexthop_tab[num_ifindex].nexthop_addr.family = AF_INET;
if (nexthop_type == NEXTHOP_TYPE_IPV4_IFINDEX nexthop_tab[num_ifindex].nexthop_addr.u.prefix4.s_addr =
|| nexthop_type == NEXTHOP_TYPE_IPV4) {
nexthop_tab[num_ifindex]
.nexthop_addr.u.prefix4.s_addr =
stream_get_ipv4(s); stream_get_ipv4(s);
} else {
nexthop_tab[num_ifindex]
.nexthop_addr.u.prefix4.s_addr =
PIM_NET_INADDR_ANY;
}
nexthop_tab[num_ifindex].ifindex = stream_getl(s); nexthop_tab[num_ifindex].ifindex = stream_getl(s);
nexthop_tab[num_ifindex].protocol_distance = distance;
nexthop_tab[num_ifindex].route_metric = metric;
++num_ifindex; ++num_ifindex;
break; break;
case NEXTHOP_TYPE_IPV6_IFINDEX: case NEXTHOP_TYPE_IPV6_IFINDEX:
@ -272,19 +276,13 @@ static int zclient_read_nexthop(struct pim_instance *pim,
} }
++num_ifindex; ++num_ifindex;
break; break;
default: case NEXTHOP_TYPE_IPV6:
/* do nothing */ case NEXTHOP_TYPE_BLACKHOLE:
{ /* ignore */
char addr_str[INET_ADDRSTRLEN]; continue;
pim_inet4_dump("<addr?>", addr, addr_str,
sizeof(addr_str));
zlog_warn(
"%s: found non-ifindex nexthop type=%d for address %s(%s)",
__PRETTY_FUNCTION__, nexthop_type,
addr_str, pim->vrf->name);
}
break;
} }
nexthop_tab[num_ifindex].protocol_distance = distance;
nexthop_tab[num_ifindex].route_metric = metric;
} }
return num_ifindex; return num_ifindex;