mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00
Code Releases Activity

Merge commit 'v2.14-32-gcaa9460a' into mq-merge-step-2

Browse Source
This commit is contained in:
Maria Matejka 2024-01-28 14:57:10 +01:00
commit 9b731089b5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proto/ospf/rt.c
View File

@ -1796,7 +1796,12 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en,
if (ifa->type == OSPF_IT_VLINK) if (ifa->type == OSPF_IT_VLINK)
return new_nexthop(p, IPA_NONE, NULL, 0); return new_nexthop(p, IPA_NONE, NULL, 0);
/* FIXME: On physical PtP links we may skip next-hop altogether */ /*
* The type of the ospf_iface is PtP and the iface is a physical PtP link,
* so we can simply use the iface, and skip further resolving.
*/
if (ifa->type == OSPF_IT_PTP && !(ifa->iface->flags & IF_MULTIACCESS))
return new_nexthop(p, IPA_NONE, ifa->iface, ifa->ecmp_weight);
if (ospf_is_v2(p) || ospf_is_ip6(p)) if (ospf_is_v2(p) || ospf_is_ip6(p))
{ {