From c5d28568c6b71e16fefb3a409159e8fc9742e3f0 Mon Sep 17 00:00:00 2001 From: Kaushik Date: Tue, 1 Sep 2020 01:31:49 -0700 Subject: ospf6d : Preparing for ospf6d VRF support. 1. Removed the VRF_DEFAULT dependency from ospf6d. 2. The dependency on show command still exist will be fixed when the ospf6 master is available. Co-authored-by: Harios Signed-off-by: Kaushik --- ospf6d/ospf6_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ospf6d/ospf6_main.c') diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c index 8ae5fdcf06..182faf0038 100644 --- a/ospf6d/ospf6_main.c +++ b/ospf6d/ospf6_main.c @@ -79,15 +79,17 @@ struct thread_master *master; static void __attribute__((noreturn)) ospf6_exit(int status) { - struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); + struct vrf *vrf; struct interface *ifp; frr_early_fini(); if (ospf6) { + vrf = vrf_lookup_by_id(ospf6->vrf_id); ospf6_delete(ospf6); ospf6 = NULL; - } + } else + vrf = vrf_lookup_by_id(VRF_DEFAULT); bfd_gbl_exit(); -- cgit v1.2.3