diff options
| author | Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org> | 2018-06-08 18:26:39 +0200 |
|---|---|---|
| committer | Martin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org> | 2018-06-08 18:29:04 +0200 |
| commit | 56c1568b3d78e6e15c8fa230c6ed0e29419e2341 (patch) | |
| tree | f37cf8e3954e5cf6858fd8ad0f2eb18d9b12fdc4 /pimd/pim_nht.c | |
| parent | Merge pull request #2298 from qlyoung/pipe-actions-vtysh (diff) | |
| download | frr-56c1568b3d78e6e15c8fa230c6ed0e29419e2341.tar.xz frr-56c1568b3d78e6e15c8fa230c6ed0e29419e2341.zip | |
pimd: Fix connected route nexthop fix from 66f5152f
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>
Diffstat (limited to 'pimd/pim_nht.c')
| -rw-r--r-- | pimd/pim_nht.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index 3cbd11a9a..fa6486a83 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; |