Skip to content

Commit

Permalink
Merge pull request FRRouting#17633 from opensourcerouting/fix/backpor…
Browse files Browse the repository at this point in the history
…t_9b0b9282d317a9aeab36d9a8b08a35fe9a172c4b_9.1

bgpd: Fix bgp core with a possible Intf delete (backport)
  • Loading branch information
donaldsharp authored Dec 11, 2024
2 parents a9dbbfe + 4eb5913 commit 81e8265
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions bgpd/bgp_zebra.c
Original file line number Diff line number Diff line change
Expand Up @@ -1179,9 +1179,10 @@ static bool update_ipv6nh_for_route_install(int nh_othervrf, struct bgp *nh_bgp,
ifindex =
pi->peer->nexthop.ifp->ifindex;
if (!ifindex) {
if (pi->peer->conf_if)
ifindex = pi->peer->ifp->ifindex;
else if (pi->peer->ifname)
if (pi->peer->conf_if) {
if (pi->peer->ifp)
ifindex = pi->peer->ifp->ifindex;
} else if (pi->peer->ifname)
ifindex = ifname2ifindex(
pi->peer->ifname,
pi->peer->bgp->vrf_id);
Expand Down

0 comments on commit 81e8265

Please sign in to comment.