proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-17 22:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Fix connected route nexthop fix from 66f5152f

Browse Source 
Fix a couple of problems in my 1st fix for PIM nexthops reachable via a
connected route:

Use NEXTHOP_TYPE_IPV4_IFINDEX instead of NEXTHOP_TYPE_IPV4 since we add an
IPv4 address to an already known ifindex.

Assign nexthop_tab[num_ifindex].protocol_distance and .route_metric before
incrementing num_ifindex.

Revert the default: to individual switch case statement conversion in
zclient_read_nexthop() as requested by donaldsharp in #2347

Signed-off-by: Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
This commit is contained in:
Martin Buck 2018-06-08 18:26:39 +02:00
parent 9eafc8abd7
commit 56c1568b3d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim_nht.c
View File

@ -667,7 +667,7 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient,
* RPF address from nexthop cache (i.e. * RPF address from nexthop cache (i.e.
* destination) as PIM nexthop. * destination) as PIM nexthop.
*/ */
nexthop->type = NEXTHOP_TYPE_IPV4; nexthop->type = NEXTHOP_TYPE_IPV4_IFINDEX;
nexthop->gate.ipv4 = nexthop->gate.ipv4 =
pnc->rpf.rpf_addr.u.prefix4; pnc->rpf.rpf_addr.u.prefix4;
break; break;

20
pimd/pim_zlookup.c
View File

@ -215,6 +215,8 @@ static int zclient_read_nexthop(struct pim_instance *pim,
tab_size, addr_str, pim->vrf->name); tab_size, addr_str, pim->vrf->name);
return num_ifindex; return num_ifindex;
} }
nexthop_tab[num_ifindex].protocol_distance = distance;
nexthop_tab[num_ifindex].route_metric = metric;
switch (nexthop_type) { switch (nexthop_type) {
case NEXTHOP_TYPE_IFINDEX: case NEXTHOP_TYPE_IFINDEX:
nexthop_tab[num_ifindex].ifindex = stream_getl(s); nexthop_tab[num_ifindex].ifindex = stream_getl(s);
@ -276,13 +278,19 @@ static int zclient_read_nexthop(struct pim_instance *pim,
} }
++num_ifindex; ++num_ifindex;
break; break;
case NEXTHOP_TYPE_IPV6: default:
case NEXTHOP_TYPE_BLACKHOLE: /* do nothing */
/* ignore */ {
continue; char addr_str[INET_ADDRSTRLEN];
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;