diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-08 13:50:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 13:50:48 -0400 |
| commit | c0efc5989f1582158051a9dedea78afa27d3b09f (patch) | |
| tree | f37cf8e3954e5cf6858fd8ad0f2eb18d9b12fdc4 | |
| parent | 9eafc8abd74a4d8144c764e0361dbb2a51da91c9 (diff) | |
| parent | 56c1568b3d78e6e15c8fa230c6ed0e29419e2341 (diff) | |
Merge pull request #2386 from gromit1811/pim-connected-nexthop-fix2
pimd: Fix connected route nexthop fix from 66f5152f
| -rw-r--r-- | pimd/pim_nht.c | 2 | ||||
| -rw-r--r-- | pimd/pim_zlookup.c | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 3cbd11a9ae..fa6486a83e 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -667,7 +667,7 @@ int pim_parse_nexthop_update(int command, struct zclient *zclient, * RPF address from nexthop cache (i.e. * destination) as PIM nexthop. */ - nexthop->type = NEXTHOP_TYPE_IPV4; + nexthop->type = NEXTHOP_TYPE_IPV4_IFINDEX; nexthop->gate.ipv4 = pnc->rpf.rpf_addr.u.prefix4; break; diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 9295b231cb..fb616e1b0d 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -215,6 +215,8 @@ static int zclient_read_nexthop(struct pim_instance *pim, tab_size, addr_str, pim->vrf->name); return num_ifindex; } + nexthop_tab[num_ifindex].protocol_distance = distance; + nexthop_tab[num_ifindex].route_metric = metric; switch (nexthop_type) { case NEXTHOP_TYPE_IFINDEX: nexthop_tab[num_ifindex].ifindex = stream_getl(s); @@ -276,13 +278,19 @@ static int zclient_read_nexthop(struct pim_instance *pim, } ++num_ifindex; break; - case NEXTHOP_TYPE_IPV6: - case NEXTHOP_TYPE_BLACKHOLE: - /* ignore */ - continue; + default: + /* do nothing */ + { + 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; |