From a82683694da23799f247b3392a00efdd342afdfc Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Sun, 22 Jan 2023 18:12:04 +0100 Subject: VRF: Fix issues with reconfiguration Protocols receive if_notify() announcements that are filtered according to their VRF setting, but during reconfiguration, they access iface_list directly and forgot to check VRF setting here, which leads to all interfaces be addedd. Fix this issue for Babel, OSPF, RAdv and RIP protocols. Thanks to Marcel Menzel for the bugreport. --- proto/ospf/iface.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'proto/ospf') diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c index 4cd45033..87e3d95e 100644 --- a/proto/ospf/iface.c +++ b/proto/ospf/iface.c @@ -1227,6 +1227,9 @@ ospf_reconfigure_ifaces2(struct ospf_proto *p) WALK_LIST(iface, iface_list) { + if (p->p.vrf_set && p->p.vrf != iface->master) + continue; + if (! (iface->flags & IF_UP)) continue; @@ -1273,6 +1276,9 @@ ospf_reconfigure_ifaces3(struct ospf_proto *p) WALK_LIST(iface, iface_list) { + if (p->p.vrf_set && p->p.vrf != iface->master) + continue; + if (! (iface->flags & IF_UP)) continue; -- cgit v1.2.3