]> git.puffer.fish Git - mirror/frr.git/commitdiff
ospfd: OSPFv2 VRF, fix CLAN SA warning
authorChirag Shah <chirag@cumulusnetworks.com>
Wed, 6 Sep 2017 18:42:20 +0000 (11:42 -0700)
committerChirag Shah <chirag@cumulusnetworks.com>
Tue, 3 Oct 2017 16:15:19 +0000 (09:15 -0700)
Signed-off-by: Chirag Shah <chirag@cumulusnetworks.com>
ospfd/ospf_apiserver.c

index 20d1b5944b16ca435fd5aa011009fe467d6e7114..3b9d67af8137195312d7fba746f0e7a765ae36a8 100644 (file)
@@ -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);