diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2024-01-31 02:51:18 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2024-01-31 02:51:18 +0900 |
| commit | eeff06337fea038a0f45246df01d50bd1db90b99 (patch) | |
| tree | 414f5695e5b29f85e7e2557586728e7884009108 | |
| parent | 32372c89a8e2cb8386d6032a25ba87ac26be5bac (diff) | |
| download | bird-eeff06337fea038a0f45246df01d50bd1db90b99.tar.gz | |
Revert "OSPF: On physical PtP links, skip next-hop resolving"
This reverts commit 31aa62ae6d2e111e87c08b4b27a16ead968f0689.
TODO: I need to figure out what is going wrong here, but this seems to
be causing issues for me.
Jan 30 17:34:50 stk1-heath.net.rhe.jp bird[1469]: ospf6: Unexpected case in next hop calculation
Jan 30 17:34:50 stk1-heath.net.rhe.jp bird[1469]: ospf6: Cannot find next hop for LSA (Type: 2001, Id: 0.0.0.0, Rt: 45.148.172.69)
| -rw-r--r-- | proto/ospf/rt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index efcd4e17..471bb586 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -1796,12 +1796,7 @@ calc_next_hop(struct ospf_area *oa, struct top_hash_entry *en, if (ifa->type == OSPF_IT_VLINK) return new_nexthop(p, IPA_NONE, NULL, 0); - /* - * 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); + /* FIXME: On physical PtP links we may skip next-hop altogether */ if (ospf_is_v2(p) || ospf_is_ip6(p)) { |