summaryrefslogtreecommitdiffstats
path: root/ospf6d/ospf6_main.c
diff options
context:
space:
mode:
authorKaushik <kaushik@niralnetworks.com>2020-09-01 10:31:49 +0200
committerKaushik <kaushik@niralnetworks.com>2020-09-01 12:02:46 +0200
commitc5d28568c6b71e16fefb3a409159e8fc9742e3f0 (patch)
tree9aa9c4b0944e5f6ed9740c184ca81141edf28f36 /ospf6d/ospf6_main.c
parentMerge pull request #7025 from opensourcerouting/silence-cli-warning (diff)
downloadfrr-c5d28568c6b71e16fefb3a409159e8fc9742e3f0.tar.xz
frr-c5d28568c6b71e16fefb3a409159e8fc9742e3f0.zip
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 <hari@niralnetworks.com> Signed-off-by: Kaushik <kaushik@niralnetworks.com>
Diffstat (limited to 'ospf6d/ospf6_main.c')
-rw-r--r--ospf6d/ospf6_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 8ae5fdcf0..182faf003 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();