From: Chirag Shah <chirag@cumulusnetworks.com>
Date: Wed, 6 Sep 2017 18:42:20 +0000 (-0700)
Subject: ospfd: OSPFv2 VRF, fix CLAN SA warning
X-Git-Tag: frr-4.0-dev~249^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0d31e63e3e56b2b70118316d4816dabf4b676565;p=matthieu%2Ffrr.git

ospfd: OSPFv2 VRF, fix CLAN SA warning

Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
---

diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 20d1b5944b..3b9d67af81 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -1376,7 +1376,11 @@ struct ospf_lsa *ospf_apiserver_opaque_lsa_new(struct ospf_area *area,
 
 	struct ospf *ospf;
 
-	ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
+	if (oi->ospf)
+		ospf = oi->ospf;
+	else
+		ospf = ospf_lookup_by_vrf_id(VRF_DEFAULT);
+
 	assert(ospf);
 
 	/* Create a stream for internal opaque LSA */
@@ -1431,7 +1435,7 @@ struct ospf_lsa *ospf_apiserver_opaque_lsa_new(struct ospf_area *area,
 
 	new->area = area;
 	new->oi = oi;
-	new->vrf_id = oi->ospf->vrf_id;
+	new->vrf_id = ospf->vrf_id;
 
 	SET_FLAG(new->flags, OSPF_LSA_SELF);
 	memcpy(new->data, newlsa, length);