]> git.puffer.fish Git - matthieu/frr.git/commit
pimd: Fix connected route nexthop fix from 66f5152f
authorMartin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
Fri, 8 Jun 2018 16:26:39 +0000 (18:26 +0200)
committerMartin Buck <mb-tmp-tvguho.pbz@gromit.dyndns.org>
Fri, 8 Jun 2018 16:29:04 +0000 (18:29 +0200)
commit56c1568b3d78e6e15c8fa230c6ed0e29419e2341
treef37cf8e3954e5cf6858fd8ad0f2eb18d9b12fdc4
parent9eafc8abd74a4d8144c764e0361dbb2a51da91c9
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>
pimd/pim_nht.c
pimd/pim_zlookup.c